Переглянути джерело

Work towards loop info

add-license-1
Trevor Irons 7 роки тому
джерело
коміт
3605e27258
2 змінених файлів з 221 додано та 155 видалено
  1. 38
    20
      akvo/gui/akvoGUI.py
  2. 183
    135
      akvo/gui/main.ui

+ 38
- 20
akvo/gui/akvoGUI.py Переглянути файл

@@ -173,11 +173,19 @@ class ApplicationWindow(QtWidgets.QMainWindow):
173 173
 
174 174
         ##########################################################################
175 175
         # modelling Table 
176
-        self.ui.loopTableWidget.setRowCount(40)       
177
-        self.ui.loopTableWidget.setColumnCount(5)      
178
-        self.ui.loopTableWidget.setHorizontalHeaderLabels( ["ch. tag", "Northing [m]","Easting [m]","Height [m]", "Radius"] )
179
-        self.ui.loopTableWidget.cellChanged.connect(self.cellChanged) 
176
+        self.ui.loopTableWidget.setRowCount(80)       
177
+        self.ui.loopTableWidget.setColumnCount(6)      
178
+        self.ui.loopTableWidget.setHorizontalHeaderLabels( ["ch. tag", "Northing [m]","Easting [m]","Height [m]", "Radius","Tx"] )
179
+        
180
+        for ir in range(1, self.ui.loopTableWidget.rowCount() ):
181
+            for ic in range( self.ui.loopTableWidget.columnCount() ):
182
+                pCell = QtWidgets.QTableWidgetItem()
183
+                #pCell.setFlags(QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable)
184
+                pCell.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
185
+                pCell.setBackground( QtGui.QColor("lightgrey").lighter(110) )
186
+                self.ui.loopTableWidget.setItem(ir, ic, pCell)
180 187
 
188
+        self.ui.loopTableWidget.cellChanged.connect(self.loopCellChanged) 
181 189
         self.ui.loopTableWidget.setDragDropOverwriteMode(False)
182 190
         self.ui.loopTableWidget.setDragEnabled(True)
183 191
         self.ui.loopTableWidget.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
@@ -188,15 +196,12 @@ class ApplicationWindow(QtWidgets.QMainWindow):
188 196
         self.ui.layerTableWidget.setColumnCount(3)      
189 197
         self.ui.layerTableWidget.setHorizontalHeaderLabels( [r"top [m]", r"bottom [m]", "σ [ Ωm]" ] )
190 198
 
191
-
192 199
         self.ui.layerTableWidget.setDragDropOverwriteMode(False)
193 200
         self.ui.layerTableWidget.setDragEnabled(True)
194 201
         self.ui.layerTableWidget.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
195 202
         
196 203
         pCell = QtWidgets.QTableWidgetItem()
197
-        #pCell.setFlags(QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable)
198 204
         pCell.setFlags(QtCore.Qt.NoItemFlags) # not selectable 
199
-        #pCell.setBackground( QtGui.QColor("lightblue").lighter(125) )
200 205
         pCell.setBackground( QtGui.QColor("lightgrey").lighter(110) )
201 206
         self.ui.layerTableWidget.setItem(0, 1, pCell)
202 207
         for ir in range(1, 80):
@@ -259,7 +264,6 @@ class ApplicationWindow(QtWidgets.QMainWindow):
259 264
                     self.ui.layerTableWidget.cellChanged.connect(self.sigmaCellChanged) 
260 265
                     return
261 266
 
262
-            print("I'm here joey")
263 267
             # enable next layer
264 268
             pCell4 = self.ui.layerTableWidget.item(ii+1, jj)
265 269
             pCell4.setBackground( QtGui.QColor("lightblue") ) #.lighter(110))
@@ -278,7 +282,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
278 282
         self.ui.layerTableWidget.cellChanged.connect(self.sigmaCellChanged) 
279 283
 
280 284
 
281
-    def cellChanged(self):
285
+    def loopCellChanged(self):
282 286
         # TODO consider building the model whenever this is called. Would be nice to be able to 
283 287
         # do that. Would require instead dist of T2 I guess. 
284 288
         jj = self.ui.loopTableWidget.currentColumn()
@@ -287,15 +291,25 @@ class ApplicationWindow(QtWidgets.QMainWindow):
287 291
         #if self.ui.loopTableWidget.item(ii, jj) == None:
288 292
         #    return
289 293
 
