From 9ef4f2f1f88309198eaefb2314b28660e8b12826 Mon Sep 17 00:00:00 2001
From: "Michael D. M. Dryden" <mdryden@chem.utoronto.ca>
Date: Tue, 26 Aug 2014 14:41:54 -0400
Subject: [PATCH] Renamed interface_test.py to main.py
---
dstat-interface/dstat-interface/build_windows.py | 2 +-
.../dstat-interface/{interface_test.spec => dstat.spec} | 8 ++++----
.../dstat-interface/{interface_test.py => main.py} | 7 ++-----
3 files changed, 7 insertions(+), 10 deletions(-)
rename dstat-interface/dstat-interface/{interface_test.spec => dstat.spec} (79%)
rename dstat-interface/dstat-interface/{interface_test.py => main.py} (99%)
diff --git a/dstat-interface/dstat-interface/build_windows.py b/dstat-interface/dstat-interface/build_windows.py
index b5377be..14d1fbd 100644
--- a/dstat-interface/dstat-interface/build_windows.py
+++ b/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
diff --git a/dstat-interface/dstat-interface/interface_test.spec b/dstat-interface/dstat-interface/dstat.spec
similarity index 79%
rename from dstat-interface/dstat-interface/interface_test.spec
rename to dstat-interface/dstat-interface/dstat.spec
index 1a9c7fe..c0f001d 100644
--- a/dstat-interface/dstat-interface/interface_test.spec
+++ b/dstat-interface/dstat-interface/dstat.spec
@@ -1,5 +1,5 @@
# -*- 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)
diff --git a/dstat-interface/dstat-interface/interface_test.py b/dstat-interface/dstat-interface/main.py
similarity index 99%
rename from dstat-interface/dstat-interface/interface_test.py
rename to dstat-interface/dstat-interface/main.py
index b4a2e35..0411d19 100644
--- a/dstat-interface/dstat-interface/interface_test.py
+++ b/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")
--
GitLab