Further improvements to GUI

akvo/gui/akvoGUI.py

@@ -172,6 +172,25 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.plotGI.setEnabled(False) 
         self.ui.plotGI.pressed.connect( self.plotGI )
  
+        # hide header info box 
+        #self.ui.headerFileBox.setVisible(False) 
+        self.ui.headerFileBox.clicked.connect( self.headerBoxShrink ) 
+        self.ui.headerBox2.setVisible(False) 
+
+        # Clean up the tab widget 
+        self.ui.actionPreprocessing.triggered.connect(self.addPreProc)
+        self.ui.actionModelling.triggered.connect(self.addModelling)
+        self.ui.actionInversion.triggered.connect(self.addInversion)
+
+        # tabs 
+        #self.ui.ProcTabs.tabCloseRequested.connect( self.closeTabs )
+        #self.ui.ProcTabs.tabBar().setTabButton(7, QtWidgets.QTabBar.RightSide,None) 
+        self.ui.ProcTabs.removeTab(4)    
+        self.ui.ProcTabs.removeTab(4)    
+        self.ui.ProcTabs.removeTab(4)    
+        self.ui.ProcTabs.removeTab(4)    
+        #self.ui.LoadTab.close(  ) 
+
         # Add progressbar to statusbar
         self.ui.barProgress =  QtWidgets.QProgressBar()
         self.ui.statusbar.addPermanentWidget(self.ui.barProgress, 0);
@@ -181,6 +200,7 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.mplwidget_navigator.setCanvas(self.ui.mplwidget)
         #self.ui.mplwidget_navigator_2.setCanvas(self.ui.mplwidget)
 
+
         ##########################################################################
         # Loop Table 
         self.ui.loopTableWidget.setRowCount(80)       
@@ -231,6 +251,59 @@ class ApplicationWindow(QtWidgets.QMainWindow):
                 self.ui.layerTableWidget.setItem(ir, ic, pCell)
         self.ui.layerTableWidget.cellChanged.connect(self.sigmaCellChanged) 
 
+    def closeTabs(self):
+        #self.ui.ProcTabs.removeTab(idx)    
+        self.ui.ProcTabs.clear( )    
+    
+    def addPreProc(self):
+        if self.ui.actionPreprocessing.isChecked(): 
+            self.ui.actionModelling.setChecked(False) 
+            self.ui.actionInversion.setChecked(False) 
+            self.ui.ProcTabs.clear( )    
+            self.ui.ProcTabs.insertTab( 0, self.ui.LoadTab, "Load" )    
+            self.ui.ProcTabs.insertTab( 1, self.ui.NCTab, "NC" )    
+            self.ui.ProcTabs.insertTab( 2, self.ui.QCTab, "QC" )    
+            self.ui.ProcTabs.insertTab( 3, self.ui.METATab, "META" )    
+            self.ui.ProcTabs.insertTab( 4, self.ui.LogTab, "Log" )    
+        else:
+            self.ui.ProcTabs.removeTab(0)    
+            self.ui.ProcTabs.removeTab(0)    
+            self.ui.ProcTabs.removeTab(0)    
+            self.ui.ProcTabs.removeTab(0)    
+    
+    def addModelling(self):
+        if self.ui.actionModelling.isChecked(): 
+            self.ui.actionPreprocessing.setChecked(False) 
+            self.ui.actionInversion.setChecked(False) 
+            self.ui.ProcTabs.clear( )    
+            self.ui.ProcTabs.insertTab( 0, self.ui.KernTab, "Kernel" )    
+            self.ui.ProcTabs.insertTab( 1, self.ui.ModelTab, "Modelling" )    
+            self.ui.ProcTabs.insertTab( 2, self.ui.LogTab, "Log" )    
+        else:
+            self.ui.ProcTabs.removeTab(0)    
+            self.ui.ProcTabs.removeTab(0)    
+    
+    def addInversion(self, idx):
+        if self.ui.actionInversion.isChecked(): 
+            self.ui.actionPreprocessing.setChecked(False) 
+            self.ui.actionModelling.setChecked(False) 
+            self.ui.ProcTabs.clear( )    
+            self.ui.ProcTabs.insertTab( 0, self.ui.InvertTab, "Inversion" )    
+            self.ui.ProcTabs.insertTab( 1, self.ui.AppraiseTab, "Appraisal" )    
+            self.ui.ProcTabs.insertTab( 2, self.ui.LogTab, "Log" )    
+        else:
+            self.ui.ProcTabs.removeTab(0)    
+            self.ui.ProcTabs.removeTab(0)    
+
+    def headerBoxShrink(self):
+        #self.ui.headerFileBox.setVisible(False)
+ 
+        if self.ui.headerFileBox.isChecked( ): 
+            #self.ui.headerFileBox.setMinimumSize(460,250) 
+            self.ui.headerBox2.setVisible(True) 
+        else:
+            #self.ui.headerFileBox.setMinimumSize(460,50) 
+            self.ui.headerBox2.setVisible(False) 
 
     def sigmaCellChanged(self):
         self.ui.layerTableWidget.cellChanged.disconnect(self.sigmaCellChanged) 
