Skip to content

Commit 3a12db3

Browse files
Integer-CtrlInteger-Ctrl
authored
Merge branch 'Stellarium:master' into master
2 parents 9f8435b + d8cfa17 commit 3a12db3

File tree

36 files changed

+7072
-6991
lines changed

36 files changed

+7072
-6991
lines changed

‎plugins/LensDistortionEstimator/src/LensDistortionEstimator.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,15 @@ void LensDistortionEstimator::setProjectionCenterMarkerEnabled(const bool enable
819819
emit pointMarkersToggled(enable);
820820
}
821821

822+
void LensDistortionEstimator::setImgPosResetOnLoadingEnabled(const bool enable)
823+
{
824+
if(imgPosResetOnLoadingEnabled == enable) return;
825+
826+
imgPosResetOnLoadingEnabled = enable;
827+
conf_->setValue("LensDistortionEstimator/reset_img_pos_on_loading", enable);
828+
emit pointMarkersToggled(enable);
829+
}
830+
822831
void LensDistortionEstimator::setImageAxesEnabled(const bool enable)
823832
{
824833
if(imageAxesEnabled == enable) return;
@@ -853,6 +862,7 @@ void LensDistortionEstimator::loadSettings()
853862
setImageAxesEnabled(conf_->value("LensDistortionEstimator/show_image_axes", false).toBool());
854863
setPointMarkersEnabled(conf_->value("LensDistortionEstimator/mark_picked_points", true).toBool());
855864
setProjectionCenterMarkerEnabled(conf_->value("LensDistortionEstimator/mark_center_of_projection", false).toBool());
865+
setImgPosResetOnLoadingEnabled(conf_->value("LensDistortionEstimator/reset_img_pos_on_loading", true).toBool());
856866
imageAxesColor = Vec3f(conf_->value("LensDistortionEstimator/image_axes_color", defaultImageAxesColor).toString());
857867
pointMarkerColor = Vec3f(conf_->value("LensDistortionEstimator/point_marker_color", defaultPointMarkerColor).toString());
858868
selectedPointMarkerColor = Vec3f(conf_->value("LensDistortionEstimator/selected_point_marker_color", defaultSelectedPointMarkerColor).toString());

‎plugins/LensDistortionEstimator/src/LensDistortionEstimator.hpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class LensDistortionEstimator : public StelModule
3939
Q_PROPERTY(bool imageAxesEnabled READ areImageAxesEnabled WRITE setImageAxesEnabled NOTIFY imageAxesToggled)
4040
Q_PROPERTY(bool pointMarkersEnabled READ arePointMarkersEnabled WRITE setPointMarkersEnabled NOTIFY pointMarkersToggled)
4141
Q_PROPERTY(bool projectionCenterMarkerEnabled READ isProjectionCenterMarkerEnabled WRITE setProjectionCenterMarkerEnabled NOTIFY projectionCenterMarkerToggled)
42+
Q_PROPERTY(bool imgPosResetOnLoadingEnabled READ isImgPosResetOnLoadingEnabled WRITE setImgPosResetOnLoadingEnabled NOTIFY imgPosResetOnLoadingToggled)
4243
Q_PROPERTY(Vec3f selectedPointMarkerColor READ getSelectedPointMarkerColor WRITE setSelectedPointMarkerColor NOTIFY selectedPointMarkerColorChanged )
4344
Q_PROPERTY(Vec3f pointMarkerColor READ getPointMarkerColor WRITE setPointMarkerColor NOTIFY pointMarkerColorChanged )
4445
Q_PROPERTY(Vec3f projectionCenterMarkerColor READ getProjectionCenterMarkerColor WRITE setProjectionCenterMarkerColor NOTIFY projectionCenterMarkerColorChanged )
@@ -62,6 +63,7 @@ class LensDistortionEstimator : public StelModule
6263
bool configureGui(bool show = true) override;
6364
bool arePointMarkersEnabled() const { return pointMarkersEnabled; }
6465
bool isProjectionCenterMarkerEnabled() const { return projectionCenterMarkerEnabled; }
66+
bool isImgPosResetOnLoadingEnabled() const { return imgPosResetOnLoadingEnabled; }
6567
bool areImageAxesEnabled() const { return imageAxesEnabled; }
6668
bool isImageEnabled() const { return imageEnabled; }
6769
bool isDialogVisible() const { return dialogVisible; }
@@ -78,6 +80,7 @@ public slots:
7880
void setImageAxesEnabled(bool enabled);
7981
void setPointMarkersEnabled(bool enabled);
8082
void setProjectionCenterMarkerEnabled(bool enabled);
83+
void setImgPosResetOnLoadingEnabled(bool enabled);
8184
void setProjectionCenterMarkerColor(const Vec3f& color);
8285
void setSelectedPointMarkerColor(const Vec3f& color);
8386
void setPointMarkerColor(const Vec3f& color);
@@ -87,6 +90,7 @@ public slots:
8790
void dialogToggled(bool enabled);
8891
void imageAxesToggled(bool enabled);
8992
void pointMarkersToggled(bool enabled);
93+
void imgPosResetOnLoadingToggled(bool enabled);
9094
void projectionCenterMarkerToggled(bool enabled);
9195
void projectionCenterMarkerColorChanged(const Vec3f& color);
9296
void selectedPointMarkerColorChanged(const Vec3f& color);
@@ -141,6 +145,7 @@ public slots:
141145
bool rotatingImage_ = false;
142146
bool pointMarkersEnabled = true;
143147
bool projectionCenterMarkerEnabled = false;
148+
bool imgPosResetOnLoadingEnabled = true;
144149
bool imageAxesEnabled = false;
145150
bool imageEnabled = true;
146151
bool dialogVisible = false;

‎plugins/LensDistortionEstimator/src/gui/LensDistortionEstimatorDialog.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ void LensDistortionEstimatorDialog::createDialogContent()
273273
connectBoolProperty(ui_->imageAxesEnabled, "LensDistortionEstimator.imageAxesEnabled");
274274
connectBoolProperty(ui_->markPickedPoints, "LensDistortionEstimator.pointMarkersEnabled");
275275
connectBoolProperty(ui_->markProjectionCenter, "LensDistortionEstimator.projectionCenterMarkerEnabled");
276+
connectBoolProperty(ui_->imgPosResetOnLoadingEnabled, "LensDistortionEstimator.imgPosResetOnLoadingEnabled");
276277
ui_->imageAxesColor->setup("LensDistortionEstimator.imageAxesColor", "LensDistortionEstimator/image_axes_color");
277278
ui_->pointMarkerColor->setup("LensDistortionEstimator.pointMarkerColor", "LensDistortionEstimator/point_marker_color");
278279
ui_->selectedPointMarkerColor->setup("LensDistortionEstimator.selectedPointMarkerColor",
@@ -1246,7 +1247,8 @@ void LensDistortionEstimatorDialog::updateImage()
12461247
imageChanged_ = true;
12471248
setupGenerateLensfunModelButton();
12481249
computeColorToSubtract();
1249-
placeImageInCenterOfScreen();
1250+
if(ui_->imgPosResetOnLoadingEnabled->isChecked())
1251+
placeImageInCenterOfScreen();
12501252

12511253
#ifdef HAVE_EXIV2
12521254
try

‎plugins/LensDistortionEstimator/src/gui/lensDistortionEstimatorDialog.ui‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -730,13 +730,6 @@ distortion</string>
730730
<bool>true</bool>
731731
</property>
732732
<layout class="QGridLayout" name="gridLayout_6">
733-
<item row="2" column="2">
734-
<widget class="ColorButton" name="imageAxesColor">
735-
<property name="text">
736-
<string/>
737-
</property>
738-
</widget>
739-
</item>
740733
<item row="0" column="1">
741734
<spacer name="horizontalSpacer_2">
742735
<property name="orientation">
@@ -750,14 +743,21 @@ distortion</string>
750743
</property>
751744
</spacer>
752745
</item>
746+
<item row="2" column="2">
747+
<widget class="ColorButton" name="imageAxesColor">
748+
<property name="text">
749+
<string/>
750+
</property>
751+
</widget>
752+
</item>
753753
<item row="0" column="3">
754754
<widget class="QLabel" name="label_10">
755755
<property name="text">
756756
<string comment="As in &quot;normal&quot; points, the opposite being &quot;selected&quot;">normal</string>
757757
</property>
758758
</widget>
759759
</item>
760-
<item row="3" column="1">
760+
<item row="4" column="1">
761761
<spacer name="verticalSpacer">
762762
<property name="orientation">
763763
<enum>Qt::Vertical</enum>
@@ -770,24 +770,17 @@ distortion</string>
770770
</property>
771771
</spacer>
772772
</item>
773-
<item row="2" column="0">
774-
<widget class="QCheckBox" name="imageAxesEnabled">
775-
<property name="text">
776-
<string>Mark image axes</string>
777-
</property>
778-
</widget>
779-
</item>
780-
<item row="0" column="5">
781-
<widget class="QLabel" name="label_11">
773+
<item row="0" column="0">
774+
<widget class="QCheckBox" name="markPickedPoints">
782775
<property name="text">
783-
<string comment="As in &quot;selected points&quot;">selected</string>
776+
<string>Mark picked points</string>
784777
</property>
785778
</widget>
786779
</item>
787-
<item row="0" column="0">
788-
<widget class="QCheckBox" name="markPickedPoints">
780+
<item row="1" column="2">
781+
<widget class="ColorButton" name="projectionCenterMarkerColor">
789782
<property name="text">
790-
<string>Mark picked points</string>
783+
<string/>
791784
</property>
792785
</widget>
793786
</item>
@@ -805,17 +798,31 @@ distortion</string>
805798
</property>
806799
</widget>
807800
</item>
801+
<item row="2" column="0">
802+
<widget class="QCheckBox" name="imageAxesEnabled">
803+
<property name="text">
804+
<string>Mark image axes</string>
805+
</property>
806+
</widget>
807+
</item>
808+
<item row="0" column="5">
809+
<widget class="QLabel" name="label_11">
810+
<property name="text">
811+
<string comment="As in &quot;selected points&quot;">selected</string>
812+
</property>
813+
</widget>
814+
</item>
808815
<item row="1" column="0">
809816
<widget class="QCheckBox" name="markProjectionCenter">
810817
<property name="text">
811818
<string>Mark center of projection</string>
812819
</property>
813820
</widget>
814821
</item>
815-
<item row="1" column="2">
816-
<widget class="ColorButton" name="projectionCenterMarkerColor">
822+
<item row="3" column="0">
823+
<widget class="QCheckBox" name="imgPosResetOnLoadingEnabled">
817824
<property name="text">
818-
<string/>
825+
<string>Reset image position on loading</string>
819826
</property>
820827
</widget>
821828
</item>

‎plugins/RemoteControl/doc/remoteControlWeb.doxygen‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ define(["jquery", "api/remotecontrol"], function($,rc) {
338338
//do something as soon as this module is loaded
339339
console.log("my awesome module is being loaded!");
340340

341-
//do something when the DOM is ready (because that is not guaranteed while the module is first bein loaded!)
341+
//do something when the DOM is ready (because that isn't guaranteed while the module is first being loaded!)
342342
$(function(){
343343
console.log("the document is ready, you can access the elements now!");
344344
//access an element and modify it

‎plugins/RemoteControl/src/qtwebapp/httpserver/httprequest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ void HttpRequest::parseMultiPartFile()
404404
while (!tempFile.atEnd() && !finished && !tempFile.error())
405405
{
406406
#ifdef SUPERVERBOSE
407-
qDebug("HttpRequest: reading multpart headers");
407+
qDebug("HttpRequest: reading multipart headers");
408408
#endif
409409
QByteArray fieldName;
410410
QByteArray fileName;
@@ -443,7 +443,7 @@ void HttpRequest::parseMultiPartFile()
443443
}
444444

445445
#ifdef SUPERVERBOSE
446-
qDebug("HttpRequest: reading multpart data");
446+
qDebug("HttpRequest: reading multipart data");
447447
#endif
448448
QTemporaryFile* uploadedFile=Q_NULLPTR;
449449
QByteArray fieldValue;

‎plugins/Satellites/README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If all goes well, the relevant files should be built and copied to your
5252
~/.stellarium/modules directory.
5353

5454

55-
ACKNOWLEGDEMENTS
55+
ACKNOWLEDGEMENTS
5656
================
5757

5858
Re-write of orbital calculation routines by Jose Luis Canales, added

‎plugins/Satellites/src/gsatellite/gSatTEME.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/***************************************************************************
1818
* Copyright (C) 2006 by J.L. Canales *
19-
* jlcanales.gasco@gmail.com *
19+
* jlcanales.gasco@gmail.com *
2020
* *
2121
* This program is free software; you can redistribute it and/or modify *
2222
* it under the terms of the GNU General Public License as published by *
@@ -31,7 +31,7 @@
3131
* You should have received a copy of the GNU General Public License *
3232
* along with this program; if not, write to the *
3333
* Free Software Foundation, Inc., *
34-
* 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. *
34+
* 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. *
3535
***************************************************************************/
3636

3737
#ifndef GSATTEME_HPP
@@ -48,7 +48,7 @@
4848
//! @brief Sat position and velocity predictions over TEME reference system.
4949
//! @details
5050
//! Class to abstract all the SGP4 complexity.
51-
//! It implementation wrap whit an object oriented class the revised David. A. Vallado
51+
//! It implementation wrap with an object oriented class the revised David. A. Vallado
5252
//! code for SGP4 Calculation. (Spacetrack report #6 revised AIAA-2006-6753-rev1)
5353
//! @ingroup satellites
5454
class gSatTEME

‎plugins/TelescopeControl/src/TelescopeClient.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class TelescopeClient : public QObject, public StelObject
7575
//! - PlainText
7676
//! @param core the StelCore object
7777
//! @param flags a set of InfoStringGroup items to include in the return value.
78-
//! @return a QString containing an HMTL encoded description of the Telescope.
78+
//! @return a QString containing an HTML encoded description of the Telescope.
7979
QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const override;
8080
QString getType(void) const override {return TELESCOPECLIENT_TYPE;}
8181
QString getObjectType(void) const override {return N_("telescope");}

0 commit comments

Comments
 (0)