pychemstation 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

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/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.dist-info → pychemstation-0.5.9.dist-info}/METADATA

@@ -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.dist-info → pychemstation-0.5.9.dist-info}/RECORD

@@ -8,9 +8,9 @@ pychemstation/control/comm.py,sha256=u44g1hTluQ0yUG93Un-QAshScoDpgYRrZfFTgweP5tY
 pychemstation/control/hplc.py,sha256=mIq7iN-BkWLSCNGCQPWc19Wjx82_mA_0X5Cy8TJoaUQ,10751
 pychemstation/control/controllers/__init__.py,sha256=di3ytLIK-35XC_THw4IjNaOtCUTe7GuEOFb-obmREw4,166
 pychemstation/control/controllers/comm.py,sha256=IU4I_Q42VNCNUlVi93MxCmw2EBY9hiBDkU9FxubKg3c,7441
-pychemstation/control/controllers/method.py,sha256=Z_nLu_zXyXhpixDq7xTOljMWVBn9ioFvmSLXhTHXw-Y,13322
+pychemstation/control/controllers/method.py,sha256=rB-7o7ibOhh1ZzkmhJ1YdOz3vbs-CGxjjQKd0-rWlWs,14230
 pychemstation/control/controllers/sequence.py,sha256=ME9F5nWt-GqL5Qonhe8uNRU0K9oRwGPkPpb_YgqbziI,11318
-pychemstation/control/controllers/table_controller.py,sha256=RARvXS2UIfVdinoVOD5aBFQFhEtu95K57bcNgwOKCME,9081
+pychemstation/control/controllers/table_controller.py,sha256=ecMbFWRv5fk7onCWO_NAE8liAYcGrPipFeusuJKQslA,9113
 pychemstation/control/table/__init__.py,sha256=RgMN4uIWHdNUHpGRBWdzmzAbk7XEKl6Y-qtqWCxzSZU,124
 pychemstation/control/table/method.py,sha256=THVoGomSXff_CTU3eAYme0BYwkPzab5UgZKsiZ29QSk,12196
 pychemstation/control/table/sequence.py,sha256=Eri52AnbE3BGthfrRSvYKYciquUzvHKo0lYUTySYYE8,10542
@@ -27,13 +27,13 @@ pychemstation/utils/sequence_types.py,sha256=3VqiUHsfFEdynAxfR-z8JIWBCo7PdnGwTvs
 pychemstation/utils/table_types.py,sha256=H67-7I96X8Zkm2HygHYttYwG_XuNDmV2AKZW10yZbiA,2418
 pychemstation/utils/tray_types.py,sha256=UUDED-IAf-8FmPVZezuWSiIQE_HgiZQMV2sTqu4oZw8,177
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/constants.py,sha256=lLwT_QaVriivL5llkul6RxXxPriwUp1E-Y3G9fejvbo,2092
+tests/constants.py,sha256=ngjbR4FXfEFkgwsGB7Al4_6m9iUaV8EO7PCTraJ7TOk,2121
 tests/test_comb.py,sha256=Ef5PD_uEVszCMmpurbzlweSAXzGH6o1rblFqYhGC9r0,5680
 tests/test_comm.py,sha256=1ZZd0UrIBOKe91wzA-XI-gSRgXmId9mLWYSMeche82Y,2973
 tests/test_method.py,sha256=uCPpZVYKPz1CNWwhmBo_8TH0ku2V0ZpDZJj3f8iINB4,2440
 tests/test_sequence.py,sha256=yIQGhUTehtHz6D1ai5W6AlP0zes2icF0VdQ0IGJ2CbQ,4901
-pychemstation-0.5.8.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
-pychemstation-0.5.8.dist-info/METADATA,sha256=26690ZaxEouoE36tiXIBFH7DwfNr4DNTzABSddb3Rlw,4307
-pychemstation-0.5.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pychemstation-0.5.8.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
-pychemstation-0.5.8.dist-info/RECORD,,
+pychemstation-0.5.9.dist-info/LICENSE,sha256=9bdF75gIf1MecZ7oymqWgJREVz7McXPG-mjqrTmzzD8,18658
+pychemstation-0.5.9.dist-info/METADATA,sha256=mExMVySyRewB-QkP_1ah4qv0Hi_ZgKxTuVfLek_DJ1s,4307
+pychemstation-0.5.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pychemstation-0.5.9.dist-info/top_level.txt,sha256=zXfKu_4nYWwPHo3OsuhshMNC3SPkcoTGCyODjURaghY,20
+pychemstation-0.5.9.dist-info/RECORD,,

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),