Browse Source

Fixed bug when saving before stack

master
Trevor Irons 3 years ago
parent
commit
8f40113ed1
2 changed files with 7 additions and 4 deletions
  1. 6
    3
      akvo/gui/akvoGUI.py
  2. 1
    1
      setup.py

+ 6
- 3
akvo/gui/akvoGUI.py View File

1242
         self.RAWDataProc.dt = 1./self.RAWDataProc.samp 
1242
         self.RAWDataProc.dt = 1./self.RAWDataProc.samp 
1243
         
1243
         
1244
 
1244
 
1245
+        self.RAWDataProc.Instrument = self.RAWDataProc.DATADICT["INFO"]["Instrument"]
1246
+
1245
         if self.RAWDataProc.DATADICT["INFO"]["Instrument"] == "MIDI 2":
1247
         if self.RAWDataProc.DATADICT["INFO"]["Instrument"] == "MIDI 2":
1246
             self.RAWDataProc.Instrument = "MIDI 2"
1248
             self.RAWDataProc.Instrument = "MIDI 2"
1247
             self.RAWDataProc.MIDIGain = self.RAWDataProc.DATADICT["INFO"]["MIDIGain"] 
1249
             self.RAWDataProc.MIDIGain = self.RAWDataProc.DATADICT["INFO"]["MIDIGain"] 
1414
         ######################
1416
         ######################
1415
         # Qs
1417
         # Qs
1416
         #####################
1418
         #####################
1417
-        print("text",  self.ui.QLineEdit.text()) 
1419
+        #print("text",  self.ui.QLineEdit.text()) 
1418
         if  self.ui.QLineEdit.text() == "":
1420
         if  self.ui.QLineEdit.text() == "":
1419
             self.pulseMoments = [-1]  
1421
             self.pulseMoments = [-1]  
1420
             print("Setting pulse moments to [-1]") 
1422
             print("Setting pulse moments to [-1]") 
1533
             return
1535
             return
1534
 
1536
 
1535
         # Qs
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
             self.pulseMoments = [-1] 
1540
             self.pulseMoments = [-1] 
1538
         else:
1541
         else:
1539
             try:
1542
             try:
1541
             except:
1544
             except:
1542
                 err_msg = "You need to set your pulse moments correctly.\n" + \
1545
                 err_msg = "You need to set your pulse moments correctly.\n" + \
1543
                       "This should be a Python Numpy interpretable list\n" + \
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
                 QtWidgets.QMessageBox.critical(self, 'Error', err_msg) 
1548
                 QtWidgets.QMessageBox.critical(self, 'Error', err_msg) 
1546
 
1549
 
1547
         # Data Channels
1550
         # Data Channels

+ 1
- 1
setup.py View File

21
     long_description = fh.read()
21
     long_description = fh.read()
22
 
22
 
23
 setup(name='Akvo',     
23
 setup(name='Akvo',     
24
-      version='1.7.1', 
24
+      version='1.7.2', 
25
       python_requires='>3.7.0', # due to pyLemma 
25
       python_requires='>3.7.0', # due to pyLemma 
26
       description='Surface nuclear magnetic resonance workbench',
26
       description='Surface nuclear magnetic resonance workbench',
27
       long_description=long_description,
27
       long_description=long_description,

Loading…
Cancel
Save