Kaynağa Gözat

Fixed bug when saving before stack

master
Trevor Irons 2 yıl önce
ebeveyn
işleme
8f40113ed1
2 değiştirilmiş dosya ile 7 ekleme ve 4 silme
  1. 6
    3
      akvo/gui/akvoGUI.py
  2. 1
    1
      setup.py

+ 6
- 3
akvo/gui/akvoGUI.py Dosyayı Görüntüle

@@ -1242,6 +1242,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
1242 1242
         self.RAWDataProc.dt = 1./self.RAWDataProc.samp 
1243 1243
         
1244 1244
 
1245
+        self.RAWDataProc.Instrument = self.RAWDataProc.DATADICT["INFO"]["Instrument"]
1246
+
1245 1247
         if self.RAWDataProc.DATADICT["INFO"]["Instrument"] == "MIDI 2":
1246 1248
             self.RAWDataProc.Instrument = "MIDI 2"
1247 1249
             self.RAWDataProc.MIDIGain = self.RAWDataProc.DATADICT["INFO"]["MIDIGain"] 
@@ -1414,7 +1416,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
1414 1416
         ######################
1415 1417
         # Qs
1416 1418
         #####################
1417
-        print("text",  self.ui.QLineEdit.text()) 
1419
+        #print("text",  self.ui.QLineEdit.text()) 
1418 1420
         if  self.ui.QLineEdit.text() == "":
1419 1421
             self.pulseMoments = [-1]  
1420 1422
             print("Setting pulse moments to [-1]") 
@@ -1533,7 +1535,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
1533 1535
             return
1534 1536
 
1535 1537
         # Qs
1536
-        if  self.ui.QLineEdit.text() == "Optional":
1538
+        #print("pulse moment text",  len(self.ui.QLineEdit.text())) 
1539
+        if  self.ui.QLineEdit.text() == "":
1537 1540
             self.pulseMoments = [-1] 
1538 1541
         else:
1539 1542
             try:
@@ -1541,7 +1544,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
1541 1544
             except:
1542 1545
                 err_msg = "You need to set your pulse moments correctly.\n" + \
1543 1546
                       "This should be a Python Numpy interpretable list\n" + \
1544
-                      "of stack indices. For example 1:24 or 1:4,8:24"
1547
+                      "of stack indices. For example 1:24 or 1:4,8:25"
1545 1548
                 QtWidgets.QMessageBox.critical(self, 'Error', err_msg) 
1546 1549
 
1547 1550
         # Data Channels

+ 1
- 1
setup.py Dosyayı Görüntüle

@@ -21,7 +21,7 @@ with open("README.md", "r") as fh:
21 21
     long_description = fh.read()
22 22
 
23 23
 setup(name='Akvo',     
24
-      version='1.7.1', 
24
+      version='1.7.2', 
25 25
       python_requires='>3.7.0', # due to pyLemma 
26 26
       description='Surface nuclear magnetic resonance workbench',
27 27
       long_description=long_description,

Loading…
İptal
Kaydet