Renamed interface_test.py to main.py

dstat-interface/dstat-interface/build_windows.py

@@ -5,7 +5,7 @@ __requires__ = 'PyInstaller==2.1'
 import os, sys
 os.chdir(os.path.dirname(sys.argv[0]))
 
-args = ['interface_test.spec']
+args = ['dstat.spec']
 args.extend(sys.argv[1:])
 
 import PyInstaller.main as pyi #For some reason, it gets the path here, so working dir must be set first

dstat-interface/dstat-interface/interface_test.spec → dstat-interface/dstat-interface/dstat.spec

 # -*- mode: python -*-
-a = Analysis(['./interface_test.py'],
+a = Analysis(['./main.py'],
              pathex=['/Users/mdryden/src/dstat-interface2/dstatInterface'],
              hiddenimports=[],
              hookspath=None,
@@ -8,7 +8,7 @@ pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,
           exclude_binaries=True,
-          name='interface_test',
+          name='DStat',
           debug=False,
           strip=None,
           upx=True,
@@ -19,7 +19,7 @@ coll = COLLECT(exe,
                a.datas,
                strip=None,
                upx=True,
-               name='interface_test')
+               name='DStat')
 app = BUNDLE(coll,
-             name='interface_test.app',
+             name='DStat.app',
              icon=None)

dstat-interface/dstat-interface/interface_test.py → dstat-interface/dstat-interface/main.py

@@ -198,11 +198,8 @@ class Main:
         
         try:
             if selection == 0:  # CA
-                parameters['potential'] = [int(r[0]) for r 
-                                           in self.chronoamp.model]
-                parameters['time'] = [int(r[1]) for r 
-                                      in self.chronoamp.model]
-            
+                # Add experiment parameters to existing
+                parameters.update(self.exp_window.get_params('cae'))
                 if not parameters['potential']:
                     raise InputError(parameters['potential'],
                                      "Step table is empty")