comment out lines to make all working again
This commit is contained in:
15
swissmx.py
15
swissmx.py
@@ -78,8 +78,8 @@ TASK_EMBL = "embl"
|
||||
|
||||
|
||||
import PrelocatedCoordinatesModel
|
||||
#from EmblModule import EmblWidget #ZAC: orig. code
|
||||
#from HelicalTable import HelicalTableWidget #ZAC: orig. code
|
||||
from EmblModule import EmblWidget #ZAC: orig. code
|
||||
from HelicalTable import HelicalTableWidget #ZAC: orig. code
|
||||
#from Wigis import Spinner, Checkbox #ZAC: orig. code
|
||||
#from exceptions import * #ZAC: orig. code
|
||||
#import qoptic #ZAC: orig. code
|
||||
@@ -323,7 +323,7 @@ class Main(QMainWindow, Ui_MainWindow):
|
||||
|
||||
self.init_actions()
|
||||
self.prepare_microscope_page()
|
||||
#self.prepare_embl_gui()
|
||||
self.prepare_embl_gui()
|
||||
self.prepare_left_tabs()
|
||||
#self.update_beam_marker(qoptic_zoom.get_position()) #ZAC: orig. code
|
||||
self._centerpiece_stack.setCurrentIndex(0)
|
||||
@@ -332,7 +332,7 @@ class Main(QMainWindow, Ui_MainWindow):
|
||||
self.init_settings_tracker()
|
||||
self.wire_storage()
|
||||
|
||||
#self.create_helical_widgets() #ZAC: orig. code
|
||||
self.create_helical_widgets() #ZAC: orig. code
|
||||
|
||||
self.center_piece_update(0) # start camera updater
|
||||
curzoom = app._zoom.get()
|
||||
@@ -901,12 +901,13 @@ class Main(QMainWindow, Ui_MainWindow):
|
||||
self._rois.remove(roi)
|
||||
|
||||
def prepare_embl_gui(self):
|
||||
app = QApplication.instance()
|
||||
self._tab_daq_method_embl.setLayout(QVBoxLayout())
|
||||
layout = self._tab_daq_method_embl.layout()
|
||||
motors = self.get_gonio_motors()
|
||||
#self._embl_module = EmblWidget(self) #ZAC: orig. code
|
||||
#self._embl_module.configure(motors, sample_camera, qoptic_zoom)
|
||||
#layout.addWidget(self._embl_module)
|
||||
self._embl_module = EmblWidget(self) #ZAC: orig. code
|
||||
self._embl_module.configure(motors, app._camera, app._zoom)
|
||||
layout.addWidget(self._embl_module)
|
||||
|
||||
def prepare_microscope_page(self):
|
||||
layout = self.microscope_page.layout()
|
||||
|
||||
Reference in New Issue
Block a user