astrodatagui: set bin size default to None

This commit is contained in:
2024-03-18 16:29:24 +01:00
parent 4457116d16
commit a1f7b1bb66
3 changed files with 12 additions and 8 deletions
+4
View File
@@ -282,7 +282,11 @@ class AstrodataGUI(QtWidgets.QMainWindow):
def updateFlaredetectionWidgetBin(self): def updateFlaredetectionWidgetBin(self):
binEnabled = self.cbPlotBinEnable.isChecked() binEnabled = self.cbPlotBinEnable.isChecked()
try:
binSize = int(self.edBinSize.text()) binSize = int(self.edBinSize.text())
except:
print(f"Invalid bin size detected: {self.edBinSize.text()}, setting None")
binSize = None
self.flaredetectorPreview.setBinState(binEnabled, binSize) self.flaredetectorPreview.setBinState(binEnabled, binSize)
def updateFlaredetectionWidgetFlatten(self): def updateFlaredetectionWidgetFlatten(self):
+1 -1
View File
@@ -520,7 +520,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>1</string> <string>None</string>
</property> </property>
</widget> </widget>
</item> </item>
+6 -6
View File
@@ -24,7 +24,7 @@ class FlaredetectorWidget(QtWidgets.QWidget):
self.NormalizeState = {"Enabled": False, "Scale": "unscaled"} self.NormalizeState = {"Enabled": False, "Scale": "unscaled"}
self.RemoveOutliersState = {"Enabled": False, "Sigma": 5.0} self.RemoveOutliersState = {"Enabled": False, "Sigma": 5.0}
self.RemoveNansState = {"Enabled": False} self.RemoveNansState = {"Enabled": False}
self.BinState = {"Enabled": False, "Size": 1} self.BinState = {"Enabled": False, "Size": None}
self.FlattenState = {"Enabled": False, "WindowLength": 101, "PolynomialOrder": 2} self.FlattenState = {"Enabled": False, "WindowLength": 101, "PolynomialOrder": 2}
self.FoldState = {"Enabled": False, "Period": 1, "EpochTime": 0} self.FoldState = {"Enabled": False, "Period": 1, "EpochTime": 0}
self.PeriodogramState = {"Enabled": False, "Method": "lombscargle"} self.PeriodogramState = {"Enabled": False, "Method": "lombscargle"}
@@ -62,11 +62,11 @@ class FlaredetectorWidget(QtWidgets.QWidget):
self.RemoveNansState["Enabled"] = enabled self.RemoveNansState["Enabled"] = enabled
self.updatePlot() self.updatePlot()
def setBinState(self, enabled: bool, binSize: int): def setBinState(self, enabled: bool, binSize):
self.BinState["Enabled"] = enabled self.BinState["Enabled"] = enabled
if(binSize < 0): if(binSize is not None and binSize < 0):
print(f"Negative binSize detected, setting default 1") print(f"Negative binSize detected, setting default None")
binSize = 1 binSize = None
self.BinState["Size"] = binSize self.BinState["Size"] = binSize
self.updatePlot() self.updatePlot()
@@ -124,7 +124,7 @@ class FlaredetectorWidget(QtWidgets.QWidget):
if(self.RemoveNansState["Enabled"]): if(self.RemoveNansState["Enabled"]):
lc = lc.remove_nans() lc = lc.remove_nans()
label += " - no nans" label += " - no nans"
if(self.BinState["Enabled"]): if(self.BinState["Enabled"] and self.BinState["Size"] is not None):
lc = lc.bin(time_bin_size=self.BinState["Size"]) lc = lc.bin(time_bin_size=self.BinState["Size"])
label += " - binned" label += " - binned"
if(self.FlattenState["Enabled"]): if(self.FlattenState["Enabled"]):