sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment out lines to make all working again

Browse Source
This commit is contained in:
zamofing_t
2022-07-18 09:43:54 +02:00
parent b69b63f18b
commit af8a887f2f
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
EmblModule.py
View File

@@ -12,8 +12,8 @@ import zmq
from os.path import join from os.path import join
from pathlib import Path from pathlib import Path
import qsingleton #import qsingleton #ZAC: orig. code
from CoordinatesModel import CoordinatesModel #from CoordinatesModel import CoordinatesModel #ZAC: orig. code
from app_config import settings, appsconf, option from app_config import settings, appsconf, option
EMBL_RESULTS_TIMEOUT = "embl/results_timeout" EMBL_RESULTS_TIMEOUT = "embl/results_timeout"
@@ -48,10 +48,10 @@ from PyQt5.QtWidgets import (
QProgressDialog, QProgressDialog,
) )
import storage #import storage
from app_utils import assert_motor_positions from app_utils import assert_motor_positions
folders = storage.Folders() #folders = storage.Folders()
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -67,7 +67,8 @@ ZPOS, FPATH = range(2)
RS = 0x1e RS = 0x1e
class EmblMessage(QObject, metaclass=qsingleton.Singleton): #class EmblMessage(QObject, metaclass=qsingleton.Singleton): #ZAC: orig. code
class EmblMessage(QObject):
def __init__(self, parent=None, **kwargs): def __init__(self, parent=None, **kwargs):
super(EmblMessage, self).__init__(parent, **kwargs) super(EmblMessage, self).__init__(parent, **kwargs)
@@ -205,7 +206,7 @@ class EmblWidget(QWidget):
tabs.setObjectName("embl_tabs") tabs.setObjectName("embl_tabs")
view = self._results_view = QTableView(self) view = self._results_view = QTableView(self)
view.setModel(CoordinatesModel()) #view.setModel(CoordinatesModel()) #ZAC: orig. code
view.verticalHeader().show() view.verticalHeader().show()
view.horizontalHeader().show() view.horizontalHeader().show()
view.setContextMenuPolicy(Qt.CustomContextMenu) view.setContextMenuPolicy(Qt.CustomContextMenu)

9
PrelocatedCoordinatesModel.py
View File

@@ -33,11 +33,11 @@ from PyQt5.QtWidgets import (
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# from coord_library import conversions # from coord_library import conversions
import conversions #import conversions #ZAC: orig. code
from app_config import settings from app_config import settings
from storage import Folders #from storage import Folders #ZAC: orig. code
folders = Folders() #folders = Folders() #ZAC: orig. code
XY_Coord = List[float] XY_Coord = List[float]
@@ -591,7 +591,8 @@ class PrelocatedCoordinates(QWidget):
def loadMarkers(self, filename=None): def loadMarkers(self, filename=None):
logger = logging.getLogger("preloc.loadMarkers") logger = logging.getLogger("preloc.loadMarkers")
def_folder = join(folders.pgroup_folder, "preloc_sheets") #def_folder = join(folders.pgroup_folder, "preloc_sheets") #ZAC: orig. code
def_folder =''
data_folder = settings.value("folders/last_prelocation_folder", def_folder) data_folder = settings.value("folders/last_prelocation_folder", def_folder)
if filename is None: if filename is None:

15
swissmx.py
View File

@@ -78,8 +78,8 @@ TASK_EMBL = "embl"
import PrelocatedCoordinatesModel import PrelocatedCoordinatesModel
#from EmblModule import EmblWidget #ZAC: orig. code from EmblModule import EmblWidget #ZAC: orig. code
#from HelicalTable import HelicalTableWidget #ZAC: orig. code from HelicalTable import HelicalTableWidget #ZAC: orig. code
#from Wigis import Spinner, Checkbox #ZAC: orig. code #from Wigis import Spinner, Checkbox #ZAC: orig. code
#from exceptions import * #ZAC: orig. code #from exceptions import * #ZAC: orig. code
#import qoptic #ZAC: orig. code #import qoptic #ZAC: orig. code
@@ -323,7 +323,7 @@ class Main(QMainWindow, Ui_MainWindow):
self.init_actions() self.init_actions()
self.prepare_microscope_page() self.prepare_microscope_page()
#self.prepare_embl_gui() self.prepare_embl_gui()
self.prepare_left_tabs() self.prepare_left_tabs()
#self.update_beam_marker(qoptic_zoom.get_position()) #ZAC: orig. code #self.update_beam_marker(qoptic_zoom.get_position()) #ZAC: orig. code
self._centerpiece_stack.setCurrentIndex(0) self._centerpiece_stack.setCurrentIndex(0)
@@ -332,7 +332,7 @@ class Main(QMainWindow, Ui_MainWindow):
self.init_settings_tracker() self.init_settings_tracker()
self.wire_storage() 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 self.center_piece_update(0) # start camera updater
curzoom = app._zoom.get() curzoom = app._zoom.get()
@@ -901,12 +901,13 @@ class Main(QMainWindow, Ui_MainWindow):
self._rois.remove(roi) self._rois.remove(roi)
def prepare_embl_gui(self): def prepare_embl_gui(self):
app = QApplication.instance()
self._tab_daq_method_embl.setLayout(QVBoxLayout()) self._tab_daq_method_embl.setLayout(QVBoxLayout())
layout = self._tab_daq_method_embl.layout() layout = self._tab_daq_method_embl.layout()
motors = self.get_gonio_motors() motors = self.get_gonio_motors()
#self._embl_module = EmblWidget(self) #ZAC: orig. code self._embl_module = EmblWidget(self) #ZAC: orig. code
#self._embl_module.configure(motors, sample_camera, qoptic_zoom) self._embl_module.configure(motors, app._camera, app._zoom)
#layout.addWidget(self._embl_module) layout.addWidget(self._embl_module)
def prepare_microscope_page(self): def prepare_microscope_page(self):
layout = self.microscope_page.layout() layout = self.microscope_page.layout()