Yaml improvements for logging

akvo/gui/akvoGUI.py

@@ -26,12 +26,13 @@ import os
 from copy import deepcopy
 from matplotlib.backends.backend_qt4 import NavigationToolbar2QT #as NavigationToolbar
 import datetime, time
-import yaml
+
 
 from akvo.tressel import mrsurvey 
 import pkg_resources  # part of setuptools
 version = pkg_resources.require("Akvo")[0].version
 
+import yaml
 # Writes out numpy arrays into Eigen vectors as serialized by Lemma
 class MatrixXr(yaml.YAMLObject):
     yaml_tag = u'!MatrixXr'
@@ -51,6 +52,18 @@ class VectorXr(yaml.YAMLObject):
     def __repr__(self):
         # Converts to numpy array on import 
         return "np.array(%r)" % (self.data)
+
+class AkvoYamlNode(yaml.YAMLObject):
+    yaml_tag = u'!AkvoData'
+    def __init__(self):
+        self.Akvo_VERSION = version
+        self.Import = {}
+        self.dataProcessing = {}
+        #self.data = {}
+    # For going the other way, data import based on Yaml serialization, 
+    def __repr__(self):
+        return "%s(name=%r, hp=%r, ac=%r, attacks=%r)" % (
+            self.__class__.__name__, self.name, self.hp, self.ac, self.attacks, self.thingy)
     
 try:    
     import thread 
@@ -89,7 +102,9 @@ class ApplicationWindow(QtWidgets.QMainWindow):
                 warn.write("Gui files were not compiled locally using pyuic! Further warnings have been supressed")
                 warn.close()
         self.RAWDataProc = None 
-            
+
+        self.YamlNode = AkvoYamlNode()           
+ 
         # initialise some stuff
         self.ui.lcdNumberTauPulse2.setEnabled(0)
         self.ui.lcdNumberTauPulse1.setEnabled(0)
@@ -717,6 +732,14 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         nlogText.append( "  reference channels: " + str(self.refChan) )
         nlogText.append( "  pulse records: " + str(self.ui.FIDProcComboBox.currentText()) ) 
         nlogText.append( "  instrument dead time: " + str(1e-3 * self.ui.DeadTimeSpinBox.value( )) )   
+        self.YamlNode.Import["GMR Header"] = self.headerstr
+        self.YamlNode.Import["opened"] = datetime.datetime.now().isoformat() 
+        self.YamlNode.Import["pulse Type"] = str(self.RAWDataProc.pulseType) 
+        self.YamlNode.Import["stacks"] = self.procStacks.tolist() 
+        self.YamlNode.Import["data channels"] = self.dataChan.tolist()  
+        self.YamlNode.Import["reference channels"] = self.refChan.tolist() 
+        self.YamlNode.Import["pulse records"] = str(self.ui.FIDProcComboBox.currentText())  
+        self.YamlNode.Import["instrument dead time"] = (1e-3 * self.ui.DeadTimeSpinBox.value( ))    
 
         self.Log ( nlogText )     
 
@@ -741,9 +764,13 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.mplwidget.draw()
 
     def Log(self, nlogText):
-        for line in nlogText: 
-            self.ui.logTextBrowser.append( line )
-            self.logText.append( line ) 
+        #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.ui.logTextBrowser.clear() 
+        self.ui.logTextBrowser.append( yaml.dump(self.YamlNode)) #, default_flow_style=False)  )
 
     def disable(self):
         self.ui.BandPassBox.setEnabled(False)

akvo/gui/main.ui

@@ -73,8 +73,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>966</width>
-         <height>924</height>
+         <width>982</width>
+         <height>921</height>
         </rect>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -96,7 +96,7 @@
            <enum>Qt::LeftToRight</enum>
           </property>
           <property name="currentIndex">
-           <number>3</number>
+           <number>0</number>
           </property>
           <widget class="QWidget" name="tab">
            <property name="minimumSize">
@@ -801,7 +801,7 @@ background: dark grey;
               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:8pt; font-weight:400; font-style:italic;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:italic;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'DejaVu Serif'; font-size:9pt;&quot;&gt;Load supported RAW Dataset header from file menu&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
@@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; }
               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:italic;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:italic;&quot;&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'DejaVu Serif'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
@@ -3092,8 +3092,8 @@ background: red;
              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;All processing steps are recorded here for your records&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;All processing steps are recorded here for your records&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
            <widget class="QLabel" name="label_53">
@@ -3124,7 +3124,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>1000</width>
-     <height>25</height>
+     <height>19</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">