Tweaks to UI

akvo/gui/akvoGUI.py

@@ -228,7 +228,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         # layer Table 
         self.ui.layerTableWidget.setRowCount(80)       
         self.ui.layerTableWidget.setColumnCount(3)      
-        self.ui.layerTableWidget.setHorizontalHeaderLabels( [r"top [m]", r"bottom [m]", "σ [ Ωm]" ] )
+        self.ui.layerTableWidget.setHorizontalHeaderLabels( [r"top [m]", r"bottom [m]", "ρ [Ωm]" ] )
 
         # do we want this
         self.ui.layerTableWidget.setDragDropOverwriteMode(False)
@@ -238,14 +238,21 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         pCell0 = QtWidgets.QTableWidgetItem()
         pCell0.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
         pCell0.setBackground( QtGui.QColor("lightgrey").lighter(110) )
+        pCell0.setForeground( QtGui.QColor("black") )
         pCell0.setText(str("0"))
         self.ui.layerTableWidget.setItem(0, 0, pCell0)
         
         pCell1 = QtWidgets.QTableWidgetItem()
         #pCell1.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
-        pCell1.setBackground( QtGui.QColor("lightgrey").lighter(110) )
-        pCell1.setForeground( QtGui.QColor("black").lighter(110) )
+        pCell1.setBackground( QtGui.QColor("lightblue") ) #.lighter(110) )
+        pCell1.setForeground( QtGui.QColor("black") )
         self.ui.layerTableWidget.setItem(0, 1, pCell1)
+        
+        pCell2 = QtWidgets.QTableWidgetItem()
+        #pCell1.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
+        pCell2.setBackground( QtGui.QColor("white") ) #.lighter(110) )
+        pCell2.setForeground( QtGui.QColor("black") )
+        self.ui.layerTableWidget.setItem(0, 2, pCell2)
 
 
         for ir in range(1, self.ui.layerTableWidget.rowCount() ):
@@ -867,7 +874,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         #INFO["samp"] = self.RAWDataProc.samp
         INFO["nPulseMoments"] = self.RAWDataProc.nPulseMoments
         #INFO["deadTime"] = self.RAWDataProc.deadTime
-        INFO["processed"] = "Akvo v. 1.0, on " + time.strftime("%d/%m/%Y")
+        INFO["processed"] = "Akvo v"  + self.Akvo_VERSION + ", on "  + time.strftime("%d/%m/%Y")
         # Pulse current info
         ip = 0
         INFO["Pulses"] = {}

akvo/gui/main.ui

@@ -711,7 +711,7 @@ background: dark grey;
          <x>0</x>
          <y>0</y>
          <width>537</width>
-         <height>999</height>
+         <height>982</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -760,7 +760,7 @@ background: dark grey;
            <enum>Qt::LeftToRight</enum>
           </property>
           <property name="currentIndex">
-           <number>0</number>
+           <number>6</number>
           </property>
           <property name="elideMode">
            <enum>Qt::ElideLeft</enum>
@@ -3676,13 +3676,13 @@ background: dark grey;
           </widget>
           <widget class="QWidget" name="KernTab">
            <attribute name="title">
-            <string>Kernel</string>
+            <string>1D Kernel</string>
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_11">
             <item>
              <widget class="QGroupBox" name="groupBox">
               <property name="title">
-               <string>Conductivty model</string>
+               <string>Resistivity model</string>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_10">
                <item>
@@ -3712,6 +3712,9 @@ background: dark grey;
                  <property name="text">
                   <string>Rx</string>
                  </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
                 </widget>
                </item>
                <item row="1" column="0">
@@ -3719,12 +3722,15 @@ background: dark grey;
                  <property name="text">
                   <string>Tx</string>
                  </property>
+                 <property name="alignment">
+                  <set>Qt::AlignCenter</set>
+                 </property>
                 </widget>
                </item>
                <item row="0" column="0">
                 <widget class="QPushButton" name="K0Data">
                  <property name="text">
-                  <string>Data file</string>
+                  <string>Data</string>
                  </property>
                 </widget>
                </item>
@@ -3733,7 +3739,7 @@ background: dark grey;
                  <property name="maximumSize">
                   <size>
                    <width>16777215</width>
-                   <height>60</height>
+                   <height>50</height>
                   </size>
                  </property>
                  <property name="font">
@@ -3749,7 +3755,7 @@ background: dark grey;
                  <property name="maximumSize">
                   <size>
                    <width>16777215</width>
-                   <height>70</height>
+                   <height>60</height>
                   </size>
                  </property>
                  <property name="alternatingRowColors">
@@ -3762,7 +3768,7 @@ background: dark grey;
                  <property name="maximumSize">
                   <size>
                    <width>16777215</width>
-                   <height>70</height>
+                   <height>60</height>
                   </size>
                  </property>
                  <property name="alternatingRowColors">
@@ -3822,7 +3828,14 @@ background: dark grey;
                 </widget>
                </item>
                <item row="4" column="1" colspan="2">
-                <widget class="QDoubleSpinBox" name="originE"/>
+                <widget class="QDoubleSpinBox" name="originE">
+                 <property name="minimum">
+                  <double>-10000000000.000000000000000</double>
+                 </property>
+                 <property name="maximum">
+                  <double>100000000000.000000000000000</double>
+                 </property>
+                </widget>
                </item>
                <item row="1" column="3">
                 <widget class="QLabel" name="label_72">
@@ -3926,7 +3939,14 @@ background: dark grey;
                 </widget>
                </item>
                <item row="3" column="1" colspan="2">
-                <widget class="QDoubleSpinBox" name="originN"/>
+                <widget class="QDoubleSpinBox" name="originN">
+                 <property name="minimum">
+                  <double>-10000000.000000000000000</double>
+                 </property>
+                 <property name="maximum">
+                  <double>100000000.000000000000000</double>
+                 </property>
+                </widget>
                </item>
                <item row="0" column="1">
                 <widget class="QSpinBox" name="minLevel">
@@ -4086,8 +4106,8 @@ background: dark grey;
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>100</width>
-               <height>30</height>
+               <width>96</width>
+               <height>26</height>
               </rect>
              </property>
              <attribute name="label">
@@ -4099,8 +4119,8 @@ background: dark grey;
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>411</width>
-               <height>67</height>
+               <width>96</width>
+               <height>26</height>
               </rect>
              </property>
              <attribute name="label">
@@ -4111,7 +4131,7 @@ background: dark grey;
           </widget>
           <widget class="QWidget" name="InvertTab">
            <attribute name="title">
-            <string>QT Inversion</string>
+            <string>QT Inv.</string>
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_12">
             <item>