Add local maximum to POI widget. Fix POI export. Disable load new POI

for now. Fix TODO. Bump version.
jaj42 · May 28, 2020 · f41353e · f41353e
1 parent f892db1
commit f41353e
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/graphysio/mainui.py b/graphysio/mainui.py
@@ -114,14 +114,6 @@ def tabChanged(self, tabid):
             for title, item in submenu.items():
                 menu.addAction(title, item)
 
-    def readData(self, func, title='Load Data'):
-        future = self.executor.submit(readdata.read_file)
-        future.add_done_callback(self.createNewPlotWithData)
-        reader = readdata.ReadFile(title)
-        data = reader.getdata()
-        if data:
-            func(data)
-
     def launchNewPlot(self):
         reader = readdata.FileReader()
         reader.askFile(self.dircache)

diff --git a/graphysio/plotwidgets/poiselector.py b/graphysio/plotwidgets/poiselector.py
@@ -15,6 +15,7 @@
 class FixIndex(Enum):
     disabled = 'Disabled'
     minimum = 'Local Minimum'
+    maximum = 'Local Maximum'
     sndderiv = '2nd derivative peak'
 
 
@@ -38,12 +39,12 @@ def __init__(self, series, parent):
     @property
     def menu(self):
         m = {
-            'Plot': {
-                '&Import POIs': partial(
-                    self.parent.launchReadData, cb=self.poiselectorwidget.loadPOI
-                )
-            },
-            'Export': {'&POI to CSV': self.poiselectorwidget.exporter.poitocsv},
+            #'Plot': {
+            #    '&Import POIs': partial(
+            #        self.parent.launchReadData, cb=self.poiselectorwidget.loadPOI
+            #    )
+            #},
+            'Export': {'&POI to CSV': self.poiselectorwidget.exporter.poi},
         }
         return m
 
@@ -108,6 +109,12 @@ def fixpos(self, pos):
             posprop = findPOIGreedy(s, pos, 'min')
             fixedposloc = s.index.get_loc(posprop, method='nearest')
             correctedpos = s.index[fixedposloc]
+        elif self.fixvalue is FixIndex.maximum:
+            xmin, xmax = self.vbrange
+            s = self.curve.series.loc[xmin:xmax]
+            posprop = findPOIGreedy(s, pos, 'max')
+            fixedposloc = s.index.get_loc(posprop, method='nearest')
+            correctedpos = s.index[fixedposloc]
         elif self.fixvalue is FixIndex.sndderiv:
             xmin, xmax = self.vbrange
             s = self.sndderiv.loc[xmin:xmax]

diff --git a/graphysio/ui/poiwidget.py b/graphysio/ui/poiwidget.py
@@ -36,6 +36,10 @@ def setupUi(self, POISelectorWidget):
         self.radioFixMinimum.setObjectName("radioFixMinimum")
         self.buttonGroup.addButton(self.radioFixMinimum)
         self.verticalLayout.addWidget(self.radioFixMinimum)
+        self.radioFixMaximum = QtWidgets.QRadioButton(self.groupBox)
+        self.radioFixMaximum.setObjectName("radioFixMaximum")
+        self.buttonGroup.addButton(self.radioFixMaximum)
+        self.verticalLayout.addWidget(self.radioFixMaximum)
         self.radioFixSecondDerivative = QtWidgets.QRadioButton(self.groupBox)
         self.radioFixSecondDerivative.setObjectName("radioFixSecondDerivative")
         self.buttonGroup.addButton(self.radioFixSecondDerivative)
@@ -54,4 +58,5 @@ def retranslateUi(self, POISelectorWidget):
         self.groupBox.setTitle(_translate("POISelectorWidget", "Fix Position"))
         self.radioFixDisabled.setText(_translate("POISelectorWidget", "Disabled"))
         self.radioFixMinimum.setText(_translate("POISelectorWidget", "Local Minimum"))
+        self.radioFixMaximum.setText(_translate("POISelectorWidget", "Local Maximum"))
         self.radioFixSecondDerivative.setText(_translate("POISelectorWidget", "2nd derivative peak"))
diff --git a/graphysio/ui/poiwidget.ui b/graphysio/ui/poiwidget.ui
@@ -61,6 +61,16 @@
           </attribute>
          </widget>
         </item>
+        <item>
+         <widget class="QRadioButton" name="radioFixMaximum">
+          <property name="text">
+           <string>Local Maximum</string>
+          </property>
+          <attribute name="buttonGroup">
+           <string notr="true">buttonGroup</string>
+          </attribute>
+         </widget>
+        </item>
         <item>
          <widget class="QRadioButton" name="radioFixSecondDerivative">
           <property name="text">

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = graphysio
-version = 2020.05.22
+version = 2020.05.28
 author = Jona Joachim
 author-email = [email protected]
 home-page = https://github.com/jaj42/graphysio