290
-        try:
291
-            eval (str( self.ui.loopTableWidget.item(ii, jj).text() ))
292
-        except:
293
-            if jj != 0:
294
-                Error = QtWidgets.QMessageBox()
295
-                Error.setWindowTitle("Error!")
296
-                Error.setText("Non-numeric value encountered")
297
-                Error.setDetailedText("Modelling parameters must be able to be cast into numeric values.")
298
-                Error.exec_()
294
+        if jj == 5:
295
+            pass
296
+            #pCell = QtWidgets.QTableWidgetItem()
297
+            #pCell.setFlags(QtCore.Qt.ItemIsEnabled)
298
+            #pCell.setBackground( QtGui.QColor("lightblue") ) #.lighter(110))
299
+            #self.ui.loopTableWidget.setItem(ii, jj, pCell)
300
+            #pCell4 = self.ui.layerTableWidget.item(ii, jj)
301
+            #print(pCell4)
302
+            #pCell4.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEditable | QtCore.Qt.ItemIsEnabled )
303
+            #pCell4.setBackground( QtGui.QColor("lightblue") ) #.lighter(110))
304
+#         try:
305
+#             eval (str( self.ui.loopTableWidget.item(ii, jj).text() ))
306
+#         except:
307
+#             if jj != 0:
308
+#                 Error = QtWidgets.QMessageBox()
309
+#                 Error.setWindowTitle("Error!")
310
+#                 Error.setText("Non-numeric value encountered")
311
+#                 Error.setDetailedText("Modelling parameters must be able to be cast into numeric values.")
312
+#                 Error.exec_()
299 313
             
300 314
         self.plotLoops()
301 315
 
@@ -310,8 +324,10 @@ class ApplicationWindow(QtWidgets.QMainWindow):
310 324
         for ii in range( self.ui.loopTableWidget.rowCount() ):
311 325
             for jj in range( self.ui.loopTableWidget.columnCount() ):
312 326
                 tp = type(self.ui.loopTableWidget.item(ii, jj))
313
-                if str(tp) == "<class 'NoneType'>":  # ugly hack needed by PySide for some strange reason.
314
-                    pass #print ("NONE")
327
+                if str(tp) == "<class 'NoneType'>":  
328
+                    pass 
329
+                elif not len(self.ui.loopTableWidget.item(ii, jj).text()): 
330
+                    pass
315 331
                 else:
316 332
                     if jj == 0: 
317 333
                         idx = self.ui.loopTableWidget.item(ii, 0).text()
@@ -331,6 +347,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
331 347
                 self.ui.mplwidget_3.ax1.plot(  np.array(nor[ii]), np.array(eas[ii])  )
332 348
             except:
333 349
                 pass 
350
+        #self.ui.mplwidget_3.figure.axes().set
351
+        plt.gca().set_aspect('equal') #, adjustable='box')
334 352
         self.ui.mplwidget_3.draw()
335 353
 
336 354
     def about(self):

+ 183
- 135
akvo/gui/main.ui Переглянути файл

@@ -73,8 +73,8 @@
73 73
         <rect>
74 74
          <x>0</x>
75 75
          <y>0</y>
76
-         <width>982</width>
77
-         <height>921</height>
76
+         <width>967</width>
77
+         <height>922</height>
78 78
         </rect>
79 79
        </property>
80 80
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -96,7 +96,7 @@
96 96
            <enum>Qt::LeftToRight</enum>
97 97
           </property>
98 98
           <property name="currentIndex">
99
-           <number>0</number>
99
+           <number>2</number>
100 100
           </property>
101 101
           <widget class="QWidget" name="tab">
102 102
            <property name="minimumSize">
@@ -801,7 +801,7 @@ background: dark grey;
801 801
               <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;
802 802
 &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;
803 803
 p, li { white-space: pre-wrap; }
804
-&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;
804
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:8pt; font-weight:400; font-style:italic;&quot;&gt;
805 805
 &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>
806 806
              </property>
807 807
             </widget>
@@ -854,7 +854,7 @@ p, li { white-space: pre-wrap; }
854 854
               <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;
855 855
 &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;
856 856
 p, li { white-space: pre-wrap; }
857
-&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;
857
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:italic;&quot;&gt;
858 858
 &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>
859 859
              </property>
860 860
             </widget>
@@ -2489,7 +2489,7 @@ background: dark grey;
2489 2489
                 <rect>
2490 2490
                  <x>20</x>
2491 2491
                  <y>37</y>
