Commit 183aca08 authored by Jasem Mutlaq's avatar Jasem Mutlaq

Remove auto park since it is done in scheduler. Improve GUI

parent b19391ed
......@@ -183,8 +183,7 @@ Capture::Capture()
guideDeviationCheck->setChecked(Options::enforceGuideDeviation());
guideDeviation->setValue(Options::guideDeviation());
autofocusCheck->setChecked(Options::enforceAutofocus());
parkCheck->setChecked(Options::autoParkTelescope());
autofocusCheck->setChecked(Options::enforceAutofocus());
meridianCheck->setChecked(Options::autoMeridianFlip());
meridianHours->setValue(Options::autoMeridianHours());
......@@ -194,8 +193,6 @@ Capture::Capture()
connect(guideDeviation, SIGNAL(valueChanged(double)), this, SLOT(setDirty()));
connect(meridianCheck, SIGNAL(toggled(bool)), this, SLOT(setDirty()));
connect(meridianHours, SIGNAL(valueChanged(double)), this, SLOT(setDirty()));
connect(parkCheck, SIGNAL(toggled(bool)), this, SLOT(setDirty()));
// FIXME remove this later
connect(&postCaptureScript, SIGNAL(finished(int)), this, SLOT(postScriptFinished(int)));
......@@ -309,8 +306,7 @@ void Capture::start()
Options::setEnforceGuideDeviation(guideDeviationCheck->isChecked());
Options::setEnforceAutofocus(autofocusCheck->isChecked());
Options::setAutoMeridianFlip(meridianCheck->isChecked());
Options::setAutoMeridianHours(meridianHours->value());
Options::setAutoParkTelescope(parkCheck->isChecked());
Options::setAutoMeridianHours(meridianHours->value());
if (queueTable->rowCount() ==0)
addJob();
......@@ -1039,14 +1035,6 @@ void Capture::processJobCompletion()
state = CAPTURE_COMPLETE;
emit newStatus(Ekos::CAPTURE_COMPLETE);
if (parkCheck->isChecked() && currentTelescope && currentTelescope->canPark())
{
appendLogText(i18n("Parking telescope..."));
//emit mountParking();
currentTelescope->Park();
return;
}
//Resume guiding if it was suspended before
//if (isAutoGuiding && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
if (guideState == GUIDE_SUSPENDED && currentCCD->getChip(ISD::CCDChip::GUIDE_CCD) == guideChip)
......@@ -2030,8 +2018,6 @@ void Capture::syncTelescopeInfo()
{
if (currentCCD && currentTelescope && currentTelescope->isConnected())
{
parkCheck->setEnabled(currentTelescope->canPark());
ITextVectorProperty *activeDevices = currentCCD->getBaseDevice()->getText("ACTIVE_DEVICES");
if (activeDevices)
{
......@@ -2148,15 +2134,7 @@ bool Capture::loadSequenceQueue(const QString &fileURL)
else
meridianCheck->setChecked(false);
}
else if (!strcmp(tagXMLEle(ep), "Park"))
{
if (!strcmp(findXMLAttValu(ep, "enabled"), "true"))
parkCheck->setChecked(true);
else
parkCheck->setChecked(false);
}
}
else
{
processJobInfo(ep);
......@@ -2431,8 +2409,7 @@ bool Capture::saveSequenceQueue(const QString &path)
outstream << "<SequenceQueue version='1.4'>" << endl;
outstream << "<GuideDeviation enabled='" << (guideDeviationCheck->isChecked() ? "true" : "false") << "'>" << guideDeviation->value() << "</GuideDeviation>" << endl;
outstream << "<Autofocus enabled='" << (autofocusCheck->isChecked() ? "true" : "false") << "'>" << HFRPixels->value() << "</Autofocus>" << endl;
outstream << "<MeridianFlip enabled='" << (meridianCheck->isChecked() ? "true" : "false") << "'>" << meridianHours->value() << "</MeridianFlip>" << endl;
outstream << "<Park enabled='" << (parkCheck->isChecked() ? "true" : "false") << "'></Park>" << endl;
outstream << "<MeridianFlip enabled='" << (meridianCheck->isChecked() ? "true" : "false") << "'>" << meridianHours->value() << "</MeridianFlip>" << endl;
foreach(SequenceJob *job, jobs)
{
job->getPrefixSettings(rawPrefix, filterEnabled, expEnabled, tsEnabled);
......@@ -2773,12 +2750,6 @@ void Capture::setInSequenceFocus(bool enable, double HFR)
}
}
void Capture::setParkOnComplete(bool enable)
{
if (parkCheck->isEnabled())
parkCheck->setChecked(enable);
}
void Capture::setTemperature()
{
if (currentCCD)
......
......@@ -151,12 +151,6 @@ public:
*/
Q_SCRIPTABLE Q_NOREPLY void setInSequenceFocus(bool enable, double HFR);
/** DBUS interface function.
* Enables or disables park on complete option.
* @param enable If true, mount shall be commanded to parking position after all jobs are complete in the sequence queue.
*/
Q_SCRIPTABLE Q_NOREPLY void setParkOnComplete(bool enable);
/** DBUS interface function.
* Enable or Disable meridian flip, and sets its activation hour.
* @param enable If true, meridian flip will be command after user-configurable number of hours.
......
This diff is collapsed.
......@@ -1404,11 +1404,7 @@
<entry name="AutoMeridianFlip" type="Bool">
<label>Flips the mount when reaching the meridian, if supported.</label>
<default>false</default>
</entry>
<entry name="AutoParkTelescope" type="Bool">
<label>Parks the telescope when the sequence jobs are complete, if supported.</label>
<default>false</default>
</entry>
</entry>
<entry name="ADUValue" type="UInt">
<label>Desired flat field ADU percentage</label>
<whatsthis>If set, Ekos will capture a few flat images to determine the optimal exposure time to achieve the desired ADU percentage.</whatsthis>
......
......@@ -47,11 +47,7 @@
<arg name="enable" type="b" direction="in"/>
<arg name="HFR" type="d" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="setParkOnComplete">
<arg name="enable" type="b" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
</method>
<method name="setMeridianFlip">
<arg name="enable" type="b" direction="in"/>
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
......
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