Adding GUI functionality, mainly in loops. Also, new logo plot.

akvo/gui/addCircularLoop.ui

@@ -7,21 +7,48 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>395</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>height (m)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <widget class="QDoubleSpinBox" name="dip">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The dip designates the angle between the normal and the ground. Zero designates a loop that is flat on the ground, whereas 90 is a vertical loop. This value in turn with azimuth allows for arbitrary orientation of the loops. If azimuth is zero, and dip is 90, the loop has a normal aligned in the northing direction. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="maximum">
+      <double>90.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="label_8">
+     <property name="text">
+      <string>azimuth (°)</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Centre Northing </string>
+      <string>centre northing (m)</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="2">
     <widget class="QDoubleSpinBox" name="centreNorth">
      <property name="minimum">
       <double>-999999999.000000000000000</double>
@@ -31,32 +58,41 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_7">
      <property name="text">
-      <string>Centre Easting</string>
+      <string>dip (°)</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QDoubleSpinBox" name="centreEast">
-     <property name="minimum">
-      <double>-99999999.000000000000000</double>
+   <item row="10" column="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="maximum">
-      <double>99999999.989999994635582</double>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>height </string>
+   <item row="3" column="2">
+    <widget class="QDoubleSpinBox" name="loopRadius">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Radius of the loop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="minimum">
+      <double>0.100000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>600.000000000000000</double>
+     </property>
+     <property name="value">
+      <double>50.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QDoubleSpinBox" name="doubleSpinBox">
+   <item row="2" column="2">
+    <widget class="QDoubleSpinBox" name="loopHeight">
      <property name="toolTip">
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Akvo uses a positive down convention, a slight negative value to the loop height improves numerical stability using digital filtering hankel transforms. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
@@ -71,50 +107,68 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>centre easting (m)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="2">
+    <widget class="QDoubleSpinBox" name="az">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>radius</string>
+      <string>radius (m)</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="doubleSpinBox_2">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Radius of the loop&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>turns</string>
      </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QDoubleSpinBox" name="centreEast">
      <property name="minimum">
-      <double>0.100000000000000</double>
+      <double>-99999999.000000000000000</double>
      </property>
      <property name="maximum">
-      <double>299.990000000000009</double>
+      <double>99999999.989999994635582</double>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>segments</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QSpinBox" name="spinBox">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Currently Akvo/Merlin calculates circular loops using segments of wire, forming a polygon. Analytic circular loops may be added in the future. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
+   <item row="4" column="2">
+    <widget class="QSpinBox" name="loopTurns">
      <property name="minimum">
-      <number>5</number>
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <number>100000</number>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="5" column="2">
+    <widget class="QSpinBox" name="segments">
+     <property name="toolTip">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Currently Akvo/Merlin calculates circular loops using segments of wire, forming a polygon. Analytic circular loops may be added in the future. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     <property name="minimum">
+      <number>5</number>
      </property>
     </widget>
    </item>

akvo/gui/akvoGUI.py

@@ -29,9 +29,11 @@ from copy import deepcopy
 from matplotlib.backends.backend_qt4 import NavigationToolbar2QT #as NavigationToolbar
 import datetime, time
 
-
 from akvo.tressel import mrsurvey 
-#from akvo.lemma import pyLemmaCore  # Looking ahead! 
+
+from pyLemma import LemmaCore  
+from pyLemma import FDEM1D 
+from pyLemma import Merlin
 
 import pkg_resources  # part of setuptools
 version = pkg_resources.require("Akvo")[0].version
@@ -205,9 +207,12 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.dateEdit.dateChanged.connect( self.logSite )
         # this may call the yaml stuff too often... 
         self.ui.txtComments.textChanged.connect( self.logSite )
+        
+        self.ui.plotLoops.pressed.connect( self.plotLoops2 )       
  
-        # invert
+        # Loops
         self.ui.addLoopButton.pressed.connect( self.loopAdd )
+        self.loops = {}          
  
         # hide header info box 
         #self.ui.headerFileBox.setVisible(False) 
@@ -262,8 +267,10 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.loopTableWidget.setDragEnabled(False)
         #self.ui.loopTableWidget.setDragDropMode(QtWidgets.QAbstractItemView.InternalMove)
 
