diff --git a/main/astrodatagui/AstrodataGUI.py b/main/astrodatagui/AstrodataGUI.py index ee97022..5316915 100644 --- a/main/astrodatagui/AstrodataGUI.py +++ b/main/astrodatagui/AstrodataGUI.py @@ -36,6 +36,7 @@ class AstrodataGUI(QtWidgets.QMainWindow): self.comboPlotFluxType.currentTextChanged.connect(self.plotOptionsComboBoxTextChanged) self.comboPlotNormalizeUnit.currentTextChanged.connect(self.plotOptionsComboBoxTextChanged) self.comboPlotPeriodogramMethod.currentTextChanged.connect(self.plotOptionsComboBoxTextChanged) + self.comboPlotPeriodogramView.currentTextChanged.connect(self.plotOptionsComboBoxTextChanged) self.sbRemoveOutliersSigma.valueChanged.connect(self.plotOptionsSpinBoxValueChanged) @@ -255,7 +256,7 @@ class AstrodataGUI(QtWidgets.QMainWindow): case self.comboPlotNormalizeUnit: self.updateFlaredetectionWidgetNormalize() - case self.comboPlotPeriodogramMethod: + case (self.comboPlotPeriodogramMethod | self.comboPlotPeriodogramView): self.updateFlaredetectionWidgetPeriodogram() def plotOptionsSpinBoxValueChanged(self): @@ -328,4 +329,5 @@ class AstrodataGUI(QtWidgets.QMainWindow): def updateFlaredetectionWidgetPeriodogram(self): periodogramEnabled = self.cbPlotPeriodogramEnable.isChecked() method = self.comboPlotPeriodogramMethod.currentText() - self.flaredetectorPreview.setPeriodogramState(periodogramEnabled, method) \ No newline at end of file + view = self.comboPlotPeriodogramView.currentText() + self.flaredetectorPreview.setPeriodogramState(periodogramEnabled, method, view) \ No newline at end of file diff --git a/main/astrodatagui/astrodatagui.ui b/main/astrodatagui/astrodatagui.ui index e58689f..b078133 100644 --- a/main/astrodatagui/astrodatagui.ui +++ b/main/astrodatagui/astrodatagui.ui @@ -826,20 +826,6 @@ - - - - - - - - - - - Method: - - - @@ -854,6 +840,41 @@ + + + + Method: + + + + + + + + + + + + + + View: + + + + + + + + frequency + + + + + period + + + + diff --git a/main/astrodatagui/ui/FlaredetectorWidget.py b/main/astrodatagui/ui/FlaredetectorWidget.py index 482aea0..badac0a 100644 --- a/main/astrodatagui/ui/FlaredetectorWidget.py +++ b/main/astrodatagui/ui/FlaredetectorWidget.py @@ -37,7 +37,7 @@ class FlaredetectorWidget(QtWidgets.QWidget): self.BinState = {"Enabled": False, "Size": None} self.FlattenState = {"Enabled": False, "WindowLength": 101, "PolynomialOrder": 2} self.FoldState = {"Enabled": False, "Period": 1, "EpochTime": 0} - self.PeriodogramState = {"Enabled": False, "Method": "lombscargle"} + self.PeriodogramState = {"Enabled": False, "Method": "lombscargle", "View": "frequency"} def setFitsFile(self, fitsFilePath, mainName: str): print(f"Plotting: {fitsFilePath}") @@ -131,12 +131,16 @@ class FlaredetectorWidget(QtWidgets.QWidget): self.PeriodogramState["Enabled"] = False self.updatePlot() - def setPeriodogramState(self, enabled: bool, method: str): + def setPeriodogramState(self, enabled: bool, method: str, view: str): self.PeriodogramState["Enabled"] = enabled if(method not in ["lombscargle", "boxleastsquares", "ls", "bls"]): print(f"Unsupported method detected, setting default lombscargle") method = "lombscargle" + if(view not in ["frequency", "period"]): + print(f"Unsupported view detected, setting default frequency") + view = "frequency" self.PeriodogramState["Method"] = method + self.PeriodogramState["View"] = view if(self.PeriodogramState["Enabled"]): self.FoldState["Enabled"] = False self.FlattenState["Enabled"] = False @@ -176,6 +180,8 @@ class FlaredetectorWidget(QtWidgets.QWidget): self.figureAxis.clear() if(self.FoldState["Enabled"]): lc.scatter(label=label, ax=self.figureAxis) + elif(self.PeriodogramState["Enabled"]): + lc.plot(label=label, ax=self.figureAxis, view=self.PeriodogramState["View"]) else: lc.plot(label=label, ax=self.figureAxis) self.figure.canvas.draw_idle() \ No newline at end of file