From 4f6421ae222bc5a08ef92d1b3f36c043cfb05ace Mon Sep 17 00:00:00 2001 From: Markus Rosenstihl Date: Tue, 18 Jun 2013 22:28:24 +0200 Subject: [PATCH] -If temperature not found open a dialogue and ask for one -updated resources --- ConductivityGroupBox.py | 2 +- PeakGroupBox.py | 2 +- QDS.py | 1 + QDSMain.py | 2 +- images_rc.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ConductivityGroupBox.py b/ConductivityGroupBox.py index 0bdfb95..b492acb 100644 --- a/ConductivityGroupBox.py +++ b/ConductivityGroupBox.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'ConductivityGroupBox.ui' # -# Created: Fri Jun 7 16:23:12 2013 +# Created: Fri Jun 14 08:45:33 2013 # by: PyQt4 UI code generator 4.10.1 # # WARNING! All changes made in this file will be lost! diff --git a/PeakGroupBox.py b/PeakGroupBox.py index 4884e79..6bd3d04 100644 --- a/PeakGroupBox.py +++ b/PeakGroupBox.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'PeakGroupBox.ui' # -# Created: Fri Jun 7 16:23:12 2013 +# Created: Fri Jun 14 08:45:33 2013 # by: PyQt4 UI code generator 4.10.1 # # WARNING! All changes made in this file will be lost! diff --git a/QDS.py b/QDS.py index b740ad2..43a23a1 100755 --- a/QDS.py +++ b/QDS.py @@ -473,6 +473,7 @@ class AppWindow(QMainWindow): break else: print "No Temperature found in file" + raise #Temp = QInputDialog.getDouble(self, "No temperature found in data set","Temperature/K:", value=Temp)[0] except: Temp = QInputDialog.getDouble(self, "No temperature found in data set","Temperature/K:", value=0.0)[0] diff --git a/QDSMain.py b/QDSMain.py index 728a67f..2bed5c3 100644 --- a/QDSMain.py +++ b/QDSMain.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'QDSMain.ui' # -# Created: Fri Jun 7 16:23:11 2013 +# Created: Fri Jun 14 08:45:33 2013 # by: PyQt4 UI code generator 4.10.1 # # WARNING! All changes made in this file will be lost! diff --git a/images_rc.py b/images_rc.py index 502f83e..b9ad7ce 100644 --- a/images_rc.py +++ b/images_rc.py @@ -2,7 +2,7 @@ # Resource object code # -# Created: Fr. Jun 7 16:23:11 2013 +# Created: Fr. Jun 14 08:45:33 2013 # by: The Resource Compiler for PyQt (Qt v4.8.4) # # WARNING! All changes made in this file will be lost!