#204: first cut of fix for null dateinfo error seen by Max

AAVSO · Jan 28, 2025 · cfb2c9b · cfb2c9b
1 parent 4e37db8
commit cfb2c9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/plugin/src/org/aavso/tools/vstar/external/plugin/AoVPeriodSearch.java b/plugin/src/org/aavso/tools/vstar/external/plugin/AoVPeriodSearch.java
@@ -47,6 +47,7 @@
 import org.aavso.tools.vstar.ui.dialog.period.PeriodAnalysis2DChartPane;
 import org.aavso.tools.vstar.ui.dialog.period.PeriodAnalysisDataTablePane;
 import org.aavso.tools.vstar.ui.dialog.period.PeriodAnalysisTopHitsTablePane;
+import org.aavso.tools.vstar.ui.mediator.AnalysisType;
 import org.aavso.tools.vstar.ui.mediator.Mediator;
 import org.aavso.tools.vstar.ui.mediator.message.NewStarMessage;
 import org.aavso.tools.vstar.ui.mediator.message.PeriodAnalysisSelectionMessage;
@@ -300,24 +301,30 @@ protected void modelAction(List<PeriodAnalysisDataPoint> dataPoints) {
                 try {
                     // Compute binning result again for selected top-hit period.
                     double period = dataPoints.get(0).getPeriod();
-                    
+
                     // Duplicate the obs (just JD and mag) so we can set phases
                     // without disturbing the original observation object.
                     List<ValidObservation> phObs = copyObs(obs);
 
-                    double epoch = PhaseCalcs.epochStrategyMap.get("alpha").determineEpoch(phObs);
+                    double epoch = PhaseCalcs.epochStrategyMap.get("alpha").determineEpoch(obs);
 
                     PhaseCalcs.setPhases(phObs, epoch, period);
 
                     Collections.sort(phObs, StandardPhaseComparator.instance);
 
+                    Mediator.getInstance().createPhasePlot(period, epoch);
+                    Mediator.getInstance().waitForJobCompletion();
+
+                    Mediator.getInstance().changeAnalysisType(AnalysisType.PHASE_PLOT);
+                    Mediator.getInstance().waitForJobCompletion();
+
                     // Note: 1 / bins = 1 cycle divided into N bins
                     BinningResult binningResult = DescStats.createSymmetricBinnedObservations(phObs,
                             PhaseTimeElementEntity.instance, 1.0 / bins);
 
                     List<ValidObservation> meanObs = binningResult.getMeanObservations();
 
-                    PiecewiseLinearModel model = new PiecewiseLinearModel(this.obs, meanObs);
+                    PiecewiseLinearModel model = new PiecewiseLinearModel(phObs, meanObs);
 
                     Mediator.getInstance().performModellingOperation(model);
                 } catch (Exception ex) {

diff --git a/src/org/aavso/tools/vstar/ui/dialog/period/PeriodAnalysisTopHitsTablePane.java b/src/org/aavso/tools/vstar/ui/dialog/period/PeriodAnalysisTopHitsTablePane.java
@@ -242,7 +242,9 @@ public boolean canBeRemoved() {
     @Override
     protected void enableButtons() {
         super.enableButtons();
-        refineButton.setEnabled(true);
+        if (refineButton != null) {
+            refineButton.setEnabled(true);
+        }
     }
 
     /**