Browse Source

Tweaks to UI

tags/1.6.1
Trevor Irons 5 years ago
parent
commit
99d72b5b78
2 changed files with 46 additions and 19 deletions
  1. 11
    4
      akvo/gui/akvoGUI.py
  2. 35
    15
      akvo/gui/main.ui

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

228
         # layer Table 
228
         # layer Table 
229
         self.ui.layerTableWidget.setRowCount(80)       
229
         self.ui.layerTableWidget.setRowCount(80)       
230
         self.ui.layerTableWidget.setColumnCount(3)      
230
         self.ui.layerTableWidget.setColumnCount(3)      
231
-        self.ui.layerTableWidget.setHorizontalHeaderLabels( [r"top [m]", r"bottom [m]", "σ [ Ωm]" ] )
231
+        self.ui.layerTableWidget.setHorizontalHeaderLabels( [r"top [m]", r"bottom [m]", "ρ [Ωm]" ] )
232
 
232
 
233
         # do we want this
233
         # do we want this
234
         self.ui.layerTableWidget.setDragDropOverwriteMode(False)
234
         self.ui.layerTableWidget.setDragDropOverwriteMode(False)
238
         pCell0 = QtWidgets.QTableWidgetItem()
238
         pCell0 = QtWidgets.QTableWidgetItem()
239
         pCell0.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
239
         pCell0.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
240
         pCell0.setBackground( QtGui.QColor("lightgrey").lighter(110) )
240
         pCell0.setBackground( QtGui.QColor("lightgrey").lighter(110) )
241
+        pCell0.setForeground( QtGui.QColor("black") )
241
         pCell0.setText(str("0"))
242
         pCell0.setText(str("0"))
242
         self.ui.layerTableWidget.setItem(0, 0, pCell0)
243
         self.ui.layerTableWidget.setItem(0, 0, pCell0)
243
         
244
         
244
         pCell1 = QtWidgets.QTableWidgetItem()
245
         pCell1 = QtWidgets.QTableWidgetItem()
245
         #pCell1.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
246
         #pCell1.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
246
-        pCell1.setBackground( QtGui.QColor("lightgrey").lighter(110) )
247
-        pCell1.setForeground( QtGui.QColor("black").lighter(110) )
247
+        pCell1.setBackground( QtGui.QColor("lightblue") ) #.lighter(110) )
248
+        pCell1.setForeground( QtGui.QColor("black") )
248
         self.ui.layerTableWidget.setItem(0, 1, pCell1)
249
         self.ui.layerTableWidget.setItem(0, 1, pCell1)
250
+        
251
+        pCell2 = QtWidgets.QTableWidgetItem()
252
+        #pCell1.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
253
+        pCell2.setBackground( QtGui.QColor("white") ) #.lighter(110) )
254
+        pCell2.setForeground( QtGui.QColor("black") )
255
+        self.ui.layerTableWidget.setItem(0, 2, pCell2)
249
 
256
 
250
 
257
 
251
         for ir in range(1, self.ui.layerTableWidget.rowCount() ):
258
         for ir in range(1, self.ui.layerTableWidget.rowCount() ):
867
         #INFO["samp"] = self.RAWDataProc.samp
874
         #INFO["samp"] = self.RAWDataProc.samp
868
         INFO["nPulseMoments"] = self.RAWDataProc.nPulseMoments
875
         INFO["nPulseMoments"] = self.RAWDataProc.nPulseMoments
869
         #INFO["deadTime"] = self.RAWDataProc.deadTime
876
         #INFO["deadTime"] = self.RAWDataProc.deadTime
870
-        INFO["processed"] = "Akvo v. 1.0, on " + time.strftime("%d/%m/%Y")
877
+        INFO["processed"] = "Akvo v"  + self.Akvo_VERSION + ", on "  + time.strftime("%d/%m/%Y")
871
         # Pulse current info
878
         # Pulse current info
872
         ip = 0
879
         ip = 0
