more intuitive file selection in kernel and inversion

akvo/gui/akvoGUI.py

@@ -142,6 +142,11 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.calcQGO.pressed.connect( self.calcQ )
         self.ui.FDSmartStackGO.pressed.connect( self.FDSmartStack )
         self.ui.harmonicGO.pressed.connect( self.harmonicModel )       
+        
+        self.ui.K0Data.pressed.connect( self.K0DataSelect )       
+        
+        self.ui.invDataButton.pressed.connect( self.invDataSelect )       
+        self.ui.invKernelButton.pressed.connect( self.invKernelSelect )       
 
         self.ui.f0K1Spin.valueChanged.connect( self.LCDHarmonics )
         self.ui.f0KNSpin.valueChanged.connect( self.LCDHarmonics )
@@ -318,7 +323,60 @@ class ApplicationWindow(QtWidgets.QMainWindow):
             self.ui.ProcTabs.removeTab(0)    
             self.ui.ProcTabs.removeTab(0)    
     
+    def invDataSelect(self):
+        try:
+            with open('.akvo.last.path') as f: 
+                fpath = f.readline()  
+                pass
+        except IOError as e:
+            fpath = '.'
+        
+        self.akvoDataFile = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
+        self.ui.dataText.clear()   
+        self.ui.dataText.append( self.akvoDataFile )   
+    
+    def K0DataSelect(self):
+        try:
+            with open('.akvo.last.path') as f: 
+                fpath = f.readline()  
+                pass
+        except IOError as e:
+            fpath = '.'
+        
+        self.K0akvoDataFile = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
+        self.ui.K0DataText.clear()   
+        self.ui.K0DataText.append( self.K0akvoDataFile )  
+
+        # populate combo box with loops 
+
+        with open(self.K0akvoDataFile) as f:
+            parse = yaml.load( f, Loader=yaml.Loader )
+        
+        self.ui.txListWidget.clear()
+        self.ui.rxListWidget.clear()
+        for loop in parse.META["Loops"]:
+            print(loop)
+            self.ui.txListWidget.addItem( parse.META["Loops"][loop] )
+            self.ui.rxListWidget.addItem( parse.META["Loops"][loop] )
+            
+        self.ui.txListWidget.setCurrentRow(0)
+        self.ui.rxListWidget.setCurrentRow(0)
+         
+ 
+    def invKernelSelect(self):
+        try:
+            with open('.akvo.last.path') as f: 
+                fpath = f.readline()  
+                pass
+        except IOError as e:
+            fpath = '.'
+        
+        self.K0file = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Kernel File', fpath, r"Akvo kernels (*.yml)")[0]
+        self.ui.kernelText.clear()   
+        self.ui.kernelText.append(self.K0file)   
+    
     def QTInv(self):
+    
         print("Big RED INVERT BUTTON")
         
         try:
@@ -328,14 +386,13 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         except IOError as e:
             fpath = '.'
         
-        akvoDatafile = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
-        K0file = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Kernel File', fpath, r"Akvo kernels (*.yml)")[0]
+        #K0file = self.ui.kernelText.text()
+        #akvoDataFile = self.ui.dataText.text()   
 
         T2lo = self.ui.T2low.value()
         T2hi = self.ui.T2hi.value()
         NT2 = self.ui.NT2.value()
         dataChan = self.ui.invChan.currentText()
-       
 
         t2Obj = self.ui.T2Objective.currentText()
         depthObj = self.ui.depthObjective.currentText()
@@ -344,9 +401,9 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         invDict = dict()
         invDict["data"] = dict()
         invDict["data"] = dict() 
-        invDict["data"][akvoDatafile] = dict()
-        invDict["data"][akvoDatafile]["channels"] = [dataChan,]
-        invDict["K0"] = [K0file,]
+        invDict["data"][self.akvoDataFile] = dict()
+        invDict["data"][self.akvoDataFile]["channels"] = [dataChan,]
+        invDict["K0"] = [self.K0file,]
         invDict["T2Bins"] = dict()
         invDict["T2Bins"]["low"] = T2lo
         invDict["T2Bins"]["high"] = T2hi
@@ -375,8 +432,9 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         except IOError as e:
             fpath = '.'
 
