SpecLog 0.0.2__tar.gz → 0.0.4__tar.gz

{speclog-0.0.2 → speclog-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SpecLog
-Version: 0.0.2
+Version: 0.0.4
 Summary: A Python Package for logging data from instrumentations
 Author-email: Yen-Chun Huang <yen-chun.huang@bruker.com>
 License-Expression: MIT

{speclog-0.0.2 → speclog-0.0.4}/SpecLog/SpecLog.py

@@ -60,13 +60,13 @@ class SpecLog:
         if not self.last_query_time or now - self.last_query_time > self.delay:
             warning_level = 0
             self._setTimeInDataDictByVariable()  # update time
-            devices_info = (
-                self.devices.devices_info
+            device_info = (
+                self.devices.device_info
             )  # dictionary: {model: {status, config_status, device, id_command}}
             for name, info in self.commands.items():
                 delimiter = self.device_config[name]["delimiter"]
                 index = self.device_config[name]["index"]
-                device = devices_info[name]["device"]
+                device = device_info[name]["device"]
                 termination = self.device_config[name]["termination"]
                 for variable in info.keys():
                     info[variable]['min'], info[variable]['max'], info[variable]['static']
@@ -143,7 +143,7 @@ class SpecLog:
             if (
                 address in self.devices.deviceAddresses
                 and address not in self.available_addresses
-                and not self.devices.devices_info[name]["status"]
+                and not self.devices.device_info[name]["status"]
             ):
                 restart_DEVICE = True
 

speclog-0.0.4/SpecLog/config/config.cfg

@@ -0,0 +1,31 @@
+[SETTINGS]
+log_interval = 10
+log_folder_location   = C:/Users/Public/
+save_file_size_kb   = 1024
+limit_hours = 48
+
+[F70]
+device_status = True
+address = ADDC_COM_NUMBER
+termination = CR
+id_command = $ID1D629
+index = 1
+delimiter = ,
+helium_discharge_temperature  = $TE140B8, alias = He discharge
+water_outlet_temperature      = $TE241F8, alias = H2O outlet, max = 45
+water_inlet_temperature       = $TE38139, alias = H2O inlet, min = 5, max = 30
+compressor_pressure           = $PR171F6, alias = He pressure
+status                        = $STA3504, alias = Status, bits = 9, bit_static = 301, indicators = ['Compressor Run','*Motor Temperature','*Phase Sequence/Fuse','*Helium Temperature','*Water Temperature','*Water Flow','*Oil Level','*Pressure','Solenoid']
+
+[MODEL218E]
+device_status = True
+address = ADDC_COM_NUMBER
+data_bits = 7
+termination = CRLF
+parity = 1
+delimiter = ,
+1st_stage     = KRDG?1, alias = 1st stage, min = 30, max = 50
+2nd_stage     = KRDG?2, alias = 2nd stage, min = 2, max = 5
+magnet_lhs    = KRDG?3, alias = Magnet LHS, min = 2, max = 5
+magnet_rhs    = KRDG?4, alias = Magnet RHS, min = 2, max = 5
+magnet_switch = KRDG?5, alias = Magnet Switch, min = 2, max = 10

{speclog-0.0.2 → speclog-0.0.4}/SpecLog/device.py

@@ -16,7 +16,7 @@ from .debugLog import *
 
 class DEVICE:
     def __init__(self, config, debug_logger):
-        self.devices_info = {}
+        self.device_info = {}
         self._getPorts()
         self.debug_logger = debug_logger
         self.device_config = config.devices
@@ -71,7 +71,7 @@ class DEVICE:
             else:
                 device = None
 
-            self.devices_info[name] = {
+            self.device_info[name] = {
                 "status": status,
                 "config_status": status,
                 "device": device,
@@ -81,13 +81,13 @@ class DEVICE:
             return True
 
         else:
-            self.devices_info = {}
+            self.device_info = {}
             for name in self.device_config.keys():
                 self._setDevice(name)
 
     def checkDeviceStatus(self, name: str = None, init: bool = False):
         if name:
-            device_info = self.devices_info[name]
+            device_info = self.device_info[name]
             id_command = device_info["id_command"]
             device = device_info["device"]
             termination = device_info["termination"]
@@ -114,7 +114,7 @@ class DEVICE:
                 return False
 
         else:
-            for name in self.devices_info.keys():
+            for name in self.device_info.keys():
                 if self.checkDeviceStatus(name):
                     self.debug_logger.info("%s is valid and connected" % name)
                 else:

speclog-0.0.4/SpecLog/run_logger.pyw

@@ -0,0 +1,64 @@
+'''
+This is the python program to run logger only 
+'''
+
+import os
+import traceback
+import ctypes
+import time
+import threading
+from collections import Counter
+from .SpecLog import *
+from .debugLog import *
+
+
+def popout(level = 0):
+    if level == 0:
+        return 
+    elif level == 1:
+        ctypes.windll.user32.MessageBoxW(0, 'Warning: System is reaching the limit', "Logger", 1)
+    elif level > 2:
+        ctypes.windll.user32.MessageBoxW(0, 'Warning: System is error', "Logger", 1)
+
+def main_func(config_file = None):
+    # last_warning = 0
+    debugLogger = debugLog(config_file).logger
+    current_exe = os.popen('wmic process get description').read().strip().replace(' ', '').split('\n\n')
+    hashDict = Counter(current_exe) 
+    # thread = threading.Thread(target=popout, args=(0))
+    if 'SpecLogger_running.exe' in hashDict and hashDict['SpecLogger_running.exe'] > 1:
+        debugLogger.warning('start fail: SpecLogger is running in the background')
+        return 
+    else:
+        try:
+            log = SpecLog()
+            debugLogger.info('SpecLog initialization succeed')
+        except Exception as err:
+            debugLogger.warning('SpecLog initialization failed')
+            debugLogger.error(traceback.format_exc())
+            return
+        debugLogger.info('SpecLog logging started')
+        while(1):
+            try:
+                log.log()
+                # warning = log.warning
+                # if last_warning != warning:
+                #     if warning == 0 and thread.is_alive: # error clean
+                #         thread.join()
+                #     elif warning != last_warning: # error changes
+                #         if thread.is_alive():
+                #             wd=ctypes.windll.user32.FindWindowA(0,"Logger") # close window 
+                #             ctypes.windll.user32.SendMessageA(wd,0x0010,0,0)
+                #             thread.join()
+                #         thread = threading.Thread(target=popout, kwargs = {'level': warning})  
+                #         thread.start()
+                        
+                #     last_warning = warning                     
+
+            except Exception as err:
+                debugLogger.warning('logging failed')
+                debugLogger.critical(traceback.format_exc())                    
+                return 
+                
+if __name__ == "__main__":
+    main_func()

speclog-0.0.4/SpecLog/run_monitor.pyw

@@ -0,0 +1,27 @@
+'''
+This is the python program to run monitor only 
+'''
+
+import os
+import sys
+from collections import Counter
+import argparse
+from .monitor import *
+
+def main_func():
+    parser = argparse.ArgumentParser(prog='specmonitor')
+    parser.add_argument('number_of_file', type=int, nargs='?', default = 10, 
+                        help='To select number of files to plot in real-time')
+    args = parser.parse_args()
+    current_exe = os.popen('wmic process get description').read().strip().replace(' ', '').split('\n\n')
+    hashDict = Counter(current_exe) 
+    if 'specmonitor.exe' in hashDict and hashDict['specmonitor.exe'] > 1:
+        exit()
+    else:
+        app = QApplication(sys.argv)
+        window = MainWindow()
+        window.show()
+        app.exec()
+
+if __name__ == "__main__":
+    main_func()

speclog-0.0.4/SpecLog/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.4"

{speclog-0.0.2 → speclog-0.0.4}/SpecLog.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SpecLog
-Version: 0.0.2
+Version: 0.0.4
 Summary: A Python Package for logging data from instrumentations
 Author-email: Yen-Chun Huang <yen-chun.huang@bruker.com>
 License-Expression: MIT

{speclog-0.0.2 → speclog-0.0.4}/SpecLog.egg-info/SOURCES.txt

@@ -7,6 +7,8 @@ SpecLog/debugLog.py
 SpecLog/device.py
 SpecLog/loggerConfig.py
 SpecLog/monitor.py
+SpecLog/run_logger.pyw
+SpecLog/run_monitor.pyw
 SpecLog/version.py
 SpecLog.egg-info/PKG-INFO
 SpecLog.egg-info/SOURCES.txt
@@ -15,6 +17,7 @@ SpecLog.egg-info/entry_points.txt
 SpecLog.egg-info/requires.txt
 SpecLog.egg-info/top_level.txt
 SpecLog/config/__init__.py
+SpecLog/config/config.cfg
 SpecLog/config/config.py
 SpecLog/ui/__init__.py
 SpecLog/ui/plotting.py

{speclog-0.0.2 → speclog-0.0.4}/pyproject.toml

@@ -41,10 +41,7 @@ include-package-data = true
 include = ["SpecLog", "SpecLog.*"]
 
 [tool.setuptools.package-data]
-SpecLog = [
-  "config/command.cfg",
-  "ui/plotting.ui",
-]
+SpecLog = ["*.pyw", "config/*.cfg", "ui/*.ui"]
 
 [tool.setuptools.dynamic]
 version = { attr = "SpecLog.version.__version__" }

speclog-0.0.2/SpecLog/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.2"