Commit of changes following version "d" field testing

Author: bwdev01

src/gear_simulator.cpp

@@ -116,8 +116,8 @@ double SimCamParams::seeing_scale; // simulated seeing scale factor
 double SimCamParams::cam_angle; // simulated camera angle (degrees)
 double SimCamParams::guide_rate; // guide rate, pixels per second
 PierSide SimCamParams::pier_side; // side of pier
-bool SimCamParams::reverse_dec_pulse_on_west_side; // reverse dec pulse on west side of pier, like ASCOM pulse guided equatorial
-                                                   // mounts
+bool SimCamParams::reverse_dec_pulse_on_west_side; // reverse dec pulse on west side of pier, like some ASCOM pulse guided
+                                                   // equatorial mounts
 unsigned int SimCamParams::clouds_inten = 50; // seed brightness for cloud contribution
 double SimCamParams::clouds_opacity;
 double SimCamParams::image_scale; // arc-sec per pixel
@@ -1639,11 +1639,11 @@ bool CameraSimulator::Capture(usImage& img, const CaptureParams& captureParams)
                 HasBayer = false;
         }
 
-        //// Save full frame size
+        // Save full frame size
         FrameSize.x = image.size().width;
         FrameSize.y = image.size().height;
 
-        // Simulate scope motion
+        // Simulate motion from tracking errors and seeing
         double deltaX, deltaY;
         sim.GetSimDisplacements(&deltaX, &deltaY, nullptr, true);
 
@@ -2421,7 +2421,13 @@ void SimCamDialog::OnFileTextChange(wxCommandEvent& event)
     simcam->sim.CloseDir();
 }
 
-void SimCamDialog::OnRecenterButton(wxCommandEvent& event) { }
+void SimCamDialog::OnRecenterButton(wxCommandEvent& event)
+{
+    pFrame->pGuider->StopGuiding();
+    CameraSimulator *simcam = static_cast<CameraSimulator *>(pCamera);
+    simcam->sim.ra_ofs = 0;
+    simcam->sim.dec_ofs = 0;
+}
 
 void SimCamDialog::UpdatePierSideLabel()
 {

src/guider_solarsys.cpp

@@ -138,16 +138,6 @@ bool GuiderSolarSys::AutoSelect(const wxRect& roi)
             throw ERROR_INFO("No Current Image");
         }
 
-        // If mount is not calibrated, we need to choose a star a bit farther
-        // from the egde to allow for the motion of the star during
-        // calibration
-        //
-        int edgeAllowance = 0;
-        if (pMount && pMount->IsConnected() && !pMount->IsCalibrated())
-            edgeAllowance = wxMax(edgeAllowance, pMount->CalibrationTotDistance());
-        if (pSecondaryMount && pSecondaryMount->IsConnected() && !pSecondaryMount->IsCalibrated())
-            edgeAllowance = wxMax(edgeAllowance, pSecondaryMount->CalibrationTotDistance());
-
         Star newDisk;
 
         if (!m_SolarSystemObject->FindDisk(image, false, &newDisk))
@@ -197,11 +187,6 @@ bool GuiderSolarSys::AutoSelect(const wxRect& roi)
     return error;
 }
 
