Differential D22954 Diff 63325 kstars/ekos/observatory/observatorymodel.cpp

Changeset View

Standalone View

View Options

kstars/ekos/observatory/observatorymodel.cpp

Show All 23 Lines17{
24 setWeatherModel(new ObservatoryWeatherModel()); 24​ setWeatherModel(new ObservatoryWeatherModel());
25} 25​}
26 26​
27void ObservatoryModel::setDomeModel(ObservatoryDomeModel *model) { 27​void ObservatoryModel::setDomeModel(ObservatoryDomeModel *model) {
28 mDomeModel = model; 28​ mDomeModel = model;
29 if (model != nullptr) 29​ if (model != nullptr)
30 { 30​ {
31 connect(mDomeModel, &ObservatoryDomeModel::newStatus, [this](ISD::Dome::Status s) { Q_UNUSED(s); updateStatus(); }); 31​ connect(mDomeModel, &ObservatoryDomeModel::newStatus, [this](ISD::Dome::Status s) { Q_UNUSED(s); updateStatus(); });
32​ connect(mDomeModel, &ObservatoryDomeModel::newParkStatus, [this](ISD::ParkStatus s) { Q_UNUSED(s); updateStatus(); });
32 connect(mDomeModel, &ObservatoryDomeModel::newShutterStatus, [this](ISD::Dome::ShutterStatus s) { Q_UNUSED(s); updateStatus(); }); 33​ connect(mDomeModel, &ObservatoryDomeModel::newShutterStatus, [this](ISD::Dome::ShutterStatus s) { Q_UNUSED(s); updateStatus(); });
33 if (mWeatherModel != nullptr) 34​ if (mWeatherModel != nullptr)
34 connect(mWeatherModel, &ObservatoryWeatherModel::execute, mDomeModel, &ObservatoryDomeModel::execute); 35​ connect(mWeatherModel, &ObservatoryWeatherModel::execute, mDomeModel, &ObservatoryDomeModel::execute);
35 } 36​ }
36 else 37​ else
37 { 38​ {
38 if (mWeatherModel != nullptr) 39​ if (mWeatherModel != nullptr)
39 disconnect(mWeatherModel, &ObservatoryWeatherModel::execute, mDomeModel, &ObservatoryDomeModel::execute); 40​ disconnect(mWeatherModel, &ObservatoryWeatherModel::execute, mDomeModel, &ObservatoryDomeModel::execute);
Show All 28 Lines66{
68 Options::setObservatoryStatusUseShutter(control.useShutter); 69​ Options::setObservatoryStatusUseShutter(control.useShutter);
69 Options::setObservatoryStatusUseWeather(control.useWeather); 70​ Options::setObservatoryStatusUseWeather(control.useWeather);
70 updateStatus(); 71​ updateStatus();
71} 72​}
72 73​
73bool ObservatoryModel::isReady() 74​bool ObservatoryModel::isReady()
74{ 75​{
75 // dome relevant for the status and dome is ready 76​ // dome relevant for the status and dome is ready
76 if (mStatusControl.useDome && (getDomeModel() == nullptr || 77​ if (mStatusControl.useDome && (getDomeModel() == nullptr || getDomeModel()->parkStatus() != ISD::PARK_UNPARKED))
77 (getDomeModel()->status() != ISD::Dome::DOME_IDLE && ​
78 getDomeModel()->status() != ISD::Dome::DOME_TRACKING))) ​
79 return false; 78​ return false;
80 79​
81 // shutter relevant for the status and shutter open 80​ // shutter relevant for the status and shutter open
82 if (mStatusControl.useShutter && (getDomeModel() == nullptr || 81​ if (mStatusControl.useShutter && (getDomeModel() == nullptr ||
83 (getDomeModel()->hasShutter() && getDomeModel()->shutterStatus() != ISD::Dome::SHUTTER_OPEN))) 82​ (getDomeModel()->hasShutter() && getDomeModel()->shutterStatus() != ISD::Dome::SHUTTER_OPEN)))
84 return false; 83​ return false;
85 84​
86 // weather relevant for the status and weather is OK 85​ // weather relevant for the status and weather is OK
Show All 27 Lines