873
         INFO["Pulses"] = {}
880
         INFO["Pulses"] = {}

+ 35
- 15
akvo/gui/main.ui View File

711
          <x>0</x>
711
          <x>0</x>
712
          <y>0</y>
712
          <y>0</y>
713
          <width>537</width>
713
          <width>537</width>
714
-         <height>999</height>
714
+         <height>982</height>
715
         </rect>
715
         </rect>
716
        </property>
716
        </property>
717
        <property name="sizePolicy">
717
        <property name="sizePolicy">
760
            <enum>Qt::LeftToRight</enum>
760
            <enum>Qt::LeftToRight</enum>
761
           </property>
761
           </property>
762
           <property name="currentIndex">
762
           <property name="currentIndex">
763
-           <number>0</number>
763
+           <number>6</number>
764
           </property>
764
           </property>
765
           <property name="elideMode">
765
           <property name="elideMode">
766
            <enum>Qt::ElideLeft</enum>
766
            <enum>Qt::ElideLeft</enum>
3676
           </widget>
3676
           </widget>
3677
           <widget class="QWidget" name="KernTab">
3677
           <widget class="QWidget" name="KernTab">
3678
            <attribute name="title">
3678
            <attribute name="title">
3679
-            <string>Kernel</string>
3679
+            <string>1D Kernel</string>
3680
            </attribute>
3680
            </attribute>
3681
            <layout class="QVBoxLayout" name="verticalLayout_11">
3681
            <layout class="QVBoxLayout" name="verticalLayout_11">
3682
             <item>
3682
             <item>
3683
              <widget class="QGroupBox" name="groupBox">
3683
              <widget class="QGroupBox" name="groupBox">
3684
               <property name="title">
3684
               <property name="title">
3685
-               <string>Conductivty model</string>
3685
+               <string>Resistivity model</string>
3686
               </property>
3686
               </property>
3687
               <layout class="QVBoxLayout" name="verticalLayout_10">
3687
               <layout class="QVBoxLayout" name="verticalLayout_10">
3688
                <item>
3688
                <item>
3712
                  <property name="text">
3712
                  <property name="text">
3713
                   <string>Rx</string>
3713
                   <string>Rx</string>
3714
                  </property>
3714
                  </property>
3715
+                 <property name="alignment">
3716
+                  <set>Qt::AlignCenter</set>
3717
+                 </property>
3715
                 </widget>
3718
                 </widget>
3716
                </item>
3719
                </item>
3717
                <item row="1" column="0">
3720
                <item row="1" column="0">
3719
                  <property name="text">
3722
                  <property name="text">
3720
                   <string>Tx</string>
3723
                   <string>Tx</string>
3721
                  </property>
3724
                  </property>
3725
+                 <property name="alignment">
3726
+                  <set>Qt::AlignCenter</set>
3727
+                 </property>
3722
                 </widget>
3728
                 </widget>
3723
                </item>
3729
                </item>
3724
                <item row="0" column="0">
3730
                <item row="0" column="0">
3725
                 <widget class="QPushButton" name="K0Data">
3731
                 <widget class="QPushButton" name="K0Data">
3726
                  <property name="text">
3732
                  <property name="text">
3727
-                  <string>Data file</string>
3733
+                  <string>Data</string>
3728
                  </property>
3734
                  </property>
3729
                 </widget>
3735
                 </widget>
3730
                </item>
3736
                </item>
3733
                  <property name="maximumSize">
3739
                  <property name="maximumSize">
3734
                   <size>
3740
                   <size>
3735
                    <width>16777215</width>
3741
                    <width>16777215</width>
3736
-                   <height>60</height>
3742
+                   <height>50</height>
3737
                   </size>
3743
                   </size>
3738
                  </property>
3744
                  </property>
3739
                  <property name="font">
3745
                  <property name="font">
3749
                  <property name="maximumSize">
3755
                  <property name="maximumSize">
3750
                   <size>
3756
                   <size>
