Version bump. Yaml changed from pyyaml to ruamel.yaml. This allows for improved mixed flow styles that are more human readable.

akvo/gui/akvoGUI.py

@@ -34,7 +34,12 @@ from akvo.tressel import mrsurvey
 import pkg_resources  # part of setuptools
 version = pkg_resources.require("Akvo")[0].version
 
-import yaml
+from ruamel import yaml
+#import ruamel.yaml 
+#yaml = ruamel.yaml.YAML()
+#yaml.indent(mapping=4)
+
+#import yaml
 # Writes out numpy arrays into Eigen vectors as serialized by Lemma
 class MatrixXr(yaml.YAMLObject):
     yaml_tag = u'MatrixXr'
@@ -614,7 +619,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
             self.ui.FIDProcComboBox.setCurrentIndex (0)
     
     def ExportPreprocess(self):
-        """ This method export to YAML 
+        """ This method exports to YAML 
         """
         try:
             with open('.akvo.last.yaml.path') as f: 
@@ -686,7 +691,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
             #for line in self.logText:
             #    outfile.write(line+"\n")
             yaml.dump(self.YamlNode, outfile)   
-            yaml.dump(INFO, outfile, default_flow_style=False)   
+            yaml.dump(INFO, outfile) #, default_flow_style=False)   
  
     def SavePreprocess(self):
      
@@ -1010,9 +1015,9 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         #for line in yaml.dump(self.YamlNode, default_flow_style=False):
         #for line in nlogText: 
         #    self.ui.logTextBrowser.append( line )
-        #    self.logText.append( line ) 
+        #    self.logText.append( line )
         self.ui.logTextBrowser.clear()
-        self.ui.logTextBrowser.append( yaml.dump(self.YamlNode)) #, default_flow_style=False)  )
+        self.ui.logTextBrowser.append( yaml.dump(self.YamlNode )) 
 
     def disable(self):
         self.ui.inputRAWParametersBox.setEnabled(False)

akvo/gui/main.ui

@@ -979,7 +979,7 @@ background: dark grey;
           </widget>
           <widget class="QWidget" name="NCTab">
            <attribute name="title">
-            <string>NC</string>
+            <string>Noise cancelation</string>
            </attribute>
            <attribute name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This tab contains noise cancellation algorithms. The frequency-domain algorithm is often less effective than the time domain approach. We often discourage using the frequency domain algorithm. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -1182,7 +1182,7 @@ background: black;
 }
 
 #lcdH1F2:disabled {
-color: red;
+color: grey;
 background: dark grey;
 }</string>
                  </property>

setup.py

@@ -21,7 +21,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setup(name='Akvo',
-      version='1.2.5',
+      version='1.2.6',
       description='Surface nuclear magnetic resonance workbench',
       long_description=long_description,
       long_description_content_type='text/markdown',
@@ -46,6 +46,7 @@ setup(name='Akvo',
           'numpy',
           'pyqt5',
           'pyyaml',
+          'ruamel.yaml',
           'pandas',
           'pyqt-distutils',
           'cmocean'