-        self.loops = {}          
-
+        self.ui.txRxTable.setColumnCount(4)
+        self.ui.txRxTable.setRowCount(0)
+        self.ui.txRxTable.setHorizontalHeaderLabels( ["Label", "Geom.","Turns","Tx/Rx"] )
+        
         ##########################################################################
         # layer Table 
         self.ui.layerTableWidget.setRowCount(80)       
@@ -355,11 +362,10 @@ class ApplicationWindow(QtWidgets.QMainWindow):
     
     def loopAdd(self):
 
-        print(self.ui.loopLabel.text())
-        print(self.ui.loopGeom.currentText())
-        print(self.ui.loopType.currentText())
-           
-        print( "label len", len(self.ui.loopLabel.text()) ) 
+        #print(self.ui.loopLabel.text())
+        #print(self.ui.loopGeom.currentText())
+        #print(self.ui.loopType.currentText())
+        #print( "label len", len(self.ui.loopLabel.text()) ) 
         if len(self.ui.loopLabel.text().strip()) == 0: 
             Error = QtWidgets.QMessageBox()
             Error.setWindowTitle("Error!")
@@ -374,7 +380,52 @@ class ApplicationWindow(QtWidgets.QMainWindow):
                 dialog.exec_()
                 dialog.show()
                 if dialog.result():
-                    print("centre north", dialog.ui.centreNorth.value())
+                    cn = dialog.ui.centreNorth.value()
+                    ce = dialog.ui.centreEast.value()
+                    ht = dialog.ui.loopHeight.value()
+                    rad = dialog.ui.loopRadius.value()
+                    turns = dialog.ui.loopTurns.value()
+                    ns = dialog.ui.segments.value()
+                    #print("dip", dialog.ui.dip.value())
+                    #print("azimuth", dialog.ui.az.value())
+                    
+                    self.loops[self.ui.loopLabel.text()] = FDEM1D.PolygonalWireAntenna()
+                    self.loops[self.ui.loopLabel.text()].SetNumberOfPoints( dialog.ui.segments.value() + 1 )
+                    self.loops[self.ui.loopLabel.text()].SetNumberOfTurns( dialog.ui.loopTurns.value() )
+
+                    points = np.linspace(0, 2*np.pi, dialog.ui.segments.value()+1)
+                    for iseg, ipt in enumerate(points):
+                        #self.loops[self.ui.loopLabel.text()].SetPoint(iseg,( dialog.ui.centreNorth.value(),  dialog.ui.centreEast.value(), dialog.ui.loopHeight.value()))
+                        self.loops[self.ui.loopLabel.text()].SetPoint(iseg, ( cn+rad*np.sin(ipt), ce+rad*np.cos(ipt), ht ))
+                        #self.loops[self.ui.loopLabel.text()].SetPoint(1,(150,  50, -1e-3))
+                    
+                    self.loops[self.ui.loopLabel.text()].SetNumberOfFrequencies(1)
+                    #self.loops[self.ui.loopLabel.text].SetFrequency(0,2246) 
+                    self.loops[self.ui.loopLabel.text()].SetCurrent(1.)
+                   
+                    # update the table 
+                    self.ui.txRxTable.setRowCount( len(self.loops.keys()) )
+                    
+                    pCell = QtWidgets.QTableWidgetItem()
+                    pCell.setText( self.ui.loopLabel.text() ) 
+                    pCell.setFlags( QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled )
+                    self.ui.txRxTable.setItem( len(self.loops.keys())-1, 0, pCell)
+                    
+                    gCell = QtWidgets.QTableWidgetItem()
+                    gCell.setText( self.ui.loopGeom.currentText() ) 
+                    gCell.setFlags( QtCore.Qt.ItemIsEnabled )
+                    self.ui.txRxTable.setItem( len(self.loops.keys())-1, 1, gCell)
+                    
+                    tCell = QtWidgets.QTableWidgetItem()
+                    tCell.setText( str(dialog.ui.loopTurns.value()) ) 
+                    tCell.setFlags( QtCore.Qt.ItemIsEnabled )
+                    self.ui.txRxTable.setItem( len(self.loops.keys())-1, 2, tCell)
+                    
+                    txCell = QtWidgets.QTableWidgetItem()
+                    txCell.setText( str(self.ui.loopType.currentText()) ) 
+                    txCell.setFlags( QtCore.Qt.ItemIsEnabled )
+                    self.ui.txRxTable.setItem( len(self.loops.keys())-1, 3, txCell)
+
 
     def headerBoxShrink(self):
         #self.ui.headerFileBox.setVisible(False)
