cleanup
This commit is contained in:
@@ -12,13 +12,9 @@ _log = logging.getLogger(__name__)
|
||||
|
||||
from PyQt5 import QtCore, QtGui
|
||||
from PyQt5.QtCore import QSettings
|
||||
from PyQt5.QtWidgets import QApplication, QMainWindow #QLineEdit, QWidget, QGridLayout, QLabel
|
||||
from PyQt5.QtWidgets import QApplication, QMainWindow
|
||||
import json
|
||||
import pyqtgraph as pg
|
||||
import numpy as np
|
||||
import GenericDialog
|
||||
|
||||
#from pyqtgraph.Qt import QtCore, QtGui
|
||||
|
||||
class MyJsonEncoder(json.JSONEncoder):
|
||||
""" Special json encoder for numpy types """
|
||||
@@ -60,26 +56,20 @@ class AppCfg(QSettings):
|
||||
DT_MISC="deltatau/miscellaneous"
|
||||
# ---------- OBSOLETE ??? ----------
|
||||
#ZOOM_BUTTONS="sample_viewing/zoom_buttons"
|
||||
|
||||
SKIP_ESCAPE_TRANSITIONS_IF_SAFE="escape/skip_transitions_if_safe"
|
||||
|
||||
CRYOJET_MOTION_ENABLED="cryojet/motion_enabled"
|
||||
CRYOJET_NOZZLE_OUT="cryojet/nozzle_out"
|
||||
CRYOJET_NOZZLE_IN="cryojet/nozzle_in"
|
||||
|
||||
#SKIP_ESCAPE_TRANSITIONS_IF_SAFE="escape/skip_transitions_if_safe"
|
||||
#CRYOJET_MOTION_ENABLED="cryojet/motion_enabled"
|
||||
#CRYOJET_NOZZLE_OUT="cryojet/nozzle_out"
|
||||
#CRYOJET_NOZZLE_IN="cryojet/nozzle_in"
|
||||
#DELTATAU_HOST="deltatau/host"
|
||||
#DELTATAU_SHOW_PLOTS="deltatau/show_plots"
|
||||
DELTATAU_OMEGACOS="deltatau/omegacos"
|
||||
DELTATAU_SORT_POINTS="deltatau/sort_points"
|
||||
#DELTATAU_OMEGACOS="deltatau/omegacos"
|
||||
#DELTATAU_SORT_POINTS="deltatau/sort_points"
|
||||
#DELTATAU_VELOCITY_SCALE="deltatau/velocity_scale"
|
||||
|
||||
CAMERA_TRANSFORMATIONS="camera/transformations"
|
||||
CAMERA_ZOOM_TO_PPM="camera/zoom_to_ppm"
|
||||
|
||||
EXPERIMENT_PGROUP="experiment/pgroup"
|
||||
EXPERIMENT_UID="experiment/uid"
|
||||
|
||||
ACTIVATE_PULSE_PICKER="scanning/activate_pulse_picker"
|
||||
#CAMERA_TRANSFORMATIONS="camera/transformations"
|
||||
#CAMERA_ZOOM_TO_PPM="camera/zoom_to_ppm"
|
||||
#EXPERIMENT_PGROUP="experiment/pgroup"
|
||||
#EXPERIMENT_UID="experiment/uid"
|
||||
#ACTIVATE_PULSE_PICKER="scanning/activate_pulse_picker"
|
||||
|
||||
def __init__(self):
|
||||
super(AppCfg, self).__init__("PSI", "SwissMX")
|
||||
@@ -220,6 +210,8 @@ from pyqtgraph.parametertree import Parameter, ParameterTree
|
||||
class WndParameter(QMainWindow):
|
||||
def __init__(self, parent=None):
|
||||
super(WndParameter, self).__init__(parent)
|
||||
|
||||
self.setWindowTitle('SwissMX Preferences')
|
||||
app=QApplication.instance()
|
||||
cfg=app._cfg
|
||||
#GBL_FLD_SCR_SHOT="global/folder_screenshot"
|
||||
|
||||
Reference in New Issue
Block a user