-        akvoData = QtWidgets.QFileDialog.getOpenFileName(self, 'Open Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
-        txCoil = QtWidgets.QFileDialog.getOpenFileName(self, 'Open Tx File', fpath, r"Akvo datafiles (*.yaml, *.yml)")[0] 
+        #self.K0akvoDataFile = QtWidgets.QFileDialog.getOpenFileName(self, 'Select Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
+        #akvoData = QtWidgets.QFileDialog.getOpenFileName(self, 'Open Datafile File', fpath, r"Akvo datafiles (*.yaml)")[0]
+        txCoil = self.ui.txListWidget.currentItem().text() 
         saveStr = QtWidgets.QFileDialog.getSaveFileName(self, "Save kernel as", fpath, r"Merlin KernelV0 (*.yml)")[0] 
 
         intDict = dict()
@@ -428,7 +486,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         
         callBox.ui = Ui_callScript()
         callBox.ui.setupUi( callBox )
-        callBox.setupCB( akvoData, txCoil, "kparams.yml", saveStr  )
+        callBox.setupCB( self.K0akvoDataFile, txCoil, "kparams.yml", saveStr  )
         
         callBox.exec_()
         callBox.show()

akvo/gui/main.ui

@@ -711,7 +711,7 @@ background: dark grey;
          <x>0</x>
          <y>0</y>
          <width>537</width>
-         <height>982</height>
+         <height>999</height>
         </rect>
        </property>
        <property name="sizePolicy">
@@ -3688,7 +3688,85 @@ background: dark grey;
                <item>
                 <widget class="QTableWidget" name="layerTableWidget">
                  <property name="toolTip">
-                  <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>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This table is used to enter a resistivity model. For each layer the top and bottom interfaces should be specified in m, z is positive down. The top layer must begin at 0. The bottom layer is infinite and should not have a bottom specified. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="groupBox_7">
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>100</height>
+               </size>
+              </property>
+              <property name="title">
+               <string>Align with Akvo processed dataset</string>
+              </property>
+              <layout class="QGridLayout" name="gridLayout_20">
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_84">
+                 <property name="text">
+                  <string>Rx</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="label_83">
+                 <property name="text">
+                  <string>Tx</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QPushButton" name="K0Data">
+                 <property name="text">
+                  <string>Data file</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="2">
+                <widget class="QTextEdit" name="K0DataText">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>60</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <pointsize>8</pointsize>
+                   <italic>true</italic>
+                  </font>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1" colspan="2">
+                <widget class="QListWidget" name="txListWidget">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>70</height>
+                  </size>
+                 </property>
+                 <property name="alternatingRowColors">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1" colspan="2">
+                <widget class="QListWidget" name="rxListWidget">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>70</height>
+                  </size>
+                 </property>
+                 <property name="alternatingRowColors">
+                  <bool>true</bool>
                  </property>
                 </widget>
                </item>
@@ -4120,111 +4198,157 @@ background: dark grey;
                <string>QT Inversion</string>
               </property>
               <layout class="QGridLayout" name="gridLayout_19">
-               <item row="5" column="0" colspan="2">
-                <widget class="QPushButton" name="invertButton">
-                 <property name="styleSheet">
-                  <string notr="true">#invertButton {
-font-size:29pt;
-font-weight: bold;
-color: white;
-background: red;
-}</string>
-                 </property>
-                 <property name="text">
-                  <string>Invert</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="0">
-                <widget class="QLabel" name="label_81">
-                 <property name="text">
-                  <string>initial alpha </string>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="1">
-                <widget class="QSpinBox" name="initialAlpha">
-                 <property name="maximum">
-                  <number>10000000</number>
-                 </property>
-                 <property name="value">
-                  <number>1000000</number>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_79">
-                 <property name="text">
-                  <string>Data channel</string>
-                 </property>
-                </widget>
-               </item>
                <item row="2" column="1">
-                <widget class="QComboBox" name="T2Objective">
+                <widget class="QComboBox" name="invChan">
                  <item>
                   <property name="text">
-                   <string>Smallest</string>
+                   <string>Chan. 1</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Smoothest</string>
+                   <string>Chan. 2</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Both</string>
+                   <string>Chan. 3</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+                   <string>Chan. 4</string>
                   </property>
                  </item>
                 </widget>
                </item>
-               <item row="1" column="1">
-                <widget class="QComboBox" name="invChan">
+               <item row="4" column="1">
+                <widget class="QComboBox" name="depthObjective">
                  <item>
                   <property name="text">
-                   <string>Chan. 1</string>
+                   <string>Smallest</string>
                   </property>
                  </item>
+                </widget>
+               </item>
+               <item row="3" column="1">
+                <widget class="QComboBox" name="T2Objective">
                  <item>
                   <property name="text">
-                   <string>Chan. 2</string>
+                   <string>Smallest</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Chan. 3</string>
+                   <string>Smoothest</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
-                   <string>Chan. 4</string>
+                   <string>Both</string>
                   </property>
                  </item>
                 </widget>
                </item>
-               <item row="2" column="0">
+               <item row="3" column="0">
                 <widget class="QLabel" name="label_80">
                  <property name="text">
                   <string>T2* model objective</string>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="1">
-                <widget class="QComboBox" name="depthObjective">
-                 <item>
-                  <property name="text">
-                   <string>Smallest</string>
-                  </property>
-                 </item>
-                </widget>
-               </item>
-               <item row="3" column="0">
+               <item row="4" column="0">
                 <widget class="QLabel" name="label_82">
                  <property name="text">
                   <string>Depth model objective</string>
                  </property>
                 </widget>
                </item>
+               <item row="0" column="1">
+                <widget class="QTextBrowser" name="dataText">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>60</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <pointsize>8</pointsize>
+                   <italic>true</italic>
+                  </font>
+                 </property>
+                </widget>
+               </item>
+               <item row="6" column="0" colspan="2">
+                <widget class="QPushButton" name="invertButton">
+                 <property name="styleSheet">
+                  <string notr="true">#invertButton {
+font-size:29pt;
+font-weight: bold;
+color: white;
+background: red;
+}</string>
+                 </property>
+                 <property name="text">
+                  <string>Invert</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="0">
+                <widget class="QLabel" name="label_79">
+                 <property name="text">
+                  <string>Data channel</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QPushButton" name="invDataButton">
+                 <property name="text">
+                  <string>Select Data</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="0">
+                <widget class="QLabel" name="label_81">
+                 <property name="text">
+                  <string>initial alpha </string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="1">
+                <widget class="QSpinBox" name="initialAlpha">
+                 <property name="maximum">
+                  <number>10000000</number>
+                 </property>
+                 <property name="value">
+                  <number>1000000</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QPushButton" name="invKernelButton">
+                 <property name="text">
+                  <string>Select Kernel</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QTextEdit" name="kernelText">
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>60</height>
+                  </size>
+                 </property>
+                 <property name="font">
+                  <font>
+                   <pointsize>8</pointsize>
+                   <italic>true</italic>
+                  </font>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
             </item>