optimize imports and cleanup code

zoom.py

@@ -8,30 +8,18 @@
 '''
 '''
 
-import json
 import logging
 _log=logging.getLogger(__name__)
 import os
-from PyQt5 import QtWidgets, uic
-import PyQt5.QtWidgets as qtw
 from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtWidgets import (
-  QApplication,
-  QPushButton,
-  QGroupBox,
-  QGridLayout,
-  QLabel,
-  QDoubleSpinBox,
-  QSpinBox,
-  QVBoxLayout,
-  QHBoxLayout,
-  QCheckBox,
+  QApplication, QPushButton, QGroupBox, QGridLayout, QLabel, QDoubleSpinBox, QSpinBox,
+  QVBoxLayout, QHBoxLayout, QCheckBox,
 )
 from PyQt5.uic import loadUiType
 
 import backlight, illumination, camera
 import epics
-from app_config import AppCfg #settings
 
 Ui_Zoom, QWidget = loadUiType(os.path.join(os.path.dirname(__file__),"zoom.ui"))
 MIN_ZOOM = 1
@@ -50,22 +38,6 @@ class Zoom(QGroupBox, Ui_Zoom):
 
   def init_settings(self):
     app=QApplication.instance()
-    #cfg=app._cfg
-    #keys=cfg.allKeys()
-    #if cfg.ZOOM_BUTTONS in keys:
-    #  buttons=json.loads(cfg.value(cfg.ZOOM_BUTTONS))
-    #else:
-    #  buttons=((1, "1"),(200, "200"),(400, "400"),(600, "600"),(800, "800"),(1000, "1000"),)
-    #  cfg.setValue(cfg.ZOOM_BUTTONS,json.dumps(buttons))
-    #self.get_zoom_pv = PV(zoom_api + ":ZOOM-RBV", callback=self.zoom_update_cb)
-    #self.status_pv = PV(zoom_api + ":ZOOM-STATUS", callback=self.zoom_status_cb)
-    #try:
-    #  pv=app._zoom.getPv('POS_RB')
-    #except AttributeError as e:
-    #  _log.debug('Simulated zoom')
-    #else:
-    #  pv.callbacks ... = self.zoom_update_cb
-    # check also: pv.clear_auto_monitor()  # disconnect PV monitor callback -> program exit faster.
     buttons=((1, "1"), (200, "200"), (400, "400"), (600, "600"), (800, "800"), (1000, "1000"),)
 
     zoom=QApplication.instance()._zoom
@@ -80,7 +52,6 @@ class Zoom(QGroupBox, Ui_Zoom):
     self._zoom_spinner.setRange(MIN_ZOOM, MAX_ZOOM)
     self._zoom_spinner.setValue(current_zoom_value)
     self._zoom_spinner.editingFinished.connect(self.move_zoom_a)
-    # self._zoom_spinner.setSingleStep(SPINNER_SINGLE_STEP)
     self._zoom_spinner.setSingleStep(SPINNER_LARGE_STEP)
     _box = QWidget()
     _box.setLayout(QHBoxLayout())
@@ -178,14 +149,6 @@ class Zoom(QGroupBox, Ui_Zoom):
     self.slid.setSuffix(" ms")
     grid.addWidget(self.slid, 0, 1)
 
-    #grid.addWidget(QLabel("Acq.Mode"), 1, 0)
-    #cbox = QComboBox()
-    #for mode in Camera.AcquisitionMode:
-    #  cbox.addItem(mode.name, mode)
-    #cbox.setCurrentIndex(cam.pv_acqmode.get())
-    #cbox.currentIndexChanged.connect(self.update_camera_acqmode)
-    #grid.addWidget(cbox, 1, 1)
-
     lbox.layout().addWidget(grp)
     self.slid.editingFinished.connect(lambda: self.update_exposure(self.slid.value()))
 
@@ -270,21 +233,6 @@ class Zoom(QGroupBox, Ui_Zoom):
     self._zoom_spinner.blockSignals(False)
     self.zoomChanged.emit(float(value))
 
-#  def get_zoom(self) -> int:
-#    zoom=QApplication.instance()._zoom
-#    pos = zoom.get()
-#    _log.debug("get_zoom(epics) => {}".format(pos))
-#    return pos
-
-#  def zoom_update_cb(self, pvname, value, char_value, **kwargs):
-#    self._zoom_spinner.blockSignals(True)
-#    self._zoom_spinner.setValue(value)
-#    self._zoom_spinner.blockSignals(False)
-
-#  def zoom_status_cb(self, pvname, value, char_value, **kwargs):
-#    busy = bool(value)
-#    self.setDisabled(busy)
-
 
 class QopticZoom(object):
 
@@ -336,7 +284,7 @@ class QopticZoom(object):
 
 
 if __name__ == "__main__":
-  import time, os, PIL.Image, platform, subprocess
+  import sys, os
   import argparse
   logging.basicConfig(level=logging.DEBUG,format='%(levelname)s:%(module)s:%(lineno)d:%(funcName)s:%(message)s ')
 
@@ -344,18 +292,11 @@ if __name__ == "__main__":
   parser.add_argument("--sim", "-s", help="simulate all devices", action='store_true')
   args = parser.parse_args()
 
-  import sys
-
   _log.info('Arguments:{}'.format(args.__dict__))
   os.environ['EPICS_CA_ADDR_LIST'] = '129.129.244.255 sf-saresc-cagw.psi.ch:5062 sf-saresc-cagw.psi.ch:5066'
   app = QApplication(sys.argv)
   from app_config import appsconf
 
-  #from PyQt5 import QtGui
-  #qtawesome.load_font("material","MaterialIcons-Regular.ttf","MaterialIcons-Regular.json","fonts/",)
-  #QtGui.QFontDatabase.addApplicationFont("fonts/Inconsolata-Bold.ttf")
-  #QtGui.QFontDatabase.addApplicationFont("fonts/Baloo-Regular.ttf")
-
   if args.sim:
     app._backlight = backlight.Backlight(None)
     app._illumination = illumination.IlluminationControl(None)
@@ -367,8 +308,6 @@ if __name__ == "__main__":
     app._zoom = QopticZoom()
     app._camera = camera.epics_cam()
 
-
-
   simulated = appsconf["microscope"]["zoom"].get("simulate", False)
 
   obj=Zoom()