summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-08-25 08:33:51 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-08-25 08:33:51 (GMT)
commit02a4a440e8cbff859f1e3224968af4a167999744 (patch)
tree6598cc511322c2dce68a85e47d56c537e3fa5226
parent4c94638ce73765fd7cb7afaebf3321b5d7c50a10 (diff)
Fix Mosaic URL issue and add tool tips
-rw-r--r--kstars/ekos/mosaic.ui46
-rw-r--r--kstars/ekos/scheduler.cpp5
-rw-r--r--kstars/ekos/scheduler.ui10
3 files changed, 48 insertions, 13 deletions
diff --git a/kstars/ekos/mosaic.ui b/kstars/ekos/mosaic.ui
index 97252b9..6c404eb 100644
--- a/kstars/ekos/mosaic.ui
+++ b/kstars/ekos/mosaic.ui
@@ -27,7 +27,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Equipment</string>
+ <string>1. Equipment</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="2">
@@ -124,6 +124,9 @@
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
+ <property name="toolTip">
+ <string>Mount focal length in millimeters</string>
+ </property>
<property name="text">
<string>Focal Length:</string>
</property>
@@ -131,6 +134,9 @@
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
+ <property name="toolTip">
+ <string>Camera pixel size in microns</string>
+ </property>
<property name="text">
<string>Pixel Size:</string>
</property>
@@ -138,6 +144,9 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
+ <property name="toolTip">
+ <string>Camera frame width and height in pixels</string>
+ </property>
<property name="text">
<string>Camera:</string>
</property>
@@ -195,6 +204,9 @@
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
+ <property name="toolTip">
+ <string>Camera's rotation angle (East of North) in degrees. To measure the angle, solve an image and use the astrometry solver solution's rotation angle</string>
+ </property>
<property name="text">
<string>Rotation:</string>
</property>
@@ -229,7 +241,7 @@
<bool>true</bool>
</property>
<property name="title">
- <string>FOV</string>
+ <string>2. FOV</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -237,6 +249,9 @@
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Camera FOV in arc minutes as determined from equipment parameters above</string>
+ </property>
<property name="text">
<string>Camera FOV:</string>
</property>
@@ -244,8 +259,11 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
+ <property name="toolTip">
+ <string>Specify the number of rows and columns of the final mosaic image</string>
+ </property>
<property name="text">
- <string>Mosaic:</string>
+ <string>Mosaic Grid:</string>
</property>
</widget>
</item>
@@ -277,8 +295,11 @@
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Final mosaic field of view size in arc minutes. Click update to calculate it or enter it manually.</string>
+ </property>
<property name="text">
- <string>Target FOV:</string>
+ <string>Mosaic FOV:</string>
</property>
</widget>
</item>
@@ -415,6 +436,9 @@
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Percentage of overlap between two neighbouring images</string>
+ </property>
<property name="text">
<string>Overlap:</string>
</property>
@@ -474,7 +498,7 @@
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
- <string>Output</string>
+ <string>3. Output</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@@ -484,6 +508,9 @@
<property name="enabled">
<bool>true</bool>
</property>
+ <property name="toolTip">
+ <string>Number of scheduler jobs required to capture the mosaic image. Click update to calculate it</string>
+ </property>
<property name="text">
<string>Job Count:</string>
</property>
@@ -569,6 +596,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QPushButton" name="updateB">
+ <property name="toolTip">
+ <string>Calculate target FOV and number of jobs required to capture the mosaic</string>
+ </property>
<property name="text">
<string>Update</string>
</property>
@@ -576,6 +606,9 @@
</item>
<item>
<widget class="QPushButton" name="resetB">
+ <property name="toolTip">
+ <string>Reset all parameters</string>
+ </property>
<property name="text">
<string>Reset</string>
</property>
@@ -599,6 +632,9 @@
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="toolTip">
+ <string>Create scheduler jobs to capture the mosaic image</string>
+ </property>
<property name="text">
<string>Create Jobs</string>
</property>
diff --git a/kstars/ekos/scheduler.cpp b/kstars/ekos/scheduler.cpp
index 140ce76..3c65abd 100644
--- a/kstars/ekos/scheduler.cpp
+++ b/kstars/ekos/scheduler.cpp
@@ -4255,7 +4255,7 @@ void Scheduler::startMosaicTool()
QString filename = QString("%1/%2.esq").arg(outputDir).arg(prefix);
sequenceEdit->setText(filename);
- sequenceURL = QUrl(filename);
+ sequenceURL = QUrl::fromLocalFile(filename);
raBox->setText(oneJob->skyCenter.ra0().toHMSString());
decBox->setText(oneJob->skyCenter.dec0().toDMSString());
@@ -4272,8 +4272,7 @@ void Scheduler::startMosaicTool()
queueTable->removeRow(0);
}
- QUrl mosaicURL;
- mosaicURL.setPath(QString("%1/%2_mosaic.esl").arg(outputDir).arg(targetName));
+ QUrl mosaicURL = QUrl::fromLocalFile((QString("%1/%2_mosaic.esl").arg(outputDir).arg(targetName)));
if (saveScheduler(mosaicURL))
{
diff --git a/kstars/ekos/scheduler.ui b/kstars/ekos/scheduler.ui
index 86020bf..047a1b5 100644
--- a/kstars/ekos/scheduler.ui
+++ b/kstars/ekos/scheduler.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>722</width>
- <height>460</height>
+ <height>488</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -409,7 +409,7 @@
</size>
</property>
<property name="toolTip">
- <string>Create mosaic job</string>
+ <string>Create mosaic job. You must add a job before creating a mosaic job.</string>
</property>
<property name="text">
<string/>
@@ -1214,17 +1214,17 @@
<resources/>
<connections/>
<buttongroups>
- <buttongroup name="constraintButtonGroup">
+ <buttongroup name="startupProcedureButtonGroup">
<property name="exclusive">
<bool>false</bool>
</property>
</buttongroup>
- <buttongroup name="startupProcedureButtonGroup">
+ <buttongroup name="startupButtonGroup"/>
+ <buttongroup name="constraintButtonGroup">
<property name="exclusive">
<bool>false</bool>
</property>
</buttongroup>
- <buttongroup name="startupButtonGroup"/>
<buttongroup name="completionButtonGroup"/>
<buttongroup name="stepsButtonGroup">
<property name="exclusive">