Merge pull request #754 from markotoplak/hyper-default-integration

HyperSpectra: change the default integration method
Quasars · Oct 5, 2024 · 0459bf7 · 0459bf7
2 parents 5a74ade + 0afb921
commit 0459bf7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/orangecontrib/spectroscopy/tests/test_owhyper.py b/orangecontrib/spectroscopy/tests/test_owhyper.py
@@ -22,7 +22,8 @@
 
 from orangecontrib.spectroscopy.data import _spectra_from_image, build_spec_table
 from orangecontrib.spectroscopy.io.util import VisibleImage
-from orangecontrib.spectroscopy.preprocess.integrate import IntegrateFeaturePeakSimple, Integrate
+from orangecontrib.spectroscopy.preprocess.integrate import IntegrateFeaturePeakSimple, \
+    Integrate, IntegrateFeatureSimple
 from orangecontrib.spectroscopy.widgets import owhyper
 from orangecontrib.spectroscopy.widgets.owhyper import \
     OWHyper
@@ -419,7 +420,9 @@ def last_called_array(m):
 
         wrap = self.widget.imageplot.img
 
-        # integrals from zero; default
+        # integral from zero
+        self.widget.integration_method = \
+            self.widget.integration_methods.index(IntegrateFeatureSimple)
         self.send_signal("Data", data)
         with patch.object(wrap, 'setImage', wraps=wrap.setImage) as m:
             wait_for_image(self.widget)

diff --git a/orangecontrib/spectroscopy/widgets/owhyper.py b/orangecontrib/spectroscopy/widgets/owhyper.py
@@ -1107,7 +1107,7 @@ class Outputs(SelectionOutputsMixin.Outputs):
     imageplot = SettingProvider(ImagePlot)
     curveplot = SettingProvider(CurvePlotHyper)
 
-    integration_method = Setting(0)
+    integration_method = Setting(4)  # Closest value
     integration_methods = Integrate.INTEGRALS
     value_type = Setting(0)
     attr_value = ContextSetting(None)