@@ -365,18 +438,17 @@ class ApplicationWindow(QtWidgets.QMainWindow):
                 #pCell.setFlags( )
                 pCell.setBackground( QtGui.QColor("lightblue") )
 
-
-            
- 
         self.plotLoops()
         self.ui.loopTableWidget.cellChanged.connect(self.loopCellChanged) 
 
 
     def plotLoops(self):
-               
-        #self.ui.mplwidget_3.fig.clear() 
-        self.ui.mplwidget_3.ax1.clear() 
-        self.ui.mplwidget_3.ax2.clear()
+
+        print("Plotting loopz")        
+       
+        self.ui.mplwidget.reAxH(1)
+        #self.ui.mplwidget.ax1.clear() 
+        #self.ui.mplwidget.ax2.clear()
         nor = dict()
         eas = dict()
         dep = dict() 
@@ -403,12 +475,12 @@ class ApplicationWindow(QtWidgets.QMainWindow):
 
         for ii in nor.keys():            
             try:    
-                self.ui.mplwidget_3.ax1.plot(  np.array(nor[ii]), np.array(eas[ii])  )
+                self.ui.mplwidget.ax1.plot(  np.array(nor[ii]), np.array(eas[ii])  )
             except:
                 pass 
-        #self.ui.mplwidget_3.figure.axes().set
-        plt.gca().set_aspect('equal') #, adjustable='box')
-        self.ui.mplwidget_3.draw()
+        #self.ui.mplwidget.figure.axes().set
+        self.ui.mplwidget.ax1.set_aspect('equal') #, adjustable='box')
+        self.ui.mplwidget.draw()
 
     def about(self):
         # TODO proper popup with info
@@ -469,6 +541,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.lcdNumberNQ.setEnabled(True)
 
         self.ui.headerFileBox.setEnabled(True)
+        self.ui.headerFileBox.setChecked( True )
+        self.ui.headerBox2.setVisible(True) 
         self.ui.inputRAWParametersBox.setEnabled(True)
         self.ui.loadDataPushButton.setEnabled(True)
          
@@ -706,6 +780,8 @@ class ApplicationWindow(QtWidgets.QMainWindow):
         self.ui.lcdNumberNQ.setEnabled(True)
 
         self.ui.headerFileBox.setEnabled(True)
+        self.ui.headerFileBox.setChecked( False )
+        #self.ui.headerBox2.setVisible(True) 
         self.ui.inputRAWParametersBox.setEnabled(True)
         self.ui.loadDataPushButton.setEnabled(True)
         
@@ -1249,8 +1325,8 @@ def main():
     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 )
+        #ax.fig.patch.set_facecolor( None )
+        #ax.fig.patch.set_alpha( .0 )
         subplot.imshow(img) 
         subplot.xaxis.set_major_locator(plt.NullLocator()) 
         subplot.yaxis.set_major_locator(plt.NullLocator()) 

akvo/gui/mydynamicmplcanvas.py

