Merge pull request #90 from DiamondLightSource/revert_algo

Revert algo

Author: UrszulaNeuman

.gitignore

@@ -12,3 +12,4 @@ dist
 qt.conf
 *.exe
 main.spec
+debug.log

dls_barcode/geometry/unipuck.py

@@ -15,7 +15,7 @@ class Unipuck:
     TYPE_NAME = "Unipuck"
     NUM_SLOTS = Template.NUM_SLOTS
 
-    def __init__(self, center, radius, rotation=math.pi/4, feature_center=None, feature_boarder=None):
+    def __init__(self, center, radius, rotation=0.0, feature_center=None, feature_boarder=None):
         # rotation=math.pi/2 - align the read dot of the camera with the screw
         """ Determine the puck geometry (position and orientation) for the locations of the
         centers of some (or all of the pins).

dls_barcode/geometry/unipuck_calculator.py

@@ -109,8 +109,8 @@ def _determine_puck_orientation(puck, pin_centers):
         original_angle = puck.angle()
 
         # For each angular increment, calculate the sum of squared errors in slot center position
-        for a in range(-16, 16, 1):
-            angle = original_angle + a / (180 / math.pi)
+        for a in range(0, 360, 2):
+            angle = a / (180 / math.pi)
             puck.set_rotation(angle)
             sse = 0
             for p in pin_centers:

dls_barcode/gui/main_window.py

@@ -1,3 +1,4 @@
+from dls_barcode.camera.scanner_message import ScanErrorMessage
 from dls_barcode.frame_grabber_controller import FrameGrabberController
 from dls_util.beeper import Beeper
 
@@ -125,26 +126,30 @@ def set_actions_triger(self):
         self._record_table.cell_pressed_action_triggered(self._stop_frame_grabber)
 
     def _stop_frame_grabber(self):
+        self._log.debug("Frame grabber stopper")
         self._scan_button.setStartLayout()
         self.resetCountdown()
         self._frame_grabber_controller.kill_grabber_thread()
 
     def _start_frame_grabber(self):
+        self._log.debug("Frame grabber started")
         self._scan_button.setStopLayout()
         self._frame_grabber_controller.start_grabber_thread(self.displayHolderFrame, self.displayPuckFrame, 
                                                             self.displayCameraErrorMessage)      
 
     def _on_about_action_clicked(self):
+        self._log.debug("About menu clicked")
         QtWidgets.QMessageBox.about(self, 'About', "Version: " + self._version)
 
     def _on_scan_action_clicked(self):
-        self._log.debug("MAIN: Scan menu clicked")
+        self._log.debug("Scan menu clicked")
         if  self._scan_button.is_running():
             self._stop_frame_grabber()
         else: 
             self._start_frame_grabber()
 
     def _on_options_action_clicked(self):
+        self._log.debug("Options menu clicked")
         self._frame_grabber_controller.kill_grabber_thread()
         dialog = BarcodeConfigDialog(self._config)
         self._stop_frame_grabber()
@@ -157,6 +162,7 @@ def closeEvent(self, event):
         event.accept()
 
     def displayCameraErrorMessage(self):
+        self._log.debug("Camera Error")
         message_box = QMessageBox(self)
         message_box.setIcon(QMessageBox.Critical)
         message_box.setWindowTitle("Camera Error")
@@ -173,6 +179,7 @@ def displayCameraErrorMessage(self):
 
     def displayPuckScanCompleteMessage(self):
         self._message_box.display(MessageFactory.puck_scan_completed_message())
+        self._log.debug("Puck scan complete")
 
     def clear_frame(self):
         self._result_frame.clear_frame()
@@ -181,6 +188,7 @@ def displayScanTimeoutMessage(self):
         if self._config.get_scan_beep():
             Beeper.beep()
         self._message_box.display(MessageFactory.scan_timeout_message())
+        self._log.debug("Scan timeout")
 
     @pyqtSlot(Frame)
     def displayPuckFrame(self, frame):
@@ -195,6 +203,7 @@ def displayHolderFrame(self, frame):
         self._holder_frame.display_image(frame.frame_to_image())
 
     def _load_store_records(self):
+        self._log.debug("Stored records loaded")
         self._record_table._load_store_records()
 
     def addRecordFrame(self, top_result, side_result):
@@ -206,12 +215,15 @@ def addRecordFrame(self, top_result, side_result):
         self._plate_beep(plate, self._config.get_scan_beep())
 
     def startCountdown(self, duration):
+        self._log.debug("Countdown started")
         self._countdown_box.start_countdown(duration)
 
     def resetCountdown(self):
+        self._log.debug("Countdown re-set")
         self._countdown_box.reset_countdown()
 
     def scanCompleted(self):
+        self._log.debug("Countdown completed")
         self._countdown_box.scan_completed()
 
     def is_latest_holder_barcode(self, result_barcode):
@@ -228,8 +240,10 @@ def _plate_beep(self, plate, do_beep):
 
     #@pyqtSlot(ScanErrorMessage)
     #def displayScanErrorMessage(self, scanner_msg): 
-    #    self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
+        #self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
+        #self._log.debug("Scan Error message", scanner_msg.content())
 
-    #@pyqtSlot(ScanErrorMessage)
+    #pyqtSlot(ScanErrorMessage)
     #def clear_frame_display_message(self, scanner_msg):     
     #    self._result_frame.clear_frame_and_set_text(scanner_msg.content())
+        

dls_barcode/version.py

@@ -1 +1 @@
-VERSION = "v1.6.0"
+VERSION = "v1.7.0"

dls_util/logging/process_logging.py

@@ -0,0 +1,17 @@
+Release Notes (Development)
+===========================
+
+Changes merged into master
+--------------------------
+| Jira Task | GitHub Issue | Type | Description |
+|-----------|--------------|------|-------------|
+|     -     |     -        |Minor |Rall back to the previous version of the puck orientation  algo|
+|     -     |     -        |Minor |Add more logs and log to a local file only|
+
+Change Types:
+* Major - Backward incompatible change
+* Minor - Backward compatible change in API/functionality
+* Patch - Bug fix, no change in functionality
+
+
+

docs/release-notes/release-notes-v1_7_0.md

@@ -8,7 +8,6 @@
 import json
 import logging.config
 import logging.handlers
-import getpass
 import threading
 
 
@@ -41,34 +40,27 @@
             "formatter": "simple",
             "stream": "ext://sys.stdout"
         },
-
-        "graylog_gelf": {
-            "class": "pygelf.GelfUdpHandler",
-            "level": "INFO",
-            # Obviously a DLS-specific configuration: the graylog server address and port
-            # Use the input "Load Balanced GELF TCP" on graylog2.
-            "host": "graylog2.diamond.ac.uk",# "localhost", - use locaklhost for tests
-            "port": 12201,
-            "debug": True,
-            #  The following custom fields will be disabled if setting this False
-            "include_extra_fields": True,
-            "username": getpass.getuser(),
-            "pid": os.getpid(),
-            "application": "BarcodeScanner",
-            "facility": "XChem",
-            "_version": version.VERSION
+        
+        "local_file_handler": {
+            "class": "logging.handlers.RotatingFileHandler",
+            #  "class": "logging.handlers.FileHandler",
+            "level": "DEBUG",
+            "formatter": "extended",
+            "filename": "debug.log",
+            "maxBytes": MAXBYTES,
+            "backupCount": BACKUPCOUNT,
+            "encoding": ENCODING,
+            "delay" : True
         },
 
     },
     "root": {
         # Set the level here to be the default minimum level of log record to be produced
         # If you set a handler to level DEBUG you will need to set either this level
         "level": "DEBUG",
-        "handlers": ["console", "graylog_gelf"]
+        "handlers": ["local_file_handler"] #["console", "local_file_handler"]
     }
 }
-
-
 class ThreadContextFilter(logging.Filter):
     """A logging context filter to add thread name and ID."""
 

logconfig.py

@@ -1,6 +1,6 @@
 from dls_barcode.gui.main_window import DiamondBarcodeMainWindow
-
 import logging
+import logconfig
 import sys
 
 from os.path import dirname
@@ -29,14 +29,15 @@
 
 
 def main(config_file, version):
-    # Start process logge
+    # Start process logger
+    logconfig.setup_logging()
 
     log = logging.getLogger(".".join([__name__]))
     log.info("CONFIG: " + config_file)
-
+    log.debug(version)
     app = QtWidgets.QApplication(sys.argv)
     config = BarcodeConfig(config_file, FileManager())
-    ui = DiamondBarcodeMainWindow(config, version, None)
+    ui = DiamondBarcodeMainWindow(config, 'version', None)
 
 
     ui.set_actions_triger()