2492
-                 <width>111</width>
2492
+                 <width>121</width>
2493 2493
                  <height>16</height>
2494 2494
                 </rect>
2495 2495
                </property>
@@ -2513,8 +2513,8 @@ background: dark grey;
2513 2513
               <widget class="QLabel" name="label_36">
2514 2514
                <property name="geometry">
2515 2515
                 <rect>
2516
-                 <x>560</x>
2517
-                 <y>40</y>
2516
+                 <x>10</x>
2517
+                 <y>190</y>
2518 2518
                  <width>61</width>
2519 2519
                  <height>16</height>
2520 2520
                 </rect>
@@ -2526,88 +2526,157 @@ background: dark grey;
2526 2526
               <widget class="QLineEdit" name="locEdit">
2527 2527
                <property name="geometry">
2528 2528
                 <rect>
2529
-                 <x>560</x>
2530
-                 <y>60</y>
2531
-                 <width>351</width>
2532
-                 <height>81</height>
2529
+                 <x>10</x>
2530
+                 <y>210</y>
2531
+                 <width>441</width>
2532
+                 <height>51</height>
2533 2533
                 </rect>
2534 2534
                </property>
2535 2535
               </widget>
2536
-              <widget class="QDoubleSpinBox" name="decSpinBox">
2536
+              <widget class="Line" name="line">
2537 2537
                <property name="geometry">
2538 2538
                 <rect>
2539
-                 <x>420</x>
2540
-                 <y>70</y>
2541
-                 <width>101</width>
2542
-                 <height>31</height>
2539
+                 <x>20</x>
2540
+                 <y>160</y>
2541
+                 <width>371</width>
2542
+                 <height>16</height>
2543 2543
                 </rect>
2544 2544
                </property>
2545
-               <property name="decimals">
2546
-                <number>1</number>
2545
+               <property name="orientation">
2546
+                <enum>Qt::Horizontal</enum>
2547 2547
                </property>
2548
-               <property name="minimum">
2549
-                <double>-90.000000000000000</double>
2548
+              </widget>
2549
+              <widget class="QLabel" name="label_52">
2550
+               <property name="geometry">
2551
+                <rect>
2552
+                 <x>0</x>
2553
+                 <y>260</y>
2554
+                 <width>191</width>
2555
+                 <height>31</height>
2556
+                </rect>
2550 2557
                </property>
2551
-               <property name="maximum">
2552
-                <double>90.000000000000000</double>
2558
+               <property name="text">
2559
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Comments and field notes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
2553 2560
                </property>
2554
-               <property name="value">
2555
-                <double>0.000000000000000</double>
2561
+              </widget>
2562
+              <widget class="QTextBrowser" name="txtComments">
2563
+               <property name="geometry">
2564
+                <rect>
2565
+                 <x>10</x>
2566
+                 <y>300</y>
2567
+                 <width>441</width>
2568
+                 <height>221</height>
2569
+                </rect>
2570
+               </property>
2571
+               <property name="readOnly">
2572
+                <bool>false</bool>
2556 2573
                </property>
2557 2574
               </widget>
2558
-              <widget class="QDoubleSpinBox" name="incSpinBox">
2575
+              <widget class="QTimeEdit" name="timeEdit">
2559 2576
                <property name="geometry">
2560 2577
                 <rect>
2561
-                 <x>420</x>
2562
-                 <y>30</y>
2563
-                 <width>101</width>
2564
-                 <height>31</height>
2578
+                 <x>150</x>
2579
+                 <y>110</y>
2580
+                 <width>118</width>
2581
+                 <height>29</height>
2565 2582
                 </rect>
2566 2583
                </property>
2567
-               <property name="decimals">
2568
-                <number>1</number>
2584
+               <property name="calendarPopup">
2585
+                <bool>true</bool>
2569 2586
                </property>
2570
-               <property name="minimum">
2571
-                <double>-90.000000000000000</double>
2587
+              </widget>
2588
+              <widget class="QDateEdit" name="dateEdit">
2589
+               <property name="geometry">
2590
+                <rect>
2591
+                 <x>150</x>
2592
+                 <y>70</y>
2593
+                 <width>112</width>
2594
+                 <height>29</height>
2595
+                </rect>
2572 2596
                </property>
2573
-               <property name="maximum">
2574
-                <double>90.000000000000000</double>
2597
+               <property name="calendarPopup">
2598
+                <bool>true</bool>
2575 2599
                </property>