3751
                    <width>16777215</width>
3757
                    <width>16777215</width>
3752
-                   <height>70</height>
3758
+                   <height>60</height>
3753
                   </size>
3759
                   </size>
3754
                  </property>
3760
                  </property>
3755
                  <property name="alternatingRowColors">
3761
                  <property name="alternatingRowColors">
3762
                  <property name="maximumSize">
3768
                  <property name="maximumSize">
3763
                   <size>
3769
                   <size>
3764
                    <width>16777215</width>
3770
                    <width>16777215</width>
3765
-                   <height>70</height>
3771
+                   <height>60</height>
3766
                   </size>
3772
                   </size>
3767
                  </property>
3773
                  </property>
3768
                  <property name="alternatingRowColors">
3774
                  <property name="alternatingRowColors">
3822
                 </widget>
3828
                 </widget>
3823
                </item>
3829
                </item>
3824
                <item row="4" column="1" colspan="2">
3830
                <item row="4" column="1" colspan="2">
3825
-                <widget class="QDoubleSpinBox" name="originE"/>
3831
+                <widget class="QDoubleSpinBox" name="originE">
3832
+                 <property name="minimum">
3833
+                  <double>-10000000000.000000000000000</double>
3834
+                 </property>
3835
+                 <property name="maximum">
3836
+                  <double>100000000000.000000000000000</double>
3837
+                 </property>
3838
+                </widget>
3826
                </item>
3839
                </item>
3827
                <item row="1" column="3">
3840
                <item row="1" column="3">
3828
                 <widget class="QLabel" name="label_72">
3841
                 <widget class="QLabel" name="label_72">
3926
                 </widget>
3939
                 </widget>
3927
                </item>
3940
                </item>
3928
                <item row="3" column="1" colspan="2">
3941
                <item row="3" column="1" colspan="2">
3929
-                <widget class="QDoubleSpinBox" name="originN"/>
3942
+                <widget class="QDoubleSpinBox" name="originN">
3943
+                 <property name="minimum">
3944
+                  <double>-10000000.000000000000000</double>
3945
+                 </property>
3946
+                 <property name="maximum">
3947
+                  <double>100000000.000000000000000</double>
3948
+                 </property>
3949
+                </widget>
3930
                </item>
3950
                </item>
3931
                <item row="0" column="1">
3951
                <item row="0" column="1">
3932
                 <widget class="QSpinBox" name="minLevel">
3952
                 <widget class="QSpinBox" name="minLevel">
4086
               <rect>
4106
               <rect>
4087
                <x>0</x>
4107
                <x>0</x>
4088
                <y>0</y>
4108
                <y>0</y>
4089
-               <width>100</width>
4090
-               <height>30</height>
4109
+               <width>96</width>
4110
+               <height>26</height>
4091
               </rect>
4111
               </rect>
4092
              </property>
4112
              </property>
4093
              <attribute name="label">
4113
              <attribute name="label">
4099
               <rect>
4119
               <rect>
4100
                <x>0</x>
4120
                <x>0</x>
4101
                <y>0</y>
4121
                <y>0</y>
4102
-               <width>411</width>
4103
-               <height>67</height>
4122
+               <width>96</width>
4123
+               <height>26</height>
4104
               </rect>
4124
               </rect>
4105
              </property>
4125
              </property>
4106
              <attribute name="label">
4126
              <attribute name="label">
4111
           </widget>
4131
           </widget>
4112
           <widget class="QWidget" name="InvertTab">
4132
           <widget class="QWidget" name="InvertTab">
4113
            <attribute name="title">
4133
            <attribute name="title">
4114
-            <string>QT Inversion</string>
4134
+            <string>QT Inv.</string>
4115
            </attribute>
4135
            </attribute>
4116
            <layout class="QVBoxLayout" name="verticalLayout_12">
4136
            <layout class="QVBoxLayout" name="verticalLayout_12">
4117
             <item>
4137
             <item>

Loading…
Cancel
Save