Commit 2973fc19 authored by Jasem Mutlaq's avatar Jasem Mutlaq

Adding option to disable twilight check allowing observatories to run before...

Adding option to disable twilight check allowing observatories to run before and after astronomical twilight darkness.
Removing ForceNow option since it is no longer needed, the user can force scheduler to run now by adjusting constraints and steps.
Makeing altitude constraint ON by default with 15 degrees minimum value.
parent 2e617573
This diff is collapsed.
......@@ -267,6 +267,11 @@ protected slots:
*/
void startMosaicTool();
/**
* @brief displayTwilightWarning Display twilight warning to user if it is unchecked.
*/
void checkTwilightWarning(bool enabled);
signals:
void newLog();
void weatherChanged(IPState state);
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>622</width>
<height>496</height>
<width>649</width>
<height>436</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
......@@ -550,19 +550,6 @@
</attribute>
</widget>
</item>
<item>
<widget class="QRadioButton" name="forceNowConditionR">
<property name="toolTip">
<string>Start the job now regardless of conditions and constraints. Constraints are ignored during the job execution.</string>
</property>
<property name="text">
<string>Force Now</string>
</property>
<attribute name="buttonGroup">
<string notr="true">startupButtonGroup</string>
</attribute>
</widget>
</item>
</layout>
</item>
<item>
......@@ -673,6 +660,9 @@
<property name="text">
<string>Alt &gt; </string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">constraintButtonGroup</string>
</attribute>
......@@ -729,6 +719,22 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QCheckBox" name="twilightCheck">
<property name="toolTip">
<string>Jobs are only executed during astronomical twilight darkness period.</string>
</property>
<property name="text">
<string>Twilight</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">constraintButtonGroup</string>
</attribute>
</widget>
</item>
<item>
<widget class="QCheckBox" name="weatherCheck">
<property name="toolTip">
......@@ -1151,19 +1157,19 @@
<resources/>
<connections/>
<buttongroups>
<buttongroup name="completionButtonGroup"/>
<buttongroup name="startupProcedureButtonGroup">
<buttongroup name="constraintButtonGroup">
<property name="exclusive">
<bool>false</bool>
</property>
</buttongroup>
<buttongroup name="startupButtonGroup"/>
<buttongroup name="shutdownProcedureGroup">
<buttongroup name="completionButtonGroup"/>
<buttongroup name="startupProcedureButtonGroup">
<property name="exclusive">
<bool>false</bool>
</property>
</buttongroup>
<buttongroup name="constraintButtonGroup">
<buttongroup name="shutdownProcedureGroup">
<property name="exclusive">
<bool>false</bool>
</property>
......
......@@ -377,6 +377,16 @@ void SchedulerJob::setPriority(const uint8_t &value)
priority = value;
}
bool SchedulerJob::getEnforceTwilight() const
{
return enforceTwilight;
}
void SchedulerJob::setEnforceTwilight(bool value)
{
enforceTwilight = value;
}
void SchedulerJob::setTargetCoords(dms ra, dms dec)
......
......@@ -26,7 +26,7 @@ public:
typedef enum { STAGE_IDLE, STAGE_SLEWING, STAGE_SLEW_COMPLETE, STAGE_FOCUSING, STAGE_FOCUS_COMPLETE, STAGE_ALIGNING, STAGE_ALIGN_COMPLETE, STAGE_RESLEWING, STAGE_RESLEWING_COMPLETE,
STAGE_POSTALIGN_FOCUSING, STAGE_POSTALIGN_FOCUSING_COMPLETE, STAGE_CALIBRATING, STAGE_GUIDING, STAGE_CAPTURING, STAGE_COMPLETE} JOBStage;
//typedef enum { FITS_IDLE, FITS_SOLVING, FITS_COMPLETE, FITS_ERROR } FITSStatus;
typedef enum { START_ASAP, START_FORCE_NOW, START_CULMINATION, START_AT } StartupCondition;
typedef enum { START_ASAP, START_CULMINATION, START_AT } StartupCondition;
typedef enum { FINISH_SEQUENCE, FINISH_LOOP, FINISH_AT } CompletionCondition;
typedef enum { USE_NONE = 0,
USE_TRACK = 1 << 0,
......@@ -107,6 +107,9 @@ public:
uint8_t getPriority() const;
void setPriority(const uint8_t &value);
bool getEnforceTwilight() const;
void setEnforceTwilight(bool value);
private:
QString name;
......@@ -130,6 +133,7 @@ private:
double minMoonSeparation;
bool enforceWeather;
bool enforceTwilight;
StepPipeline stepPipeline;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment