Browse Source

Fix error associated with a changed header location

tags/1.6.1
Trevor Irons 3 years ago
parent
commit
fb51a896aa
3 changed files with 6 additions and 4 deletions
  1. 1
    1
      akvo/__init__.py
  2. 4
    2
      akvo/gui/akvoGUI.py
  3. 1
    1
      setup.py

+ 1
- 1
akvo/__init__.py View File

@@ -1 +1 @@
1
-import akvo.lemma 
1
+#import akvo.lemma 

+ 4
- 2
akvo/gui/akvoGUI.py View File

@@ -731,8 +731,10 @@ class ApplicationWindow(QtWidgets.QMainWindow):
731 731
         unpickle = pickle.Unpickler(pfile)
732 732
         self.connectGMRDataProcessor()
733 733
         self.RAWDataProc.DATADICT = unpickle.load()
734
-        
735
-        self.RAWDataProc.readHeaderFile(self.RAWDataProc.DATADICT["INFO"]["headerstr"])
734
+       
735
+        # This line causes Akvo to crash, if the header file is no longer there. We don't need to load the 
736
+        # file. TODO, need to disable "Load Data" in Load command though, as that is no longer possible.  
737
+        #self.RAWDataProc.readHeaderFile(self.RAWDataProc.DATADICT["INFO"]["headerstr"])
736 738
         self.headerstr = self.RAWDataProc.DATADICT["INFO"]["headerstr"]
737 739
  
738 740
         self.RAWDataProc.pulseType = self.RAWDataProc.DATADICT["INFO"]["pulseType"] 

+ 1
- 1
setup.py View File

@@ -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.0.19',
24
+      version='1.0.20',
25 25
       description='Surface nuclear magnetic resonance workbench',
26 26
       long_description=long_description,
27 27
       long_description_content_type='text/markdown',

Loading…
Cancel
Save