-inline static wxRect SubframeRect(const PHD_Point& pos, int halfwidth)
-{
-    return wxRect(ROUND(pos.X) - halfwidth, ROUND(pos.Y) - halfwidth, 2 * halfwidth + 1, 2 * halfwidth + 1);
-}
-
 wxRect GuiderSolarSys::GetBoundingBox() const
 {
     enum
@@ -276,11 +261,9 @@ bool GuiderSolarSys::UpdateCurrentPosition(const usImage *pImage, GuiderOffset *
         else
             distance = 0.;
 
-        // double tolerance = m_tolerateJumpsEnabled ? m_tolerateJumpsThreshold : 9e99;
-
         ImageLogger::LogImage(pImage, distance);
 
-        // update the star position, mass, etc.
+        // update the disk position, mass, etc.
         m_primaryStar = newDisk;
 
         if (lockPos.IsValid())

src/myframe_events.cpp

@@ -947,7 +947,6 @@ void MyFrame::SetSolarSystemMode(bool Enable)
     {
         pFrame->pGuider->StopGuiding();
         m_solarSystemMode = true;
-        m_mgr.GetPane(_T("GuiderSolarSys")).Show().Float();
         m_mgr.GetPane(_T("Guider")).Hide();
         m_mgr.Update();
         pFrame->pGuider = pFrame->m_pGuiderSolarSys;
@@ -956,13 +955,19 @@ void MyFrame::SetSolarSystemMode(bool Enable)
         {
             pSolarSysTool = SsgTool::CreateSolarSysToolWindow();
         }
+        bool dockIt = pConfig->Profile.GetBoolean("/guider/SSG/wasDocked", false);
+        if (dockIt)
+            m_mgr.GetPane(_T("GuiderSolarSys")).Show().Dock();
+        else
+            m_mgr.GetPane(_("GuiderSolarSys")).Show().Float();
         pSolarSysTool->Show();
     }
     else
     {
         m_solarSystemMode = false;
         m_mgr.GetPane(_T("GuiderSolarSys")).Hide();
         m_mgr.GetPane(_T("Guider")).Show().Bottom().Left().Position(0).MinSize(-1, 400);
+        pConfig->Profile.SetBoolean("/guider/SSG/wasDocked", m_mgr.GetPane(_("GuiderSolarSys")).IsDocked());
         m_mgr.Update();
         pFrame->StopCapturing();
         pFrame->pGuider = pFrame->m_pGuiderMultiStar;

src/phd.h

@@ -79,7 +79,7 @@
 
 #define APPNAME _T("PHD2 Guiding")
 #define PHDVERSION _T("2.6.14")
-#define PHDSUBVER _T(" SolSys_c")
+#define PHDSUBVER _T(" SolSys_d")
 #define FULLVER PHDVERSION PHDSUBVER
 
 #if defined(__WINDOWS__)

src/solarsys.cpp

@@ -944,7 +944,7 @@ bool SolarSystemObject::RetryBlobDetection(Mat img8, int roiX, int roiY, Centroi
         {
             Debug.Write(wxString::Format("SSG:: Retry detection found object at (%.1f, %.1f) with MinBlobDiameter of %d \n",
                                          m_center_x, m_center_x, (int) m_paramMinBlobDiameter));
-            if (retryCount > 0 && pFrame->pGuider->IsGuiding())
+            if (retryCount > 0)
             {
                 wxString msg;
                 GetDetectionStatus(msg);
@@ -967,6 +967,8 @@ bool SolarSystemObject::RetryBlobDetection(Mat img8, int roiX, int roiY, Centroi
             else
             {
                 Debug.Write("SSG: Retry detection, no target found, retries exhausted\n");
+                SsgTool::UpdateToolStatus(_("Object not found.  Make sure your MaxBlobDiameter is larger "
+                                            "than the apparent diameter of the target."));
                 done = true;
             }
         }

src/solarsys_tool.cpp

@@ -87,6 +87,8 @@ struct SolarSysToolWin : public wxDialog
     wxString m_trackingRateName;
     wxChoice *m_mountTrackingRate;
     wxCheckBox *m_restoreSidereal;
+    bool m_trackingRateNeedsConfirmation;
+    wxDateTime m_ConfirmationPeriodStart;
 
     wxCheckBox *m_RoiCheckBox;
     wxCheckBox *m_PauseCheckBox;
@@ -155,6 +157,7 @@ struct SolarSysToolWin : public wxDialog
     void OnResetDetectionStats(wxCommandEvent& evnt);
     void HandleWarningMsgs(int selection);
     void ShowStatus(const wxString& msg, bool appending = false);
+    void ConfirmMountTrackingRate();
 };
 
 static wxString TITLE = wxTRANSLATE("Solar System Guiding");
@@ -193,7 +196,7 @@ static wxSpinCtrlDouble *NewSpinner(wxWindow *parent, wxString formatstr, double
 SolarSysToolWin::SolarSysToolWin()
     : wxDialog(pFrame, wxID_ANY, wxGetTranslation(TITLE), wxDefaultPosition, wxDefaultSize,
                wxCAPTION | wxCLOSE_BOX | wxMINIMIZE_BOX),
-      m_lastDiameter(0), m_autoAdjustingActive(false)
+      m_lastDiameter(0), m_autoAdjustingActive(false), m_trackingRateNeedsConfirmation(false)
 
 {
     SetSizeHints(wxDefaultSize, wxDefaultSize);
@@ -865,6 +868,7 @@ void SolarSysToolWin::OnAutoAdjustButton(wxCommandEvent& event)
         m_maxBlobDiameter->SetValue(DefaultMaxBlobSize());
     wxSpinDoubleEvent evt;
     OnSpinCtrl_maxBlobDiameter(evt);
+    // Setting the MinBlobDiameter this large will invariably trigger retries
     m_solarSystemObj->SetMinBlobDiameter(0.8 * m_maxBlobDiameter->GetValue());
 
     if (!pFrame->pGuider->IsGuiding())
@@ -969,6 +973,31 @@ void SolarSysToolWin::InitializeTrackingRates(wxString trackingRateName)
     }
 }
 
+void SolarSysToolWin::ConfirmMountTrackingRate()
+{
+    // Need to see if the change "stuck" - can be over-written by mount s/w using customized tracking
+    Scope::TrackingRateInfo rateInfo;
+    wxStopWatch timer;
+
+    if (!pPointingSource->GetTrackingRate(rateInfo))
+    {
+        if (rateInfo.name != m_trackingRateName)
+        {
+            int inx = m_mountTrackingRate->FindString(rateInfo.name);
+            m_mountTrackingRate->SetSelection(inx);
+            ShowStatus(_("Mount tracking rate reset by another application"));
+        }
+        else
+            ShowStatus(_("Mount tracking rate confirmed"));
+    }
+    else
+    {
+        int inx = m_mountTrackingRate->FindString("Sidereal");
+        m_mountTrackingRate->SetSelection(inx);
+        ShowStatus(_("Mount driver can't set/return tracking rates correctly"));
+    }
+}
+
 void SolarSysToolWin::OnMountTrackingRateClick(wxCommandEvent& event)
 {
     if (pPointingSource && pPointingSource->IsConnected())
@@ -982,30 +1011,11 @@ void SolarSysToolWin::OnMountTrackingRateClick(wxCommandEvent& event)
         int *pRate = (int *) m_mountTrackingRate->GetClientData(sel);
         pPointingSource->SetTrackingRate((TrackingRates) *pRate);
         Debug.Write(wxString::Format("SSG: requesting mount tracking rate of %s\n", m_trackingRateName));
+        ShowStatus(wxString::Format(_("Requested mount tracking rate change to %s\n"), m_trackingRateName));
         pFrame->NotifyGuidingParam("SSG: mount tracking rate", m_trackingRateName);
         // Need to see if the change "stuck" - can be over-written by mount s/w using customized tracking
-        Scope::TrackingRateInfo rateInfo;
-        wxStopWatch timer;
-        timer.Start();
-        while (timer.Time() < 3000)
-            wxMilliSleep(100);
-        if (!pPointingSource->GetTrackingRate(rateInfo))
-        {
-            if (rateInfo.name != m_trackingRateName)
-            {
-                int inx = m_mountTrackingRate->FindString(rateInfo.name);
-                m_mountTrackingRate->SetSelection(inx);
-                ShowStatus(_("Mount tracking rate reset by another application"));
-            }
-            else
-                ShowStatus(_("Mount tracking rate confirmed"));
-        }
-        else
-        {
-            int inx = m_mountTrackingRate->FindString("Sidereal");
-            m_mountTrackingRate->SetSelection(inx);
-            ShowStatus(_("Mount driver can't set/return tracking rates correctly"));
-        }
+        m_ConfirmationPeriodStart = wxDateTime::Now(); // Check it after 3 seconds
+        m_trackingRateNeedsConfirmation = true;
     }
 }
 
@@ -1205,6 +1215,17 @@ void SolarSysToolWin::UpdateCentroidInfo(float xLoc, float yLoc, float radius)
     m_statsGrid->SetCellValue(1, 1, locStr);
     m_statsGrid->SetCellValue(4, 1, wxString::Format("%0.2f", radius * 2.0));
     m_lastDiameter = 2 * radius;
+    // Just take advantage of a periodic function to handle a one-time, little-used verification
+    if (m_trackingRateNeedsConfirmation)
+    {
+        wxDateTime now = wxDateTime::Now();
+        wxTimeSpan interval = now - m_ConfirmationPeriodStart;
+        if (interval.GetSeconds() >= 3)
+        {
+            ConfirmMountTrackingRate();
+            m_trackingRateNeedsConfirmation = false;
+        }
+    }
 }
 
 void SolarSysToolWin::UpdateDetectionStats(int rsmpCount, int rsmpReductions, int lostEvents, int totalEvents)
@@ -1304,10 +1325,12 @@ void SolarSysToolWin::NotifyMountConnectionChange(bool Connected)
         m_mountTrackingRate->Enable(false);
 }
 
+// This is used by SolarSys.cpp for auto-adjusting min blob size
 void SolarSysToolWin::ChangeMinBlobDiameter(int val)
 {
     m_minBlobDiameter->SetValue(val);
     ShowAngularSize(val, m_minBlobDiameterAngle);
+    pFrame->NotifyGuidingParam("SolarSys: Blob min diam", val);
 }
 
 // Restores profile value in UI if profile is switched while window is already displayed