update pearce

Author: cycleuser

geopytool/CustomClass.py

@@ -1,6 +1,6 @@
-version="0.9.21.0.003"
+version="0.9.21.0.004"
 
-date = '2021-01-21'
+date = '2021-03-17'
 
 dpi = 128
 # coding:utf-8

geopytool/MyGAN.py

@@ -171,7 +171,7 @@ def Key_Func(self):
                 if self._df.at[i, 'Label'] == k:
                     # tmp_list.append(self._df.loc[i])
                     tmp_list.append(self.result_to_fit.values[i])
-                self.data_indexed_dict[k] = tmp_list
+                # self.data_indexed_dict[k] = tmp_list
             self.data_indexed_dict[k]=tmp_list
 
             tmp_data=pd.DataFrame(tmp_list)
@@ -205,7 +205,6 @@ def Set_Epochs_Number(self,text):
                 #self.ErrorEvent(text=repr('Epochs must be larger than 1.'))
         except:
             pass
-
     def Set_Batch_Size(self,text):
         try:
             self.batch_size= int(text)

geopytool/Pearce.py

@@ -158,7 +158,7 @@ def create_main_frame(self):
 
         self.resize(900, 900)
         self.main_frame = QWidget()
-        self.dpi = 128
+        self.dpi = 64
         self.fig ,self.axes= plt.subplots(2, 2,figsize=(16.0, 16.0),dpi=self.dpi)
         self.fig.subplots_adjust(hspace=0.5, wspace=0.5,left=0.1, bottom=0.2, right=0.8, top=0.9)
         self.canvas = FigureCanvas(self.fig)
@@ -583,22 +583,22 @@ def Pearce(self):
             for i in self.TagsA:
                 self.axes[0,0].annotate(i.Label, xy=i.Location, xycoords='data', xytext=(i.X_offset, i.Y_offset),
                                    textcoords='offset points',
-                                   fontsize=8, color='grey', alpha=0.8)
+                                   fontsize=4, color='grey', alpha=0.8)
 
             for i in self.TagsB:
                 self.axes[0,1].annotate(i.Label, xy=i.Location, xycoords='data', xytext=(i.X_offset, i.Y_offset),
                                    textcoords='offset points',
-                                   fontsize=8, color='grey', alpha=0.8)
+                                   fontsize=4, color='grey', alpha=0.8)
 
             for i in self.TagsC:
                 self.axes[1,0].annotate(i.Label, xy=i.Location, xycoords='data', xytext=(i.X_offset, i.Y_offset),
                                    textcoords='offset points',
-                                   fontsize=8, color='grey', alpha=0.8)
+                                   fontsize=4, color='grey', alpha=0.8)
 
             for i in self.TagsD:
                 self.axes[1,1].annotate(i.Label, xy=i.Location, xycoords='data', xytext=(i.X_offset, i.Y_offset),
                                    textcoords='offset points',
-                                   fontsize=8, color='grey', alpha=0.8)
+                                   fontsize=4, color='grey', alpha=0.8)
 
 
 

geopytool/Trans.py

@@ -68,8 +68,10 @@ def create_main_frame(self):
 
 
         self.transpose_button = QPushButton('&Transpose')
-        self.center_Geometric_button = QPushButton('&Divide by Geometric Mean')
-        self.center_Arithmetic_button = QPushButton('&Subtract Arithmetic Average')
+        self.divide_Geometric_button = QPushButton('&Divide by Geometric Mean')
+        self.subtract_Geometric_button = QPushButton('&Subtract Geometric Mean')
+        self.divide_Arithmetic_button = QPushButton('&Divide By Arithmetic Average')
+        self.subtract_Arithmetic_button = QPushButton('&Subtract Arithmetic Average')
 
         self.min_max_button = QPushButton('&Min-Max Standard')
         self.std_button = QPushButton('&Standard')
@@ -97,8 +99,12 @@ def create_main_frame(self):
         self.reset_button.clicked.connect(self.resetResult)
 
         self.transpose_button.clicked.connect(self.transpose)
-        self.center_Geometric_button.clicked.connect(self.center_Geometric)
-        self.center_Arithmetic_button.clicked.connect(self.center_Arithmetic)
+        self.divide_Geometric_button.clicked.connect(self.divide_Geometric)
+        self.subtract_Geometric_button.clicked.connect(self.subtract_Geometric)
+        self.divide_Arithmetic_button.clicked.connect(self.divide_Arithmetic)
+        self.subtract_Arithmetic_button.clicked.connect(self.subtract_Arithmetic)
+
+
         self.min_max_button.clicked.connect(self.min_max)
         self.std_button.clicked.connect(self.std)
 
@@ -134,8 +140,10 @@ def create_main_frame(self):
                   self.save_button,]:
             self.hbox0.addWidget(w)
 
-        for w in [self.center_Arithmetic_button,
-                  self.center_Geometric_button,
+        for w in [self.subtract_Arithmetic_button,
+                  self.divide_Arithmetic_button,
+                  self.subtract_Geometric_button,
+                  self.divide_Geometric_button,
                   self.min_max_button,
                   self.std_button]:
             self.hbox1.addWidget(w)
@@ -271,7 +279,7 @@ def remove_column_with_0(self):
         self.tableView.setModel(self.tableresult)
         self.show()
 
-    def center_Geometric(self):
+    def divide_Geometric(self):
 
         gmean=st.gmean(self.result.T)
         tmpresult=self.result.T/gmean
@@ -281,14 +289,35 @@ def center_Geometric(self):
         self.show()
 
 
-    def center_Arithmetic(self):
+    def subtract_Geometric(self):
+
+        gmean=st.gmean(self.result.T)
+        tmpresult=self.result.T-gmean
+        self.result=tmpresult.T
+        self.tableresult=PandasModel(self.result)
+        self.tableView.setModel(self.tableresult)
+        self.show()
+
+
+
+    def subtract_Arithmetic(self):
         mean=self.result.T.mean(numeric_only= float)
         tmpresult=self.result.T-mean
         self.result=tmpresult.T
         self.tableresult=PandasModel(self.result)
         self.tableView.setModel(self.tableresult)
         self.show()
 
+
+
+    def divide_Arithmetic(self):
+        mean=self.result.T.mean(numeric_only= float)
+        tmpresult=self.result.T/mean
+        self.result=tmpresult.T
+        self.tableresult=PandasModel(self.result)
+        self.tableView.setModel(self.tableresult)
+        self.show()
+
     def min_max(self):
         # mean=self.result.T.mean(numeric_only= float)
         # std=self.result.T.std(numeric_only= float)

geopytool/setup.py

@@ -18,7 +18,7 @@
 
 
 setup(name='geopytool',
-      version="0.9.21.0.003",
+      version="0.9.21.0.004",
       description='a tool for daily geology related task. visit geopytool.com for further information',
       longdescription=README,
       author='cycleuser',

setup.py

@@ -18,7 +18,7 @@
 
 
 setup(name='geopytool',
-      version="0.9.21.0.003",
+      version="0.9.21.0.004",
       description='a tool for daily geology related task. visit geopytool.com for further information',
       longdescription=README,
       author='cycleuser',