2576
-               <property name="value">
2577
-                <double>45.000000000000000</double>
2600
+              </widget>
2601
+              <widget class="QLabel" name="label_50">
2602
+               <property name="geometry">
2603
+                <rect>
2604
+                 <x>24</x>
2605
+                 <y>117</y>
2606
+                 <width>81</width>
2607
+                 <height>16</height>
2608
+                </rect>
2609
+               </property>
2610
+               <property name="text">
2611
+                <string>Survey time</string>
2578 2612
                </property>
2579 2613
               </widget>
2580
-              <widget class="QLabel" name="label_37">
2614
+              <widget class="QDoubleSpinBox" name="tempSpinBox">
2581 2615
                <property name="geometry">
2582 2616
                 <rect>
2583
-                 <x>300</x>
2617
+                 <x>150</x>
2584 2618
                  <y>30</y>
2585 2619
                  <width>111</width>
2586
-                 <height>20</height>
2620
+                 <height>29</height>
2587 2621
                 </rect>
2588 2622
                </property>
2589
-               <property name="text">
2590
-                <string>B Inclination [°]</string>
2623
+               <property name="value">
2624
+                <double>20.000000000000000</double>
2591 2625
                </property>
2592 2626
               </widget>
2593
-              <widget class="QLabel" name="label_38">
2627
+              <widget class="QTableWidget" name="loopTableWidget">
2594 2628
                <property name="geometry">
2595 2629
                 <rect>
2596
-                 <x>300</x>
2597
-                 <y>75</y>
2598
-                 <width>111</width>
2599
-                 <height>20</height>
2630
+                 <x>10</x>
2631
+                 <y>560</y>
2632
+                 <width>641</width>
2633
+                 <height>291</height>
2634
+                </rect>
2635
+               </property>
2636
+               <property name="toolTip">
2637
+                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This table is used to enter coil geometries the format is as follows: each row specifies a single point on a coil. The first column is the coil index (using the GMR channel is useful), the next three colums specify the point in Northing, Easting, and Elevation. These can either be local coordinates or global ones. The final column specifies the loop radius if it is a circle or figure 8, for non circular or figure 8 loops leave this column blank. For figure-8 loops the coils do not need to be touching (see Irons and Kass, 2017). If a given index has 1 row it will be a circular loop, two rows will be a figure 8, and more than that will be a polygonal representation of the points, linearlly interpolated between them. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
2638
+               </property>
2639
+              </widget>
2640
+              <widget class="QLabel" name="label_54">
2641
+               <property name="geometry">
2642
+                <rect>
2643
+                 <x>10</x>
2644
+                 <y>540</y>
2645
+                 <width>91</width>
2646
+                 <height>16</height>
2600 2647
                 </rect>
2601 2648
                </property>
2602 2649
                <property name="text">
2603
-                <string>B Declination [°] </string>
2650
+                <string>Surface loops</string>
2651
+               </property>
2652
+              </widget>
2653
+              <widget class="MyDynamicMplCanvas" name="mplwidget_3" native="true">
2654
+               <property name="geometry">
2655
+                <rect>
2656
+                 <x>460</x>
2657
+                 <y>0</y>
2658
+                 <width>500</width>
2659
+                 <height>500</height>
2660
+                </rect>
2661
+               </property>
2662
+               <property name="sizePolicy">
2663
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
2664
+                 <horstretch>0</horstretch>
2665
+                 <verstretch>0</verstretch>
2666
+                </sizepolicy>
2667
+               </property>
2668
+               <property name="minimumSize">
2669
+                <size>
2670
+                 <width>500</width>
2671
+                 <height>500</height>
2672
+                </size>
2604 2673
                </property>
2605 2674
               </widget>
2606 2675
               <widget class="QDoubleSpinBox" name="intensitySpinBox">
2607 2676
                <property name="geometry">
2608 2677
                 <rect>
2609
-                 <x>420</x>
2610
-                 <y>110</y>
2678
+                 <x>790</x>
2679
+                 <y>675</y>
2611 2680
                  <width>101</width>
2612 2681
                  <height>31</height>
2613 2682
                 </rect>
@@ -2622,108 +2691,113 @@ background: dark grey;
2622 2691
                 <double>50000.000000000000000</double>
2623 2692
                </property>
2624 2693
               </widget>
2625
-              <widget class="QLabel" name="label_51">
2694
+              <widget class="QLabel" name="label_38">
2626 2695
                <property name="geometry">
2627 2696
                 <rect>