@@ -525,10 +576,17 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.plotLoops()
         self.ui.loopTableWidget.cellChanged.connect(self.loopCellChanged) 
 
+    def plotLoops2(self):
+        self.ui.mplwidget.reAxH(1)
+
+        for loop in self.loops:
+            POINTS = self.loops[loop].GetPoints().T
+            self.ui.mplwidget.ax1.plot( POINTS[:,0], POINTS[:,1] )
+        
+        self.ui.mplwidget.ax1.set_aspect('equal') #, adjustable='box')
+        self.ui.mplwidget.draw()
 
     def plotLoops(self):
-
-        print("Plotting loopz")        
        
         self.ui.mplwidget.reAxH(1)
         #self.ui.mplwidget.ax1.clear() 
@@ -1565,7 +1623,7 @@ import pkg_resources
 from pkg_resources import resource_string
 import matplotlib.image as mpimg 
 import matplotlib.pyplot as plt 
-
+from akvo.gui.logo import plotLogo
 
 def main():
     
@@ -1582,15 +1640,31 @@ def main():
     
     aw = ApplicationWindow()
 
-    img=mpimg.imread(logo)
+    #img=mpimg.imread(logo)
     for ax in [ aw.ui.mplwidget ]: 
         ax.fig.clear()
-        subplot = ax.fig.add_subplot(111)
-        #ax.fig.patch.set_facecolor( None )
-        #ax.fig.patch.set_alpha( .0 )
-        subplot.imshow(img) 
+        subplot = ax.fig.add_subplot(211)
+        # old logo plot
+        ax.fig.patch.set_facecolor( None )
+        ax.fig.patch.set_alpha( .0 )
+        #subplot.imshow(img)
+        #ax.fig.patch.set_visible(False)
+        subplot.axis('off')
+        
+        plotLogo(subplot) 
         subplot.xaxis.set_major_locator(plt.NullLocator()) 
         subplot.yaxis.set_major_locator(plt.NullLocator()) 
+        
+        subplot2 = ax.fig.add_subplot(212)
+        subplot2.text(0.5, 1.,'surface NMR workbench',
+            horizontalalignment='center',
+            verticalalignment='center',
+            size=22,
+            transform = subplot2.transAxes)
+        subplot2.xaxis.set_major_locator(plt.NullLocator()) 
+        subplot2.yaxis.set_major_locator(plt.NullLocator()) 
+        subplot2.axis('off')
+        
         ax.draw()
 
     if ssplash:

akvo/gui/logo.py

@@ -0,0 +1,46 @@
+def plotLogo(ax):
+    #import matplotlib.pyplot as ax 
+    import numpy as np 
+
+    x  = np.arange(-np.pi/2, 7.0*np.pi, .01)
+    y  = np.sin(x)
+    y2 = np.cos(x)
+
+    y3 = np.sin(.5*x)
+    y4 = np.cos(.5*x)
+
+    ax.plot(x,  y, linewidth=1, color='lightgrey')
+    ax.plot(x, -y, linewidth=1, color='lightgrey')
+    ax.plot(x, y2, linewidth=1, color='lightgrey')
+    ax.plot(x,-y2, linewidth=1, color='lightgrey')
+
+    ax.plot(x,  y3, linewidth=1, color='lightgrey')
+    ax.plot(x, -y3, linewidth=1, color='lightgrey')
+    ax.plot(x,  y4, linewidth=1, color='lightgrey')
+    ax.plot(x, -y4, linewidth=1, color='lightgrey')
+
+    a = np.arange(10,615)
+    ax.plot(x[a],y[a], linewidth=3, color='black')
+    ax.fill_between(x[a],y[a], y2=-1, where=y[a]>=-1, interpolate=True, linewidth=0, alpha=.95, color='maroon')
+
+    k  = np.arange(615, 785)
+    k2 = np.arange(785, 1105)
+    ax.plot(x[k],    y[k ], linewidth=3, color='black')
+    ax.plot(x[k],   -y[k ], linewidth=3, color='black')
+    ax.plot(x[k2],  y3[k2], linewidth=3, color='black')
+    ax.plot(x[k2], -y3[k2], linewidth=3, color='black')
+
+    #v = np.arange(1265,1865) # y 
+    v = np.arange(1105, 1720)
+    ax.plot(x[v], -y2[v], linewidth=3, color='black')
+
+    o = np.arange(1728,2357)
+    ax.plot(x[o],  y4[o], linewidth=3, color='black')
+    ax.plot(x[o], -y4[o], linewidth=3, color='black')
+    ax.fill_between(x[o],  y4[o], y2=-y4[o],  where=y4[o]<=1, interpolate=True, linewidth=0, alpha=.95, color='maroon')
+#ax.fill_between(x[o], -y4[o], y2=0, where=-y4[o]<=1, interpolate=True, linewidth=0, alpha=.5, color='black')
+#ax.plot(x[o], y2[o], linewidth=3, color='black')
+#ax.plot(x[o],-y2[o], linewidth=3, color='black')
+#ax.fill_between(x[a], y[a], y2=-1, where=y[a]>=-1, interpolate=True, linewidth=0, alpha=.5, color='black')
+
+#ax.show()

