diff --git a/.idea/ElegantTools.iml b/.idea/ElegantTools.iml
index b5978d0..091f81f 100644
--- a/.idea/ElegantTools.iml
+++ b/.idea/ElegantTools.iml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1c8b6db..5cfa3be 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,18 +4,13 @@
-
-
-
-
-
-
-
+
+
+
-
+
-
@@ -32,6 +27,10 @@
+
+
+
+
{
"associatedIndex": 3
}
@@ -40,31 +39,38 @@
- {
- "keyToString": {
- "ModuleVcsDetector.initialDetectionPerformed": "true",
- "Python.ElegantTools.executor": "Run",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.git.unshallow": "true",
- "SHELLCHECK.PATH": "I do mind",
- "git-widget-placeholder": "master",
- "last_opened_file_path": "/home/reiche/Desktop/Software/ElegantTools",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "com.intellij.pycharm.community.ide.impl.configuration.PythonContentEntriesConfigurable",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
-
+
+
-
@@ -82,11 +88,13 @@
+
-
+
+
@@ -100,8 +108,8 @@
-
-
+
+
@@ -113,7 +121,10 @@
1752559006350
-
+
+
+
+
@@ -163,18 +174,46 @@
1753350076881
-
+
+
+ 1753432990655
+
+
+
+ 1753432990655
+
+
+
+ 1753433183193
+
+
+
+ 1753433183193
+
+
+
+
+
-
+
+
-
+
\ No newline at end of file
diff --git a/model.py b/model.py
index a4342fc..bea84ee 100644
--- a/model.py
+++ b/model.py
@@ -68,6 +68,9 @@ class Model:
def loadSettingsGroup(self,group,fields,normalized=False):
for key in group.keys():
ele = self.om.getElement(key)
+ if ele is None:
+ print('Cannot find element',key)
+ continue
for field in fields:
ele.__dict__[field]=group[key][field]
if normalized:
diff --git a/track.py b/track.py
index d68dbe7..cbd0b7f 100644
--- a/track.py
+++ b/track.py
@@ -73,7 +73,7 @@ class Track(QtCore.QObject):
def Telegant(self):
self.parent.UITrackOutput.appendPlainText('Starting thread to run elegant')
- #p = subprocess.run(self.cmd)
+# p = subprocess.run(self.cmd)
p = subprocess.Popen(self.cmd,stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
for line in iter(p.stdout.readline, b''):
self.message.emit(line.decode('utf-8').strip())
diff --git a/ui/ElegantPlotGui.py b/ui/ElegantPlotGui.py
index f31d06c..2b65f69 100644
--- a/ui/ElegantPlotGui.py
+++ b/ui/ElegantPlotGui.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/ElegantPlotGui.ui'
#
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.11
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/ui/ElegantToolsGui.py b/ui/ElegantToolsGui.py
index 4138f0d..042cb4b 100644
--- a/ui/ElegantToolsGui.py
+++ b/ui/ElegantToolsGui.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'ui/ElegantToolsGui.ui'
#
-# Created by: PyQt5 UI code generator 5.15.10
+# Created by: PyQt5 UI code generator 5.15.11
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
@@ -521,7 +521,7 @@ class Ui_ElegantGUI(object):
self.menubar.addAction(self.menuHelp.menuAction())
self.retranslateUi(ElegantGUI)
- self.TabMaster.setCurrentIndex(2)
+ self.TabMaster.setCurrentIndex(0)
self.actionQuit.triggered.connect(ElegantGUI.close) # type: ignore
QtCore.QMetaObject.connectSlotsByName(ElegantGUI)