2628
-                 <x>300</x>
2629
-                 <y>115</y>
2697
+                 <x>670</x>
2698
+                 <y>640</y>
2630 2699
                  <width>111</width>
2631 2700
                  <height>20</height>
2632 2701
                 </rect>
2633 2702
                </property>
2634 2703
                <property name="text">
2635
-                <string>B Intensity [nT]</string>
2704
+                <string>B Declination [°] </string>
2636 2705
                </property>
2637 2706
               </widget>
2638
-              <widget class="Line" name="line">
2707
+              <widget class="QLabel" name="label_37">
2639 2708
                <property name="geometry">
2640 2709
                 <rect>
2641
-                 <x>20</x>
2642
-                 <y>160</y>
2643
-                 <width>901</width>
2644
-                 <height>16</height>
2710
+                 <x>670</x>
2711
+                 <y>600</y>
2712
+                 <width>111</width>
2713
+                 <height>20</height>
2645 2714
                 </rect>
2646 2715
                </property>
2647
-               <property name="orientation">
2648
-                <enum>Qt::Horizontal</enum>
2716
+               <property name="text">
2717
+                <string>B Inclination [°]</string>
2649 2718
                </property>
2650 2719
               </widget>
2651
-              <widget class="QLabel" name="label_52">
2720
+              <widget class="QDoubleSpinBox" name="decSpinBox">
2652 2721
                <property name="geometry">
2653 2722
                 <rect>
2654
-                 <x>10</x>
2655
-                 <y>180</y>
2656
-                 <width>191</width>
2723
+                 <x>790</x>
2724
+                 <y>635</y>
2725
+                 <width>101</width>
2657 2726
                  <height>31</height>
2658 2727
                 </rect>
2659 2728
                </property>
2660
-               <property name="text">
2661
-                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Comments and field notes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
2729
+               <property name="decimals">
2730
+                <number>1</number>
2662 2731
                </property>
2663
-              </widget>
2664
-              <widget class="QTextBrowser" name="txtComments">
2665
-               <property name="geometry">
2666
-                <rect>
2667
-                 <x>30</x>
2668
-                 <y>220</y>
2669
-                 <width>881</width>
2670
-                 <height>631</height>
2671
-                </rect>
2732
+               <property name="minimum">
2733
+                <double>-90.000000000000000</double>
2672 2734
                </property>
2673
-               <property name="readOnly">
2674
-                <bool>false</bool>
2735
+               <property name="maximum">
2736
+                <double>90.000000000000000</double>
2737
+               </property>
2738
+               <property name="value">
2739
+                <double>0.000000000000000</double>
2675 2740
                </property>
2676 2741
               </widget>
2677
-              <widget class="QTimeEdit" name="timeEdit">
2742
+              <widget class="QDoubleSpinBox" name="incSpinBox">
2678 2743
                <property name="geometry">
2679 2744
                 <rect>
2680
-                 <x>140</x>
2681
-                 <y>110</y>
2682
-                 <width>118</width>
2683
-                 <height>29</height>
2745
+                 <x>790</x>
2746
+                 <y>595</y>
2747
+                 <width>101</width>
2748
+                 <height>31</height>
2684 2749
                 </rect>
2685 2750
                </property>
2686
-               <property name="calendarPopup">
2687
-                <bool>true</bool>
2751
+               <property name="decimals">
2752
+                <number>1</number>
2753
+               </property>
2754
+               <property name="minimum">
2755
+                <double>-90.000000000000000</double>
2756
+               </property>
2757
+               <property name="maximum">
2758
+                <double>90.000000000000000</double>
2759
+               </property>
2760
+               <property name="value">
2761
+                <double>45.000000000000000</double>
2688 2762
                </property>
2689 2763
               </widget>
2690
-              <widget class="QDateEdit" name="dateEdit">
2764
+              <widget class="QLabel" name="label_51">
2691 2765
                <property name="geometry">
2692 2766
                 <rect>
2693
-                 <x>140</x>
2694
-                 <y>70</y>
2695
-                 <width>112</width>
2696
-                 <height>29</height>
2767
+                 <x>670</x>
2768
+                 <y>680</y>
2769
+                 <width>111</width>
2770
+                 <height>20</height>
2697 2771
                 </rect>
2698 2772
                </property>
2699
-               <property name="calendarPopup">
2700
-                <bool>true</bool>
2773
+               <property name="text">
2774
+                <string>B Intensity [nT]</string>
2701 2775
                </property>
2702 2776
               </widget>