@@ -17,7 +17,8 @@ class MyMplCanvas(FigureCanvas):
     """Ultimately, this is a QWidget (as well as a FigureCanvasAgg, etc.)."""
     def __init__(self, parent=None, width=3, height=4, dpi=100):
         
-        self.fig = Figure(figsize=(width, height), dpi=dpi)
+        self.fig = Figure(figsize=(width, height), dpi=dpi, facecolor='darkgrey') # this fucking works...why?
+        #self.fig.patch.set_facecolor('blue')
         FigureCanvas.__init__(self, self.fig)
 
         self.setParent(parent)
@@ -33,35 +34,43 @@ class MyDynamicMplCanvas(MyMplCanvas):
 
     """A canvas that updates itself every second with a new plot."""
     def __init__(self, *args, **kwargs):
-        
         MyMplCanvas.__init__(self, *args, **kwargs)
         self.ax1 = self.fig.add_axes([.125,.1,.725,.8])
         self.ax2 = self.ax1.twinx() # fig.add_axes([.125,.1,.725,.8])
         self.compute_initial_figure()
 
     def reAxH(self, num, shx=True, shy=True):
+        
+        try:
+            for ax in fig.axes:
+                self.fig.delaxes(ax)
+        except:
+            pass
         try:
             self.fig.clear()
         except:
             pass
+
         for n in range(num):
             if n == 0:
-                self.ax1 = self.fig.add_subplot( 1, num, 1 )
+                self.ax1 = self.fig.add_subplot( 1, num, 1)
                 self.ax1.tick_params(axis='both', which='major', labelsize=8)
                 self.ax1.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
+                self.ax1.ticklabel_format(style='sci', scilimits=(0,0), axis='x')  
                 self.ax1.yaxis.get_offset_text().set_size(8) 
+                self.ax1.xaxis.get_offset_text().set_size(8) 
             if n == 1:
-                self.ax2 = self.fig.add_subplot( 1, num, 2 )
+                self.ax2 = self.fig.add_subplot( 1, num, 2)
                 self.ax2.tick_params(axis='both', which='major', labelsize=8)
                 self.ax2.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax2.yaxis.get_offset_text().set_size(8) 
             if n == 2:
-                self.ax3 = self.fig.add_subplot( 1, num, 3 )
+                self.ax3 = self.fig.add_subplot( 1, num, 3) 
                 self.ax3.tick_params(axis='both', which='major', labelsize=8)
                 self.ax3.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax3.yaxis.get_offset_text().set_size(8) 
             if n == 3:
-                self.ax4 = self.fig.add_subplot( 1, num, 4 )
+                self.ax4 = self.fig.add_subplot( 1, num, 4) 
                 self.ax4.tick_params(axis='both', which='major', labelsize=8)
                 self.ax4.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax4.yaxis.get_offset_text().set_size(8) 
@@ -72,7 +81,6 @@ class MyDynamicMplCanvas(MyMplCanvas):
                 self.fig.delaxes(ax)
         except:
             pass
-
         try:
             self.fig.clear()
         except:
@@ -80,29 +88,29 @@ class MyDynamicMplCanvas(MyMplCanvas):
         
         for n in range(num):
             if n == 0:
-                self.ax1 = self.fig.add_subplot( 2, num, 1 )
+                self.ax1 = self.fig.add_subplot( 2, num, 1)
                 self.ax1.tick_params(axis='both', which='major', labelsize=8)
                 self.ax1.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax1.yaxis.get_offset_text().set_size(8) 
-                self.ax21 = self.fig.add_subplot( 2, num, num+1 )
+                self.ax21 = self.fig.add_subplot( 2, num, num+1)
                 self.ax21.tick_params(axis='both', which='major', labelsize=8)
                 self.ax21.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax21.yaxis.get_offset_text().set_size(8) 
             if n == 1:
-                self.ax2 = self.fig.add_subplot( 2, num, 2, sharex=self.ax1, sharey=self.ax1 )
+                self.ax2 = self.fig.add_subplot( 2, num, 2, sharex=self.ax1, sharey=self.ax1)
                 self.ax2.tick_params(axis='both', which='major', labelsize=8)
                 self.ax2.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax2.yaxis.get_offset_text().set_size(8) 
-                self.ax22 = self.fig.add_subplot( 2, num, num+2, sharex=self.ax21, sharey=self.ax21 )
+                self.ax22 = self.fig.add_subplot( 2, num, num+2, sharex=self.ax21, sharey=self.ax21)
                 self.ax22.tick_params(axis='both', which='major', labelsize=8)
                 self.ax22.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax22.yaxis.get_offset_text().set_size(8) 
             if n == 2:
-                self.ax3 = self.fig.add_subplot( 2, num, 3, sharex=self.ax1, sharey=self.ax1 )
+                self.ax3 = self.fig.add_subplot( 2, num, 3, sharex=self.ax1, sharey=self.ax1)
                 self.ax3.tick_params(axis='both', which='major', labelsize=8)
                 self.ax3.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax3.yaxis.get_offset_text().set_size(8) 
-                self.ax23 = self.fig.add_subplot( 2, num, num+3, sharex=self.ax21, sharey=self.ax21 )
+                self.ax23 = self.fig.add_subplot( 2, num, num+3, sharex=self.ax21, sharey=self.ax21)
                 self.ax23.tick_params(axis='both', which='major', labelsize=8)
                 self.ax23.ticklabel_format(style='sci', scilimits=(0,0), axis='y')  
                 self.ax23.yaxis.get_offset_text().set_size(8) 
@@ -176,6 +184,7 @@ class MyDynamicMplCanvas(MyMplCanvas):
         except:
             pass
 
+        #self.fig.patch.set_facecolor('red')
         self.ax1 = self.fig.add_subplot(211)
         if shx and shy:
             self.ax2 = self.fig.add_subplot(212, sharex=self.ax1, sharey=self.ax1)
@@ -232,6 +241,13 @@ class MyDynamicMplCanvas(MyMplCanvas):
 
         self.ax3 = self.ax1.twinx()
 
+        #self.ax1.set_facecolor('red')
+        #self.ax2.set_facecolor('red')
+        #self.ax3.set_facecolor('red')
+        #self.fig.set_facecolor('red')
+        #self.fig.set_edgecolor('red')
+        #self.ax1.set_axis_bgcolor('green')
+
         self.ax1.tick_params(axis='both', which='major', labelsize=8)
         self.ax2.tick_params(axis='both', which='major', labelsize=8)
         self.ax3.tick_params(axis='both', which='major', labelsize=8)

akvo/tressel/mrsurvey.py

@@ -2216,6 +2216,7 @@ class GMRDataProcessor(SNMRDataProcessor):
         #    results = pool.starmap( loadGMRBinaryFID, zip(itertools.repeat(self), fnames, info ) ) # zip(np.tile(vc, (ns, 1)), np.tile(vgc, (ns,1)), itertools.repeat(sys.argv[1]), itertools.repeat(sys.argv[2]), EPS_CMR))
 
         # Plotting
+
         if plot: 
             iistack = 0
             for istack in procStacks:
@@ -2223,6 +2224,7 @@ class GMRDataProcessor(SNMRDataProcessor):
                     canvas.ax1.clear()
                     canvas.ax2.clear()
                     canvas.ax3.clear()
+                    #canvas.fig.patch.set_facecolor('blue')
                            
                     for ichan in chan:
                         canvas.ax1.plot(self.DATADICT["Pulse 1"]["PULSE_TIMES"], self.DATADICT["Pulse 1"]["CURRENT"][ipm][istack] , color='black')

setup.py

@@ -17,7 +17,7 @@ class custom_build_py(build_py):
         build_py.run(self)
 
 setup(name='Akvo',
-      version='1.0.6',
+      version='1.0.7',
       description='Surface nuclear magnetic resonance workbench',
       author='Trevor P. Irons',
       author_email='Trevor.Irons@lemmasoftware.org',