akvo/gui/main.ui

@@ -1653,7 +1653,7 @@ background: dark grey;
           </widget>
           <widget class="QWidget" name="NCTab">
            <attribute name="title">
-            <string>Noise cancelation</string>
+            <string>Noise removal</string>
            </attribute>
            <attribute name="toolTip">
             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This tab contains noise cancellation algorithms. The frequency-domain algorithm is often less effective than the time domain approach. We often discourage using the frequency domain algorithm. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -3527,15 +3527,15 @@ background: dark grey;
               <property name="title">
                <string>Surface Loops</string>
               </property>
-              <layout class="QGridLayout" name="gridLayout_17">
-               <item row="1" column="0">
-                <widget class="QLabel" name="label_58">
+              <layout class="QGridLayout" name="gridLayout_2">
+               <item row="2" column="2">
+                <widget class="QPushButton" name="removeLoopButton">
                  <property name="text">
-                  <string>Label</string>
+                  <string>Remove</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="5">
+               <item row="0" column="3">
                 <widget class="QComboBox" name="loopType">
                  <item>
                   <property name="text">
@@ -3559,13 +3559,10 @@ background: dark grey;
                  </item>
                 </widget>
                </item>
-               <item row="1" column="2">
-                <widget class="QLineEdit" name="loopLabel"/>
-               </item>
                <item row="0" column="0">
-                <widget class="QLabel" name="label_54">
+                <widget class="QPushButton" name="addLoopButton">
                  <property name="text">
-                  <string>Geometry</string>
+                  <string>Add </string>
                  </property>
                 </widget>
                </item>
@@ -3598,31 +3595,20 @@ background: dark grey;
                  </item>
                 </widget>
                </item>
-               <item row="2" column="5">
+               <item row="1" column="0" colspan="4">
+                <widget class="QTableWidget" name="txRxTable"/>
+               </item>
+               <item row="2" column="3">
                 <widget class="QPushButton" name="plotLoops">
                  <property name="text">
                   <string>Plot loops</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="5">
-                <widget class="QPushButton" name="removeLoopButton">
-                 <property name="text">
-                  <string>Remove</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="4">
-                <widget class="QPushButton" name="addLoopButton">
-                 <property name="text">
-                  <string>Add </string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="4">
-                <widget class="QLabel" name="label_60">
-                 <property name="text">
-                  <string>Type</string>
+               <item row="0" column="1">
+                <widget class="QLineEdit" name="loopLabel">
+                 <property name="placeholderText">
+                  <string>Enter loop name</string>
                  </property>
                 </widget>
                </item>
@@ -3875,8 +3861,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">

setup.py

@@ -50,9 +50,9 @@ setup(name='Akvo',
           'pandas',
           'pyqt-distutils',
           'cmocean',
-          'pyLemma=0.0.9'
+          'pyLemma >= 0.0.9'
       ],
-      packages=['akvo', 'akvo.tressel', 'akvo.gui','akvo.lemma'],
+      packages=['akvo', 'akvo.tressel', 'akvo.gui'],
       license=['GPL 4.0'],
       entry_points = {
               'console_scripts': [