2703
-              <widget class="QLabel" name="label_50">
2777
+              <widget class="QLabel" name="label_57">
2704 2778
                <property name="geometry">
2705 2779
                 <rect>
2706
-                 <x>24</x>
2707
-                 <y>117</y>
2708
-                 <width>81</width>
2780
+                 <x>670</x>
2781
+                 <y>560</y>
2782
+                 <width>121</width>
2709 2783
                  <height>16</height>
2710 2784
                 </rect>
2711 2785
                </property>
2712 2786
                <property name="text">
2713
-                <string>Survey time</string>
2787
+                <string>Magnetic field</string>
2714 2788
                </property>
2715 2789
               </widget>
2716
-              <widget class="QDoubleSpinBox" name="tempSpinBox">
2790
+              <widget class="Line" name="line_3">
2717 2791
                <property name="geometry">
2718 2792
                 <rect>
2719
-                 <x>140</x>
2720
-                 <y>30</y>
2721
-                 <width>111</width>
2722
-                 <height>29</height>
2793
+                 <x>670</x>
2794
+                 <y>540</y>
2795
+                 <width>251</width>
2796
+                 <height>20</height>
2723 2797
                 </rect>
2724 2798
                </property>
2725
-               <property name="value">
2726
-                <double>20.000000000000000</double>
2799
+               <property name="orientation">
2800
+                <enum>Qt::Horizontal</enum>
2727 2801
                </property>
2728 2802
               </widget>
2729 2803
              </widget>
@@ -2734,19 +2808,6 @@ background: dark grey;
2734 2808
            <attribute name="title">
2735 2809
             <string>Kernel calc</string>
2736 2810
            </attribute>
2737
-           <widget class="QTableWidget" name="loopTableWidget">
2738
-            <property name="geometry">
2739
-             <rect>
2740
-              <x>20</x>
2741
-              <y>70</y>
2742
-              <width>441</width>
2743
-              <height>271</height>
2744
-             </rect>
2745
-            </property>
2746
-            <property name="toolTip">
2747
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This table is used to enter coil geometries the format is as follows: each row specifies a single point on a coil. The first column is the coil index (using the GMR channel is useful), the next three colums specify the point in Northing, Easting, and Elevation. These can either be local coordinates or global ones. The final column specifies the loop radius if it is a circle or figure 8, for non circular or figure 8 loops leave this column blank. For figure-8 loops the coils do not need to be touching (see Irons and Kass, 2017). If a given index has 1 row it will be a circular loop, two rows will be a figure 8, and more than that will be a polygonal representation of the points, linearlly interpolated between them. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
2748
-            </property>
2749
-           </widget>
2750 2811
            <widget class="Line" name="line_2">
2751 2812
             <property name="geometry">
2752 2813
              <rect>
@@ -2760,20 +2821,7 @@ background: dark grey;
2760 2821
              <enum>Qt::Horizontal</enum>
2761 2822
             </property>
2762 2823
            </widget>
2763
-           <widget class="QLabel" name="label_54">
2764
-            <property name="geometry">
2765
-             <rect>
2766
-              <x>20</x>
2767
-              <y>40</y>
2768
-              <width>91</width>
2769
-              <height>16</height>
2770
-             </rect>
2771
-            </property>
2772
-            <property name="text">
2773
-             <string>Surface loops</string>
2774
-            </property>
2775
-           </widget>
2776
-           <widget class="MyDynamicMplCanvas" name="mplwidget_3" native="true">
2824
+           <widget class="MyDynamicMplCanvas" name="mplwidget_4" native="true">
2777 2825
             <property name="geometry">
2778 2826
              <rect>
2779 2827
               <x>480</x>
@@ -3098,8 +3146,8 @@ background: red;
3098 3146
              <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;
3099 3147
 &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;
3100 3148
 p, li { white-space: pre-wrap; }
3101
-&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;
3102
-&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>
3149
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
3150
+&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>
3103 3151
             </property>
3104 3152
            </widget>
3105 3153
            <widget class="QLabel" name="label_53">
@@ -3130,7 +3178,7 @@ p, li { white-space: pre-wrap; }
3130 3178
      <x>0</x>
3131 3179
      <y>0</y>
3132 3180
      <width>1000</width>
3133
-     <height>19</height>
3181
+     <height>25</height>
3134 3182
     </rect>
3135 3183
    </property>
3136 3184
    <widget class="QMenu" name="menuFile">

Завантаження…
Відмінити
Зберегти