Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce the new Planetary Guiding Tool (part 5) #1201

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2,369 −14
Open

Introduce the new Planetary Guiding Tool (part 5) #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ set(guiding_SRC
${phd_src_dir}/guide_algorithms.h
${phd_src_dir}/guider_multistar.cpp
${phd_src_dir}/guider_multistar.h
${phd_src_dir}/guider_planetary.cpp
${phd_src_dir}/guider_planetary.h
${phd_src_dir}/guider.cpp
${phd_src_dir}/guider.h
${phd_src_dir}/guiders.h
Expand Down Expand Up @@ -427,6 +429,8 @@ set(phd2_SRC
${phd_src_dir}/phdupdate.h
${phd_src_dir}/pierflip_tool.cpp
${phd_src_dir}/pierflip_tool.h
${phd_src_dir}/planetary_tool.cpp
${phd_src_dir}/planetary_tool.h
${phd_src_dir}/polardrift_tool.h
${phd_src_dir}/polardrift_toolwin.h
${phd_src_dir}/polardrift_toolwin.cpp
Expand Down
3 changes: 3 additions & 0 deletions camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,9 @@ bool GuideCamera::SetCameraGain(int cameraGain)

pConfig->Profile.SetInt("/camera/gain", GuideCameraGain);

if (pFrame)
pFrame->UpdateCameraSettings();

return bError;
}

Expand Down
6 changes: 6 additions & 0 deletions gear_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,9 @@ bool GearDialog::DoConnectCamera(bool autoReconnecting)
throw THROW_INFO("DoConnectCamera: connect failed");
}

// Notify planetary module of camera connect
pFrame->pGuider->m_Planet.NotifyCameraConnect(true);

// update camera pixel size from the driver, cam must be connected for reliable results
double prevPixelSize = m_pCamera->GetProfilePixelSize();
double pixelSize;
Expand Down Expand Up @@ -1250,6 +1253,9 @@ void GearDialog::OnButtonDisconnectCamera(wxCommandEvent& event)

m_pCamera->Disconnect();

// Notify planetary module of camera disconnect
pFrame->pGuider->m_Planet.NotifyCameraConnect(false);

if (m_pScope && m_pScope->RequiresCamera() && m_pScope->IsConnected())
{
Debug.Write("gear_dialog: scope requires camera so disconnecting scope\n");
Expand Down
5 changes: 5 additions & 0 deletions guider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
#ifndef GUIDER_H_INCLUDED
#define GUIDER_H_INCLUDED

#include "guider_planetary.h"

enum GUIDER_STATE
{
STATE_UNINITIALIZED = 0,
Expand Down Expand Up @@ -279,6 +281,9 @@ class Guider : public wxWindow
void SetAutoSelDownsample(unsigned int val);
unsigned int GetAutoSelDownsample() const;

// Planetary disk detection parameters
GuiderPlanet m_Planet;

// virtual functions -- these CAN be overridden by a subclass, which should
// consider whether they need to call the base class functions as part of
// their operation
Expand Down
Loading