pychemstation 0.5.8__tar.gz → 0.5.9__tar.gz

{pychemstation-0.5.8 → pychemstation-0.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.8
+Version: 0.5.9
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao

{pychemstation-0.5.8 → pychemstation-0.5.9}/pychemstation/control/controllers/method.py

@@ -214,6 +214,11 @@ class MethodController(TableController):
                 self.sleepy_send(
                     f'NewColVal RCPMP1Method[1], "Timetable", "SolventCompositionPumpChannel2_Percentage", {row.organic_modifer}')
 
+                self.sleepy_send('InsTabRow RCPMP1Method[1], "Timetable"')
+                self.sleepy_send('SetTabText RCPMP1Method[1], "Timetable", 2, "Function", "Flow"')
+                self.sleepy_send(f'NewColVal RCPMP1Method[1], "Timetable", "FlowFlow", {row.flow}')
+                self.sleepy_send(f'SetTabVal RCPMP1Method[1], "Timetable", 2, "FlowFlow", {row.flow})')
+
                 self.send('Sleep 1')
                 self.sleepy_send("DownloadRCMethod PMP1")
                 self.send('Sleep 1')
@@ -231,8 +236,18 @@ class MethodController(TableController):
                 self.send("Sleep 1")
                 self.sleepy_send("DownloadRCMethod PMP1")
                 self.send("Sleep 1")
+
+                self.sleepy_send('InsTabRow RCPMP1Method[1], "Timetable"')
                 self.get_num_rows()
 
+                self.sleepy_send('SetTabText RCPMP1Method[1], "Timetable", Rows , "Function", "Flow"')
+                self.sleepy_send(f'SetTabVal RCPMP1Method[1], "Timetable", Rows , "FlowFlow", {row.flow}')
+                self.sleepy_send(f'SetTabVal RCPMP1Method[1], "Timetable", Rows , "Time", {row.start_time}')
+
+                self.send("Sleep 1")
+                self.sleepy_send("DownloadRCMethod PMP1")
+                self.send("Sleep 1")
+
     def _update_param(self, method_param: Param):
         """Change a method parameter, changes what is visibly seen in Chemstation GUI.
          (changes the first row in the timetable)

{pychemstation-0.5.8 → pychemstation-0.5.9}/pychemstation/control/controllers/table_controller.py

@@ -169,7 +169,7 @@ class TableController(abc.ABC):
         finished_run = polling.poll(
             lambda: self.controller.check_if_running(),
             timeout=timeout,
-            step=18)
+            step=50)
 
         check_folder = self.fuzzy_match_most_recent_folder(most_recent_folder)
         if check_folder.is_ok() and finished_run:
@@ -178,9 +178,10 @@ class TableController(abc.ABC):
             finished_run = polling.poll(
                 lambda: self.controller.check_if_running(),
                 timeout=timeout,
-                step=12)
+                step=50)
             if finished_run:
                 return check_folder
+            return check_folder
         else:
             return Err("Run did not complete as expected")
 

{pychemstation-0.5.8 → pychemstation-0.5.9}/pychemstation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pychemstation
-Version: 0.5.8
+Version: 0.5.9
 Summary: Library to interact with Chemstation software, primarily used in Hein lab
 Home-page: https://gitlab.com/heingroup/device-api/pychemstation
 Author: Lucy Hao

{pychemstation-0.5.8 → pychemstation-0.5.9}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="pychemstation",
-    version="0.5.8",
+    version="0.5.9",
     author="Lucy Hao",
     author_email="lhao03@student.ubc.ca",
     description="Library to interact with Chemstation software, primarily used in Hein lab",

{pychemstation-0.5.8 → pychemstation-0.5.9}/tests/constants.py

@@ -40,6 +40,7 @@ def gen_rand_method():
     org_modifier = int(random.random() * 10)
     max_run_time = int(random.random() * 10)
     return MethodTimetable(
+        name=DEFAULT_METHOD,
         first_row=HPLCMethodParams(
             organic_modifier=org_modifier,
             flow=round(random.random(), 2),