1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-06-05 07:56:01 +0000
3
+++ CMakeLists.txt	2016-06-12 13:59:22 +0000
4
@@ -18,9 +18,15 @@
5
18
18
6
19
########### Project name ###########
19
########### Project name ###########
7
20
PROJECT(Stellarium)
20
PROJECT(Stellarium)
11
21
SET(STELLARIUM_MAJOR "0")
21
# Use integer versions instead of strings for easier handling if required
12
22
SET(STELLARIUM_MINOR "14")
22
SET(STELLARIUM_MAJOR 0)
13
23
SET(STELLARIUM_PATCH "90")
23
SET(STELLARIUM_MINOR 14)
14
24
SET(STELLARIUM_PATCH 90)
15
25
ADD_DEFINITIONS(
16
26
-DSTELLARIUM_MAJOR=${STELLARIUM_MAJOR}
17
27
-DSTELLARIUM_MINOR=${STELLARIUM_MINOR}
18
28
-DSTELLARIUM_PATCH=${STELLARIUM_PATCH}
19
29
)
20
24
SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
30
SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
21
25
SET(PACKAGE stellarium)
31
SET(PACKAGE stellarium)
22
26
SET(COPYRIGHT_YEARS "2000-2016")
32
SET(COPYRIGHT_YEARS "2000-2016")
23
@@ -174,7 +180,7 @@
24
174
SET(STELLARIUM_PLUGINS) # Global list of all the plugins.
180
SET(STELLARIUM_PLUGINS) # Global list of all the plugins.
25
175
MACRO(ADD_PLUGIN NAME DEFAULT)
181
MACRO(ADD_PLUGIN NAME DEFAULT)
26
176
     STRING(TOUPPER ${NAME} NAME_UP)
182
     STRING(TOUPPER ${NAME} NAME_UP)
28
177
     SET(USE_PLUGIN_${NAME_UP} ${DEFAULT} CACHE BOOL "Define wheter the ${NAME} plugin should be created.")
183
     SET(USE_PLUGIN_${NAME_UP} ${DEFAULT} CACHE BOOL "Define whether the ${NAME} plugin should be created.")
29
178
     SET(STELLARIUM_PLUGINS ${STELLARIUM_PLUGINS} ${NAME})
184
     SET(STELLARIUM_PLUGINS ${STELLARIUM_PLUGINS} ${NAME})
30
179
ENDMACRO()
185
ENDMACRO()
31
180
186
32
@@ -197,6 +203,9 @@
33
197
ADD_PLUGIN(PointerCoordinates 1)
203
ADD_PLUGIN(PointerCoordinates 1)
34
198
ADD_PLUGIN(Pulsars 1)
204
ADD_PLUGIN(Pulsars 1)
35
199
ADD_PLUGIN(Quasars 1)
205
ADD_PLUGIN(Quasars 1)
36
206
# SOCIS 2015:
37
207
ADD_PLUGIN(RemoteControl 1)
38
208
ADD_PLUGIN(RemoteSync 0)
39
200
ADD_PLUGIN(Satellites 1)
209
ADD_PLUGIN(Satellites 1)
40
201
ADD_PLUGIN(Scenery3d 1)
210
ADD_PLUGIN(Scenery3d 1)
41
202
ADD_PLUGIN(SolarSystemEditor 1)
211
ADD_PLUGIN(SolarSystemEditor 1)
42
@@ -461,9 +470,9 @@
43
461
    SET(CPACK_PACKAGE_VENDOR "Stellarium's team")
470
    SET(CPACK_PACKAGE_VENDOR "Stellarium's team")
44
462
    SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
471
    SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
45
463
    SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
472
    SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
49
464
    SET(CPACK_PACKAGE_VERSION_MAJOR ${STELLARIUM_MAJOR})
473
    SET(CPACK_PACKAGE_VERSION_MAJOR "${STELLARIUM_MAJOR}")
50
465
    SET(CPACK_PACKAGE_VERSION_MINOR ${STELLARIUM_MINOR})
474
    SET(CPACK_PACKAGE_VERSION_MINOR "${STELLARIUM_MINOR}")
51
466
    SET(CPACK_PACKAGE_VERSION_PATCH ${STELLARIUM_PATCH})
475
    SET(CPACK_PACKAGE_VERSION_PATCH "${STELLARIUM_PATCH}")
52
467
    SET(CPACK_PACKAGE_INSTALL_DIRECTORY "stellarium")
476
    SET(CPACK_PACKAGE_INSTALL_DIRECTORY "stellarium")
53
468
    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${VERSION}")
477
    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${VERSION}")
54
469
    SET(CPACK_SOURCE_GENERATOR "TGZ")
478
    SET(CPACK_SOURCE_GENERATOR "TGZ")
55
@@ -517,8 +526,18 @@
56
517
ENDIF()
526
ENDIF()
57
518
527
58
519
########### Generate doxygen doc ###############
528
########### Generate doxygen doc ###############
61
520
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
529
FIND_PACKAGE(Doxygen)
62
521
ADD_CUSTOM_TARGET(apidoc doxygen ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generate the doxygen documentation into the doc directory.")
530
IF(DOXYGEN_FOUND)
63
531
    IF(DOXYGEN_DOT_FOUND)
64
532
        SET(HAVE_DOT "YES")
65
533
        SET(DOT_PATH ${DOXYGEN_DOT_PATH})
66
534
    ELSE()
67
535
        SET(HAVE_DOT "NO")
68
536
        SET(DOT_PATH "")
69
537
    ENDIF()
70
538
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
71
539
    ADD_CUSTOM_TARGET(apidoc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generate the doxygen documentation into the doc directory.")
72
540
ENDIF()
73
522
541
74
523
##################### Generate translation copying script ######################
542
##################### Generate translation copying script ######################
75
524
IF(WIN32)
543
IF(WIN32)
76
525
544
77
=== modified file 'cmake/Doxyfile.cmake'
78
--- cmake/Doxyfile.cmake	2016-04-21 07:15:21 +0000
79
+++ cmake/Doxyfile.cmake	2016-06-12 13:59:22 +0000
80
@@ -150,7 +150,7 @@
81
150
# shortest path that makes the file name unique will be used
150
# shortest path that makes the file name unique will be used
82
151
# The default value is: YES.
151
# The default value is: YES.
83
152
152
85
153
FULL_PATH_NAMES        = NO
153
FULL_PATH_NAMES        = YES
86
154
154
87
155
# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
155
# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
88
156
# Stripping is only done if one of the specified strings matches the left-hand
156
# Stripping is only done if one of the specified strings matches the left-hand
89
@@ -2026,6 +2026,9 @@
90
2026
# run, you must also specify the path to the tagfile here.
2026
# run, you must also specify the path to the tagfile here.
91
2027
2027
92
2028
TAGFILES               = qt.tag=http://doc.qt.io/qt-5/
2028
TAGFILES               = qt.tag=http://doc.qt.io/qt-5/
93
2029
                         qtcore.tags=http://doc.qt.io/qt-5/ \
94
2030
                         qtgui.tags=http://doc.qt.io/qt-5/ \
95
2031
                         qtwidgets.tags=http://doc.qt.io/qt-5/
96
2029
2032
97
2030
# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
2033
# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
98
2031
# tag file that is based on the input files it reads. See section "Linking to
2034
# tag file that is based on the input files it reads. See section "Linking to
99
@@ -2101,7 +2104,7 @@
100
2101
# set to NO
2104
# set to NO
101
2102
# The default value is: YES.
2105
# The default value is: YES.
102
2103
2106
104
2104
HAVE_DOT               = NO
2107
HAVE_DOT               = @HAVE_DOT@
105
2105
2108
106
2106
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
2109
# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
107
2107
# to run in parallel. When set to 0 doxygen will base this on the number of
2110
# to run in parallel. When set to 0 doxygen will base this on the number of
108
@@ -2143,7 +2146,7 @@
109
2143
# The default value is: YES.
2146
# The default value is: YES.
110
2144
# This tag requires that the tag HAVE_DOT is set to YES.
2147
# This tag requires that the tag HAVE_DOT is set to YES.
111
2145
2148
113
2146
CLASS_GRAPH            = NO
2149
CLASS_GRAPH            = YES
114
2147
2150
115
2148
# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
2151
# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
116
2149
# graph for each documented class showing the direct and indirect implementation
2152
# graph for each documented class showing the direct and indirect implementation
117
@@ -2152,7 +2155,7 @@
118
2152
# The default value is: YES.
2155
# The default value is: YES.
119
2153
# This tag requires that the tag HAVE_DOT is set to YES.
2156
# This tag requires that the tag HAVE_DOT is set to YES.
120
2154
2157
122
2155
COLLABORATION_GRAPH    = NO
2158
COLLABORATION_GRAPH    = YES
123
2156
2159
124
2157
# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
2160
# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
125
2158
# groups, showing the direct groups dependencies.
2161
# groups, showing the direct groups dependencies.
126
@@ -2275,7 +2278,7 @@
127
2275
# found. If left blank, it is assumed the dot tool can be found in the path.
2278
# found. If left blank, it is assumed the dot tool can be found in the path.
128
2276
# This tag requires that the tag HAVE_DOT is set to YES.
2279
# This tag requires that the tag HAVE_DOT is set to YES.
129
2277
2280
131
2278
DOT_PATH               =
2281
DOT_PATH               = "@DOT_PATH@"
132
2279
2282
133
2280
# The DOTFILE_DIRS tag can be used to specify one or more directories that
2283
# The DOTFILE_DIRS tag can be used to specify one or more directories that
134
2281
# contain dot files that are included in the documentation (see the \dotfile
2284
# contain dot files that are included in the documentation (see the \dotfile
135
2282
2285
136
=== modified file 'data/CMakeLists.txt'
137
--- data/CMakeLists.txt	2016-05-29 09:27:35 +0000
138
+++ data/CMakeLists.txt	2016-06-12 13:59:22 +0000
139
@@ -53,13 +53,16 @@
140
53
ENDIF()
53
ENDIF()
141
54
54
142
55
# install Scenery3d shaders
55
# install Scenery3d shaders
143
56
IF(USE_PLUGIN_SCENERY3D)
144
56
INSTALL(DIRECTORY shaders/ DESTINATION share/${PACKAGE}/data/shaders FILES_MATCHING 
57
INSTALL(DIRECTORY shaders/ DESTINATION share/${PACKAGE}/data/shaders FILES_MATCHING 
147
57
	PATTERN "s3d_*.vert" PATTERN "s3d_*.geom" PATTERN "s3d_*.frag")
58
	PATTERN "s3d_*.vert" 
148
58
	
59
	PATTERN "s3d_*.geom" 
149
60
	PATTERN "s3d_*.frag")
150
59
# install Scenery3D docs for Windows
61
# install Scenery3D docs for Windows
151
60
IF(WIN32)
62
IF(WIN32)
152
61
	INSTALL(FILES ../plugins/Scenery3d/doc/Scenery3d.pdf DESTINATION share/${PACKAGE}/data)
63
	INSTALL(FILES ../plugins/Scenery3d/doc/Scenery3d.pdf DESTINATION share/${PACKAGE}/data)
153
62
ENDIF(WIN32)
64
ENDIF(WIN32)
154
65
ENDIF()
155
63
66
156
64
IF (BUILD_FOR_MAEMO)
67
IF (BUILD_FOR_MAEMO)
157
65
	INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
68
	INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
158
66
69
159
=== modified file 'data/gui/normalStyle.css'
160
--- data/gui/normalStyle.css	2015-08-18 06:29:08 +0000
161
+++ data/gui/normalStyle.css	2016-06-12 13:59:22 +0000
162
@@ -149,7 +149,7 @@
163
149
	font-size: 12px;
149
	font-size: 12px;
164
150
}
150
}
165
151
151
167
152
QLineEdit[enabled="false"] {
152
QLineEdit:disabled {
168
153
	background: rgb(90, 90, 90);
153
	background: rgb(90, 90, 90);
169
154
}
154
}
170
155
155
171
156
156
172
=== modified file 'doc/DoxygenLayout.xml'
173
--- doc/DoxygenLayout.xml	2014-06-22 14:08:40 +0000
174
+++ doc/DoxygenLayout.xml	2016-06-12 13:59:22 +0000
175
@@ -18,7 +18,7 @@
176
18
    <tab type="user" url="@ref scripting" visible="yes" title="Scripting" intro=""/>
18
    <tab type="user" url="@ref scripting" visible="yes" title="Scripting" intro=""/>
177
19
    <tab type="user" url="@ref plugins" visible="yes" title="Plugins" intro=""/>
19
    <tab type="user" url="@ref plugins" visible="yes" title="Plugins" intro=""/>
178
20
    <tab type="user" url="@ref fileStructure" visible="yes" title="File Structure" intro=""/>
20
    <tab type="user" url="@ref fileStructure" visible="yes" title="File Structure" intro=""/>
180
21
    <tab type="files" visible="no" title="">
21
    <tab type="files" visible="yes" title="">
181
22
      <tab type="filelist" visible="yes" title="" intro=""/>
22
      <tab type="filelist" visible="yes" title="" intro=""/>
182
23
      <tab type="globals" visible="yes" title="" intro=""/>
23
      <tab type="globals" visible="yes" title="" intro=""/>
183
24
    </tab>
24
    </tab>
184
25
25
185
=== modified file 'doc/doxygen.css'
186
--- doc/doxygen.css	2015-06-08 20:08:26 +0000
187
+++ doc/doxygen.css	2016-06-12 13:59:22 +0000
188
@@ -1193,7 +1193,8 @@
189
1193
        float: right;
1193
        float: right;
190
1194
        height: auto;
1194
        height: auto;
191
1195
        margin: 0 20px 10px 10px;
1195
        margin: 0 20px 10px 10px;
193
1196
        width: 200px;
1196
        min-width: 200px;
194
1197
        max-width: 400px;
195
1197
}
1198
}
196
1198
1199
197
1199
div.toc li {
1200
div.toc li {
198
1200
1201
199
=== modified file 'doc/mainpage.doxygen'
200
--- doc/mainpage.doxygen	2016-02-25 17:31:00 +0000
201
+++ doc/mainpage.doxygen	2016-06-12 13:59:22 +0000
202
@@ -32,9 +32,9 @@
203
32
<ul>
32
<ul>
204
33
<li>the main loop and main widget classes @em StelMainWindow and @em StelMainGraphicsView. Those classes have a single instance which is created at startup by the main() function. They perform various tasks such as the creation of the main program window and openGL context, the creation of the stellarium core, the creation of the GUI. After initialization, they manage user's input event propagation and event loop. There are heavily based on %Qt features.</li>
33
<li>the main loop and main widget classes @em StelMainWindow and @em StelMainGraphicsView. Those classes have a single instance which is created at startup by the main() function. They perform various tasks such as the creation of the main program window and openGL context, the creation of the stellarium core, the creation of the GUI. After initialization, they manage user's input event propagation and event loop. There are heavily based on %Qt features.</li>
205
34
<li>the core which provides a number of generic services and features to the other components. The main class is the StelApp singleton class which is used everywhere in the code to access other elements. It is the StelApp instance which creates all the main core services and modules at initialization. Example services are OpenGL textures management with the StelTextureMgr, font management with the StelFontMgr, sky images management (images which have a fixed position in the sky) with the StelSkyImageMgr etc.. Two especially important manager classes (the ones with the "Mgr" suffix) are the StelModuleMgr and StelCore classes: the first one manages the collection of StelModule instances which are registered in the program (see next point for more info on what a StelModule is). The second one provides performance critical features for rendering various elements using openGL, or for computing coordinate transformation and other mathematical services.</li>
34
<li>the core which provides a number of generic services and features to the other components. The main class is the StelApp singleton class which is used everywhere in the code to access other elements. It is the StelApp instance which creates all the main core services and modules at initialization. Example services are OpenGL textures management with the StelTextureMgr, font management with the StelFontMgr, sky images management (images which have a fixed position in the sky) with the StelSkyImageMgr etc.. Two especially important manager classes (the ones with the "Mgr" suffix) are the StelModuleMgr and StelCore classes: the first one manages the collection of StelModule instances which are registered in the program (see next point for more info on what a StelModule is). The second one provides performance critical features for rendering various elements using openGL, or for computing coordinate transformation and other mathematical services.</li>
209
35
<li>a collection of StelModule instances which display the main elements of the program such as planets and stars. Each StelModule should be registered to the StelModuleMgr. Because many components of Stellarium derive from the StelModule class, it is possible for the main loop to treat them generically by calling their standard methods such StelModule::update() and StelModule::draw() at each program iteration. It also allows other program components to access them by name. StelModule can also be loaded dynamically by Stellarium, which is the standard way of creating @ref plugins.</li>
35
<li>a collection of StelModule instances which display the main elements of the program such as planets and stars. Each StelModule should be registered to the StelModuleMgr. Because many components of Stellarium derive from the StelModule class, it is possible for the main loop to treat them generically by calling their standard methods such StelModule::update() and StelModule::draw() at each program iteration. It also allows other program components to access them by name. StelProperty can be used to access all defined static properties (see the [Qt property system](https://doc.qt.io/qt-5/properties.html) for more information) of all registered StelModule instances. StelModule can also be loaded dynamically by Stellarium, which is the standard way of creating @ref plugins. StelAction instances can be used to define actions that can be triggered by the user through UI controls or key combinations.</li>
210
36
<li>the Graphical User Interface (StelGui). It is based on styled %Qt widgets which are rendered directly in the openGL window. Users actions trigger signals which are connected to core and StelModules slots.</li>
36
<li>the Graphical User Interface (StelGui). It is based on styled %Qt widgets which are rendered directly in the openGL window. Users actions can trigger signals which are connected to core and StelModules slots. Many UI controls can also be directly connected to StelAction and/or StelProperty instances to reduce the amount of boilerplate code required to link UI changes to the back-end modules and vice-versa.</li>
211
37
<li>the script engine (StelScriptMgr) allows scripts to calls slots from the core and StelModules slots.</li>
37
<li>the script engine (StelScriptMgr) allows user scripts based on QtScript (a JavaScript dialect) to access properties and calls slots from the core and StelModule instances.</li>
212
38
</ul>
38
</ul>
213
39
@image html stellarium-architecture.png
39
@image html stellarium-architecture.png
214
40
40
215
41
41
216
=== modified file 'doc/plugIns.doxygen'
217
--- doc/plugIns.doxygen	2016-04-21 06:48:03 +0000
218
+++ doc/plugIns.doxygen	2016-06-12 13:59:22 +0000
219
@@ -65,6 +65,7 @@
220
65
 - @ref meteorShowers
65
 - @ref meteorShowers
221
66
 - @ref pointerCoordinates
66
 - @ref pointerCoordinates
222
67
 - @ref archaeoLines
67
 - @ref archaeoLines
223
68
 - @ref remoteControl
224
68
69
225
69
You can find some untechnical details on our wiki [Plugins](http://www.stellarium.org/wiki/index.php/Plugins) page.
70
You can find some untechnical details on our wiki [Plugins](http://www.stellarium.org/wiki/index.php/Plugins) page.
226
70
71
227
71
72
228
=== added file 'guide/pictures/remote.png'
229
72
Binary files guide/pictures/remote.png	1970-01-01 00:00:00 +0000 and guide/pictures/remote.png	2016-06-12 13:59:22 +0000 differ
73
Binary files guide/pictures/remote.png	1970-01-01 00:00:00 +0000 and guide/pictures/remote.png	2016-06-12 13:59:22 +0000 differ
230
=== added file 'guide/pictures/remote_web.png'
231
73
Binary files guide/pictures/remote_web.png	1970-01-01 00:00:00 +0000 and guide/pictures/remote_web.png	2016-06-12 13:59:22 +0000 differ
74
Binary files guide/pictures/remote_web.png	1970-01-01 00:00:00 +0000 and guide/pictures/remote_web.png	2016-06-12 13:59:22 +0000 differ
232
=== modified file 'guide/plg_interfaces.tex'
233
--- guide/plg_interfaces.tex	2016-05-05 23:42:27 +0000
234
+++ guide/plg_interfaces.tex	2016-06-12 13:59:22 +0000
235
@@ -373,7 +373,101 @@
236
373
\section{Remote Control}
373
\section{Remote Control}
237
374
\label{sec:plugin:RemoteControl}
374
\label{sec:plugin:RemoteControl}
238
375
375
240
376
[This will come as user documentation from SoCiS2015 work]
376
The Remote Control plugin was developed in 2015 during the 
241
377
\href{http://sophia.estec.esa.int/socis/}{ESA Summer of Code in Space} 
242
378
initiative. It enables the user to control Stellarium through an external web 
243
379
interface using a standard web browser like Firefox or Chrome, instead of using 
244
380
the main GUI. This works on the same computer Stellarium runs as well as over 
245
381
the network. Even more, multiple "remote controls" can access the same 
246
382
Stellarium instance at the same time, without getting in the way of each other. 
247
383
Much of the functionality the main interface provides is already available 
248
384
through it, and it is still getting extended.
249
385
250
386
The plugin may be useful for presentation scenarios, hiding the GUI from the 
251
387
audience and allowing the presenter to change settings on a separate monitor 
252
388
without showing distracting dialog windows. It also allows to start and stop 
253
389
scripts remotely. Because the web interface can be customized (or completely 
254
390
replaced) with some knowledge of HTML, CSS and JavaScript, another possibility 
255
391
is a kiosk mode, where untrusted users can execute a variety of predefined 
256
392
actions (like starting recorded tours) without having access to all Stellarium 
257
393
settings. The web API can also be accessed directly (without using a browser 
258
394
and the HTML interface), allowing control of Stellarium with external programs 
259
395
and scripts using HTTP calls like with the tools \file{wget} and \file{curl}.
260
396
261
397
\subsection{Using the plugin}
262
398
\label{sec:plugins:RemoteControl:using}
263
399
264
400
\begin{figure}[h]
265
401
\centering\includegraphics[width=\columnwidth]{remote_web}
266
402
\caption{The default remote control web interface}
267
403
\end{figure}
268
404
269
405
After enabling the plugin, you can set it up through the configuration dialog. 
270
406
When ``Enable automatically on startup'' is checked (it is by default), the web 
271
407
server is automatically started whenever Stellarium starts. You can also 
272
408
manually start/stop the server using the ``Server enabled'' checkbox and the 
273
409
button \includegraphics[scale=0.5]{remote} in the toolbar.
274
410
275
411
The plugin starts a HTTP server on the specified port. The default port is 
276
412
8090, so you can try to reach the remote control after enabling it by starting 
277
413
a browser on the same computer and entering \url{http://localhost:8090} in the 
278
414
address bar. When trying to access the remote control from another computer, 
279
415
you need the IP address or the hostname of the server on which Stellarium runs. 
280
416
The plugin shows the locally detected address, but depending on your network or 
281
417
if you need external access you might need to use a different one 
282
418
--- contact your network administrator if you need help with that.
283
419
284
420
The access to the remote control may optionally be restricted with a simple 
285
421
password.
286
422
287
423
\textbf{Warning:} \emph{currently no network encryption is used, meaning that 
288
424
an attacker having access to your network can easily find out the password by 
289
425
waiting for a user entering it. Access from the Internet to the 
290
426
plugin should generally be restricted, except if countermeasures such as VPN 
291
427
usage are taken! If you are in a home network using NAT (network access 
292
428
translation), this should be enough for basic security except if port 
293
429
forwarding or a DMZ is configured.}
294
430
295
431
If you are familiar with the main Stellarium interface, you should easily find 
296
432
your way around the web interface. Tabs at the top allow access to 
297
433
different settings and controls. The remote control automatically uses the 
298
434
same language as set in the main program.
299
435
300
436
The contents of the various tabs:
301
437
\begin{description}
302
438
\item[Main] Contains the time controls and most of the buttons of the 
303
439
main bottom toolbar. An additional control allows moving the view like when 
304
440
dragging the mouse or using the arrow keys in Stellarium, and a slider enables 
305
441
the changing of the field of view. There are also buttons to quickly execute 
306
442
time jumps using the commonly used astronomical time intervals.
307
443
\item[Selection] Allows searching and selecting objects like in \autoref{sec:gui:search}. 
308
444
SIMBAD search is also supported. Quick select buttons are available for the 
309
445
primary solar system objects. It also displays the information text for current 
310
446
selection.
311
447
\item[Sky] Settings related to the sky display as shown in the ``View'' dialog 
312
448
as shown in \autoref{sec:gui:view:sky}.
313
449
\item[DSO] The deep-sky object catalog, filter and display settings like in 
314
450
\autoref{sec:gui:view:markings}.
315
451
\item[Landscape] Changing and configuring the background landscape, see 
316
452
\autoref{sec:gui:view:landscape}
317
453
\item[Actions and scripts] Lists all registered actions, and allows starting 
318
454
and stopping of scripts (\autoref{ch:scripting}). If there is no button for the 
319
455
action you want in another tab, you can find all actions which can be 
320
456
configured as a keyboard shortcut (\autoref{sec:gui:configuration}) here.
321
457
\item[Location] Allows changing the location, like in 
322
458
\autoref{sec:gui:location}. Custom location saving is currently not 
323
459
supported.
324
460
\item[Projection] Switch the projection method used, like \autoref{sec:gui:view:markings}.
325
461
\end{description}
326
462
327
463
\subsection{Developer information}
328
464
\label{sec:plugins:RemoteControl:developer}
329
465
330
466
If you are a developer and would like to add functionality to the Remote 
331
467
Control API, customize the web interface or access the API through another 
332
468
program, further information can be found in the 
333
469
\href{http://stellarium.org/doc-plugins/head/}{plugin's developer 
334
470
documentation}.
335
377
471
336
378
472
337
379
% \newpage
473
% \newpage
338
380
474
339
=== modified file 'plugins/ArchaeoLines/src/ArchaeoLines.cpp'
340
--- plugins/ArchaeoLines/src/ArchaeoLines.cpp	2015-12-29 13:15:57 +0000
341
+++ plugins/ArchaeoLines/src/ArchaeoLines.cpp	2016-06-12 13:59:22 +0000
342
@@ -89,7 +89,7 @@
343
89
	objMgr=GETSTELMODULE(StelObjectMgr);
89
	objMgr=GETSTELMODULE(StelObjectMgr);
344
90
	Q_ASSERT(objMgr);
90
	Q_ASSERT(objMgr);
345
91
91
347
92
	// optimize readabiity so that each upper line of the lunistice doubles is labeled.
92
	// optimize readability so that each upper line of the lunistice doubles is labeled.
348
93
	equinoxLine = new ArchaeoLine(ArchaeoLine::Equinox, 0.0);
93
	equinoxLine = new ArchaeoLine(ArchaeoLine::Equinox, 0.0);
349
94
	northernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, 23.50);
94
	northernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, 23.50);
350
95
	southernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, -23.50);
95
	southernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, -23.50);
351
@@ -116,6 +116,7 @@
352
116
116
353
117
	configDialog = new ArchaeoLinesDialog();
117
	configDialog = new ArchaeoLinesDialog();
354
118
	conf = StelApp::getInstance().getSettings();
118
	conf = StelApp::getInstance().getSettings();
355
119
356
119
}
120
}
357
120
121
358
121
ArchaeoLines::~ArchaeoLines()
122
ArchaeoLines::~ArchaeoLines()
359
@@ -188,7 +189,8 @@
360
188
	StelApp& app = StelApp::getInstance();
189
	StelApp& app = StelApp::getInstance();
361
189
190
362
190
	// Create action for enable/disable & hook up signals	
191
	// Create action for enable/disable & hook up signals	
364
191
	addAction("actionShow_Archaeo_Lines", N_("ArchaeoLines"), N_("ArchaeoLines"), "enabled", "Ctrl+U");
192
	QString section=N_("ArchaeoLines");
365
193
	addAction("actionShow_Archaeo_Lines", section, N_("ArchaeoLines"), "enabled", "Ctrl+U");
366
192
194
367
193
	// Add a toolbar button
195
	// Add a toolbar button
368
194
	try
196
	try
369
@@ -208,6 +210,16 @@
370
208
	{
210
	{
371
209
		qWarning() << "WARNING: unable to create toolbar button for ArchaeoLines plugin: " << e.what();
211
		qWarning() << "WARNING: unable to create toolbar button for ArchaeoLines plugin: " << e.what();
372
210
	}
212
	}
373
213
	addAction("actionAL_showEquinoxLine",          section, N_("Show Line for Equinox"),            "flagShowEquinox"         ); // No Shortcuts configured.
374
214
	addAction("actionAL_showSolsticeLines",        section, N_("Show Line for Solstices"),          "flagShowSolstices"       ); // No Shortcuts configured.
375
215
	addAction("actionAL_showCrossquarterLines",    section, N_("Show Line for Crossquarter"),       "flagShowCrossquarters"   ); // No Shortcuts configured.
376
216
	addAction("actionAL_showMajorStandstillLines", section, N_("Show Line for Major Standstill"),   "flagShowMajorStandstills"); // No Shortcuts configured.
377
217
	addAction("actionAL_showMinorStandstillLines", section, N_("Show Line for Minor Standstill"),   "flagShowMinorStandstills"); // No Shortcuts configured.
378
218
	addAction("actionAL_showZenithPassageLine",    section, N_("Show Line for Zenith Passage"),     "flagShowZenithPassage"   ); // No Shortcuts configured.
379
219
	addAction("actionAL_showNadirPassageLine",     section, N_("Show Line for Nadir Passage"),      "flagShowNadirPassage"    ); // No Shortcuts configured.
380
220
	addAction("actionAL_showSelectedObjectLine",   section, N_("Show Line for Selected Object"),    "flagShowSelectedObject"  ); // No Shortcuts configured.
381
221
	addAction("actionAL_showCurrentSunLine",       section, N_("Show Line for Current Sun"),        "flagShowCurrentSun"      ); // No Shortcuts configured.
382
222
	addAction("actionAL_showCurrentMoonLine",      section, N_("Show Line for Current Moon"),       "flagShowCurrentMoon"     ); // No Shortcuts configured.
383
211
}
223
}
384
212
224
385
213
void ArchaeoLines::update(double deltaTime)
225
void ArchaeoLines::update(double deltaTime)
386
@@ -450,7 +462,7 @@
387
450
	// indicators for current declinations (those move fast over days...)
462
	// indicators for current declinations (those move fast over days...)
388
451
	showCurrentSun(conf->value("ArchaeoLines/show_current_sun", true).toBool());
463
	showCurrentSun(conf->value("ArchaeoLines/show_current_sun", true).toBool());
389
452
	showCurrentMoon(conf->value("ArchaeoLines/show_current_moon", true).toBool());
464
	showCurrentMoon(conf->value("ArchaeoLines/show_current_moon", true).toBool());
391
453
	showCurrentPlanet(conf->value("ArchaeoLines/show_current_planet", "none").toString());
465
	showCurrentPlanetNamed(conf->value("ArchaeoLines/show_current_planet", "none").toString());
392
454
466
393
455
	enableArchaeoLines(conf->value("ArchaeoLines/enable_at_startup", false).toBool());
467
	enableArchaeoLines(conf->value("ArchaeoLines/enable_at_startup", false).toBool());
394
456
}
468
}
395
@@ -526,15 +538,20 @@
396
526
538
397
527
void ArchaeoLines::showCurrentPlanet(ArchaeoLine::Line l)
539
void ArchaeoLines::showCurrentPlanet(ArchaeoLine::Line l)
398
528
{
540
{
405
529
	enumShowCurrentPlanet=l;
541
	if(l!=enumShowCurrentPlanet)
406
530
	const char *planetStrings[]={"none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"};
542
	{
407
531
543
		enumShowCurrentPlanet=l;
408
532
	conf->setValue("ArchaeoLines/show_current_planet", planetStrings[l-ArchaeoLine::CurrentPlanetNone]);
544
		const char *planetStrings[]={"none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"};
409
533
	currentPlanetLine->setLineType(enumShowCurrentPlanet);
545
410
534
	currentPlanetLine->setDisplayed(enumShowCurrentPlanet != ArchaeoLine::CurrentPlanetNone);
546
		conf->setValue("ArchaeoLines/show_current_planet", planetStrings[l-ArchaeoLine::CurrentPlanetNone]);
411
547
		currentPlanetLine->setLineType(enumShowCurrentPlanet);
412
548
		currentPlanetLine->setDisplayed(enumShowCurrentPlanet != ArchaeoLine::CurrentPlanetNone);
413
549
414
550
		emit currentPlanetChanged(l);
415
551
	}
416
535
}
552
}
417
536
553
419
537
void ArchaeoLines::showCurrentPlanet(QString planet)
554
void ArchaeoLines::showCurrentPlanetNamed(QString planet)
420
538
{
555
{
421
539
	if (planet=="none")
556
	if (planet=="none")
422
540
		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetNone;
557
		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetNone;
423
541
558
424
=== modified file 'plugins/ArchaeoLines/src/ArchaeoLines.hpp'
425
--- plugins/ArchaeoLines/src/ArchaeoLines.hpp	2015-08-03 13:17:06 +0000
426
+++ plugins/ArchaeoLines/src/ArchaeoLines.hpp	2016-06-12 13:59:22 +0000
427
@@ -77,6 +77,10 @@
428
77
	Q_OBJECT
77
	Q_OBJECT
429
78
	Q_PROPERTY(Vec3f color READ getColor WRITE setColor)
78
	Q_PROPERTY(Vec3f color READ getColor WRITE setColor)
430
79
	Q_PROPERTY(bool flagLabel READ isLabelVisible WRITE setLabelVisible)
79
	Q_PROPERTY(bool flagLabel READ isLabelVisible WRITE setLabelVisible)
431
80
432
81
	//Need to register Enum with Qt to be able to use it as Q_PROPERTY
433
82
	//or in signals/slots
434
83
	Q_ENUMS(Line)
435
80
public:
84
public:
436
81
	enum Line {
85
	enum Line {
437
82
		Equinox,
86
		Equinox,
438
@@ -174,7 +178,8 @@
439
174
				WRITE showCurrentMoon)
178
				WRITE showCurrentMoon)
440
175
	Q_PROPERTY(ArchaeoLine::Line enumShowCurrentPlanet
179
	Q_PROPERTY(ArchaeoLine::Line enumShowCurrentPlanet
441
176
				READ    whichCurrentPlanetDisplayed
180
				READ    whichCurrentPlanetDisplayed
443
177
				WRITE showCurrentPlanet)
181
				WRITE showCurrentPlanet
444
182
				NOTIFY currentPlanetChanged)
445
178
183
446
179
public:
184
public:
447
180
	ArchaeoLines();
185
	ArchaeoLines();
448
@@ -190,19 +195,7 @@
449
190
	virtual double getCallOrder(StelModuleActionName actionName) const;
195
	virtual double getCallOrder(StelModuleActionName actionName) const;
450
191
	virtual void handleKeys(class QKeyEvent* event){event->setAccepted(false);}
196
	virtual void handleKeys(class QKeyEvent* event){event->setAccepted(false);}
451
192
	virtual bool configureGui(bool show=true);
197
	virtual bool configureGui(bool show=true);
452
193
	bool isEnabled() const {return flagShowArchaeoLines;}
453
194
	bool isDmsFormat() const { return flagUseDmsFormat; } // NOT SURE IF USEFUL
198
	bool isDmsFormat() const { return flagUseDmsFormat; } // NOT SURE IF USEFUL
454
195
	bool isEquinoxDisplayed() const {return flagShowEquinox;}
455
196
	bool isSolsticesDisplayed() const {return flagShowSolstices;}
456
197
	bool isCrossquartersDisplayed() const {return flagShowCrossquarters;}
457
198
	bool isMajorStandstillsDisplayed() const {return flagShowMajorStandstills;}
458
199
	bool isMinorStandstillsDisplayed() const {return flagShowMinorStandstills;}
459
200
	bool isZenithPassageDisplayed() const {return flagShowZenithPassage;}
460
201
	bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
461
202
	bool isSelectedObjectDisplayed() const {return flagShowSelectedObject;}
462
203
	bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
463
204
	bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
464
205
	ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumShowCurrentPlanet;}
465
206
199
466
207
	//! Restore the plug-in's settings to the default state.
200
	//! Restore the plug-in's settings to the default state.
467
208
	//! Replace the plug-in's settings in Stellarium's configuration file
201
	//! Replace the plug-in's settings in Stellarium's configuration file
468
@@ -217,11 +210,27 @@
469
217
	//! @see restoreDefaultSettings()
210
	//! @see restoreDefaultSettings()
470
218
	void loadSettings();
211
	void loadSettings();
471
219
212
472
213
signals:
473
214
	void currentPlanetChanged(ArchaeoLine::Line l); // meaningful only CurrentPlanetNone...CurrentPlanetSaturn.
474
220
215
475
221
public slots:
216
public slots:
476
222
	void enableArchaeoLines(bool b);
217
	void enableArchaeoLines(bool b);
477
223
	//void useDmsFormat(bool b);
218
	//void useDmsFormat(bool b);
478
224
219
479
220
	bool isEnabled() const {return flagShowArchaeoLines;}
480
221
	bool isEquinoxDisplayed() const {return flagShowEquinox;}
481
222
	bool isSolsticesDisplayed() const {return flagShowSolstices;}
482
223
	bool isCrossquartersDisplayed() const {return flagShowCrossquarters;}
483
224
	bool isMajorStandstillsDisplayed() const {return flagShowMajorStandstills;}
484
225
	bool isMinorStandstillsDisplayed() const {return flagShowMinorStandstills;}
485
226
	bool isZenithPassageDisplayed() const {return flagShowZenithPassage;}
486
227
	bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
487
228
	bool isSelectedObjectDisplayed() const {return flagShowSelectedObject;}
488
229
	bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
489
230
	bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
490
231
	ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumShowCurrentPlanet;}
491
232
492
233
493
225
	void showEquinox(bool b);
234
	void showEquinox(bool b);
494
226
	void showSolstices(bool b);
235
	void showSolstices(bool b);
495
227
	void showCrossquarters(bool b);
236
	void showCrossquarters(bool b);
496
@@ -233,7 +242,7 @@
497
233
	void showCurrentSun(bool b);
242
	void showCurrentSun(bool b);
498
234
	void showCurrentMoon(bool b);
243
	void showCurrentMoon(bool b);
499
235
	void showCurrentPlanet(ArchaeoLine::Line l); // Allowed values for l: CurrentPlanetNone...CurrentPlanetSaturn.
244
	void showCurrentPlanet(ArchaeoLine::Line l); // Allowed values for l: CurrentPlanetNone...CurrentPlanetSaturn.
501
236
	void showCurrentPlanet(QString planet); // Allowed values for planet: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn".
245
	void showCurrentPlanetNamed(QString planet); // Allowed values for planet: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn".
502
237
246
503
238
	// called by the dialog GUI, converts GUI's QColor (0..255) to Stellarium's Vec3f float color.
247
	// called by the dialog GUI, converts GUI's QColor (0..255) to Stellarium's Vec3f float color.
504
239
	void setLineColor(ArchaeoLine::Line whichLine, QColor color);
248
	void setLineColor(ArchaeoLine::Line whichLine, QColor color);
505
240
249
506
=== modified file 'plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp'
507
--- plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp	2016-01-22 11:05:08 +0000
508
+++ plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp	2016-06-12 13:59:22 +0000
509
@@ -90,7 +90,8 @@
510
90
	ui->currentMoonCheckBox->setChecked(al->isCurrentMoonDisplayed());
90
	ui->currentMoonCheckBox->setChecked(al->isCurrentMoonDisplayed());
511
91
	connect(ui->currentMoonCheckBox, SIGNAL(toggled(bool)), al, SLOT(showCurrentMoon(bool)));
91
	connect(ui->currentMoonCheckBox, SIGNAL(toggled(bool)), al, SLOT(showCurrentMoon(bool)));
512
92
	// Planet ComboBox requires special handling!
92
	// Planet ComboBox requires special handling!
514
93
	ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDisplayed()-ArchaeoLine::CurrentPlanetNone);
93
	setCurrentPlanetFromApp();
515
94
	connect(al, SIGNAL(currentPlanetChanged(ArchaeoLine::Line)), this, SLOT(setCurrentPlanetFromApp()));
516
94
	connect(ui->currentPlanetComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentPlanetFromGUI(int)));
95
	connect(ui->currentPlanetComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentPlanetFromGUI(int)));
517
95
96
518
96
	equinoxColor         = al->getLineColor(ArchaeoLine::Equinox);
97
	equinoxColor         = al->getLineColor(ArchaeoLine::Equinox);
519
@@ -177,6 +178,12 @@
520
177
	al->showCurrentPlanet((ArchaeoLine::Line) (ArchaeoLine::CurrentPlanetNone+index));
178
	al->showCurrentPlanet((ArchaeoLine::Line) (ArchaeoLine::CurrentPlanetNone+index));
521
178
}
179
}
522
179
180
523
181
void ArchaeoLinesDialog::setCurrentPlanetFromApp()
524
182
{
525
183
	Q_ASSERT(al);
526
184
	ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDisplayed()-ArchaeoLine::CurrentPlanetNone);
527
185
}
528
186
529
180
187
530
181
void ArchaeoLinesDialog::setAboutHtml(void)
188
void ArchaeoLinesDialog::setAboutHtml(void)
531
182
{
189
{
532
183
190
533
=== modified file 'plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp'
534
--- plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp	2015-05-30 19:56:47 +0000
535
+++ plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp	2016-06-12 13:59:22 +0000
536
@@ -103,6 +103,7 @@
537
103
	void resetArchaeoLinesSettings();
103
	void resetArchaeoLinesSettings();
538
104
	//! setting planet requires a small function to link Combobox indices to line IDs.
104
	//! setting planet requires a small function to link Combobox indices to line IDs.
539
105
	void setCurrentPlanetFromGUI(int index);
105
	void setCurrentPlanetFromGUI(int index);
540
106
	void setCurrentPlanetFromApp();
541
106
107
542
107
};
108
};
543
108
109
544
109
110
545
=== modified file 'plugins/Oculars/src/Oculars.cpp'
546
--- plugins/Oculars/src/Oculars.cpp	2016-06-11 17:54:59 +0000
547
+++ plugins/Oculars/src/Oculars.cpp	2016-06-12 13:59:22 +0000
548
@@ -126,7 +126,7 @@
549
126
	flagMoonScale(false),
126
	flagMoonScale(false),
550
127
	maxEyepieceAngle(0.0),
127
	maxEyepieceAngle(0.0),
551
128
	requireSelection(true),
128
	requireSelection(true),
553
129
	flagLimitMagnitude(false),	
129
	flagLimitMagnitude(false),
554
130
	useMaxEyepieceAngle(true),
130
	useMaxEyepieceAngle(true),
555
131
	guiPanelEnabled(false),
131
	guiPanelEnabled(false),
556
132
	flagDecimalDegrees(false),
132
	flagDecimalDegrees(false),
557
@@ -258,7 +258,7 @@
558
258
		lens->writeToSettings(settings, index);
258
		lens->writeToSettings(settings, index);
559
259
		index++;
259
		index++;
560
260
	}
260
	}
562
261
        
261
563
262
	settings->setValue("ocular_count", oculars.count());
262
	settings->setValue("ocular_count", oculars.count());
564
263
	settings->setValue("telescope_count", telescopes.count());
263
	settings->setValue("telescope_count", telescopes.count());
565
264
	settings->setValue("ccd_count", ccds.count());
264
	settings->setValue("ccd_count", ccds.count());
566
@@ -283,22 +283,22 @@
567
283
		if (selectedCCDIndex > ccds.count())
283
		if (selectedCCDIndex > ccds.count())
568
284
		{
284
		{
569
285
			qWarning() << "Oculars: the selected sensor index of "
285
			qWarning() << "Oculars: the selected sensor index of "
572
286
								 << selectedCCDIndex << " is greater than the sensor count of "
286
				   << selectedCCDIndex << " is greater than the sensor count of "
573
287
								 << ccds.count() << ". Module disabled!";
287
				   << ccds.count() << ". Module disabled!";
574
288
			ready = false;
288
			ready = false;
575
289
		}
289
		}
576
290
		if (selectedOcularIndex > oculars.count())
290
		if (selectedOcularIndex > oculars.count())
577
291
		{
291
		{
578
292
			qWarning() << "Oculars: the selected ocular index of "
292
			qWarning() << "Oculars: the selected ocular index of "
581
293
								 << selectedOcularIndex << " is greater than the ocular count of "
293
				   << selectedOcularIndex << " is greater than the ocular count of "
582
294
								 << oculars.count() << ". Module disabled!";
294
				   << oculars.count() << ". Module disabled!";
583
295
			ready = false;
295
			ready = false;
584
296
		}
296
		}
585
297
		else if (selectedTelescopeIndex > telescopes.count())
297
		else if (selectedTelescopeIndex > telescopes.count())
586
298
		{
298
		{
587
299
			qWarning() << "Oculars: the selected telescope index of "
299
			qWarning() << "Oculars: the selected telescope index of "
590
300
								 << selectedTelescopeIndex << " is greater than the telescope count of "
300
				   << selectedTelescopeIndex << " is greater than the telescope count of "
591
301
								 << telescopes.count() << ". Module disabled!";
301
				   << telescopes.count() << ". Module disabled!";
592
302
			ready = false;
302
			ready = false;
593
303
		}
303
		}
594
304
		
304
		
595
@@ -785,7 +785,7 @@
596
785
		}
785
		}
597
786
	}
786
	}
598
787
	guiPanelEnabled = enable;
787
	guiPanelEnabled = enable;
600
788
	settings->setValue("enable_control_panel", enable);	
788
	settings->setValue("enable_control_panel", enable);
601
789
	settings->sync();
789
	settings->sync();
602
790
}
790
}
603
791
791
604
@@ -833,7 +833,7 @@
605
833
	if (oculars.isEmpty())
833
	if (oculars.isEmpty())
606
834
	{
834
	{
607
835
		selectedOcularIndex = -1;
835
		selectedOcularIndex = -1;
609
836
		actionShowOcular->setChecked(false);
836
		enableOcular(false);
610
837
	}
837
	}
611
838
	else
838
	else
612
839
	{
839
	{
613
@@ -847,8 +847,8 @@
614
847
	if (telescopes.isEmpty())
847
	if (telescopes.isEmpty())
615
848
	{
848
	{
616
849
		selectedTelescopeIndex = -1;
849
		selectedTelescopeIndex = -1;
619
850
		actionShowOcular->setChecked(false);
850
		enableOcular(false);
620
851
		actionShowSensor->setChecked(false);
851
		toggleCCD(false);
621
852
	}
852
	}
622
853
	else
853
	else
623
854
	{
854
	{
624
@@ -862,7 +862,7 @@
625
862
	if (ccds.isEmpty())
862
	if (ccds.isEmpty())
626
863
	{
863
	{
627
864
		selectedCCDIndex = -1;
864
		selectedCCDIndex = -1;
629
865
		actionShowSensor->setChecked(false);
865
		toggleCCD(false);
630
866
	}
866
	}
631
867
	else
867
	else
632
868
	{
868
	{
633
@@ -895,8 +895,7 @@
634
895
		// Close the sensor view if it's displayed
895
		// Close the sensor view if it's displayed
635
896
		if (flagShowCCD)
896
		if (flagShowCCD)
636
897
		{
897
		{
639
898
			if (actionShowSensor->isChecked())
898
			toggleCCD(false);
638
899
				actionShowSensor->setChecked(false);
640
900
			flagShowCCD = false;
899
			flagShowCCD = false;
641
901
			selectedCCDIndex = -1;
900
			selectedCCDIndex = -1;
642
902
		}
901
		}
643
@@ -904,8 +903,7 @@
644
904
		// Close the Telrad sight if it's displayed
903
		// Close the Telrad sight if it's displayed
645
905
		if (flagShowTelrad)
904
		if (flagShowTelrad)
646
906
		{
905
		{
649
907
			if (actionShowTelrad->isChecked())
906
			toggleTelrad(false);
648
908
				actionShowTelrad->setChecked(false);
650
909
		}
907
		}
651
910
908
652
911
		// Check to ensure that we have enough oculars & telescopes, as they may have been edited in the config dialog
909
		// Check to ensure that we have enough oculars & telescopes, as they may have been edited in the config dialog
653
@@ -954,10 +952,6 @@
654
954
			usageMessageLabelID = labelManager->labelScreen(labelText, xPosition, yPosition,
952
			usageMessageLabelID = labelManager->labelScreen(labelText, xPosition, yPosition,
655
955
									true, font.pixelSize(), tcolor);
953
									true, font.pixelSize(), tcolor);
656
956
		}
954
		}
657
957
		// we didn't accept the new status - make sure the toolbar button reflects this
658
958
		disconnect(actionShowOcular, SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
659
959
		actionShowOcular->setChecked(false);
660
960
		connect(actionShowOcular, SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
661
961
	}
955
	}
662
962
	else
956
	else
663
963
	{
957
	{
664
@@ -972,6 +966,8 @@
665
972
				guiPanel->showOcularGui();
966
				guiPanel->showOcularGui();
666
973
		}
967
		}
667
974
	}
968
	}
668
969
669
970
	emit enableOcularChanged(flagShowOculars);
670
975
}
971
}
671
976
972
672
977
void Oculars::decrementCCDIndex()
973
void Oculars::decrementCCDIndex()
673
@@ -1363,14 +1359,10 @@
674
1363
		flagShowCCD = false;
1359
		flagShowCCD = false;
675
1364
		selectedCCDIndex = -1;
1360
		selectedCCDIndex = -1;
676
1365
		show = false;
1361
		show = false;
677
1366
		if (actionShowSensor->isChecked())
678
1367
		{
679
1368
			actionShowSensor->setChecked(false);
680
1369
		}
681
1370
	}
1362
	}
682
1371
1363
683
1372
	StelCore *core = StelApp::getInstance().getCore();
1364
	StelCore *core = StelApp::getInstance().getCore();
685
1373
	StelMovementMgr *movementManager = core->getMovementMgr();	
1365
	StelMovementMgr *movementManager = core->getMovementMgr();
686
1374
	StelSkyDrawer *skyManager = core->getSkyDrawer();
1366
	StelSkyDrawer *skyManager = core->getSkyDrawer();
687
1375
	skyManager->setAbsoluteStarScale(absoluteStarScale);
1367
	skyManager->setAbsoluteStarScale(absoluteStarScale);
688
1376
	if (show)
1368
	if (show)
689
@@ -1378,18 +1370,10 @@
690
1378
		initialFOV = movementManager->getCurrentFov();
1370
		initialFOV = movementManager->getCurrentFov();
691
1379
		//Mutually exclusive with the ocular mode
1371
		//Mutually exclusive with the ocular mode
692
1380
		hideUsageMessageIfDisplayed();
1372
		hideUsageMessageIfDisplayed();
700
1381
		if (flagShowOculars)
1373
		enableOcular(false);
694
1382
		{
695
1383
			if (actionShowOcular->isChecked())
696
1384
			{
697
1385
				actionShowOcular->setChecked(false);
698
1386
			}
699
1387
		}
701
1388
1374
702
1389
		if (flagShowTelrad) {
1375
		if (flagShowTelrad) {
706
1390
			if (actionShowTelrad->isChecked()) {
1376
			toggleTelrad(false);
704
1391
				actionShowTelrad->setChecked(false);
705
1392
			}
707
1393
		}
1377
		}
708
1394
1378
709
1395
		if (selectedTelescopeIndex < 0)
1379
		if (selectedTelescopeIndex < 0)
710
@@ -1402,6 +1386,7 @@
711
1402
		}
1386
		}
712
1403
		flagShowCCD = true;
1387
		flagShowCCD = true;
713
1404
		setScreenFOVForCCD();
1388
		setScreenFOVForCCD();
714
1389
715
1405
		// Change relative scale for stars
1390
		// Change relative scale for stars
716
1406
		// TODO: Finding experimental value for better rendering
1391
		// TODO: Finding experimental value for better rendering
717
1407
		skyManager->setRelativeStarScale(0.6);
1392
		skyManager->setRelativeStarScale(0.6);
718
@@ -1417,7 +1402,7 @@
719
1417
1402
720
1418
		skyManager->setRelativeStarScale(relativeStarScale);
1403
		skyManager->setRelativeStarScale(relativeStarScale);
721
1419
		movementManager->setFlagTracking(false);
1404
		movementManager->setFlagTracking(false);
723
1420
		//Zoom out		
1405
		//Zoom out
724
1421
		if (getFlagInitFovUsage())
1406
		if (getFlagInitFovUsage())
725
1422
			movementManager->zoomTo(movementManager->getInitFov());
1407
			movementManager->zoomTo(movementManager->getInitFov());
726
1423
		else
1408
		else
727
@@ -1434,51 +1419,42 @@
728
1434
			guiPanel->foldGui();
1419
			guiPanel->foldGui();
729
1435
		}
1420
		}
730
1436
	}
1421
	}
731
1422
732
1423
	emit enableCCDChanged(flagShowCCD);
733
1437
}
1424
}
734
1438
1425
735
1439
void Oculars::toggleCCD()
1426
void Oculars::toggleCCD()
736
1440
{
1427
{
745
1441
	if (flagShowCCD)
1428
	toggleCCD(!flagShowCCD);
738
1442
	{
739
1443
		toggleCCD(false);
740
1444
	}
741
1445
	else
742
1446
	{
743
1447
		toggleCCD(true);
744
1448
	}
746
1449
}
1429
}
747
1450
1430
748
1451
void Oculars::toggleCrosshairs(bool show)
1431
void Oculars::toggleCrosshairs(bool show)
749
1452
{
1432
{
757
1453
	if (show && flagShowOculars)
1433
	if(show != flagShowCrosshairs)
758
1454
	{
1434
	{
759
1455
		flagShowCrosshairs = true;
1435
		flagShowCrosshairs = show;
760
1456
	}
1436
		emit enableCrosshairsChanged(show);
754
1457
	else
755
1458
	{
756
1459
		flagShowCrosshairs = false;
761
1460
	}
1437
	}
762
1461
}
1438
}
763
1462
1439
764
1463
void Oculars::toggleTelrad(bool show)
1440
void Oculars::toggleTelrad(bool show)
765
1464
{
1441
{
767
1465
	if (show)
1442
	if(show!=flagShowTelrad)
768
1466
	{
1443
	{
774
1467
		hideUsageMessageIfDisplayed();
1444
		if (show)
775
1468
		if (actionShowOcular->isChecked())
1445
		{
776
1469
			actionShowOcular->setChecked(false);
1446
			hideUsageMessageIfDisplayed();
777
1470
		if (actionShowSensor->isChecked())
1447
			enableOcular(false);
778
1471
			actionShowSensor->setChecked(false);
1448
			toggleCCD(false);
779
1449
		}
780
1450
		flagShowTelrad = show;
781
1451
		emit enableTelradChanged(flagShowTelrad);
782
1472
	}
1452
	}
783
1473
	flagShowTelrad = show;
784
1474
}
1453
}
785
1475
1454
786
1476
void Oculars::toggleTelrad()
1455
void Oculars::toggleTelrad()
787
1477
{
1456
{
792
1478
	if (flagShowTelrad)
1457
	toggleTelrad(!flagShowTelrad);
789
1479
		toggleTelrad(false);
790
1480
	else
791
1481
		toggleTelrad(true);
793
1482
}
1458
}
794
1483
1459
795
1484
/* ****************************************************************************************************************** */
1460
/* ****************************************************************************************************************** */
796
@@ -1493,8 +1469,7 @@
797
1493
	Q_ASSERT(gui);
1469
	Q_ASSERT(gui);
798
1494
1470
799
1495
	QString ocularsGroup = N_("Oculars");
1471
	QString ocularsGroup = N_("Oculars");
802
1496
	actionShowOcular = addAction("actionShow_Ocular", ocularsGroup, N_("Ocular view"), "enableOcular(bool)", "Ctrl+O");
1472
	actionShowOcular = addAction("actionShow_Ocular", ocularsGroup, N_("Ocular view"), "enableOcular", "Ctrl+O");
801
1497
	actionShowOcular->setChecked(flagShowOculars);
803
1498
	// Make a toolbar button
1473
	// Make a toolbar button
804
1499
	try
1474
	try
805
1500
	{
1475
	{
806
@@ -1510,9 +1485,9 @@
807
1510
	}
1485
	}
808
1511
1486
809
1512
	actionMenu = addAction("actionShow_Ocular_Menu", ocularsGroup, N_("Oculars popup menu"), "displayPopupMenu()", "Alt+O");
1487
	actionMenu = addAction("actionShow_Ocular_Menu", ocularsGroup, N_("Oculars popup menu"), "displayPopupMenu()", "Alt+O");
813
1513
	actionShowCrosshairs = addAction("actionShow_Ocular_Crosshairs", ocularsGroup, N_("Show crosshairs"), "toggleCrosshairs(bool)", "Alt+C");
1488
	actionShowCrosshairs = addAction("actionShow_Ocular_Crosshairs", ocularsGroup, N_("Show crosshairs"), "enableCrosshairs", "Alt+C");
814
1514
	actionShowSensor = addAction("actionShow_Sensor", ocularsGroup, N_("Image sensor frame"), "toggleCCD(bool)");
1489
	actionShowSensor = addAction("actionShow_Sensor", ocularsGroup, N_("Image sensor frame"), "enableCCD");
815
1515
	actionShowTelrad = addAction("actionShow_Telrad", ocularsGroup, N_("Telrad sight"), "toggleTelrad(bool)", "Ctrl+B");
1490
	actionShowTelrad = addAction("actionShow_Telrad", ocularsGroup, N_("Telrad sight"), "enableTelrad", "Ctrl+B");
816
1516
	actionConfiguration = addAction("actionOpen_Oculars_Configuration", ocularsGroup, N_("Oculars plugin configuration"), ocularDialog, "visible");
1491
	actionConfiguration = addAction("actionOpen_Oculars_Configuration", ocularsGroup, N_("Oculars plugin configuration"), ocularDialog, "visible");
817
1517
	// Select next telescope via keyboard
1492
	// Select next telescope via keyboard
818
1518
	addAction("actionShow_Telescope_Increment", ocularsGroup, N_("Select next telescope"), "incrementTelescopeIndex()", "");
1493
	addAction("actionShow_Telescope_Increment", ocularsGroup, N_("Select next telescope"), "incrementTelescopeIndex()", "");
819
@@ -1556,11 +1531,11 @@
820
1556
1531
821
1557
void Oculars::paintCCDBounds()
1532
void Oculars::paintCCDBounds()
822
1558
{
1533
{
824
1559
	StelCore *core = StelApp::getInstance().getCore();	
1534
	StelCore *core = StelApp::getInstance().getCore();
825
1560
	StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
1535
	StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
826
1561
	Lens *lens = selectedLensIndex >=0  ? lense[selectedLensIndex] : NULL;
1536
	Lens *lens = selectedLensIndex >=0  ? lense[selectedLensIndex] : NULL;
827
1562
1537
829
1563
	const StelProjectorP projector = core->getProjection(StelCore::FrameEquinoxEqu);	
1538
	const StelProjectorP projector = core->getProjection(StelCore::FrameEquinoxEqu);
830
1564
	double screenFOV = params.fov;
1539
	double screenFOV = params.fov;
831
1565
1540
832
1566
	// draw sensor rectangle
1541
	// draw sensor rectangle
833
@@ -1648,9 +1623,9 @@
834
1648
1623
835
1649
					//painter.setColor(0.60f, 0.20f, 0.20f, .5f);
1624
					//painter.setColor(0.60f, 0.20f, 0.20f, .5f);
836
1650
					painter.drawCircle(params.viewportCenter[0] * params.devicePixelsPerPixel,
1625
					painter.drawCircle(params.viewportCenter[0] * params.devicePixelsPerPixel,
838
1651
							   params.viewportCenter[1] * params.devicePixelsPerPixel, in_oag_r);
1626
							params.viewportCenter[1] * params.devicePixelsPerPixel, in_oag_r);
839
1652
					painter.drawCircle(params.viewportCenter[0] * params.devicePixelsPerPixel,
1627
					painter.drawCircle(params.viewportCenter[0] * params.devicePixelsPerPixel,
841
1653
							   params.viewportCenter[1] * params.devicePixelsPerPixel, out_oag_r);
1628
							params.viewportCenter[1] * params.devicePixelsPerPixel, out_oag_r);
842
1654
1629
843
1655
					QTransform oag_transform = QTransform().translate(params.viewportCenter[0] * params.devicePixelsPerPixel,
1630
					QTransform oag_transform = QTransform().translate(params.viewportCenter[0] * params.devicePixelsPerPixel,
844
1656
							params.viewportCenter[1] * params.devicePixelsPerPixel).rotate(-(ccd->chipRotAngle() + polarAngle + ccd->prismPosAngle()));
1631
							params.viewportCenter[1] * params.devicePixelsPerPixel).rotate(-(ccd->chipRotAngle() + polarAngle + ccd->prismPosAngle()));
845
@@ -1786,8 +1761,8 @@
846
1786
		reticleTexture->getDimensions(textureWidth, textureHeight);
1761
		reticleTexture->getDimensions(textureWidth, textureHeight);
847
1787
1762
848
1788
		painter.drawSprite2dMode(params.viewportXywh[2] / 2 * params.devicePixelsPerPixel,
1763
		painter.drawSprite2dMode(params.viewportXywh[2] / 2 * params.devicePixelsPerPixel,
851
1789
					 params.viewportXywh[3] / 2 * params.devicePixelsPerPixel,
1764
				params.viewportXywh[3] / 2 * params.devicePixelsPerPixel,
852
1790
					 inner, reticleRotation);
1765
				inner, reticleRotation);
853
1791
	}
1766
	}
854
1792
1767
855
1793
	if (oculars[selectedOcularIndex]->hasPermanentCrosshair())
1768
	if (oculars[selectedOcularIndex]->hasPermanentCrosshair())
856
@@ -1845,7 +1820,7 @@
857
1845
void Oculars::paintText(const StelCore* core)
1820
void Oculars::paintText(const StelCore* core)
858
1846
{
1821
{
859
1847
	const StelProjectorP prj = core->getProjection(StelCore::FrameAltAz);
1822
	const StelProjectorP prj = core->getProjection(StelCore::FrameAltAz);
861
1848
	StelPainter painter(prj);	
1823
	StelPainter painter(prj);
862
1849
1824
863
1850
	// Get the current instruments
1825
	// Get the current instruments
864
1851
	CCD *ccd = NULL;
1826
	CCD *ccd = NULL;
865
@@ -1922,7 +1897,7 @@
866
1922
			QString ocularFOVLabel = QString(q_("Ocular aFOV: %1")).arg(ocularFov);
1897
			QString ocularFOVLabel = QString(q_("Ocular aFOV: %1")).arg(ocularFov);
867
1923
			painter.drawText(xPosition, yPosition, ocularFOVLabel);
1898
			painter.drawText(xPosition, yPosition, ocularFOVLabel);
868
1924
			yPosition-=lineHeight;
1899
			yPosition-=lineHeight;
870
1925
	
1900
871
1926
			QString lensNumberLabel;
1901
			QString lensNumberLabel;
872
1927
			// Barlow and Shapley lens
1902
			// Barlow and Shapley lens
873
1928
			if (lens != NULL) // it's null if lens is not selected (lens index = -1)
1903
			if (lens != NULL) // it's null if lens is not selected (lens index = -1)
874
@@ -1943,7 +1918,7 @@
875
1943
			}
1918
			}
876
1944
			painter.drawText(xPosition, yPosition, lensNumberLabel);
1919
			painter.drawText(xPosition, yPosition, lensNumberLabel);
877
1945
			yPosition-=lineHeight;
1920
			yPosition-=lineHeight;
879
1946
		
1921
880
1947
			// The telescope
1922
			// The telescope
881
1948
			QString telescopeString = "";
1923
			QString telescopeString = "";
882
1949
			QString magString = "";
1924
			QString magString = "";
883
@@ -2014,7 +1989,7 @@
884
2014
					.arg(name);
1989
					.arg(name);
885
2015
		}
1990
		}
886
2016
		// The telescope
1991
		// The telescope
888
2017
		QString telescopeNumberLabel;		
1992
		QString telescopeNumberLabel;
889
2018
		if (telescopeName.isEmpty())
1993
		if (telescopeName.isEmpty())
890
2019
		{
1994
		{
891
2020
			telescopeNumberLabel = QString(q_("Telescope #%1"))
1995
			telescopeNumberLabel = QString(q_("Telescope #%1"))
892
@@ -2051,7 +2026,7 @@
893
2051
		if (!src.copy(ocularIniPath))
2026
		if (!src.copy(ocularIniPath))
894
2052
		{
2027
		{
895
2053
			qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] "
2028
			qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] "
897
2054
										+ ocularIniPath;
2029
				      + ocularIniPath;
898
2055
		}
2030
		}
899
2056
		else
2031
		else
900
2057
		{
2032
		{
901
@@ -2256,7 +2231,7 @@
902
2256
		}
2231
		}
903
2257
		telescope = telescopes[selectedTelescopeIndex];
2232
		telescope = telescopes[selectedTelescopeIndex];
904
2258
		core->setFlipHorz(telescope->isHFlipped());
2233
		core->setFlipHorz(telescope->isHFlipped());
906
2259
		core->setFlipVert(telescope->isVFlipped());		
2234
		core->setFlipVert(telescope->isVFlipped());
907
2260
	}
2235
	}
908
2261
2236
909
2262
	// Change relative and absolute scales for stars
2237
	// Change relative and absolute scales for stars
910
@@ -2308,7 +2283,7 @@
911
2308
QMenu* Oculars::addLensSubmenu(QMenu* parent)
2283
QMenu* Oculars::addLensSubmenu(QMenu* parent)
912
2309
{
2284
{
913
2310
	Q_ASSERT(parent);
2285
	Q_ASSERT(parent);
915
2311
    
2286
916
2312
	QMenu *submenu = new QMenu(q_("&Lens"), parent);
2287
	QMenu *submenu = new QMenu(q_("&Lens"), parent);
917
2313
	submenu->addAction(q_("&Previous lens"), this, SLOT(decrementLensIndex()));
2288
	submenu->addAction(q_("&Previous lens"), this, SLOT(decrementLensIndex()));
918
2314
	submenu->addAction(q_("&Next lens"), this, SLOT(incrementLensIndex()));
2289
	submenu->addAction(q_("&Next lens"), this, SLOT(incrementLensIndex()));
919
@@ -2371,7 +2346,7 @@
920
2371
void Oculars::setFlagDecimalDegrees(const bool b)
2346
void Oculars::setFlagDecimalDegrees(const bool b)
921
2372
{
2347
{
922
2373
	flagDecimalDegrees = b;
2348
	flagDecimalDegrees = b;
924
2374
	settings->setValue("use_decimal_degrees", b);	
2349
	settings->setValue("use_decimal_degrees", b);
925
2375
	settings->sync();
2350
	settings->sync();
926
2376
}
2351
}
927
2377
2352
928
2378
2353
929
=== modified file 'plugins/Oculars/src/Oculars.hpp'
930
--- plugins/Oculars/src/Oculars.hpp	2016-06-11 17:54:59 +0000
931
+++ plugins/Oculars/src/Oculars.hpp	2016-06-12 13:59:22 +0000
932
@@ -75,6 +75,12 @@
933
75
class Oculars : public StelModule
75
class Oculars : public StelModule
934
76
{
76
{
935
77
	Q_OBJECT
77
	Q_OBJECT
936
78
937
79
	Q_PROPERTY(bool enableOcular READ getEnableOcular WRITE enableOcular NOTIFY enableOcularChanged)
938
80
	Q_PROPERTY(bool enableCrosshairs READ getEnableCrosshairs WRITE toggleCrosshairs NOTIFY enableCrosshairsChanged)
939
81
	Q_PROPERTY(bool enableCCD READ getEnableCCD WRITE toggleCCD NOTIFY enableCCDChanged)
940
82
	Q_PROPERTY(bool enableTelrad READ getEnableTelrad WRITE toggleTelrad NOTIFY enableTelradChanged)
941
83
942
78
	//BM: Temporary, until the GUI is finalized and some other method of getting
84
	//BM: Temporary, until the GUI is finalized and some other method of getting
943
79
	//info from the main class is implemented.
85
	//info from the main class is implemented.
944
80
	friend class OcularsGuiPanel;
86
	friend class OcularsGuiPanel;
945
@@ -119,6 +125,7 @@
946
119
	//! This method is called with we detect that our hot key is pressed.  It handles
125
	//! This method is called with we detect that our hot key is pressed.  It handles
947
120
	//! determining if we should do anything - based on a selected object.
126
	//! determining if we should do anything - based on a selected object.
948
121
	void enableOcular(bool b);
127
	void enableOcular(bool b);
949
128
	bool getEnableOcular() const { return flagShowOculars; }
950
122
	void incrementCCDIndex();
129
	void incrementCCDIndex();
951
123
	void incrementOcularIndex();
130
	void incrementOcularIndex();
952
124
	void incrementTelescopeIndex();
131
	void incrementTelescopeIndex();
953
@@ -133,9 +140,12 @@
954
133
	void toggleCCD(bool show);
140
	void toggleCCD(bool show);
955
134
	//! Toggles the sensor frame overlay (overloaded for blind switching).
141
	//! Toggles the sensor frame overlay (overloaded for blind switching).
956
135
	void toggleCCD();
142
	void toggleCCD();
957
143
	bool getEnableCCD() const { return flagShowCCD; }
958
136
	void toggleCrosshairs(bool show = true);
144
	void toggleCrosshairs(bool show = true);
959
145
	bool getEnableCrosshairs() const { return flagShowCrosshairs; }
960
137
	//! Toggles the Telrad sight overlay.
146
	//! Toggles the Telrad sight overlay.
961
138
	void toggleTelrad(bool show);
147
	void toggleTelrad(bool show);
962
148
	bool getEnableTelrad() const { return flagShowTelrad; }
963
139
	//! Toggles the Telrad sight overlay (overloaded for blind switching).
149
	//! Toggles the Telrad sight overlay (overloaded for blind switching).
964
140
	void toggleTelrad();
150
	void toggleTelrad();
965
141
	void enableGuiPanel(bool enable = true);
151
	void enableGuiPanel(bool enable = true);
966
@@ -156,6 +166,10 @@
967
156
	bool getFlagUseSemiTransparency(void) const;
166
	bool getFlagUseSemiTransparency(void) const;
968
157
167
969
158
signals:
168
signals:
970
169
	void enableOcularChanged(bool value);
971
170
	void enableCrosshairsChanged(bool value);
972
171
	void enableCCDChanged(bool value);
973
172
	void enableTelradChanged(bool value);
974
159
	void selectedCCDChanged();
173
	void selectedCCDChanged();
975
160
	void selectedOcularChanged();
174
	void selectedOcularChanged();
976
161
	void selectedTelescopeChanged();
175
	void selectedTelescopeChanged();
977
@@ -166,7 +180,7 @@
978
166
	void instrumentChanged();
180
	void instrumentChanged();
979
167
	void determineMaxEyepieceAngle();
181
	void determineMaxEyepieceAngle();
980
168
	void setRequireSelection(bool state);
182
	void setRequireSelection(bool state);
982
169
	void setScaleImageCircle(bool state);	
183
	void setScaleImageCircle(bool state);
983
170
	void setScreenFOVForCCD();
184
	void setScreenFOVForCCD();
984
171
	void retranslateGui();
185
	void retranslateGui();
985
172
	void setStelStyle(const QString& style);
186
	void setStelStyle(const QString& style);
986
173
187
987
=== modified file 'plugins/Oculars/src/gui/OcularsGuiPanel.cpp'
988
--- plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2016-03-04 15:04:20 +0000
989
+++ plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2016-06-12 13:59:22 +0000
990
@@ -37,8 +37,8 @@
991
37
#include <QWidget>
37
#include <QWidget>
992
38
38
993
39
OcularsGuiPanel::OcularsGuiPanel(Oculars* plugin,
39
OcularsGuiPanel::OcularsGuiPanel(Oculars* plugin,
996
40
                                 QGraphicsWidget *parent,
40
				 QGraphicsWidget *parent,
997
41
                                 Qt::WindowFlags wFlags):
41
				 Qt::WindowFlags wFlags):
998
42
	QGraphicsWidget(parent, wFlags),
42
	QGraphicsWidget(parent, wFlags),
999
43
	ocularsPlugin(plugin),
43
	ocularsPlugin(plugin),
1000
44
	parentWidget(parent),
44
	parentWidget(parent),
1001
@@ -58,56 +58,49 @@
1002
58
	StelApp& stelApp = StelApp::getInstance();
58
	StelApp& stelApp = StelApp::getInstance();
1003
59
	Q_ASSERT(ocularsPlugin->actionShowOcular);
59
	Q_ASSERT(ocularsPlugin->actionShowOcular);
1004
60
	buttonOcular = new StelButton(buttonBar,
60
	buttonOcular = new StelButton(buttonBar,
1010
61
	                              QPixmap(":/ocular/bt_ocular_on.png"),
61
				      QPixmap(":/ocular/bt_ocular_on.png"),
1011
62
	                              QPixmap(":/ocular/bt_ocular_off.png"),
62
				      QPixmap(":/ocular/bt_ocular_off.png"),
1012
63
	                              QPixmap(),
63
				      QPixmap(),
1013
64
	                              ocularsPlugin->actionShowOcular,
64
				      ocularsPlugin->actionShowOcular,
1014
65
	                              true); //No background
65
				      true); //No background
1015
66
	buttonOcular->setToolTip(ocularsPlugin->actionShowOcular->getText());
66
	buttonOcular->setToolTip(ocularsPlugin->actionShowOcular->getText());
1016
67
	buttonOcular->setParentItem(buttonBar);
67
	buttonOcular->setParentItem(buttonBar);
1017
68
68
1018
69
	//Hack to avoid buttonOcular being left "checked" if it has been toggled
1019
70
	//without any object selected.
1020
71
	disconnect(ocularsPlugin->actionShowOcular, SIGNAL(toggled(bool)),
1021
72
	           ocularsPlugin, SLOT(enableOcular(bool)));
1022
73
	connect(ocularsPlugin->actionShowOcular, SIGNAL(toggled(bool)),
1023
74
	        ocularsPlugin, SLOT(enableOcular(bool)));
1024
75
1025
76
	Q_ASSERT(ocularsPlugin->actionShowCrosshairs);
69
	Q_ASSERT(ocularsPlugin->actionShowCrosshairs);
1026
77
	buttonCrosshairs = new StelButton(buttonBar,
70
	buttonCrosshairs = new StelButton(buttonBar,
1032
78
	                                  QPixmap(":/ocular/bt_crosshairs_on.png"),
71
					  QPixmap(":/ocular/bt_crosshairs_on.png"),
1033
79
	                                  QPixmap(":/ocular/bt_crosshairs_off.png"),
72
					  QPixmap(":/ocular/bt_crosshairs_off.png"),
1034
80
	                                  QPixmap(),
73
					  QPixmap(),
1035
81
	                                  ocularsPlugin->actionShowCrosshairs,
74
					  ocularsPlugin->actionShowCrosshairs,
1036
82
	                                  true);
75
					  true);
1037
83
	buttonCrosshairs->setToolTip(ocularsPlugin->actionShowCrosshairs->getText());
76
	buttonCrosshairs->setToolTip(ocularsPlugin->actionShowCrosshairs->getText());
1038
84
	buttonCrosshairs->setVisible(false);
77
	buttonCrosshairs->setVisible(false);
1039
85
78
1040
86
	Q_ASSERT(ocularsPlugin->actionShowSensor);
79
	Q_ASSERT(ocularsPlugin->actionShowSensor);
1041
87
	buttonCcd = new StelButton(buttonBar,
80
	buttonCcd = new StelButton(buttonBar,
1047
88
	                           QPixmap(":/ocular/bt_sensor_on.png"),
81
				   QPixmap(":/ocular/bt_sensor_on.png"),
1048
89
	                           QPixmap(":/ocular/bt_sensor_off.png"),
82
				   QPixmap(":/ocular/bt_sensor_off.png"),
1049
90
	                           QPixmap(),
83
				   QPixmap(),
1050
91
	                           ocularsPlugin->actionShowSensor,
84
				   ocularsPlugin->actionShowSensor,
1051
92
	                           true);
85
				   true);
1052
93
	buttonCcd->setToolTip(ocularsPlugin->actionShowSensor->getText());
86
	buttonCcd->setToolTip(ocularsPlugin->actionShowSensor->getText());
1053
94
87
1054
95
	Q_ASSERT(ocularsPlugin->actionShowTelrad);
88
	Q_ASSERT(ocularsPlugin->actionShowTelrad);
1055
96
	buttonTelrad = new StelButton(buttonBar,
89
	buttonTelrad = new StelButton(buttonBar,
1061
97
	                              QPixmap(":/ocular/bt_telrad_on.png"),
90
				      QPixmap(":/ocular/bt_telrad_on.png"),
1062
98
	                              QPixmap(":/ocular/bt_telrad_off.png"),
91
				      QPixmap(":/ocular/bt_telrad_off.png"),
1063
99
	                              QPixmap(),
92
				      QPixmap(),
1064
100
	                              ocularsPlugin->actionShowTelrad,
93
				      ocularsPlugin->actionShowTelrad,
1065
101
	                              true);
94
				      true);
1066
102
	buttonTelrad->setToolTip(ocularsPlugin->actionShowTelrad->getText());
95
	buttonTelrad->setToolTip(ocularsPlugin->actionShowTelrad->getText());
1067
103
96
1068
104
	Q_ASSERT(ocularsPlugin->actionConfiguration);
97
	Q_ASSERT(ocularsPlugin->actionConfiguration);
1069
105
	buttonConfiguration = new StelButton(buttonBar,
98
	buttonConfiguration = new StelButton(buttonBar,
1075
106
	                                     QPixmap(":/ocular/bt_settings_on.png"),
99
					     QPixmap(":/ocular/bt_settings_on.png"),
1076
107
	                                     QPixmap(":/ocular/bt_settings_off.png"),
100
					     QPixmap(":/ocular/bt_settings_off.png"),
1077
108
	                                     QPixmap(),
101
					     QPixmap(),
1078
109
	                                     ocularsPlugin->actionConfiguration,
102
					     ocularsPlugin->actionConfiguration,
1079
110
	                                     true);
103
					     true);
1080
111
	buttonConfiguration->setToolTip(ocularsPlugin->actionConfiguration->getText());
104
	buttonConfiguration->setToolTip(ocularsPlugin->actionConfiguration->getText());
1081
112
105
1082
113
	qreal buttonHeight = buttonOcular->boundingRect().height();
106
	qreal buttonHeight = buttonOcular->boundingRect().height();
1083
@@ -179,73 +172,63 @@
1084
179
	QPixmap naOff(":/graphicGui/btTimeForward-off.png");
172
	QPixmap naOff(":/graphicGui/btTimeForward-off.png");
1085
180
	QPixmap nextArrowOff = naOff.scaledToHeight(scale, Qt::SmoothTransformation);
173
	QPixmap nextArrowOff = naOff.scaledToHeight(scale, Qt::SmoothTransformation);
1086
181
174
1087
182
	StelAction* defaultAction = new StelAction(this);
1088
183
	defaultAction->setCheckable(false);
1089
184
	prevOcularButton = new StelButton(ocularControls,
175
	prevOcularButton = new StelButton(ocularControls,
1094
185
	                                  prevArrow,
176
					  prevArrow,
1095
186
	                                  prevArrowOff,
177
					  prevArrowOff,
1096
187
	                                  QPixmap(),
178
					  QPixmap());
1093
188
	                                  defaultAction);
1097
189
	prevOcularButton->setToolTip(q_("Previous ocular"));
179
	prevOcularButton->setToolTip(q_("Previous ocular"));
1098
190
	nextOcularButton = new StelButton(ocularControls,
180
	nextOcularButton = new StelButton(ocularControls,
1103
191
	                                  nextArrow,
181
					  nextArrow,
1104
192
	                                  nextArrowOff,
182
					  nextArrowOff,
1105
193
	                                  QPixmap(),
183
					  QPixmap());
1102
194
	                                  defaultAction);
1106
195
	nextOcularButton->setToolTip(q_("Next ocular"));
184
	nextOcularButton->setToolTip(q_("Next ocular"));
1107
196
	prevLensButton = new StelButton(lensControls,
185
	prevLensButton = new StelButton(lensControls,
1112
197
                                      prevArrow,
186
					prevArrow,
1113
198
                                      prevArrowOff,
187
					prevArrowOff,
1114
199
                                      QPixmap(),
188
					QPixmap());
1111
200
                                      defaultAction);
1115
201
	prevLensButton->setToolTip(q_("Previous lens"));
189
	prevLensButton->setToolTip(q_("Previous lens"));
1116
202
	nextLensButton = new StelButton(lensControls,
190
	nextLensButton = new StelButton(lensControls,
1121
203
                                      nextArrow,
191
					nextArrow,
1122
204
                                      nextArrowOff,
192
					nextArrowOff,
1123
205
                                      QPixmap(),
193
					QPixmap());
1120
206
                                      defaultAction);
1124
207
	nextLensButton->setToolTip(q_("Next lens"));
194
	nextLensButton->setToolTip(q_("Next lens"));
1125
208
	prevCcdButton = new StelButton(ccdControls,
195
	prevCcdButton = new StelButton(ccdControls,
1130
209
	                               prevArrow,
196
				       prevArrow,
1131
210
	                               prevArrowOff,
197
				       prevArrowOff,
1132
211
	                               QPixmap(),
198
				       QPixmap());
1129
212
	                               defaultAction);
1133
213
	prevCcdButton->setToolTip(q_("Previous CCD frame"));
199
	prevCcdButton->setToolTip(q_("Previous CCD frame"));
1134
214
	nextCcdButton = new StelButton(ccdControls,
200
	nextCcdButton = new StelButton(ccdControls,
1139
215
	                               nextArrow,
201
				       nextArrow,
1140
216
	                               nextArrowOff,
202
				       nextArrowOff,
1141
217
	                               QPixmap(),
203
				       QPixmap());
1138
218
	                               defaultAction);
1142
219
	nextCcdButton->setToolTip(q_("Next CCD frame"));
204
	nextCcdButton->setToolTip(q_("Next CCD frame"));
1143
220
	prevTelescopeButton = new StelButton(telescopeControls,
205
	prevTelescopeButton = new StelButton(telescopeControls,
1148
221
	                                     prevArrow,
206
					     prevArrow,
1149
222
	                                     prevArrowOff,
207
					     prevArrowOff,
1150
223
	                                     QPixmap(),
208
					     QPixmap());
1147
224
	                                     defaultAction);
1151
225
	prevTelescopeButton->setToolTip(q_("Previous telescope"));
209
	prevTelescopeButton->setToolTip(q_("Previous telescope"));
1152
226
	nextTelescopeButton = new StelButton(telescopeControls,
210
	nextTelescopeButton = new StelButton(telescopeControls,
1157
227
	                                     nextArrow,
211
					     nextArrow,
1158
228
	                                     nextArrowOff,
212
					     nextArrowOff,
1159
229
	                                     QPixmap(),
213
					     QPixmap());
1156
230
	                                     defaultAction);
1160
231
	nextTelescopeButton->setToolTip(q_("Next telescope"));
214
	nextTelescopeButton->setToolTip(q_("Next telescope"));
1161
232
215
1162
233
	connect(nextOcularButton, SIGNAL(triggered()),
216
	connect(nextOcularButton, SIGNAL(triggered()),
1164
234
	        ocularsPlugin, SLOT(incrementOcularIndex()));
217
		ocularsPlugin, SLOT(incrementOcularIndex()));
1165
235
	connect(nextCcdButton, SIGNAL(triggered()),
218
	connect(nextCcdButton, SIGNAL(triggered()),
1167
236
	        ocularsPlugin, SLOT(incrementCCDIndex()));
219
		ocularsPlugin, SLOT(incrementCCDIndex()));
1168
237
	connect(nextTelescopeButton, SIGNAL(triggered()),
220
	connect(nextTelescopeButton, SIGNAL(triggered()),
1170
238
	        ocularsPlugin, SLOT(incrementTelescopeIndex()));
221
		ocularsPlugin, SLOT(incrementTelescopeIndex()));
1171
239
	connect(prevOcularButton, SIGNAL(triggered()),
222
	connect(prevOcularButton, SIGNAL(triggered()),
1173
240
	        ocularsPlugin, SLOT(decrementOcularIndex()));
223
		ocularsPlugin, SLOT(decrementOcularIndex()));
1174
241
	connect(prevCcdButton, SIGNAL(triggered()),
224
	connect(prevCcdButton, SIGNAL(triggered()),
1176
242
	        ocularsPlugin, SLOT(decrementCCDIndex()));
225
		ocularsPlugin, SLOT(decrementCCDIndex()));
1177
243
	connect(prevTelescopeButton, SIGNAL(triggered()),
226
	connect(prevTelescopeButton, SIGNAL(triggered()),
1179
244
	        ocularsPlugin, SLOT(decrementTelescopeIndex()));
227
		ocularsPlugin, SLOT(decrementTelescopeIndex()));
1180
245
	connect(nextLensButton, SIGNAL(triggered()),
228
	connect(nextLensButton, SIGNAL(triggered()),
1182
246
			ocularsPlugin, SLOT(incrementLensIndex()));
229
		ocularsPlugin, SLOT(incrementLensIndex()));
1183
247
	connect(prevLensButton, SIGNAL(triggered()),
230
	connect(prevLensButton, SIGNAL(triggered()),
1185
248
			ocularsPlugin, SLOT(decrementLensIndex()));
231
		ocularsPlugin, SLOT(decrementLensIndex()));
1186
249
232
1187
250
	QColor cOn(255, 255, 255);
233
	QColor cOn(255, 255, 255);
1188
251
	QColor cOff(102, 102, 102);
234
	QColor cOff(102, 102, 102);
1189
@@ -256,11 +239,11 @@
1190
256
	QPixmap pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
239
	QPixmap pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
1191
257
	QPixmap pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
240
	QPixmap pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
1192
258
	rotateCcdMinus15Button = new StelButton(ccdControls,
241
	rotateCcdMinus15Button = new StelButton(ccdControls,
1198
259
	                                        pOn,
242
						pOn,
1199
260
	                                        pOff,
243
						pOff,
1200
261
	                                        pHover,
244
						pHover,
1201
262
	                                        defaultAction,
245
						NULL,
1202
263
	                                        true);
246
						true);
1203
264
	rotateCcdMinus15Button->setToolTip(q_("Rotate the sensor frame 15 degrees counterclockwise"));
247
	rotateCcdMinus15Button->setToolTip(q_("Rotate the sensor frame 15 degrees counterclockwise"));
1204
265
248
1205
266
	degrees = QString("-5%1").arg(QChar(0x00B0));
249
	degrees = QString("-5%1").arg(QChar(0x00B0));
1206
@@ -269,10 +252,10 @@
1207
269
	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
252
	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
1208
270
	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
253
	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
1209
271
	rotateCcdMinus5Button = new StelButton(ccdControls,
254
	rotateCcdMinus5Button = new StelButton(ccdControls,
1214
272
	                                       pOn,
255
					       pOn,
1215
273
	                                       pOff,
256
					       pOff,
1216
274
	                                       pHover,
257
					       pHover,
1217
275
					       defaultAction,
258
					       NULL,
1218
276
					       true);
259
					       true);
1219
277
	rotateCcdMinus5Button->setToolTip(q_("Rotate the sensor frame 5 degrees counterclockwise"));
260
	rotateCcdMinus5Button->setToolTip(q_("Rotate the sensor frame 5 degrees counterclockwise"));
1220
278
261
1221
@@ -284,8 +267,8 @@
1222
284
	rotateCcdMinus1Button = new StelButton(ccdControls,
267
	rotateCcdMinus1Button = new StelButton(ccdControls,
1223
285
					       pOn,
268
					       pOn,
1224
286
					       pOff,
269
					       pOff,
1227
287
	                                       pHover,
270
					       pHover,
1228
288
					       defaultAction,
271
					       NULL,
1229
289
					       true);
272
					       true);
1230
290
	rotateCcdMinus1Button->setToolTip(q_("Rotate the sensor frame 1 degree counterclockwise"));
273
	rotateCcdMinus1Button->setToolTip(q_("Rotate the sensor frame 1 degree counterclockwise"));
1231
291
274
1232
@@ -295,10 +278,10 @@
1233
295
	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
278
	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
1234
296
	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
279
	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
1235
297
	resetCcdRotationButton = new StelButton(ccdControls,
280
	resetCcdRotationButton = new StelButton(ccdControls,
1240
298
	                                        pOn,
281
						pOn,
1241
299
	                                        pOff,
282
						pOff,
1242
300
	                                        pHover,
283
						pHover,
1243
301
						defaultAction,
284
						NULL,
1244
302
						true);
285
						true);
1245
303
	resetCcdRotationButton->setToolTip(q_("Reset the sensor frame rotation"));
286
	resetCcdRotationButton->setToolTip(q_("Reset the sensor frame rotation"));
1246
304
287
1247
@@ -311,7 +294,7 @@
1248
311
					      pOn,
294
					      pOn,
1249
312
					      pOff,
295
					      pOff,
1250
313
					      pHover,
296
					      pHover,
1252
314
					      defaultAction,
297
					      NULL,
1253
315
					      true);
298
					      true);
1254
316
	rotateCcdPlus1Button->setToolTip(q_("Rotate the sensor frame 1 degree clockwise"));
299
	rotateCcdPlus1Button->setToolTip(q_("Rotate the sensor frame 1 degree clockwise"));
1255
317
300
1256
@@ -324,7 +307,7 @@
1257
324
					      pOn,
307
					      pOn,
1258
325
					      pOff,
308
					      pOff,
1259
326
					      pHover,
309
					      pHover,
1261
327
					      defaultAction,
310
					      NULL,
1262
328
					      true);
311
					      true);
1263
329
	rotateCcdPlus5Button->setToolTip(q_("Rotate the sensor frame 5 degrees clockwise"));
312
	rotateCcdPlus5Button->setToolTip(q_("Rotate the sensor frame 5 degrees clockwise"));
1264
330
313
1265
@@ -336,8 +319,8 @@
1266
336
	rotateCcdPlus15Button = new StelButton(ccdControls,
319
	rotateCcdPlus15Button = new StelButton(ccdControls,
1267
337
					       pOn,
320
					       pOn,
1268
338
					       pOff,
321
					       pOff,
1271
339
	                                       pHover,
322
					       pHover,
1272
340
					       defaultAction,
323
					       NULL,
1273
341
					       true);
324
					       true);
1274
342
	rotateCcdPlus15Button->setToolTip(q_("Rotate the sensor frame 15 degrees clockwise"));
325
	rotateCcdPlus15Button->setToolTip(q_("Rotate the sensor frame 15 degrees clockwise"));
1275
343
326
1276
@@ -350,34 +333,34 @@
1277
350
	sm->setMapping(rotateCcdPlus15Button, QString("15"));
333
	sm->setMapping(rotateCcdPlus15Button, QString("15"));
1278
351
334
1279
352
	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
335
	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
1281
353
	        sm, SLOT(map()));
336
		sm, SLOT(map()));
1282
354
	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
337
	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
1284
355
	        sm, SLOT(map()));
338
		sm, SLOT(map()));
1285
356
	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
339
	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
1287
357
	        sm, SLOT(map()));
340
		sm, SLOT(map()));
1288
358
	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
341
	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
1290
359
	        sm, SLOT(map()));
342
		sm, SLOT(map()));
1291
360
	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
343
	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
1293
361
	        sm, SLOT(map()));
344
		sm, SLOT(map()));
1294
362
	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
345
	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
1296
363
	        sm, SLOT(map()));
346
		sm, SLOT(map()));
1297
364
	connect(resetCcdRotationButton, SIGNAL(triggered()),
347
	connect(resetCcdRotationButton, SIGNAL(triggered()),
1299
365
	        ocularsPlugin, SLOT(ccdRotationReset()));
348
		ocularsPlugin, SLOT(ccdRotationReset()));
1300
366
349
1301
367
	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
350
	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
1303
368
	        this, SLOT(updateCcdControls()));
351
		this, SLOT(updateCcdControls()));
1304
369
	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
352
	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
1306
370
	        this, SLOT(updateCcdControls()));
353
		this, SLOT(updateCcdControls()));
1307
371
	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
354
	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
1309
372
	        this, SLOT(updateCcdControls()));
355
		this, SLOT(updateCcdControls()));
1310
373
	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
356
	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
1312
374
	        this, SLOT(updateCcdControls()));
357
		this, SLOT(updateCcdControls()));
1313
375
	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
358
	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
1315
376
	        this, SLOT(updateCcdControls()));
359
		this, SLOT(updateCcdControls()));
1316
377
	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
360
	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
1318
378
	        this, SLOT(updateCcdControls()));
361
		this, SLOT(updateCcdControls()));
1319
379
	connect(resetCcdRotationButton, SIGNAL(triggered()),
362
	connect(resetCcdRotationButton, SIGNAL(triggered()),
1321
380
	        this, SLOT(updateCcdControls()));
363
		this, SLOT(updateCcdControls()));
1322
381
364
1323
382
365
1324
383
	//Set the layout and update the size
366
	//Set the layout and update the size
1325
@@ -395,7 +378,7 @@
1326
395
378
1327
396
	//Border/background for the widget
379
	//Border/background for the widget
1328
397
	borderPath = new QGraphicsPathItem();
380
	borderPath = new QGraphicsPathItem();
1330
398
	borderPath->setZValue(100);		
381
	borderPath->setZValue(100);
1331
399
	QBrush borderBrush(QColor::fromRgbF(0.22, 0.22, 0.23, 0.2));
382
	QBrush borderBrush(QColor::fromRgbF(0.22, 0.22, 0.23, 0.2));
1332
400
	borderPath->setBrush(borderBrush);
383
	borderPath->setBrush(borderBrush);
1333
401
	QPen borderPen = QPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
384
	QPen borderPen = QPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
1334
@@ -405,17 +388,17 @@
1335
405
388
1336
406
	updatePosition();
389
	updatePosition();
1337
407
	connect (parentWidget, SIGNAL(geometryChanged()),
390
	connect (parentWidget, SIGNAL(geometryChanged()),
1339
408
	         this, SLOT(updatePosition()));
391
		 this, SLOT(updatePosition()));
1340
409
392
1341
410
	//Connecting other slots
393
	//Connecting other slots
1342
411
	connect(ocularsPlugin, SIGNAL(selectedOcularChanged()),
394
	connect(ocularsPlugin, SIGNAL(selectedOcularChanged()),
1344
412
	        this, SLOT(updateOcularControls()));
395
		this, SLOT(updateOcularControls()));
1345
413
	connect(ocularsPlugin, SIGNAL(selectedCCDChanged()),
396
	connect(ocularsPlugin, SIGNAL(selectedCCDChanged()),
1347
414
	        this, SLOT(updateCcdControls()));
397
		this, SLOT(updateCcdControls()));
1348
415
	connect(ocularsPlugin, SIGNAL(selectedTelescopeChanged()),
398
	connect(ocularsPlugin, SIGNAL(selectedTelescopeChanged()),
1350
416
	        this, SLOT(updateTelescopeControls()));
399
		this, SLOT(updateTelescopeControls()));
1351
417
	connect(ocularsPlugin, SIGNAL(selectedLensChanged()),
400
	connect(ocularsPlugin, SIGNAL(selectedLensChanged()),
1353
418
            this, SLOT(updateTelescopeControls()));
401
		this, SLOT(updateTelescopeControls()));
1354
419
402
1355
420
	//Night mode
403
	//Night mode
1356
421
	connect(&stelApp, SIGNAL(colorSchemeChanged(const QString&)),
404
	connect(&stelApp, SIGNAL(colorSchemeChanged(const QString&)),
1357
@@ -479,7 +462,7 @@
1358
479
	QPointF verticalBorderStart = geometry().topLeft();
462
	QPointF verticalBorderStart = geometry().topLeft();
1359
480
	QPointF horizontalBorderEnd = geometry().bottomRight();
463
	QPointF horizontalBorderEnd = geometry().bottomRight();
1360
481
	QPointF cornerArcStart(verticalBorderStart.x(),
464
	QPointF cornerArcStart(verticalBorderStart.x(),
1362
482
	                       horizontalBorderEnd.y() - cornerRadius);
465
			       horizontalBorderEnd.y() - cornerRadius);
1363
483
	newBorderPath.moveTo(verticalBorderStart);
466
	newBorderPath.moveTo(verticalBorderStart);
1364
484
	newBorderPath.lineTo(cornerArcStart);
467
	newBorderPath.lineTo(cornerArcStart);
1365
485
	newBorderPath.arcTo(cornerArcStart.x(), cornerArcStart.y(), cornerRadius, cornerRadius, 180, 90);
468
	newBorderPath.arcTo(cornerArcStart.x(), cornerArcStart.y(), cornerRadius, cornerRadius, 180, 90);
1366
@@ -552,7 +535,7 @@
1367
552
		QString apparentFovString = QString::number(apparentFov);
535
		QString apparentFovString = QString::number(apparentFov);
1368
553
		apparentFovString.append(QChar(0x00B0));// Degree sign
536
		apparentFovString.append(QChar(0x00B0));// Degree sign
1369
554
		QString apparentFovLabel = QString(q_("Ocular aFOV: %1"))
537
		QString apparentFovLabel = QString(q_("Ocular aFOV: %1"))
1371
555
					   .arg(apparentFovString);
538
				.arg(apparentFovString);
1372
556
		fieldOcularAfov->setPlainText(apparentFovLabel);
539
		fieldOcularAfov->setPlainText(apparentFovLabel);
1373
557
		fieldOcularAfov->setToolTip(q_("Apparent field of view of the ocular"));
540
		fieldOcularAfov->setToolTip(q_("Apparent field of view of the ocular"));
1374
558
		fieldOcularAfov->setPos(posX, posY);
541
		fieldOcularAfov->setPos(posX, posY);
1375
@@ -637,8 +620,8 @@
1376
637
620
1377
638
	//Get the name
621
	//Get the name
1378
639
	int index = ocularsPlugin->selectedCCDIndex;
622
	int index = ocularsPlugin->selectedCCDIndex;
1381
640
	CCD* ccd = ocularsPlugin->ccds[index];	
623
	CCD* ccd = ocularsPlugin->ccds[index];
1382
641
	Q_ASSERT(ccd);	
624
	Q_ASSERT(ccd);
1383
642
	QString name = ccd->name();
625
	QString name = ccd->name();
1384
643
	QString fullName;
626
	QString fullName;
1385
644
	if (name.isEmpty())
627
	if (name.isEmpty())
1386
@@ -801,7 +784,7 @@
1387
801
			posY = 0.;
784
			posY = 0.;
1388
802
			widgetHeight = 0.;
785
			widgetHeight = 0.;
1389
803
786
1391
804
			fieldMagnification->setToolTip(q_("Magnification provided by these binoculars"));			
787
			fieldMagnification->setToolTip(q_("Magnification provided by these binoculars"));
1392
805
			fieldFov->setToolTip(q_("Actual field of view provided by these binoculars"));
788
			fieldFov->setToolTip(q_("Actual field of view provided by these binoculars"));
1393
806
			fieldExitPupil->setToolTip(q_("Exit pupil provided by these binoculars"));
789
			fieldExitPupil->setToolTip(q_("Exit pupil provided by these binoculars"));
1394
807
		}
790
		}
1395
@@ -811,15 +794,15 @@
1396
811
			nextTelescopeButton->setVisible(true);
794
			nextTelescopeButton->setVisible(true);
1397
812
			fieldTelescopeName->setVisible(true);
795
			fieldTelescopeName->setVisible(true);
1398
813
796
1400
814
			fieldMagnification->setToolTip(q_("Magnification provided by this ocular/lens/telescope combination"));			
797
			fieldMagnification->setToolTip(q_("Magnification provided by this ocular/lens/telescope combination"));
1401
815
			fieldFov->setToolTip(q_("Actual field of view provided by this ocular/lens/telescope combination"));
798
			fieldFov->setToolTip(q_("Actual field of view provided by this ocular/lens/telescope combination"));
1402
816
			fieldExitPupil->setToolTip(q_("Exit pupil provided by this ocular/lens/telescope combination"));
799
			fieldExitPupil->setToolTip(q_("Exit pupil provided by this ocular/lens/telescope combination"));
1403
817
		}
800
		}
1404
818
801
1405
819
		//WTF? Rounding?
802
		//WTF? Rounding?
1406
820
		double magnification = ((int)(ocular->magnification(telescope, lens) * 10.0)) / 10.0;
803
		double magnification = ((int)(ocular->magnification(telescope, lens) * 10.0)) / 10.0;
1409
821
		QString magnificationString = QString::number(magnification);		
804
		QString magnificationString = QString::number(magnification);
1410
822
		magnificationString.append(QChar(0x00D7));		
805
		magnificationString.append(QChar(0x00D7));
1411
823
		QString magnificationLabel = QString(q_("Magnification: %1")).arg(magnificationString);
806
		QString magnificationLabel = QString(q_("Magnification: %1")).arg(magnificationString);
1412
824
		fieldMagnification->setPlainText(magnificationLabel);
807
		fieldMagnification->setPlainText(magnificationLabel);
1413
825
		fieldMagnification->setPos(posX, posY);
808
		fieldMagnification->setPos(posX, posY);
1414
@@ -963,7 +946,7 @@
1415
963
void OcularsGuiPanel::updateMainButtonsPositions()
946
void OcularsGuiPanel::updateMainButtonsPositions()
1416
964
{
947
{
1417
965
	Q_ASSERT(buttonOcular);
948
	Q_ASSERT(buttonOcular);
1419
966
	Q_ASSERT(buttonCrosshairs);	
949
	Q_ASSERT(buttonCrosshairs);
1420
967
	Q_ASSERT(buttonCcd);
950
	Q_ASSERT(buttonCcd);
1421
968
	Q_ASSERT(buttonTelrad);
951
	Q_ASSERT(buttonTelrad);
1422
969
	Q_ASSERT(buttonConfiguration);
952
	Q_ASSERT(buttonConfiguration);
1423
@@ -984,7 +967,7 @@
1424
984
	{
967
	{
1425
985
		qreal parentWidth = buttonOcular->parentItem()->boundingRect().width();
968
		qreal parentWidth = buttonOcular->parentItem()->boundingRect().width();
1426
986
		int nGaps = n - 1;//n buttons have n-1 gaps
969
		int nGaps = n - 1;//n buttons have n-1 gaps
1428
987
        spacing = qRound((parentWidth-width)/nGaps);
970
		spacing = qRound((parentWidth-width)/nGaps);
1429
988
	}
971
	}
1430
989
	buttonOcular->setPos(posX, posY);
972
	buttonOcular->setPos(posX, posY);
1431
990
	posX += buttonOcular->getButtonPixmapWidth() + spacing;
973
	posX += buttonOcular->getButtonPixmapWidth() + spacing;
1432
@@ -1067,11 +1050,11 @@
1433
1067
}
1050
}
1434
1068
1051
1435
1069
QPixmap OcularsGuiPanel::createPixmapFromText(const QString& text,
1052
QPixmap OcularsGuiPanel::createPixmapFromText(const QString& text,
1441
1070
                                              int width,
1053
					      int width,
1442
1071
                                              int height,
1054
					      int height,
1443
1072
                                              const QFont& font,
1055
					      const QFont& font,
1444
1073
                                              const QColor& textColor,
1056
					      const QColor& textColor,
1445
1074
                                              const QColor& backgroundColor)
1057
					      const QColor& backgroundColor)
1446
1075
{
1058
{
1447
1076
	if (width <= 0 || height <=0) {
1059
	if (width <= 0 || height <=0) {
1448
1077
		return QPixmap();
1060
		return QPixmap();
1449
@@ -1088,8 +1071,8 @@
1450
1088
	painter.setFont(font);
1071
	painter.setFont(font);
1451
1089
	painter.setPen(QPen(textColor));
1072
	painter.setPen(QPen(textColor));
1452
1090
	painter.drawText(0, 0, width, height,
1073
	painter.drawText(0, 0, width, height,
1455
1091
	                 Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine,
1074
			 Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine,
1456
1092
	                 text);
1075
			 text);
1457
1093
1076
1458
1094
	return pixmap;
1077
	return pixmap;
1459
1095
}
1078
}
1460
1096
1079
1461
=== added directory 'plugins/RemoteControl'
1462
=== added file 'plugins/RemoteControl/CMakeLists.txt'
1463
--- plugins/RemoteControl/CMakeLists.txt	1970-01-01 00:00:00 +0000
1464
+++ plugins/RemoteControl/CMakeLists.txt	2016-06-12 13:59:22 +0000
1465
@@ -0,0 +1,46 @@
1466
1
# This is the cmake config file for the RemoteControl plugin
1467
2
SET(REMOTECONTROL_VERSION "0.0.1")
1468
3
ADD_DEFINITIONS(-DREMOTECONTROL_VERSION="${REMOTECONTROL_VERSION}")
1469
4
SET(REMOTECONTROL_WEBROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/webroot/")
1470
5
ADD_DEFINITIONS(-DREMOTECONTROL_WEBROOT_PATH="${REMOTECONTROL_WEBROOT_PATH}")
1471
6
1472
7
ADD_SUBDIRECTORY( src )
1473
8
1474
9
# Custom target for updating the translationdata.js
1475
10
find_package(PythonInterp)
1476
11
1477
12
if(PYTHON_EXECUTABLE)
1478
13
	add_custom_target(RemoteControl-update-translationdata
1479
14
		COMMAND ${PYTHON_EXECUTABLE} util/update_translationdata.py 
1480
15
		${PROJECT_SOURCE_DIR}/po/stellarium-remotecontrol/stellarium-remotecontrol-js.pot ${REMOTECONTROL_WEBROOT_PATH}/js/translationdata.js
1481
16
		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
1482
17
		COMMENT "Updating RemoteControl translation data"
1483
18
		VERBATIM
1484
19
		)
1485
20
		
1486
21
	add_dependencies(RemoteControl-update-translationdata generate-pot-stellarium-remotecontrol-js)
1487
22
endif()
1488
23
1489
24
IF(APPLE)
1490
25
    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
1491
26
ElSE(APPLE)
1492
27
    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
1493
28
ENDIF(APPLE)
1494
29
INSTALL(FILES DESTINATION "modules/RemoteControl")
1495
30
1496
31
1497
32
########### install files ###############
1498
33
# install webroot
1499
34
INSTALL(DIRECTORY ${REMOTECONTROL_WEBROOT_PATH} DESTINATION share/${PACKAGE}/webroot FILES_MATCHING
1500
35
	PATTERN "*.png" 
1501
36
	PATTERN "*.gif"
1502
37
	PATTERN "*.html"
1503
38
	PATTERN "*.js"
1504
39
	PATTERN "*.css"
1505
40
	PATTERN "*.eot"
1506
41
	PATTERN "*.svg"
1507
42
	PATTERN "*.ttf"
1508
43
	PATTERN "*.woff"
1509
44
	PATTERN "*.woff2"
1510
45
	PATTERN "translate_files"
1511
46
	PATTERN "*.ico")
1512
0
\ No newline at end of file
47
\ No newline at end of file
1513
1
48
1514
=== added file 'plugins/RemoteControl/COPYING'
1515
--- plugins/RemoteControl/COPYING	1970-01-01 00:00:00 +0000
1516
+++ plugins/RemoteControl/COPYING	2016-06-12 13:59:22 +0000
1517
@@ -0,0 +1,340 @@
1518
1
		    GNU GENERAL PUBLIC LICENSE
1519
2
		       Version 2, June 1991
1520
3
1521
4
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
1522
5
 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
1523
6
 Everyone is permitted to copy and distribute verbatim copies
1524
7
 of this license document, but changing it is not allowed.
1525
8
1526
9
			    Preamble
1527
10
1528
11
  The licenses for most software are designed to take away your
1529
12
freedom to share and change it.  By contrast, the GNU General Public
1530
13
License is intended to guarantee your freedom to share and change free
1531
14
software--to make sure the software is free for all its users.  This
1532
15
General Public License applies to most of the Free Software
1533
16
Foundation's software and to any other program whose authors commit to
1534
17
using it.  (Some other Free Software Foundation software is covered by
1535
18
the GNU Library General Public License instead.)  You can apply it to
1536
19
your programs, too.
1537
20
1538
21
  When we speak of free software, we are referring to freedom, not
1539
22
price.  Our General Public Licenses are designed to make sure that you
1540
23
have the freedom to distribute copies of free software (and charge for
1541
24
this service if you wish), that you receive source code or can get it
1542
25
if you want it, that you can change the software or use pieces of it
1543
26
in new free programs; and that you know you can do these things.
1544
27
1545
28
  To protect your rights, we need to make restrictions that forbid
1546
29
anyone to deny you these rights or to ask you to surrender the rights.
1547
30
These restrictions translate to certain responsibilities for you if you
1548
31
distribute copies of the software, or if you modify it.
1549
32
1550
33
  For example, if you distribute copies of such a program, whether
1551
34
gratis or for a fee, you must give the recipients all the rights that
1552
35
you have.  You must make sure that they, too, receive or can get the
1553
36
source code.  And you must show them these terms so they know their
1554
37
rights.
1555
38
1556
39
  We protect your rights with two steps: (1) copyright the software, and
1557
40
(2) offer you this license which gives you legal permission to copy,
1558
41
distribute and/or modify the software.
1559
42
1560
43
  Also, for each author's protection and ours, we want to make certain
1561
44
that everyone understands that there is no warranty for this free
1562
45
software.  If the software is modified by someone else and passed on, we
1563
46
want its recipients to know that what they have is not the original, so
1564
47
that any problems introduced by others will not reflect on the original
1565
48
authors' reputations.
1566
49
1567
50
  Finally, any free program is threatened constantly by software
1568
51
patents.  We wish to avoid the danger that redistributors of a free
1569
52
program will individually obtain patent licenses, in effect making the
1570
53
program proprietary.  To prevent this, we have made it clear that any
1571
54
patent must be licensed for everyone's free use or not licensed at all.
1572
55
1573
56
  The precise terms and conditions for copying, distribution and
1574
57
modification follow.
1575
58
1576
0
59
1577
60
		    GNU GENERAL PUBLIC LICENSE
1578
61
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
1579
62
1580
63
  0. This License applies to any program or other work which contains
1581
64
a notice placed by the copyright holder saying it may be distributed
1582
65
under the terms of this General Public License.  The "Program", below,
1583
66
refers to any such program or work, and a "work based on the Program"
1584
67
means either the Program or any derivative work under copyright law:
1585
68
that is to say, a work containing the Program or a portion of it,
1586
69
either verbatim or with modifications and/or translated into another
1587
70
language.  (Hereinafter, translation is included without limitation in
1588
71
the term "modification".)  Each licensee is addressed as "you".
1589
72
1590
73
Activities other than copying, distribution and modification are not
1591
74
covered by this License; they are outside its scope.  The act of
1592
75
running the Program is not restricted, and the output from the Program
1593
76
is covered only if its contents constitute a work based on the
1594
77
Program (independent of having been made by running the Program).
1595
78
Whether that is true depends on what the Program does.
1596
79
1597
80
  1. You may copy and distribute verbatim copies of the Program's
1598
81
source code as you receive it, in any medium, provided that you
1599
82
conspicuously and appropriately publish on each copy an appropriate
1600
83
copyright notice and disclaimer of warranty; keep intact all the
1601
84
notices that refer to this License and to the absence of any warranty;
1602
85
and give any other recipients of the Program a copy of this License
1603
86
along with the Program.
1604
87
1605
88
You may charge a fee for the physical act of transferring a copy, and
1606
89
you may at your option offer warranty protection in exchange for a fee.
1607
90
1608
91
  2. You may modify your copy or copies of the Program or any portion
1609
92
of it, thus forming a work based on the Program, and copy and
1610
93
distribute such modifications or work under the terms of Section 1
1611
94
above, provided that you also meet all of these conditions:
1612
95
1613
96
    a) You must cause the modified files to carry prominent notices
1614
97
    stating that you changed the files and the date of any change.
1615
98
1616
99
    b) You must cause any work that you distribute or publish, that in
1617
100
    whole or in part contains or is derived from the Program or any
1618
101
    part thereof, to be licensed as a whole at no charge to all third
1619
102
    parties under the terms of this License.
1620
103
1621
104
    c) If the modified program normally reads commands interactively
1622
105
    when run, you must cause it, when started running for such
1623
106
    interactive use in the most ordinary way, to print or display an
1624
107
    announcement including an appropriate copyright notice and a
1625
108
    notice that there is no warranty (or else, saying that you provide
1626
109
    a warranty) and that users may redistribute the program under
1627
110
    these conditions, and telling the user how to view a copy of this
1628
111
    License.  (Exception: if the Program itself is interactive but
1629
112
    does not normally print such an announcement, your work based on
1630
113
    the Program is not required to print an announcement.)
1631
114
1632
1
115
1633
116
These requirements apply to the modified work as a whole.  If
1634
117
identifiable sections of that work are not derived from the Program,
1635
118
and can be reasonably considered independent and separate works in
1636
119
themselves, then this License, and its terms, do not apply to those
1637
120
sections when you distribute them as separate works.  But when you
1638
121
distribute the same sections as part of a whole which is a work based
1639
122
on the Program, the distribution of the whole must be on the terms of
1640
123
this License, whose permissions for other licensees extend to the
1641
124
entire whole, and thus to each and every part regardless of who wrote it.
1642
125
1643
126
Thus, it is not the intent of this section to claim rights or contest
1644
127
your rights to work written entirely by you; rather, the intent is to
1645
128
exercise the right to control the distribution of derivative or
1646
129
collective works based on the Program.
1647
130
1648
131
In addition, mere aggregation of another work not based on the Program
1649
132
with the Program (or with a work based on the Program) on a volume of
1650
133
a storage or distribution medium does not bring the other work under
1651
134
the scope of this License.
1652
135
1653
136
  3. You may copy and distribute the Program (or a work based on it,
1654
137
under Section 2) in object code or executable form under the terms of
1655
138
Sections 1 and 2 above provided that you also do one of the following:
1656
139
1657
140
    a) Accompany it with the complete corresponding machine-readable
1658
141
    source code, which must be distributed under the terms of Sections
1659
142
    1 and 2 above on a medium customarily used for software interchange; or,
1660
143
1661
144
    b) Accompany it with a written offer, valid for at least three
1662
145
    years, to give any third party, for a charge no more than your
1663
146
    cost of physically performing source distribution, a complete
1664
147
    machine-readable copy of the corresponding source code, to be
1665
148
    distributed under the terms of Sections 1 and 2 above on a medium
1666
149
    customarily used for software interchange; or,
1667
150
1668
151
    c) Accompany it with the information you received as to the offer
1669
152
    to distribute corresponding source code.  (This alternative is
1670
153
    allowed only for noncommercial distribution and only if you
1671
154
    received the program in object code or executable form with such
1672
155
    an offer, in accord with Subsection b above.)
1673
156
1674
157
The source code for a work means the preferred form of the work for
1675
158
making modifications to it.  For an executable work, complete source
1676
159
code means all the source code for all modules it contains, plus any
1677
160
associated interface definition files, plus the scripts used to
1678
161
control compilation and installation of the executable.  However, as a
1679
162
special exception, the source code distributed need not include
1680
163
anything that is normally distributed (in either source or binary
1681
164
form) with the major components (compiler, kernel, and so on) of the
1682
165
operating system on which the executable runs, unless that component
1683
166
itself accompanies the executable.
1684
167
1685
168
If distribution of executable or object code is made by offering
1686
169
access to copy from a designated place, then offering equivalent
1687
170
access to copy the source code from the same place counts as
1688
171
distribution of the source code, even though third parties are not
1689
172
compelled to copy the source along with the object code.
1690
173
1691
2
174
1692
175
  4. You may not copy, modify, sublicense, or distribute the Program
1693
176
except as expressly provided under this License.  Any attempt
1694
177
otherwise to copy, modify, sublicense or distribute the Program is
1695
178
void, and will automatically terminate your rights under this License.
1696
179
However, parties who have received copies, or rights, from you under
1697
180
this License will not have their licenses terminated so long as such
1698
181
parties remain in full compliance.
1699
182
1700
183
  5. You are not required to accept this License, since you have not
1701
184
signed it.  However, nothing else grants you permission to modify or
1702
185
distribute the Program or its derivative works.  These actions are
1703
186
prohibited by law if you do not accept this License.  Therefore, by
1704
187
modifying or distributing the Program (or any work based on the
1705
188
Program), you indicate your acceptance of this License to do so, and
1706
189
all its terms and conditions for copying, distributing or modifying
1707
190
the Program or works based on it.
1708
191
1709
192
  6. Each time you redistribute the Program (or any work based on the
1710
193
Program), the recipient automatically receives a license from the
1711
194
original licensor to copy, distribute or modify the Program subject to
1712
195
these terms and conditions.  You may not impose any further
1713
196
restrictions on the recipients' exercise of the rights granted herein.
1714
197
You are not responsible for enforcing compliance by third parties to
1715
198
this License.
1716
199
1717
200
  7. If, as a consequence of a court judgment or allegation of patent
1718
201
infringement or for any other reason (not limited to patent issues),
1719
202
conditions are imposed on you (whether by court order, agreement or
1720
203
otherwise) that contradict the conditions of this License, they do not
1721
204
excuse you from the conditions of this License.  If you cannot
1722
205
distribute so as to satisfy simultaneously your obligations under this
1723
206
License and any other pertinent obligations, then as a consequence you
1724
207
may not distribute the Program at all.  For example, if a patent
1725
208
license would not permit royalty-free redistribution of the Program by
1726
209
all those who receive copies directly or indirectly through you, then
1727
210
the only way you could satisfy both it and this License would be to
1728
211
refrain entirely from distribution of the Program.
1729
212
1730
213
If any portion of this section is held invalid or unenforceable under
1731
214
any particular circumstance, the balance of the section is intended to
1732
215
apply and the section as a whole is intended to apply in other
1733
216
circumstances.
1734
217
1735
218
It is not the purpose of this section to induce you to infringe any
1736
219
patents or other property right claims or to contest validity of any
1737
220
such claims; this section has the sole purpose of protecting the
1738
221
integrity of the free software distribution system, which is
1739
222
implemented by public license practices.  Many people have made
1740
223
generous contributions to the wide range of software distributed
1741
224
through that system in reliance on consistent application of that
1742
225
system; it is up to the author/donor to decide if he or she is willing
1743
226
to distribute software through any other system and a licensee cannot
1744
227
impose that choice.
1745
228
1746
229
This section is intended to make thoroughly clear what is believed to
1747
230
be a consequence of the rest of this License.
1748
231
1749
3
232
1750
233
  8. If the distribution and/or use of the Program is restricted in
1751
234
certain countries either by patents or by copyrighted interfaces, the
1752
235
original copyright holder who places the Program under this License
1753
236
may add an explicit geographical distribution limitation excluding
1754
237
those countries, so that distribution is permitted only in or among
1755
238
countries not thus excluded.  In such case, this License incorporates
1756
239
the limitation as if written in the body of this License.
1757
240
1758
241
  9. The Free Software Foundation may publish revised and/or new versions
1759
242
of the General Public License from time to time.  Such new versions will
1760
243
be similar in spirit to the present version, but may differ in detail to
1761
244
address new problems or concerns.
1762
245
1763
246
Each version is given a distinguishing version number.  If the Program
1764
247
specifies a version number of this License which applies to it and "any
1765
248
later version", you have the option of following the terms and conditions
1766
249
either of that version or of any later version published by the Free
1767
250
Software Foundation.  If the Program does not specify a version number of
1768
251
this License, you may choose any version ever published by the Free Software
1769
252
Foundation.
1770
253
1771
254
  10. If you wish to incorporate parts of the Program into other free
1772
255
programs whose distribution conditions are different, write to the author
1773
256
to ask for permission.  For software which is copyrighted by the Free
1774
257
Software Foundation, write to the Free Software Foundation; we sometimes
1775
258
make exceptions for this.  Our decision will be guided by the two goals
1776
259
of preserving the free status of all derivatives of our free software and
1777
260
of promoting the sharing and reuse of software generally.
1778
261
1779
262
			    NO WARRANTY
1780
263
1781
264
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
1782
265
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
1783
266
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
1784
267
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
1785
268
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
1786
269
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
1787
270
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
1788
271
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
1789
272
REPAIR OR CORRECTION.
1790
273
1791
274
  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
1792
275
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
1793
276
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
1794
277
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
1795
278
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
1796
279
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
1797
280
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
1798
281
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
1799
282
POSSIBILITY OF SUCH DAMAGES.
1800
283
1801
284
		     END OF TERMS AND CONDITIONS
1802
285
1803
4
286
1804
287
	    How to Apply These Terms to Your New Programs
1805
288
1806
289
  If you develop a new program, and you want it to be of the greatest
1807
290
possible use to the public, the best way to achieve this is to make it
1808
291
free software which everyone can redistribute and change under these terms.
1809
292
1810
293
  To do so, attach the following notices to the program.  It is safest
1811
294
to attach them to the start of each source file to most effectively
1812
295
convey the exclusion of warranty; and each file should have at least
1813
296
the "copyright" line and a pointer to where the full notice is found.
1814
297
1815
298
    <one line to give the program's name and a brief idea of what it does.>
1816
299
    Copyright (C) <year>  <name of author>
1817
300
1818
301
    This program is free software; you can redistribute it and/or modify
1819
302
    it under the terms of the GNU General Public License as published by
1820
303
    the Free Software Foundation; either version 2 of the License, or
1821
304
    (at your option) any later version.
1822
305
1823
306
    This program is distributed in the hope that it will be useful,
1824
307
    but WITHOUT ANY WARRANTY; without even the implied warranty of
1825
308
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1826
309
    GNU General Public License for more details.
1827
310
1828
311
    You should have received a copy of the GNU General Public License
1829
312
    along with this program; if not, write to the Free Software
1830
313
    Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
1831
314
1832
315
1833
316
Also add information on how to contact you by electronic and paper mail.
1834
317
1835
318
If the program is interactive, make it output a short notice like this
1836
319
when it starts in an interactive mode:
1837
320
1838
321
    Gnomovision version 69, Copyright (C) year  name of author
1839
322
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
1840
323
    This is free software, and you are welcome to redistribute it
1841
324
    under certain conditions; type `show c' for details.
1842
325
1843
326
The hypothetical commands `show w' and `show c' should show the appropriate
1844
327
parts of the General Public License.  Of course, the commands you use may
1845
328
be called something other than `show w' and `show c'; they could even be
1846
329
mouse-clicks or menu items--whatever suits your program.
1847
330
1848
331
You should also get your employer (if you work as a programmer) or your
1849
332
school, if any, to sign a "copyright disclaimer" for the program, if
1850
333
necessary.  Here is a sample; alter the names:
1851
334
1852
335
  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
1853
336
  `Gnomovision' (which makes passes at compilers) written by James Hacker.
1854
337
1855
338
  <signature of Ty Coon>, 1 April 1989
1856
339
  Ty Coon, President of Vice
1857
340
1858
341
This General Public License does not permit incorporating your program into
1859
342
proprietary programs.  If your program is a subroutine library, you may
1860
343
consider it more useful to permit linking proprietary applications with the
1861
344
library.  If this is what you want to do, use the GNU Library General
1862
345
Public License instead of this License.
1863
5
346
1864
=== added file 'plugins/RemoteControl/RemoteControl.qrc'
1865
--- plugins/RemoteControl/RemoteControl.qrc	1970-01-01 00:00:00 +0000
1866
+++ plugins/RemoteControl/RemoteControl.qrc	2016-06-12 13:59:22 +0000
1867
@@ -0,0 +1,6 @@
1868
1
<RCC>
1869
2
    <qresource prefix="/RemoteControl">
1870
3
        <file>resources/bt_remote_off.png</file>
1871
4
        <file>resources/bt_remote_on.png</file>
1872
5
    </qresource>
1873
6
</RCC>
1874
0
7
1875
=== added directory 'plugins/RemoteControl/doc'
1876
=== added file 'plugins/RemoteControl/doc/qtwebapp.doxygen'
1877
--- plugins/RemoteControl/doc/qtwebapp.doxygen	1970-01-01 00:00:00 +0000
1878
+++ plugins/RemoteControl/doc/qtwebapp.doxygen	2016-06-12 13:59:22 +0000
1879
@@ -0,0 +1,35 @@
1880
1
/*
1881
2
 * Stellarium
1882
3
 * Copyright (C) 2016 Florian Schaukowitsch
1883
4
 *
1884
5
 * This program is free software; you can redistribute it and/or
1885
6
 * modify it under the terms of the GNU General Public License
1886
7
 * as published by the Free Software Foundation; either version 2
1887
8
 * of the License, or (at your option) any later version.
1888
9
 *
1889
10
 * This program is distributed in the hope that it will be useful,
1890
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1891
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1892
13
 * GNU General Public License for more details.
1893
14
 *
1894
15
 * You should have received a copy of the GNU General Public License
1895
16
 * along with this program; if not, write to the Free Software
1896
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
1897
18
 */
1898
19
 
1899
20
/*!
1900
21
1901
22
@defgroup qtWebApp QtWebApp library
1902
23
1903
24
The QtWebApp library is developed by Stefan Frings (http://stefanfrings.de/qtwebapp/index-en.html). 
1904
25
It is used by the Stellarium \ref remoteControl to provide the HTTP server that serves the plugin's API.
1905
26
1906
27
Some changes have been made to the library to fit it better into Stellarium. The main differences are:
1907
28
- The settings are no longer specified using QSettings, but with configuration structs (HttpListenerSettings, StaticFileControllerSettings, etc)
1908
29
- The template engine supports translating strings at runtime through tags in pseudo-PHP style instead of just different files per language (ITemplateTranslationProvider, Template::translate)
1909
30
- The Content-Type detection of the StaticFileController has been extended to use QMimeDatabase, if required.
1910
31
1911
32
@author Stefan Frings, Florian Schaukowitsch
1912
33
@copyright GNU Lesser General Public License (https://www.gnu.org/licenses/lgpl.html)
1913
34
1914
35
*/
1915
0
36
1916
=== added file 'plugins/RemoteControl/doc/remoteControl.doxygen'
1917
--- plugins/RemoteControl/doc/remoteControl.doxygen	1970-01-01 00:00:00 +0000
1918
+++ plugins/RemoteControl/doc/remoteControl.doxygen	2016-06-12 13:59:22 +0000
1919
@@ -0,0 +1,61 @@
1920
1
/*
1921
2
 * Stellarium
1922
3
 * Copyright (C) 2016 Florian Schaukowitsch
1923
4
 *
1924
5
 * This program is free software; you can redistribute it and/or
1925
6
 * modify it under the terms of the GNU General Public License
1926
7
 * as published by the Free Software Foundation; either version 2
1927
8
 * of the License, or (at your option) any later version.
1928
9
 *
1929
10
 * This program is distributed in the hope that it will be useful,
1930
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1931
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1932
13
 * GNU General Public License for more details.
1933
14
 *
1934
15
 * You should have received a copy of the GNU General Public License
1935
16
 * along with this program; if not, write to the Free Software
1936
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
1937
18
 */
1938
19
1939
20
/*!
1940
21
@defgroup remoteControl Remote Control Plug-in
1941
22
@brief Control Stellarium through your web browser! For more information, see @ref remoteControlDoc.
1942
23
1943
24
@page remoteControlDoc Remote Control Plug-in documentation
1944
25
The %RemoteControl plugin provides a remote control using a webserver interface, usable for single or even synchronized cluster of clients (via the RemoteSync plugin).
1945
26
You can simply connect via web browser to a
1946
27
configurable port (default: 8090) of your computer. To use it locally, you can use
1947
28
http://localhost:8090[/index.html]
1948
29
or for a slightly modified GUI which may be better suited for smaller 7inch screens, try
1949
30
http://localhost:8090/tablet7in.html.
1950
31
Your web browser has to support JavaScript and HTML5 (recommended in 2016: <a href="https://mozilla.org/firefox">Firefox</a>, <a href="https://www.google.com/chrome/">Chrome</a>).
1951
32
1952
33
The web data for the interface resides in the <tt>/data/webroot</tt> directory inside the installation directory (<tt>share/stellarium/data/webroot</tt> on Linux), and can be customized with
1953
34
some knowledge of HTML, CSS and maybe JavaScript (not necessary for basic functionality, only when more complex additions are required).
1954
35
Alternative or derived HTML control GUIs must be placed into the same folder,
1955
36
the web server for now cannot read data from the private Stellarium user directory (<tt>~/.stellarium</tt>, <tt>\%APPDATA\%\\stellarium</tt>).
1956
37
1957
38
This plugin makes extensive use of the StelProperty system introduced with it. This allows not only to trigger actions,
1958
39
but also set QVariant values, which is enough to control many things in the program.
1959
40
A few dedicated modules have been implemented closely following the existing GUI for view motion, location setting,
1960
41
landscape and skyculture selection, searching objects, etc.
1961
42
It is also possible to define interfaces that control plugins, and dynamically show them only when the plugin is enabled.
1962
43
1963
44
Because the API is based on simple HTTP calls, it can also be called from command-line clients. For example,
1964
45
to execute the script "double_stars.ssc", one could use one of the following lines:
1965
46
@code
1966
47
wget -q --post-data 'id=double_stars.ssc' http://localhost:8090/api/scripts/run >/dev/null 2>&amp;1
1967
48
curl --data 'id=double_stars.ssc' http://localhost:8090/api/scripts/run >/dev/null 2>&amp;1
1968
49
curl -d     'id=double_stars.ssc' http://localhost:8090/api/scripts/run >/dev/null 2>&amp;1
1969
50
@endcode
1970
51
This allows triggering automatic show setups for museums etc.
1971
52
1972
53
The entry point of the plugin is the RemoteControl class.
1973
54
- To see how the HTTP API looks like (i.e. if you want to extend it or access it without using the web interface), see @subpage remoteControlApi.
1974
55
- To see how the web interface works (i.e. if you want to modify it or add new controls), see @subpage remoteControlWeb.
1975
56
1976
57
@author Florian Schaukowitsch, Georg Zotti
1977
58
@note This plugin includes parts of the \ref qtWebApp by Stefan Frings, used under the LGPL
1978
59
@note This plugin has been developed as project of ESA SoCiS 2015 (http://sophia.estec.esa.int/socis/)
1979
60
1980
61
*/
1981
0
62
1982
=== added file 'plugins/RemoteControl/doc/remoteControlApi.doxygen'
1983
--- plugins/RemoteControl/doc/remoteControlApi.doxygen	1970-01-01 00:00:00 +0000
1984
+++ plugins/RemoteControl/doc/remoteControlApi.doxygen	2016-06-12 13:59:22 +0000
1985
@@ -0,0 +1,461 @@
1986
1
/*
1987
2
 * Stellarium
1988
3
 * Copyright (C) 2016 Florian Schaukowitsch
1989
4
 *
1990
5
 * This program is free software; you can redistribute it and/or
1991
6
 * modify it under the terms of the GNU General Public License
1992
7
 * as published by the Free Software Foundation; either version 2
1993
8
 * of the License, or (at your option) any later version.
1994
9
 *
1995
10
 * This program is distributed in the hope that it will be useful,
1996
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1997
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1998
13
 * GNU General Public License for more details.
1999
14
 *
2000
15
 * You should have received a copy of the GNU General Public License
2001
16
 * along with this program; if not, write to the Free Software
2002
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
2003
18
 */
2004
19
 
2005
20
/*!
2006
21
2007
22
\page remoteControlApi %RemoteControl plugin HTTP API description
2008
23
2009
24
The \ref remoteControl "RemoteControl plugin" provides an HTTP-based interface to Stellarium, implemented on the server-side through implementations of AbstractAPIService.
2010
25
The APIController maintains the list of registered services, and dispatches HTTP requests to the right service.
2011
26
The API is accessible under the server path `/api/`. For example, if you have the server running on the default port of 8090,
2012
27
you can access the operation \ref rcObjectServiceFind of the ObjectService to look for objects with \c moon in their name by accessing
2013
28
\code
2014
29
http://localhost:8090/api/objects/find?str=moon
2015
30
|____________________|___|_______|____|_______|
2016
31
          |            |     |      |     |------ Standard HTTP query string for parameters (key=value)
2017
32
          |            |     |      |------------ find operation (defined by service)
2018
33
          |            |     |------------------- service (e.g. ObjectService)
2019
34
          |            |------------------------- API prefix (always /api/)
2020
35
          |-------------------------------------- server access (http://host:port)
2021
36
\endcode
2022
37
2023
38
Instead of the \ref remoteControlWeb "HTTP remote interface" you can also use tools like <a href="https://curl.haxx.se/">cURL</a>
2024
39
to access the API remotely. For POST operations, you would use the flag \c -d to pass parameters. For GET operations, you should use
2025
40
the additional flag \c -G if parameters are required. Examples:
2026
41
@code{.sh}
2027
42
# retrieve info about the script "double_stars.ssc" with a GET request
2028
43
curl -G -d 'id=double_stars.ssc' http://localhost:8090/api/scripts/info
2029
44
# run the script "double_stars.ssc" with a POST request
2030
45
curl -d 'id=double_stars.ssc' http://localhost:8090/api/scripts/run
2031
46
@endcode
2032
47
2033
48
If authentication is enabled (see RemoteControl class), <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">HTTP Basic access authentication</a> is expected, with an empty username.
2034
49
HTTPS configuration is currently not implemented, even if the underlying \ref qtWebApp would allow it.
2035
50
2036
51
Most operations return data in the <a href="http://www.json.org/">JSON</a> format, allowing it to be easily used in web applications.
2037
52
The format of the returned JSON data is described for each operation below.
2038
53
Some operations return plain text if only simple data is requested, or to confirm the success of an operation:
2039
54
to indicate success "ok" may be returned, in an error case an HTTP error code may be returned together with a string "error: error message" in the response body.
2040
55
Other operations may return HTML or even image data, you can check the returned Content-Type header if you are not sure what to expect.
2041
56
2042
57
\tableofcontents
2043
58
2044
59
\section rcExtendApi Extending the API
2045
60
2046
61
The simplest way to expose new data through the API is by using the StelProperty system for a property you want to access.
2047
62
In this way, the data is available through the MainService (allowing tracking of changes) and the StelPropertyService (giving a snapshot of current values, metadata information and allowing to change values).
2048
63
You do not need to change/implement a new service in any way for this case.
2049
64
2050
65
If you want to expose more complex behaviour, you may need to implement your own AbstractAPIService and register it with the APIController.
2051
66
\todo Find out how to do this in plugin code
2052
67
2053
68
\section rcApiReference API reference
2054
69
2055
70
The default services are registered in the RequestHandler::RequestHandler() constructor. They are:
2056
71
2057
72
Service               | Path                                                | Description
2058
73
--------------------- | --------------------------------------------------- | ------------------------
2059
74
MainService           | \ref rcMainService "main"                           | \copybrief MainService
2060
75
ObjectService         | \ref rcObjectService "objects"                      | \copybrief ObjectService
2061
76
ScriptService         | \ref rcScriptService "scripts"                      | \copybrief ScriptService
2062
77
SimbadService         | \ref rcSimbadService "simbad"                       | \copybrief SimbadService
2063
78
StelActionService     | \ref rcStelActionService "stelaction"               | \copybrief StelActionService
2064
79
StelPropertyService   | \ref rcStelPropertyService "stelproperty"           | \copybrief StelPropertyService
2065
80
LocationService       | \ref rcLocationService "location"                   | \copybrief LocationService
2066
81
LocationSearchService | \ref rcLocationSearchService "locationsearch"       | \copybrief LocationSearchService
2067
82
ViewService           | \ref rcViewService "view"                           | \copybrief ViewService
2068
83
2069
84
\subsection rcMainService MainService operations (/api/main/)
2070
85
\subsubsection rcMainServiceGET GET operations
2071
86
Implemented by MainService::getImpl
2072
87
2073
88
\paragraph rcMainServiceStatus status
2074
89
Parameters: <tt>[actionId (Number)] [propId (Number)]</tt>\n
2075
90
This operation can be polled every few moments to find out if some primary Stellarium state changed. It returns a JSON object with the following format:
2076
91
\code{.js}
2077
92
{
2078
93
    //current location information, see StelLocation
2079
94
    location : {
2080
95
        name,
2081
96
        role,
2082
97
        planet,
2083
98
        latitude,
2084
99
        longitude,
2085
100
        altitude,
2086
101
        country,
2087
102
        state,
2088
103
        landscapeKey
2089
104
    },
2090
105
    //current time information
2091
106
    time : {
2092
107
        jday,		//current Julian day
2093
108
        deltaT,		//current deltaT as determined by the current dT algorithm
2094
109
        gmtShift,	//the timezone shift to GMT
2095
110
        timeZone,	//the timezone name
2096
111
        utc,		//the time in UTC time zone as ISO8601 time string
2097
112
        local,		//the time in local time zone as ISO8601 time string
2098
113
        isTimeNow,	//if true, the Stellarium time equals the current real-world time
2099
114
        timerate	//the current time rate (in secs)
2100
115
    },
2101
116
    selectioninfo, //string that contains the information of the currently selected object, as returned by StelObject::getInfoString
2102
117
    view : {
2103
118
        fov		//current FOV
2104
119
    },
2105
120
2106
121
    //the following is only inserted if an actionId parameter was given
2107
122
    //see below for more info
2108
123
    actionChanges : {
2109
124
        id, //currently valid action id, the interface should update its own id to this value
2110
125
        changes : {
2111
126
                //a list of boolean actions that changed since the actionId parameter
2112
127
                <actionName> : <actionValue>
2113
128
        }
2114
129
    },
2115
130
    //the following is only inserted if an propId parameter was given
2116
131
    //see below for more info
2117
132
    propertyChanges : {
2118
133
        id, //currently valid prop id, the interface should update its own id to this value
2119
134
        changes : {
2120
135
                //a list of properties that changed since the propId parameter
2121
136
                <propName> : <propValue>
2122
137
        }
2123
138
    }
2124
139
}
2125
140
\endcode
2126
141
2127
142
The \c actionChanges and \c propertyChanges sections allow a remote interface to track boolean StelAction and/or StelProperty changes.
2128
143
On the initial poll, you should pass -2 as \p propId and \p actionId. This indicates to the service that you want a full
2129
144
list of properties/actions and their current values. When receiving the answer, you should set your local \p propId /\p actionId to the id
2130
145
contained in \c actionChanges and \c propertyChanges, and re-send it with the next request as parameter again.
2131
146
This allows the MainService to find out which changes must be sent to you (it maintains a queue of action/property changes internally, incrementing
2132
147
the ID with each change), and you only have to process the differences instead of everything.
2133
148
2134
149
\paragraph rcMainServicePlugins plugins
2135
150
Returns the list of all known plugins, as a JSON object of format:
2136
151
\code{.js}
2137
152
{
2138
153
    //list of known plugins, in format:
2139
154
    <pluginName> : {
2140
155
        loadAtStartup,	//if to load the plugin at startup
2141
156
        loaded,		//if the plugin is currently loaded
2142
157
        //corresponds to the StelPluginInfo of the plugin
2143
158
        info : {
2144
159
                authors,
2145
160
                contact,
2146
161
                description,
2147
162
                displayedName,
2148
163
                startByDefault,
2149
164
                version
2150
165
        }
2151
166
    }
2152
167
}
2153
168
\endcode
2154
169
2155
170
\subsubsection rcMainServicePOST POST operations
2156
171
Implemented by MainService::postImpl
2157
172
2158
173
\paragraph rcMainServiceTime time
2159
174
Parameters: <tt>time (Number) timerate (Number)</tt>\n
2160
175
Sets the current Stellarium simulation time and/or timerate. The \p time parameter defines the current time (Julian day) as passed to StelCore::setJD.
2161
176
The \p timerate parameter allows to change the speed at which the simulation time moves (in JDay/sec) as passed to StelCore::setTimeRate.
2162
177
2163
178
\paragraph rcMainServiceFocus focus
2164
179
Parameters: <tt>[target (String) | position (JSON Number Array of size 3, i.e. Vec3d)]</tt>\n
2165
180
Sets the current app focus/selection. If no parameters are given, the current selection is cleared.
2166
181
If the \p target parameter was given, the object to be selected is looked up by name (first the localized name is tried, then the english name).
2167
182
If the \p position parameter is used, it is interpreted as a coordinate in the J2000 frame, and focused using StelMovementMgr::moveToJ2000
2168
183
2169
184
\paragraph rcMainServiceMove move
2170
185
Parameters: <tt>x (Number) y (Number)</tt>\n
2171
186
Allows viewport movement, like using the arrow keys in the main program. This allows interfaces to create a "virtual joystick" to move the view manually.
2172
187
This operation defines the intended move direction. \p x and \p y  define the intended
2173
188
move speed in azimuth and altitude (i.e. a negative \p x means left). Values of +-1.0 correspond to the same speed as used for the arrow keys.
2174
189
This operation works in conjunction with the update() method - until the movement is stopped
2175
190
(i.e. \p x and \p y are zero), or no \c move command has been received for a specified time (about a second), the movement is performed in the given directions.
2176
191
2177
192
\paragraph rcMainServiceFov fov
2178
193
Parameters: <tt>fov (Number)</tt>\n
2179
194
Sets the current field-of-view using StelCore::setFov
2180
195
2181
196
\subsection rcObjectService ObjectService operations (/api/objects/)
2182
197
\subsubsection rcObjectServiceGET GET operations
2183
198
Implemented by ObjectService::getImpl
2184
199
2185
200
\paragraph rcObjectServiceFind find
2186
201
Parameters: <tt>str (String)</tt>\n
2187
202
Finds objects which match the search string \p str, which may contain greek/unicode characters like in the SearchDialog.
2188
203
Returns a JSON String array of search matches
2189
204
2190
205
\paragraph rcObjectServiceInfo info
2191
206
Parameters: <tt>[name (String)]</tt>\n
2192
207
Returns a HTML info string (StelObject::getInfoString) about the object identified by \p name.
2193
208
If no parameter is given, the currently selected object is used.
2194
209
2195
210
\paragraph rcObjectServiceListobjecttypes listobjecttypes
2196
211
Returns all object types available in the internal catalogs as a JSON array of objects of format
2197
212
@code{.js}
2198
213
{
2199
214
    key,	//the internal key for the object type
2200
215
    name,	//the english name of the type
2201
216
    name_i18n //the type name in the current language
2202
217
}
2203
218
@endcode
2204
219
2205
220
\paragraph rcObjectServiceListobjectsbytype listobjectsbytype
2206
221
Parameters: <tt>type (String) [english (Number)]</tt>\n
2207
222
Returns all objects of the specified \p type. If \p english is given and it evaluates to a "true" value, the english names
2208
223
will be returned, otherwise the localized names will be returned. Returns a JSON string array.
2209
224
2210
225
\subsection rcScriptService ScriptService operations (/api/scripts/)
2211
226
\subsubsection rcScriptServiceGET GET operations
2212
227
Implemented by ScriptService::getImpl
2213
228
2214
229
\paragraph rcScriptServiceList list
2215
230
Lists all known script files, as a JSON string array.
2216
231
2217
232
\paragraph rcScriptServiceInfo info
2218
233
Parameters: <tt>id (String) [html (any type)] </tt>\n
2219
234
Returns information about the script identified by \p id.
2220
235
If the optional parameter \p html is present (its value is ignored),
2221
236
the info is formatted using StelScriptMgr::getHtmlDescription and
2222
237
suitable for inclusion into an \c iframe element,
2223
238
otherwise this operation returns a JSON object of format:
2224
239
@code{.js}
2225
240
{
2226
241
    id,	//the script ID
2227
242
    name,	//the english name of the script
2228
243
    name_localized,	//the localized name of the script
2229
244
    description,	//the english description of the script
2230
245
    description_localized,	//the localized description of the script
2231
246
    author,	//the author(s) of the script
2232
247
    license	//the license of the script
2233
248
}
2234
249
@endcode
2235
250
2236
251
\paragraph rcScriptServiceStatus status
2237
252
Returns the current script status as a JSON object of format:
2238
253
@code{.js}
2239
254
{
2240
255
    scriptIsRunning,	//true if a script is running
2241
256
    runningScriptId		//the currently running script ID
2242
257
}
2243
258
@endcode
2244
259
@note The StelScriptMgr also provides a StelProperty \c StelScriptMgr.runningScriptId that
2245
260
can be used to find out the active script.
2246
261
2247
262
\subsubsection rcScriptServicePOST POST operations
2248
263
Implemented by ScriptService::postImpl
2249
264
2250
265
\paragraph rcScriptServiceRun run
2251
266
Parameters: <tt>id (String)</tt>\n
2252
267
Runs the script with the given \p id. Will fail if a script is currently running.
2253
268
2254
269
\paragraph rcScriptServiceDirect direct
2255
270
Parameters: <tt>code (String) [useIncludes (Bool)]</tt>\n
2256
271
Directly executes the given script \p code. If \p useIncludes is given and evaluates to true, the standard
2257
272
include folder will be used. Script execution will fail if a script is already running.
2258
273
2259
274
\paragraph rcScriptServiceStop stop
2260
275
Stops the execution of a running script.
2261
276
2262
277
\subsection rcSimbadService SimbadService operations (/api/simbad/)
2263
278
\subsubsection rcSimbadServiceGET GET operations
2264
279
Implemented by SimbadService::getImpl
2265
280
2266
281
\paragraph rcSimbadServiceLookup lookup
2267
282
Parameters: <tt>str (String)</tt>\n
2268
283
Performs a SIMBAD lookup for the string \p str using the Stellarium-configured server and returns the results as a JSON object of format
2269
284
@code{.js}
2270
285
{
2271
286
    status, //the status of the lookup: either "empty" when nothing was found, "found" when at least 1 result was returned, and "error" if the lookup caused an error
2272
287
    status_i18n, //a localized status message for display
2273
288
    errorString, //if the status is "error", this contains more information about it
2274
289
    results: {
2275
290
        names : [
2276
291
                //an array of object names
2277
292
        ],
2278
293
        positions : [
2279
294
                //an array of object positions (i.e. first one corresponds to first name, etc.)
2280
295
                //format is an array of 3 numbers for each entry, i.e.:
2281
296
                [1,2,3],...
2282
297
        ]
2283
298
    }
2284
299
}
2285
300
@endcode
2286
301
2287
302
\subsection rcStelActionService StelAction operations (/api/stelaction/)
2288
303
\subsubsection rcStelActionServiceGET GET operations
2289
304
Implemented by StelActionService::getImpl
2290
305
2291
306
\paragraph rcStelActionServiceList list
2292
307
Lists all registered StelActions, in the format
2293
308
@code{.js}
2294
309
{
2295
310
    //translated StelAction group name
2296
311
    <groupName> : [
2297
312
        //all StelActions in the group <groupName>
2298
313
        <actionName> : {
2299
314
                id,	//the ID of the action
2300
315
                isCheckable,	//true if the action represents a boolean value
2301
316
                isChecked,	//if "isCheckable" is true, shows the current boolean state
2302
317
                text	//the translated description of the action
2303
318
        }
2304
319
    ]
2305
320
}
2306
321
@endcode
2307
322
2308
323
\subsubsection rcStelActionServicePOST POST operations
2309
324
Implemented by StelActionService::postImpl
2310
325
2311
326
\paragraph rcStelActionServiceDo do
2312
327
Parameters: <tt>id (String)</tt>\n
2313
328
Triggers or toggles the StelAction specified by \p id. If it was a boolean action, returns the new state of the action (strings "true"/"false").
2314
329
2315
330
\subsection rcStelPropertyService StelProperty operations (/api/stelproperty/)
2316
331
\subsubsection rcStelPropertyServiceGET GET operations
2317
332
Implemented by StelPropertyService::getImpl
2318
333
2319
334
\paragraph rcStelPropertyServiceList list
2320
335
Lists all registered StelProperties, in the format
2321
336
@code{.js}
2322
337
{
2323
338
    <propId> : {
2324
339
        value, //the current value of the StelProperty
2325
340
        variantType, //the type string of the "value", as determined by QVariant::typeName
2326
341
        typeString, //the type string of the StelProperty, as determined by QMetaProperty::typeName (may not be equal to "variantType")
2327
342
        typeEnum, //the enum value of the type of the StelProperty, as determined by StelProperty::getType
2328
343
    }
2329
344
}
2330
345
@endcode
2331
346
@note The generic type conversions are done by QJsonValue::fromVariant
2332
347
2333
348
\subsubsection rcStelPropertyServicePOST POST operations
2334
349
Implemented by StelPropertyService::postImpl
2335
350
2336
351
\paragraph rcStelPropertyServiceSet set
2337
352
Parameters: <tt>id (String) value (String)</tt>\n
2338
353
Sets the StelProperty identified by \p id to the value \p value. The value is converted to the StelProperty type
2339
354
using QVariant logic, an error is returned if this is somehow not possible.
2340
355
2341
356
\subsection rcLocationService LocationService operations (/api/location/)
2342
357
\subsubsection rcLocationServiceGET GET operations
2343
358
Implemented by LocationService::getImpl
2344
359
2345
360
\paragraph rcLocationServiceList list
2346
361
Returns the list of all stored location IDs (keys of StelLocationMgr::getAllMap) as JSON string array
2347
362
2348
363
\paragraph rcLocationServiceCountrylist countrylist
2349
364
Returns the list of all known countries (StelLocaleMgr::getAllCountryNames), as a JSON array of objects of format
2350
365
@code
2351
366
{
2352
367
    name, //the english country name
2353
368
    name_i18n //the localized country name (current language)
2354
369
}
2355
370
@endcode
2356
371
2357
372
\paragraph rcLocationServicePlanetlist planetlist
2358
373
Returns the list of all solar system planet names (SolarSystem::getAllPlanetEnglishNames), as a JSON array of objects of format
2359
374
@code
2360
375
{
2361
376
    name, //the english planet
2362
377
    name_i18n //the localized planet name (current language)
2363
378
}
2364
379
@endcode
2365
380
2366
381
\paragraph rcLocationServicePlanetimage planetimage
2367
382
Parameters: <tt>planet (String)</tt>\n
2368
383
Returns the planet texture image for the \p planet (english name)
2369
384
2370
385
\subsubsection rcLocationServicePOST POST operations
2371
386
Implemented by LocationService::postImpl
2372
387
2373
388
\paragraph rcLocationServiceSetlocationfields setlocationfields
2374
389
Parameters: <tt>id (String) | ( [latitude (Number)] [longitude (Number)] [altitude (Number)] [name (String)] [country (String)] [planet (String)] )</tt>\n
2375
390
Changes and moves to a new location.
2376
391
If \p id is given, all other parameters are ignored, and a location is searched from the named locations using StelLocationMgr::locationForString with the \p id.
2377
392
Else, the other parameters change the specific field of the current StelLocation.
2378
393
2379
394
\subsection rcLocationSearchService LocationSearchService operations (/api/locationsearch/)
2380
395
\subsubsection rcLocationSearchServiceGET GET operations
2381
396
Implemented by LocationSearchService::getImpl
2382
397
2383
398
\paragraph rcLocationSearchServiceSearch search
2384
399
Parameters: <tt>term (String)</tt>\n
2385
400
Searches the \p term in the list of predefined locations of the StelLocationMgr, and returns a JSON string array of the results.
2386
401
2387
402
\paragraph rcLocationSearchServiceNearby nearby
2388
403
Parameters: <tt>[planet (String)] [latitude (Number)] [longitude (Number)] [radius (Number)]</tt>\n
2389
404
Searches near the location defined by \p planet, \p latitude and \p longitude for predefined locations (inside the given \p radius)
2390
405
using StelLocationMgr::pickLocationsNearby, returns a JSON string array.
2391
406
2392
407
\subsection rcViewService ViewService operations (/api/view/)
2393
408
\subsubsection rcViewServiceGET GET operations
2394
409
Implemented by ViewService::getImpl
2395
410
2396
411
\paragraph rcViewServiceListlandscape listlandscape
2397
412
Lists the installed landscapes as a JSON object of format
2398
413
@code{.js}
2399
414
{
2400
415
    <landscapeId> : <landscapeName>, //maps the landscape id to the translated landscape name
2401
416
    ...
2402
417
}
2403
418
@endcode
2404
419
2405
420
\paragraph rcViewServiceLandscapedescription landscapedescription/
2406
421
<em>Note that the slash at the end is mandatory!</em>\n
2407
422
Provides virtual filesystem access to the current landscape directory.
2408
423
The operation can take a longer path in the URL. The remainder is used to access files in the landscape directory.
2409
424
If no longer path is given, the current HTML landscape description (as per LandscapeMgr::getCurrentLandscapeHtmlDescription)
2410
425
is returned. An example: `landscapedescription/image.png` returns `image.png` from the current landscape directory.
2411
426
2412
427
This operation allows to set up an HTML \c iframe or similar for the landscape description, including all images, etc. embedded
2413
428
in the HTML description.
2414
429
2415
430
\paragraph rcViewServiceListskyculture listskyculture
2416
431
Lists the installed sky cultures as a JSON object of format
2417
432
@code{.js}
2418
433
{
2419
434
    <skycultureId> : <skycultureName>, //maps the id to the translated name
2420
435
    ...
2421
436
}
2422
437
@endcode
2423
438
2424
439
\paragraph rcViewServiceSkyculturedescription skyculturedescription/
2425
440
<em>Note that the slash at the end is mandatory!</em>\n
2426
441
Provides virtual filesystem access to the current skyculture directory.
2427
442
The operation can take a longer path in the URL. The remainder is used to access files in the skyculture directory.
2428
443
If no longer path is given, the current HTML skyculture description (as per StelSkyCultureMgr::getCurrentSkyCultureHtmlDescription)
2429
444
is returned. An example: `skyculturedescription/image.png` returns `image.png` from the current skyculture directory.
2430
445
2431
446
This operation allows to set up an HTML \c iframe or similar for the skycultures description, including all images, etc. embedded
2432
447
in the HTML description.
2433
448
2434
449
\paragraph rcViewServiceListprojection listprojection
2435
450
Lists the available projection types as a JSON object of format
2436
451
@code{.js}
2437
452
{
2438
453
    <projectionTypeKey> : <projectionName>, //maps the id to the translated name
2439
454
    ...
2440
455
}
2441
456
@endcode
2442
457
2443
458
\paragraph rcViewServiceProjectiondescription projectiondescription
2444
459
Returns the HTML description of the current projection (StelProjector::getHtmlSummary)
2445
460
2446
461
*/
2447
0
462
2448
=== added file 'plugins/RemoteControl/doc/remoteControlWeb.doxygen'
2449
--- plugins/RemoteControl/doc/remoteControlWeb.doxygen	1970-01-01 00:00:00 +0000
2450
+++ plugins/RemoteControl/doc/remoteControlWeb.doxygen	2016-06-12 13:59:22 +0000
2451
@@ -0,0 +1,564 @@
2452
1
/*
2453
2
 * Stellarium
2454
3
 * Copyright (C) 2016 Florian Schaukowitsch
2455
4
 *
2456
5
 * This program is free software; you can redistribute it and/or
2457
6
 * modify it under the terms of the GNU General Public License
2458
7
 * as published by the Free Software Foundation; either version 2
2459
8
 * of the License, or (at your option) any later version.
2460
9
 *
2461
10
 * This program is distributed in the hope that it will be useful,
2462
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2463
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2464
13
 * GNU General Public License for more details.
2465
14
 *
2466
15
 * You should have received a copy of the GNU General Public License
2467
16
 * along with this program; if not, write to the Free Software
2468
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
2469
18
 */
2470
19
2471
20
/*!
2472
21
2473
22
\page remoteControlWeb %RemoteControl plugin web interface
2474
23
2475
24
\tableofcontents
2476
25
2477
26
The \ref remoteControlDoc "RemoteControl plugin", by default, provides a HTML web interface through the same integrated HTTP
2478
27
server that serves the \ref remoteControlApi "RemoteControl API". All content found in the <tt>data/webroot</tt> folder is served.
2479
28
Note that the \c /api/ path is reserved for the \ref remoteControlApi "HTTP API", and therefore can not be used as a folder.
2480
29
The <tt>index.html</tt> file is mapped to the root, so you can access it using http://localhost:8090 with the default port setting
2481
30
of 8090. A slightly modified alternative interface (mainly larger buttons for now) for 7" tablets and other touch devices
2482
31
is available at http://localhost:8090/tablet7in.html.
2483
32
2484
33
A reasonably modern browser is required to access the interface. Some features of <a href="https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/HTML5">HTML5</a>
2485
34
and <a href="https://developer.mozilla.org/en/docs/Web/CSS/CSS3">CSS3</a> are used.
2486
35
2487
36
The interface heavily relies on <a href="https://jquery.com/">jQuery</a> for easier JavaScript coding. The code is structured into modules,
2488
37
and loaded using <a href="http://requirejs.org/">require.js</a>, which automatically resolves dependencies and load order.
2489
38
2490
39
\section remoteControlWebStructure File and directory structure
2491
40
2492
41
Note that not all files are listed here, only those of special interest.
2493
42
2494
43
- webroot/ - root directory
2495
44
    - index.html - Default interface, also mapped to the root folder
2496
45
    - style.css - Main stylesheet
2497
46
    - tablet7in.html - Modified interface for tablet devices
2498
47
    - style_tablet7in.css - Additional stylesheet for tablet7in.html
2499
48
    - translate_files - Defines which files are passed through StelTranslator, see \ref remoteControlWebTranslation
2500
49
    - iframestyle.css - defines the style for internal frames (landscape description, etc.)
2501
50
    - /js/ - Contains the JavaScript files required for the interfaces
2502
51
        - main.js - This is the configuration file for require.js. Loads \ref rcUiMainui as main module.
2503
52
        - settings.js - Contains some configuration options for the web interface
2504
53
        - translationdata.js - Auto-generated file containing strings to translate through StelTranslator, see \ref remoteControlWebTranslation
2505
54
        - /api/ - Contains .js modules that define the connection to the \ref remoteControlApi "RemoteControl API"
2506
55
            - \ref rcApiRemotecontrol
2507
56
            - \ref rcApiActions
2508
57
            - \ref rcApiFlags
2509
58
            - \ref rcApiLocation
2510
59
            - \ref rcApiProperties
2511
60
            - \ref rcApiScripts
2512
61
            - \ref rcApiSearch
2513
62
            - \ref rcApiTime
2514
63
            - \ref rcApiUpdatequeue
2515
64
            - \ref rcApiViewcontrol
2516
65
            - \ref rcApiViewoptions
2517
66
        - /ui/ - Contains UI-related .js modules which depend on the /api/ .js modules
2518
67
            - \ref rcUiMainui
2519
68
            - \ref rcUiActions
2520
69
            - \ref rcUiCombobox
2521
70
            - \ref rcUiJqueryuifixes
2522
71
            - \ref rcUiLocation
2523
72
            - \ref rcUiScripts
2524
73
            - \ref rcUiSearch
2525
74
            - \ref rcUiTime
2526
75
            - \ref rcUiViewcontrol
2527
76
            - \ref rcUiViewoptions
2528
77
2529
78
\section remoteControlWebEdit Editing the interface
2530
79
2531
80
With knowledge of HTML, CSS and JavaScript (the latter not required for basic modifications), the interface can be customized.
2532
81
2533
82
\subsection remoteControlWebBasic Basic extension
2534
83
2535
84
When using the standard JavaScript provided, they allow to use pre-defined CSS "marker" classes which do not style the element per-se (i.e. have no entries in the .css files),
2536
85
but allow you to add functionality to HTML elements without editing the JavaScript code.
2537
86
Some of these classes also allow you to add further attributes to the element
2538
87
(usually <a href="https://developer.mozilla.org/en/docs/Web/Guide/HTML/Using_data_attributes">HTML5 data attributes</a>)
2539
88
to further customize their behaviour.
2540
89
2541
90
\subsubsection remoteControlWebUIClasses UI control classes
2542
91
2543
92
Some classes allow generating UI controls that are similar to what you expect for desktop apps. These use <a href="https://jqueryui.com/">jQuery UI</a> with
2544
93
some modifications.
2545
94
2546
95
\paragraph remoteControlWebUIspinner spinner
2547
96
If added to an HTML \c input element, it sets the control up as a numerical Spinner widget (using jQuery UI: https://api.jqueryui.com/spinner/).
2548
97
It supports the following optional parameters:
2549
98
- \p data-min - Defines the minimum value of the spinner
2550
99
- \p data-max - Defines the maximum value of the spinner
2551
100
- \p data-step - Defines the desired step size of the spinner, default is 1. May be different from the number format.
2552
101
- \p data-numberformat - Defines how the number is formatted, using <a href="https://github.com/jquery/globalize/blob/v0.1.1/README.md#numbers">globalize.js 0.1.1 syntax</a>
2553
102
2554
103
The element will emit the custom \c spinuserinput event whenever the value changes (either through the buttons or direct keyboard input).
2555
104
An example, showing how a spinner is created and handled:
2556
105
\code
2557
106
//make a spinner from -50 to 50, always showing 2 decimal points and stepping 0.1 per click
2558
107
<input id="myspinner" class="spinner" data-min="-50" data-max="50" data-step="0.1" data-numberformat="n2"/>
2559
108
2560
109
//input handling in javascript
2561
110
$("#myspinner").on("spinuserinput", function(evt,ui) {
2562
111
    //print the new value
2563
112
    console.log(ui.value);
2564
113
});
2565
114
\endcode
2566
115
2567
116
\paragraph remoteControlWebUIslider slider
2568
117
If added to an HTML \c div element, it sets the control up as a numerical slider widget (using jQuery UI: https://api.jqueryui.com/slider/).
2569
118
It supports the following optional parameters:
2570
119
- \p data-min - Defines the minimum value of the slider
2571
120
- \p data-max - Defines the maximum value of the slider
2572
121
- \p data-step - Defines the desired step size of the slider, default is 1. May be different from the number format.
2573
122
2574
123
The element will emit the \c slide event when the slider is moved.
2575
124
\code
2576
125
//make a slider from -50 to 50, stepsize 0.1
2577
126
<div id="myslider" class="slider" data-min="-50" data-max="50" data-step="0.1"/>
2578
127
2579
128
//input handling in javascript
2580
129
$("#myslider").on("slide", function(evt,ui) {
2581
130
    //print the new value
2582
131
    console.log(ui.value);
2583
132
});
2584
133
\endcode
2585
134
2586
135
\paragraph remoteControlWebUIjquerybutton jquerybutton
2587
136
If added to an HTML \c button element, it converts it to a <a href="https://jqueryui.com/button/">jQuery UI button</a>.
2588
137
This is mainly a cosmetic operation.
2589
138
2590
139
\paragraph remoteControlWebUIselectmenu selectmenu
2591
140
If added to an HTML \c select element, it creates a <a href="https://jqueryui.com/selectmenu/">jQuery UI selectmenu</a> from it.
2592
141
This allows simple popup selection menus (like a QComboBox).
2593
142
2594
143
\subsubsection remoteControlWebProp Special behaviour classes
2595
144
These classes allow automatic connection to StelProperty and StelAction elements defined in Stellarium, allowing particularly easy
2596
145
extension of the web interface.
2597
146
2598
147
\paragraph remoteControlWebstelproperty stelproperty (Connection to StelProperty)
2599
148
Allows direct connection of an element to a StelProperty, meaning the element is automatically updated
2600
149
whenever the value in Stellarium changes --- regardless of the source of the change: it can come from the main GUI, scripting, or even
2601
150
other RemoteControl web interface instances! Together with the \ref remoteControlWebUIClasses listed above, this allows closely and easily recreating
2602
151
standard Stellarium interface elements. This is supported for:
2603
152
- \c input elements with the \c spinner class (for numerical properties)\n
2604
153
    The StelProperty to use is identified by the standard \c input attribute \p name.
2605
154
    Updates the \p value property of the \c input when the StelProperty changes, and reacts to \c spinuserinput events to update the property
2606
155
2607
156
- \c input elements of type \c checkbox (`<input type="checkbox">` (for boolean properties)\n
2608
157
    The StelProperty to use is identified by the standard \c input attribute \p name.
2609
158
    Uses the \p checked property and the \c click event.
2610
159
2611
160
- \c div elements with the \c slider class (for numerical properties)\n
2612
161
    The StelProperty to use is identified by the custom attribute \p data-prop.
2613
162
    Connects to the \c slider widget property \p value.
2614
163
2615
164
- \c select elements (also supports the optional \c selectmenu classs)\n
2616
165
    The StelProperty to use is identified by the standard \c select attribute \p name.
2617
166
    Sets the \c option that has the same \p value as the StelProperty value.
2618
167
    Useful for single selection out of a list of possibilities.
2619
168
2620
169
- \c span elements, for read-only property display with optional number format\n
2621
170
    The StelProperty to use is identified by the custom attribute \p data-prop.
2622
171
    The value is displayed using the element's text content.
2623
172
    The optional \p data-numberformat attribute is used for the number format
2624
173
    using [globalize.js 0.1.1 syntax](https://github.com/jquery/globalize/blob/v0.1.1/README.md#numbers)
2625
174
2626
175
- \c button or `input[type="button"]` elements, for write-only setting of a StelProperty to a pre-defined value when clicked\n
2627
176
    The StelProperty to use is identified by the standard attribute \p name,
2628
177
    and the value to set it to is defined by the attribute \p value.
2629
178
2630
179
An example, setting up a spinner for the \c MilkyWay.intensity StelProperty:
2631
180
\code{.html}
2632
181
<!-- this is all that is required, the rest is done automatically -->
2633
182
<input class="spinner stelproperty" name="MilkyWay.intensity" data-min="0" data-max="10" data-step="0.1" data-numberformat="n2"/>
2634
183
\endcode
2635
184
2636
185
Many more examples can be found by studying the `index.html` code.
2637
186
2638
187
\paragraph remoteControlWebstelaction stelaction (Connection to StelAction)
2639
188
When this class is added to \c button elements or \c input elements of `type="button"` or `type="checkbox"`,
2640
189
this connects the control to a StelAction. The action is identified by the \p name attribute.
2641
190
If the action is a boolean action (i.e. StelAction::isCheckable is true), checkboxes show the current state of the action,
2642
191
and buttons get the \c active CSS class assigned if the action is currently true.
2643
192
2644
193
Examples:
2645
194
\code{.html}
2646
195
<!-- This is how the main bottom button bar is defined -->
2647
196
<ul class="ui-corner-all ui-widget-content button32list margin-vertical">
2648
197
      <li><button class="stelaction icon32 btConstellationLines" name="actionShow_Constellation_Lines"></button></li>
2649
198
      <li><button class="stelaction icon32 btConstellationLabels" name="actionShow_Constellation_Labels"></button></li>
2650
199
      <li><button class="stelaction icon32 btConstellationArt" name="actionShow_Constellation_Art"></button></li>
2651
200
      <li><button class="stelaction icon32 btEquatorialGrid" name="actionShow_Equatorial_Grid"></button></li>
2652
201
      <li><button class="stelaction icon32 btAzimuthalGrid" name="actionShow_Azimuthal_Grid"></button></li>
2653
202
      <li><button class="stelaction icon32 btGround" name="actionShow_Ground"></button></li>
2654
203
      <li><button class="stelaction icon32 btCardinalPoints" name="actionShow_Cardinal_Points"></button></li>
2655
204
      <li><button class="stelaction icon32 btAtmosphere" name="actionShow_Atmosphere"></button></li>
2656
205
      <li><button class="stelaction icon32 btNebula" name="actionShow_Nebulas"></button></li>
2657
206
      <li><button class="stelaction icon32 btPlanets" name="actionShow_Planets_Labels"></button></li>
2658
207
      <li><button class="stelaction icon32 btEquatorialMount" name="actionSwitch_Equatorial_Mount"></button></li>
2659
208
      <li><button class="stelaction icon32 btGotoSelectedObject" name="actionSet_Tracking"></button></li>
2660
209
      <li><button class="stelaction icon32 btNightView" name="actionShow_Night_Mode"></button></li>
2661
210
      <li><button class="stelaction icon32 btFullScreen" name="actionSet_Full_Screen_Global"></button></li>
2662
211
</ul>
2663
212
2664
213
<!-- This is how to set up checkboxes -->
2665
214
<label><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr("Show Solar System objects")?></label>
2666
215
<label><input type="checkbox" class="stelaction" name="actionShow_Planets_Hints" /><?= tr("Show planet markers")?></label>
2667
216
<label><input type="checkbox" class="stelaction" name="actionShow_Planets_Orbits" /><?= tr("Show planet orbits")?></label>
2668
217
\endcode
2669
218
2670
219
\paragraph remoteControlWebStelssc stelssc (Direct script execution)
2671
220
This class allows you to define buttons that directly execute Stellarium \ref scripting code.
2672
221
Supported for \c button and \c input elements of type \p button. The code to execute should be stored inside
2673
222
the element's \p value property. If the custom attribute \p data-useincludes attribute is added (with any value),
2674
223
the default include folder is added for optional includes, but this is not recommended unless necessary.
2675
224
2676
225
An example:
2677
226
\code{.html}
2678
227
<!-- some buttons which move the view to predefined angles -->
2679
228
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 0., 3.)">0&deg;</button>
2680
229
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 30., 3.)">30&deg;</button>
2681
230
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 60., 3.)">60&deg;</button>
2682
231
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 90., 3.)">90&deg;</button>
2683
232
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 120., 3.)">120&deg;</button>
2684
233
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 150., 3.)">150&deg;</button>
2685
234
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 180., 3.)">180&deg;</button>
2686
235
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 210., 3.)">210&deg;</button>
2687
236
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 240., 3.)">240&deg;</button>
2688
237
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 270., 3.)">270&deg;</button>
2689
238
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 300., 3.)">300&deg;</button>
2690
239
<button type="button" class="stelssc" value="core.moveToAltAzi(0., 330., 3.)">330&deg;</button>
2691
240
\endcode
2692
241
2693
242
\warning
2694
243
The \c stelssc approach has some disadvantages, so try to use it only when necessary:
2695
244
- causes a larger overhead for Stellarium internally than other methods provided by the web interface
2696
245
- the scripts can't be executed if another script is currently running, an error message will be shown in this case
2697
246
    - this also includes the user clicking too fast on any \c stelssc buttons!
2698
247
2699
248
\paragraph remoteControlWebStelplugin stelplugin (Plugin-specific sections)
2700
249
With the CSS class \c stelplugin, one can create special HTML sections that
2701
250
are only shown when a specified [plugin](\ref plugins) is currently loaded by Stellarium.
2702
251
If the plugin is not loaded, the whole element and all it's children are removed from the DOM.
2703
252
This class can be added to any element. The plugin which is required is defined by the
2704
253
\c data-plugin attribute, which should be set to the plugin ID.
2705
254
2706
255
The optional \c data-pluginjs attribute can be used to define an additional JavaScript module that is only
2707
256
loaded when the plugin is loaded. This can be used to implement additional behaviour through JS, if required.
2708
257
It is recommended to put these modules into the `webroot/js/plugins` folder.
2709
258
2710
259
An example, defining the plugin panel for the \ref archaeoLines :
2711
260
\code
2712
261
<div id="vo_archaeolines" class="smallblock stelplugin" data-plugin="ArchaeoLines" data-pluginjs="plugins/archaeolines">
2713
262
  <h3><label><input type="checkbox" class="stelaction valign-middle" name="actionShow_Archaeo_Lines"/><?= tr("ArchaeoLines")?></label></h3>
2714
263
  <div class="inline-block blocklabel">
2715
264
    <label><input type="checkbox" class="stelaction" name="actionAL_showEquinoxLine"/><?= tr("Equinox")?></label>
2716
265
    <label><input type="checkbox" class="stelaction" name="actionAL_showSolsticeLines"/><?= tr("Solstices")?></label>
2717
266
    <label><input type="checkbox" class="stelaction" name="actionAL_showCrossquarterLines"/><?= tr("Crossquarters")?></label>
2718
267
    <label><input type="checkbox" class="stelaction" name="actionAL_showMajorStandstillLines"/><?= tr("Major Standstill")?></label>
2719
268
    <label><input type="checkbox" class="stelaction" name="actionAL_showMinorStandstillLines"/><?= tr("Minor Standstill")?></label>
2720
269
  </div>
2721
270
  <div class="inline-block blocklabel">
2722
271
    <label><input type="checkbox" class="stelaction" name="actionAL_showZenithPassageLine"/><?= tr("Zenith Passage")?></label>
2723
272
    <label><input type="checkbox" class="stelaction" name="actionAL_showNadirPassageLine"/><?= tr("Nadir Passage")?></label>
2724
273
    <label><input type="checkbox" class="stelaction" name="actionAL_showSelectedObjectLine"/><?= tr("Selected Object")?></label>
2725
274
    <label><input type="checkbox" class="stelaction" name="actionAL_showCurrentSunLine"/><?= tr("Current Sun")?></label>
2726
275
    <label><input type="checkbox" class="stelaction" name="actionAL_showCurrentMoonLine"/><?= tr("Current Moon")?></label>
2727
276
  </div>
2728
277
  <label class="display-block" for="select_ArchaeoLines_enumShowCurrentPlanet"><?= tr("Current Planet:")?></label>
2729
278
  <select id="select_ArchaeoLines_enumShowCurrentPlanet" class="selectmenu stelproperty display-block" name="ArchaeoLines.enumShowCurrentPlanet">
2730
279
    <option value="10"><?= tr("None")?></option>
2731
280
    <option value="11"><?= tr("Mercury")?></option>
2732
281
    <option value="12"><?= tr("Venus")?></option>
2733
282
    <option value="13"><?= tr("Mars")?></option>
2734
283
    <option value="14"><?= tr("Jupiter")?></option>
2735
284
    <option value="15"><?= tr("Saturn")?></option>
2736
285
  </select>
2737
286
</div>
2738
287
2739
288
//the contents of plugins/archaeolines.js
2740
289
define(["jquery"],function($){
2741
290
        "use strict";
2742
291
2743
292
        //this is just an example how to use additional dynamically loaded plugin files
2744
293
        console.log("Hello, this is a asynchronously loaded plugin javascript file!");
2745
294
2746
295
});
2747
296
\endcode
2748
297
2749
298
\subsection remoteControlWebTranslation Translation information
2750
299
2751
300
The interface can be translated using methods similar to the main program.
2752
301
All strings in the HTML markup that should be translated can be written
2753
302
between pseudo-PHP style tags and the \c tr function to achieve the same effect as the `q_()` macro in C++, like so:
2754
303
\code
2755
304
<label><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr("Show Solar System objects")?></label>
2756
305
\endcode
2757
306
2758
307
All files which are listed in the `webroot/translate_files` file will be parsed, and all `<?= tr("----")?>` tags will be
2759
308
replaced using the StelTranslator for the current application language.
2760
309
2761
310
If you require translated strings through JavaScript, you should use the `tr` method of the \ref rcApiRemotecontrol module,
2762
311
which also works similar to the `q_()` macro. There is a special procedure for the JavaScript strings: the target
2763
312
\c RemoteControl-update-translationdata should be run whenever new JavaScript strings have been added.
2764
313
This updates the file `webroot/js/translationdata.js` with all current `tr()` strings. [Python](https://www.python.org/)
2765
314
is required to be installed for this operation.
2766
315
2767
316
Like the main program, the strings can be extracted from the HTML/JS code using gettext/xgettext. There are CMake targets for this like
2768
317
for the C++ code (\c generate-pot-stellarium-remotecontrol, \c update-po-stellarium-remotecontrol, etc.) and they are also executed
2769
318
with the combined targets (\c generate-pot, \c update-po etc.).
2770
319
2771
320
\subsection remoteControlJS JavaScript module reference
2772
321
2773
322
All interface code is developed using [require.js modules](http://requirejs.org/docs/api.html#define).
2774
323
This allows defining the dependencies of each module, as well as easier maintainability.
2775
324
Each module should be defined in its own .js file. The module ID corresponds to the .js file name
2776
325
without the file extension.
2777
326
2778
327
In short, to define a module, wrap it in a \c define call, and optionally add dependencies.
2779
328
A basic example (for more ways to do it see the require.js doc):
2780
329
\code
2781
330
//myawesomemodule.js
2782
331
//the IDs of the dependencies are listed in an array as first parameter
2783
332
//the second parameter is usually a function which takes the actual instances of the dependencies as a parameter,
2784
333
//  in the same order as they are in the array!
2785
334
define(["jquery", "api/remotecontrol"], function($,rc) {
2786
335
    "use strict"; //it is recommended to use strict mode for each module
2787
336
2788
337
    //do something as soon as this module is loaded
2789
338
    console.log("my awesome module is being loaded!");
2790
339
2791
340
    //do something when the DOM is ready (because that is not guaranteed while the module is first bein loaded!)
2792
341
    $(function(){
2793
342
        console.log("the document is ready, you can access the elements now!");
2794
343
        //access an element and modifiy it
2795
344
        $("#myelement").text("hey, this is awesome");
2796
345
    });
2797
346
2798
347
    //react to the serverDataReceived event of the remotecontrol module
2799
348
    $(rc).on("serverDataReceived", function(evt,data) {
2800
349
        console.log("Stellarium just sent us new data!");
2801
350
        console.log("The current jDay is " + data.time);
2802
351
    });
2803
352
2804
353
    //provide some public methods that other modules may call
2805
354
    return {
2806
355
        myAwesomeMethod: function() {
2807
356
            console.log("Hello there!");
2808
357
        }
2809
358
    };
2810
359
});
2811
360
2812
361
//another module (in another file) can now reference our module as dependency to load it and use its methods
2813
362
define(["jquery", "myawesomemodule"],function($, awesome) {
2814
363
2815
364
    awesome.myAwesomeMethod(); //prints "Hello there!"
2816
365
});
2817
366
\endcode
2818
367
2819
368
The UI modules can depend on the API modules and other UI modules.
2820
369
The API modules can depend on other API modules.
2821
370
Circular dependencies should of course be avoided.
2822
371
2823
372
\subsubsection rcApiRemotecontrol api/remotecontrol
2824
373
2825
374
This is the main API module, with no further dependencies on other API modules.
2826
375
2827
376
Its main function is that it provides automatic status updates by periodically polling (by default each second) the
2828
377
\c status operation of the MainService. Whenever this poll succeeds, the \c serverDataReceived custom event is emitted,
2829
378
with the JSON response of the server as \p data parameter. Other API modules should use this event, and process
2830
379
the data in which they are interested.
2831
380
It also keeps track of StelAction and StelProperty changes,
2832
381
and emits \c stelActionsChanged and/or \c stelPropertiesChanged, if necessary. Note that it does not process them further,
2833
382
this is the job of the \ref rcApiActions and \ref rcApiProperties modules, respectively.
2834
383
When the connection to the server is lost (i.e. the polling returned an error), the \c serverDataError event is sent.
2835
384
2836
385
The other main function is that it provides the \c postCmd method, which is a simple wrapper around an AJAX POST call
2837
386
that is intended to be used by other modules to send commands to the server. It also includes the \c tr method used
2838
387
for [translating JS strings](\ref remoteControlWebTranslation).
2839
388
2840
389
Finally, this module also processes the [plugin-specific sections](\ref remoteControlWebStelplugin) on load.
2841
390
2842
391
\subsubsection rcApiActions api/actions
2843
392
2844
393
Processes StelAction related events. Whenever it detects that boolean StelAction was changed, it emits two events:
2845
394
- A generic event \c stelActionChanged with the \c actionId as a parameter. This can be used when interested in ALL action changes
2846
395
    (like for a action list)
2847
396
- A specialied event `stelActionChanged:<actionId>` with the \c actionId as part of the event name.
2848
397
    This can be used when listening for a specific action only.
2849
398
2850
399
On the first load of the interface, it loads a list of all actions (using the ActionService \c list operation) and emits the
2851
400
\c actionListLoaded event when this data is available.
2852
401
2853
402
To execute/toggle an action, it provides the public \c executeAction method, which just requires the action ID as parameter.
2854
403
To find out whether an action is currently checked, use the \c isChecked method.
2855
404
2856
405
\subsubsection rcApiFlags api/flags
2857
406
2858
407
This is a utility module, which can be used to implement checkboxes for enum flag types, where each checkbox sets a
2859
408
specific bit of a single value. The module should be constructed with \c new, the constructor takes the parent element of a list of
2860
409
checkboxes (\c input of type checkbox) and a method which is called back when the internal value changes (i.e. the user clicks a checkbox). It provides the
2861
410
\c setValue method to set the current value and check the correct checkboxes. The bit value of each \c input should be specified
2862
411
as its \p value property, in hexadecimal string format (for example `0x0004`)
2863
412
2864
413
\subsubsection rcApiLocation api/location
2865
414
2866
415
Module which connects to the LocationService and the LocationSearchService.
2867
416
It emits the following events whenever the specified field changed:
2868
417
\c planetChanged,\c nameChanged, \c countryChanged, \c altitudeChanged, \c latitudeChanged, \c longitudeChanged, \c positionChanged (emitted when either lat or lon changed)
2869
418
2870
419
It also has \c set methods for these fields.
2871
420
Furthermore, it provides \c performLocationSearch, which searches the predefined locations for a specific search string,
2872
421
and \c performNearbySearch, which searches predefined locations near a given lat/lon on the current planet.
2873
422
These methods take a callback parameter to notify the caller of the results.
2874
423
The \c setLocationById method can then be used to set the location to a result of these 2 methods.
2875
424
2876
425
It also provides a \c loadCountryList and a \c loadPlanetList which load the specified lists and return the results with a callback.
2877
426
2878
427
\subsubsection rcApiProperties api/properties
2879
428
2880
429
Processes StelProperty related things. Like the \ref rcApiActions module, it emits 2 events when it detects a StelProperty changed:
2881
430
- A generic event \c stelPropertyChanged with the \c propertyId as a parameter. This can be used when interested in ALL property changes
2882
431
    (like for a list)
2883
432
- A specialied event `stelPropertyChanged:<propertyId>` with the \c propertyId as part of the event name.
2884
433
    This can be used when listening for a specific property only.
2885
434
2886
435
It provides \c getStelProp and \c setStelProp methods which retrieve and set the value of a StelProperty,
2887
436
and also a \c setStelPropQueued convenience method to batch multiple fast interface changes (e.g. through a slider or spinner)
2888
437
into a single \c setStelProp call which is only executed after a small time has passed with no changes.
2889
438
2890
439
It also emits the \c propertyListLoaded event when it first loads the full list of StelProperties with their type information.
2891
440
2892
441
\subsubsection rcApiScripts api/scripts
2893
442
2894
443
This module handles script execution (i.e. connection to the ScriptService). It provides the following methods:
2895
444
- \c loadScriptList - loads the list of all scripts, takes a callback to return this data
2896
445
- \c runScript - runs the specified script id
2897
446
- \c runDirectScript - directly runs the given script code
2898
447
- \c stopScript - stops a currently running script
2899
448
2900
449
It also emits the \c activeScriptChanged event whenever it detects that the current script has changed or started/stopped
2901
450
2902
451
\subsubsection rcApiSearch api/search
2903
452
2904
453
Implements object search functionality, connecting to the ObjectService and the SimbadService. The following methods are provided:
2905
454
- \c loadObjectTypes - loads the list of object types, takes a callback
2906
455
- \c loadObjectList - loads the list of objects of a specified type, can return english or localized names
2907
456
- \c selectObjectByName - selects the object that matches the specified name
2908
457
- \c focusPosition - focuses the given coordinate (array of 3 numbers) in the J2000 frame
2909
458
- \c performSearch - performs an object lookup in Stellarium's internal catalog and Simbad. In addition to the search string,
2910
459
    2 callbacks must be given as parameters: one for the catalog results, and one for the simbad results. If a search is currently running,
2911
460
    it is aborted (meaning the callbacks won't be called for the old searches), allowing this method to be repeatedly called while
2912
461
    the user is typing. The Simbad search is only started after a small interval without typing, to reduce the overhead of the
2913
462
    external web requests.
2914
463
2915
464
While a search is running, it emits \c simbadStateChange events to notify the UI of the current state of the lookup.
2916
465
2917
466
\subsubsection rcApiTime api/time
2918
467
2919
468
Contains time-related functions and conversions, similar to what StelCore does. This module keeps it's own sense of Stellariums current time,
2920
469
to provide an updated interface even between the \c status polls of the \ref rcApiRemotecontrol module.
2921
470
2922
471
It provides following methods:
2923
472
- \c getCurrentTime - calculates the best guess to the current Stellarium simulation time. This depends on the information received with the last \c status poll,
2924
473
    the time since the last data was received and the time the last time change was performed
2925
474
- \c isRealTimeSpeed - true if the simulation time currently flows at the same rate as the real time (1 sec per sec).
2926
475
- \c jdayToDate - converts a jDay (single number) to Day/Month/Year format, this returns a JS object with \p day, \p month, \p year fields instead
2927
476
    of a JS Date object because of its limitations.
2928
477
- \c jdayToDate - returns the time component of the given jDay, as a JS object with \p hour, \p minute, \p second fields
2929
478
- \c dateTimeToJd - converts a time given in Y/M/D-H/MIN/S format to a jDay
2930
479
- \c dateTimeForRollover - like StelUtils::changeDateTimeForRollover
2931
480
- \c isTimeUpdatePending - if true, there is a time change which has not yet been sent to the server
2932
481
- \c increaseTimeRate - increases the Stellarium simulation time rate (like StelCore::increaseTimeSpeed)
2933
482
- \c decreaseTimeRate - decreases the Stellarium simulation time rate (like StelCore::decreaseTimeSpeed)
2934
483
- \c isRewind - returns true if the time currently flows backwards (at least at -0.99 sec / sec)
2935
484
- \c isFastForward - returns true if time currently is flowing faster than real time
2936
485
- \c isTimeNow - returns true if the current simulation time is very close to the actual system time
2937
486
- \c isTimeStopped - returns true if the simulation time rate is zero
2938
487
- \c togglePlayPause - toggles between timerates 0 and 1 sec/sec
2939
488
- \c setDateNow - sets the simulation time to the current system time
2940
489
- \c setJDay - sets the time to the specified JDay
2941
490
- \c setTimeFromTimeObj - sets the time from a "time object", containing both date and time in the following format
2942
491
\code
2943
492
{
2944
493
    date : {
2945
494
        year, month, day
2946
495
    },
2947
496
    time : {
2948
497
        hour, minute, second
2949
498
    }
2950
499
}
2951
500
\endcode
2952
501
- \c getTimeData - returns the current time data, containing the last response from the server (including timezone info, etc)
2953
502
    The event \c timeDataUpdated is sent whenever this changes.
2954
503
2955
504
\subsubsection rcApiUpdatequeue api/updatequeue
2956
505
2957
506
This implements a simple update queue class that updates the server after a specified interval if the user does nothing else inbetween.
2958
507
This is used to limit the rate at which updates are sent to the server. The \c UpdateQueue constructor takes an url and a callback for the result,
2959
508
and when the interface needs to send an update, \c enqueue can be called with the data to send.
2960
509
2961
510
\subsubsection rcApiViewcontrol api/viewcontrol
2962
511
2963
512
Implements the %FOV access and viewport movement methods. Use \c setFOV to set the %FOV, the \c fovChanged event is sent whenever the %FOV changes.
2964
513
There are \c moveRight, \c moveUp, \c moveUpRight etc. methods that allow the user to move the viewport. To stop the movement, use \c stopMovement.
2965
514
2966
515
\subsubsection rcApiViewoptions api/viewoptions
2967
516
2968
517
Implements the loading of the projection, landscape and skyculture lists.
2969
518
2970
519
\subsubsection rcUiMainui ui/mainui
2971
520
2972
521
This is the main module of the interface. It lists all the other UI modules as a dependency.
2973
522
It starts of the update look of the \c rcApiRemotecontrol module, handles the automatic generation
2974
523
of the [special controls](\ref remoteControlWebUIClasses) and [connection of StelProperty controls](\ref remoteControlWebstelproperty),
2975
524
and performs smooth animation of the time controls. It also keeps track of the current interface tab the user is on, and
2976
525
restores it when the page is reloaded.
2977
526
2978
527
\subsubsection rcUiActions ui/actions
2979
528
2980
529
Implements the action list and the [StelAction buttons and checkboxes](\ref remoteControlWebstelaction).
2981
530
2982
531
\subsubsection rcUiCombobox ui/combobox
2983
532
2984
533
Implements a custom combobox control, on top of the jQuery UI \c autocomplete control. This is used for example in the location controls.
2985
534
2986
535
\subsubsection rcUiJqueryuifixes ui/jqueryuifixes
2987
536
2988
537
Includes some fixes to the standard jQuery UI control classes, especially for the spinner, to provide a unified
2989
538
change event, prevent non-numeric input and better touch support. This module is automatically loaded whenever other modules
2990
539
load the "jquery-ui" module.
2991
540
2992
541
\subsubsection rcUiLocation ui/location
2993
542
2994
543
Implements the location controls, such as the map which can be clicked and the comboboxes for the current location.
2995
544
2996
545
\subsubsection rcUiScripts ui/scripts
2997
546
2998
547
Implements the script list and shows the active script.
2999
548
3000
549
\subsubsection rcUiSearch ui/search
3001
550
3002
551
Implements the object search panel and the quick select buttons.
3003
552
3004
553
\subsubsection rcUiTime ui/time
3005
554
3006
555
Implements the time controls, the \c updateTimeDisplay method is called repeatedly as an animation by the \ref rcUiMainui module.
3007
556
3008
557
\subsubsection rcUiViewcontrol ui/viewcontrol
3009
558
3010
559
Implements the %FOV slider and the "virtual joystick" for the viewport movement.
3011
560
3012
561
\subsubsection rcUiViewoptions ui/viewoptions
3013
562
3014
563
Implements the projection, landscape and skyculture lists, and some minor things related to other view options.
3015
564
*/
3016
0
565
3017
=== added directory 'plugins/RemoteControl/resources'
3018
=== added file 'plugins/RemoteControl/resources/bt_network_templates.tif'
3019
1
Binary files plugins/RemoteControl/resources/bt_network_templates.tif	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_network_templates.tif	2016-06-12 13:59:22 +0000 differ
566
Binary files plugins/RemoteControl/resources/bt_network_templates.tif	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_network_templates.tif	2016-06-12 13:59:22 +0000 differ
3020
=== added file 'plugins/RemoteControl/resources/bt_remote_off.png'
3021
2
Binary files plugins/RemoteControl/resources/bt_remote_off.png	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_remote_off.png	2016-06-12 13:59:22 +0000 differ
567
Binary files plugins/RemoteControl/resources/bt_remote_off.png	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_remote_off.png	2016-06-12 13:59:22 +0000 differ
3022
=== added file 'plugins/RemoteControl/resources/bt_remote_on.png'
3023
3
Binary files plugins/RemoteControl/resources/bt_remote_on.png	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_remote_on.png	2016-06-12 13:59:22 +0000 differ
568
Binary files plugins/RemoteControl/resources/bt_remote_on.png	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_remote_on.png	2016-06-12 13:59:22 +0000 differ
3024
=== added directory 'plugins/RemoteControl/src'
3025
=== added file 'plugins/RemoteControl/src/APIController.cpp'
3026
--- plugins/RemoteControl/src/APIController.cpp	1970-01-01 00:00:00 +0000
3027
+++ plugins/RemoteControl/src/APIController.cpp	2016-06-12 13:59:22 +0000
3028
@@ -0,0 +1,141 @@
3029
1
/*
3030
2
 * Stellarium Remote Control plugin
3031
3
 * Copyright (C) 2015 Florian Schaukowitsch
3032
4
 *
3033
5
 * This program is free software; you can redistribute it and/or
3034
6
 * modify it under the terms of the GNU General Public License
3035
7
 * as published by the Free Software Foundation; either version 2
3036
8
 * of the License, or (at your option) any later version.
3037
9
 *
3038
10
 * This program is distributed in the hope that it will be useful,
3039
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3040
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3041
13
 * GNU General Public License for more details.
3042
14
 *
3043
15
 * You should have received a copy of the GNU General Public License
3044
16
 * along with this program; if not, write to the Free Software
3045
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3046
18
 */
3047
19
3048
20
#include "APIController.hpp"
3049
21
#include <QJsonDocument>
3050
22
3051
23
3052
24
APIController::APIController(int prefixLength, QObject* parent) : HttpRequestHandler(parent), m_prefixLength(prefixLength)
3053
25
{
3054
26
3055
27
}
3056
28
3057
29
APIController::~APIController()
3058
30
{
3059
31
3060
32
}
3061
33
3062
34
void APIController::update(double deltaTime)
3063
35
{
3064
36
	mutex.lock();
3065
37
	foreach(AbstractAPIService* service, m_serviceMap)
3066
38
	{
3067
39
		service->update(deltaTime);
3068
40
	}
3069
41
	mutex.unlock();
3070
42
}
3071
43
3072
44
void APIController::registerService(AbstractAPIService *service)
3073
45
{
3074
46
	m_serviceMap.insert(service->serviceName(), service);
3075
47
}
3076
48
3077
49
void APIController::service(HttpRequest &request, HttpResponse &response)
3078
50
{
3079
51
	//disable caching by default for services
3080
52
	response.setHeader("Cache-Control","no-cache");
3081
53
	//default content type is text
3082
54
	response.setHeader("Content-Type","text/plain");
3083
55
3084
56
	//use the raw path here
3085
57
	QByteArray path = request.getRawPath();
3086
58
	QByteArray pathWithoutPrefix = path.right(path.size()-m_prefixLength);
3087
59
3088
60
	int slashIdx = pathWithoutPrefix.indexOf('/');
3089
61
3090
62
	QByteArray serviceString = pathWithoutPrefix;
3091
63
	QByteArray operation;
3092
64
	if(slashIdx>=0)
3093
65
	{
3094
66
		serviceString = pathWithoutPrefix.mid(0,slashIdx);
3095
67
		operation = pathWithoutPrefix.mid(slashIdx+1);
3096
68
	}
3097
69
3098
70
	//try to find service
3099
71
	//the mutex here is to prevent a very strange crash I had, in which sv is an invalid pointer (but m_serviceMap is ok)
3100
72
	//probably caused by the foreach loop in update in the main thread?
3101
73
	mutex.lock();
3102
74
	ServiceMap::iterator it = m_serviceMap.find(serviceString);
3103
75
	if(it!=m_serviceMap.end())
3104
76
	{
3105
77
		AbstractAPIService* sv = *it;
3106
78
		mutex.unlock();
3107
79
3108
80
		//create the response object
3109
81
		APIServiceResponse apiresponse;
3110
82
		if(request.getMethod()=="GET")
3111
83
		{
3112
84
#ifdef FORCE_THREADED_SERVICES
3113
85
			apiresponse = sv->get(operation, request.getParameterMap());
3114
86
#else
3115
87
			if(sv->supportsThreadedOperation())
3116
88
			{
3117
89
				apiresponse = sv->get(operation, request.getParameterMap());
3118
90
			}
3119
91
			else
3120
92
			{
3121
93
				//invoke it in the main thread!
3122
94
				QMetaObject::invokeMethod(sv,"get",Qt::BlockingQueuedConnection,
3123
95
							  Q_RETURN_ARG(APIServiceResponse, apiresponse),
3124
96
							  Q_ARG(QByteArray, operation),
3125
97
							  Q_ARG(APIParameters, request.getParameterMap()));
3126
98
			}
3127
99
#endif
3128
100
			apiresponse.applyResponse(&response);
3129
101
		}
3130
102
		else if (request.getMethod()=="POST")
3131
103
		{
3132
104
#ifdef FORCE_THREADED_SERVICES
3133
105
			apiresponse = sv->post(operation, request.getParameterMap(), request.getBody());
3134
106
#else
3135
107
			if(sv->supportsThreadedOperation())
3136
108
			{
3137
109
				apiresponse = sv->post(operation, request.getParameterMap(), request.getBody());
3138
110
			}
3139
111
			else
3140
112
			{
3141
113
				QMetaObject::invokeMethod(sv,"post",Qt::BlockingQueuedConnection,
3142
114
							  Q_RETURN_ARG(APIServiceResponse, apiresponse),
3143
115
							  Q_ARG(QByteArray, operation),
3144
116
							  Q_ARG(APIParameters, request.getParameterMap()),
3145
117
							  Q_ARG(QByteArray, request.getBody()));
3146
118
			}
3147
119
#endif
3148
120
			apiresponse.applyResponse(&response);
3149
121
		}
3150
122
		else
3151
123
		{
3152
124
			response.setStatus(405,"Method Not allowed");
3153
125
			QString str(QStringLiteral("Method %1 not allowed for service %2"));
3154
126
			response.write(str.arg(QString::fromLatin1(request.getMethod())).arg(QString::fromUtf8(pathWithoutPrefix)).toUtf8(),true);
3155
127
		}
3156
128
	}
3157
129
	else
3158
130
	{
3159
131
		mutex.unlock();
3160
132
		response.setStatus(400,"Bad Request");
3161
133
		QString str(QStringLiteral("Unknown service: '%1'\n\nAvailable services:\n").arg(QString::fromUtf8(pathWithoutPrefix)));
3162
134
		for(ServiceMap::iterator it = m_serviceMap.begin();it!=m_serviceMap.end();++it)
3163
135
		{
3164
136
			str.append(QString::fromUtf8(it.key()));
3165
137
			str.append("\n");
3166
138
		}
3167
139
		response.write(str.toUtf8(),true);
3168
140
	}
3169
141
}
3170
0
142
3171
=== added file 'plugins/RemoteControl/src/APIController.hpp'
3172
--- plugins/RemoteControl/src/APIController.hpp	1970-01-01 00:00:00 +0000
3173
+++ plugins/RemoteControl/src/APIController.hpp	2016-06-12 13:59:22 +0000
3174
@@ -0,0 +1,64 @@
3175
1
/*
3176
2
 * Stellarium Remote Control plugin
3177
3
 * Copyright (C) 2015 Florian Schaukowitsch
3178
4
 *
3179
5
 * This program is free software; you can redistribute it and/or
3180
6
 * modify it under the terms of the GNU General Public License
3181
7
 * as published by the Free Software Foundation; either version 2
3182
8
 * of the License, or (at your option) any later version.
3183
9
 *
3184
10
 * This program is distributed in the hope that it will be useful,
3185
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3186
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3187
13
 * GNU General Public License for more details.
3188
14
 *
3189
15
 * You should have received a copy of the GNU General Public License
3190
16
 * along with this program; if not, write to the Free Software
3191
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3192
18
 */
3193
19
3194
20
#ifndef APIHANDLER_HPP_
3195
21
#define APIHANDLER_HPP_
3196
22
3197
23
#include "httpserver/httprequesthandler.h"
3198
24
#include "AbstractAPIService.hpp"
3199
25
3200
26
#include <QMutex>
3201
27
3202
28
//! @ingroup remoteControl
3203
29
//! This class handles the API-specific requests and dispatches them to the correct AbstractAPISerice implementation.
3204
30
//! Services are registered using registerService().
3205
31
//! To see the default services used, see the RequestHandler::RequestHandler constructor.
3206
32
class APIController : public HttpRequestHandler
3207
33
{
3208
34
	Q_OBJECT
3209
35
public:
3210
36
	//! Constructs an APIController
3211
37
	//! @param prefixLength Determines how many characters to strip from the front of the request path
3212
38
	//! @param parent passed on to QObject constructor
3213
39
	APIController(int prefixLength, QObject* parent = 0);
3214
40
	virtual ~APIController();
3215
41
3216
42
	//! Should be called each frame from the main thread, like from StelModule::update.
3217
43
	//! Passed on to each AbstractAPIService::update method for optional processing.
3218
44
	void update(double deltaTime);
3219
45
3220
46
	//! Handles an API-specific request. It finds out which AbstractAPIService to use
3221
47
	//! depending on the service name (first part of path until slash). An error is returned for invalid requests.
3222
48
	//! If a service was found, the request is passed on to its AbstractAPIService::get or AbstractAPIService::post
3223
49
	//! method depending on the HTTP request type.
3224
50
	//! If AbstractAPIService::supportsThreadedOperation is false, these methods are called in the Stellarium main thread
3225
51
	//! using QMetaObject::invokeMethod, otherwise they are directly executed in the current thread (HTTP worker thread).
3226
52
	virtual void service(HttpRequest& request, HttpResponse& response);
3227
53
3228
54
	//! Registers a service with the APIController.
3229
55
	//! The AbstractAPIService::serviceName() determines the request path of the service.
3230
56
	void registerService(AbstractAPIService* service);
3231
57
private:
3232
58
	int m_prefixLength;
3233
59
	typedef QMap<QByteArray,AbstractAPIService*> ServiceMap;
3234
60
	ServiceMap m_serviceMap;
3235
61
	QMutex mutex;
3236
62
};
3237
63
3238
64
#endif
3239
0
65
3240
=== added file 'plugins/RemoteControl/src/AbstractAPIService.cpp'
3241
--- plugins/RemoteControl/src/AbstractAPIService.cpp	1970-01-01 00:00:00 +0000
3242
+++ plugins/RemoteControl/src/AbstractAPIService.cpp	2016-06-12 13:59:22 +0000
3243
@@ -0,0 +1,159 @@
3244
1
/*
3245
2
 * Stellarium Remote Control plugin
3246
3
 * Copyright (C) 2015 Florian Schaukowitsch
3247
4
 *
3248
5
 * This program is free software; you can redistribute it and/or
3249
6
 * modify it under the terms of the GNU General Public License
3250
7
 * as published by the Free Software Foundation; either version 2
3251
8
 * of the License, or (at your option) any later version.
3252
9
 *
3253
10
 * This program is distributed in the hope that it will be useful,
3254
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3255
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3256
13
 * GNU General Public License for more details.
3257
14
 *
3258
15
 * You should have received a copy of the GNU General Public License
3259
16
 * along with this program; if not, write to the Free Software
3260
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3261
18
 */
3262
19
3263
20
#include "AbstractAPIService.hpp"
3264
21
#include <QJsonDocument>
3265
22
3266
23
#include "httpserver/httpresponse.h"
3267
24
3268
25
int APIServiceResponse::metaTypeId = qRegisterMetaType<APIServiceResponse>();
3269
26
int APIServiceResponse::parametersMetaTypeId = qRegisterMetaType<APIParameters>();
3270
27
3271
28
void APIServiceResponse::setHeader(const QByteArray &name, const QByteArray &val)
3272
29
{
3273
30
	headers.insert(name,val);
3274
31
}
3275
32
3276
33
void APIServiceResponse::setHeader(const QByteArray &name, const int val)
3277
34
{
3278
35
	headers.insert(name,QByteArray::number(val));
3279
36
}
3280
37
3281
38
void APIServiceResponse::setStatus(int status, const QByteArray &text)
3282
39
{
3283
40
	this->status = status;
3284
41
	this->statusText = text;
3285
42
}
3286
43
3287
44
void APIServiceResponse::applyResponse(HttpResponse *response) const
3288
45
{
3289
46
	if(status != -1)
3290
47
	{
3291
48
		response->setStatus(status,statusText);
3292
49
	}
3293
50
3294
51
	//apply headers
3295
52
	response->getHeaders().unite(headers);
3296
53
3297
54
	//send response data, if any
3298
55
	if(responseData.isEmpty())
3299
56
	{
3300
57
		response->getHeaders().clear();
3301
58
		response->setStatus(500,"Internal Server Error");
3302
59
		response->write("Service provided no response",true);
3303
60
	}
3304
61
	response->write(responseData,true);
3305
62
}
3306
63
3307
64
void APIServiceResponse::setData(const QByteArray &data)
3308
65
{
3309
66
	this->responseData = data;
3310
67
}
3311
68
3312
69
void APIServiceResponse::appendData(const QByteArray &data)
3313
70
{
3314
71
	this->responseData.append(data);
3315
72
}
3316
73
3317
74
void APIServiceResponse::writeRequestError(const QByteArray &msg)
3318
75
{
3319
76
	setStatus(400,"Bad Request");
3320
77
	responseData = msg;
3321
78
}
3322
79
3323
80
void APIServiceResponse::writeJSON(const QJsonDocument &doc)
3324
81
{
3325
82
#ifdef QT_NO_DEBUG
3326
83
	//Use compact JSON format for release builds for smaller files
3327
84
	QByteArray data = doc.toJson(QJsonDocument::Compact);
3328
85
#else
3329
86
	//Use indented JSON format in debug builds for easier human reading
3330
87
	QByteArray data = doc.toJson(QJsonDocument::Indented);
3331
88
#endif
3332
89
	//setHeader("Content-Length",data.size());
3333
90
	setHeader("Content-Type","application/json; charset=utf-8");
3334
91
	setData(data);
3335
92
}
3336
93
3337
94
3338
95
void AbstractAPIService::update(double deltaTime)
3339
96
{
3340
97
	Q_UNUSED(deltaTime);
3341
98
}
3342
99
3343
100
bool AbstractAPIService::supportsThreadedOperation() const
3344
101
{
3345
102
	return false;
3346
103
}
3347
104
3348
105
APIServiceResponse AbstractAPIService::get(const QByteArray &operation, const APIParameters &parameters)
3349
106
{
3350
107
	APIServiceResponse response;
3351
108
	getImpl(operation,parameters,response);
3352
109
	return response;
3353
110
}
3354
111
3355
112
APIServiceResponse AbstractAPIService::post(const QByteArray &operation, const APIParameters &parameters, const QByteArray &data)
3356
113
{
3357
114
	APIServiceResponse response;
3358
115
	postImpl(operation,parameters,data,response);
3359
116
	return response;
3360
117
}
3361
118
3362
119
#ifdef FORCE_THREADED_SERVICES
3363
120
const Qt::ConnectionType AbstractAPIService::SERVICE_DEFAULT_INVOKETYPE = Qt::BlockingQueuedConnection;
3364
121
#else
3365
122
const Qt::ConnectionType AbstractAPIService::SERVICE_DEFAULT_INVOKETYPE = Qt::DirectConnection;
3366
123
#endif
3367
124
3368
125
void AbstractAPIService::getImpl(const QByteArray& operation, const QMultiMap<QByteArray, QByteArray> &parameters, APIServiceResponse &response)
3369
126
{
3370
127
	Q_UNUSED(operation);
3371
128
	Q_UNUSED(parameters);
3372
129
3373
130
	response.setStatus(405,"Method Not allowed");
3374
131
	QString str(QStringLiteral("Method GET not allowed for service %2"));
3375
132
3376
133
	response.setData(str.arg(QString::fromLatin1(serviceName())).toLatin1());
3377
134
}
3378
135
3379
136
void AbstractAPIService::postImpl(const QByteArray& operation, const QMultiMap<QByteArray, QByteArray> &parameters, const QByteArray &data, APIServiceResponse &response)
3380
137
{
3381
138
	Q_UNUSED(operation);
3382
139
	Q_UNUSED(parameters);
3383
140
	Q_UNUSED(data);
3384
141
3385
142
	response.setStatus(405,"Method Not allowed");
3386
143
	QString str(QStringLiteral("Method POST not allowed for service %2"));
3387
144
	response.setData(str.arg(QString::fromLatin1(serviceName())).toLatin1());
3388
145
}
3389
146
3390
147
3391
148
QString AbstractAPIService::wrapHtml(QString &text, const QString &title) const
3392
149
{
3393
150
	const QString head = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
3394
151
				"<html><head>\n"
3395
152
				"<title>" + title + "</title>\n"
3396
153
				"<link type=\"text/css\" rel=\"stylesheet\" href=\"/iframestyle.css\">\n"
3397
154
				"<base target=\"_blank\">\n"
3398
155
				"</head><body>\n";
3399
156
	const QString tail = "</body></html>";
3400
157
3401
158
	return text.prepend(head).append(tail);
3402
159
}
3403
0
160
3404
=== added file 'plugins/RemoteControl/src/AbstractAPIService.hpp'
3405
--- plugins/RemoteControl/src/AbstractAPIService.hpp	1970-01-01 00:00:00 +0000
3406
+++ plugins/RemoteControl/src/AbstractAPIService.hpp	2016-06-12 13:59:22 +0000
3407
@@ -0,0 +1,160 @@
3408
1
/*
3409
2
 * Stellarium Remote Control plugin
3410
3
 * Copyright (C) 2015 Florian Schaukowitsch
3411
4
 *
3412
5
 * This program is free software; you can redistribute it and/or
3413
6
 * modify it under the terms of the GNU General Public License
3414
7
 * as published by the Free Software Foundation; either version 2
3415
8
 * of the License, or (at your option) any later version.
3416
9
 *
3417
10
 * This program is distributed in the hope that it will be useful,
3418
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3419
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3420
13
 * GNU General Public License for more details.
3421
14
 *
3422
15
 * You should have received a copy of the GNU General Public License
3423
16
 * along with this program; if not, write to the Free Software
3424
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3425
18
 */
3426
19
3427
20
#ifndef ABSTRACTAPISERVICE_HPP_
3428
21
#define ABSTRACTAPISERVICE_HPP_
3429
22
3430
23
#include <QByteArray>
3431
24
#include <QMap>
3432
25
#include <QObject>
3433
26
3434
27
//Uncomment to force each service to run in the HTTP handling threads themselves, like the initial versions
3435
28
//#define FORCE_THREADED_SERVICES
3436
29
3437
30
class HttpResponse;
3438
31
class APIController;
3439
32
3440
33
//! \addtogroup remoteControl
3441
34
//! @{
3442
35
3443
36
//! Thread-safe version of HttpResponse that can be passed around through QMetaObject::invokeMethod.
3444
37
//! It contains the data that will be sent back to the client in the HTTP thread, when control returns to the APIController.
3445
38
struct APIServiceResponse
3446
39
{
3447
40
public:
3448
41
	//! Constructs an invalid response
3449
42
	APIServiceResponse() : status(-1)
3450
43
	{
3451
44
3452
45
	}
3453
46
3454
47
	//! Sets a specific HTTP header to the specified value
3455
48
	void setHeader(const QByteArray& name, const QByteArray& val);
3456
49
	//! Shortcut for int header values
3457
50
	void setHeader(const QByteArray& name, const int val);
3458
51
	//! Sets the HTTP status type and status text
3459
52
	void setStatus(int status, const QByteArray& text);
3460
53
3461
54
	//! Replaces the current return data
3462
55
	void setData(const QByteArray& data);
3463
56
	//! Appends to the current return data
3464
57
	void appendData(const QByteArray& data);
3465
58
3466
59
	//! Sets the HTTP status to 400, and sets the response data to the message
3467
60
	void writeRequestError(const QByteArray& msg);
3468
61
	//! Sets the Content-Type to "application/json" and serializes the given document
3469
62
	//! into JSON text format
3470
63
	void writeJSON(const QJsonDocument& doc);
3471
64
3472
65
private:
3473
66
	int status;
3474
67
	QByteArray statusText;
3475
68
	QMap<QByteArray,QByteArray> headers;
3476
69
	QByteArray responseData;
3477
70
3478
71
	//! Applies the data in this APIServiceResponse onto the HttpResponse
3479
72
	//! Must be called in the HTTP thread, done by APIController
3480
73
	void applyResponse(HttpResponse* response) const;
3481
74
3482
75
	static int metaTypeId;
3483
76
	static int parametersMetaTypeId;
3484
77
	friend class APIController;
3485
78
3486
79
};
3487
80
3488
81
//! Defines the HTTP request parameters for the service
3489
82
typedef QMultiMap<QByteArray, QByteArray> APIParameters;
3490
83
3491
84
Q_DECLARE_METATYPE(APIServiceResponse)
3492
85
Q_DECLARE_METATYPE(APIParameters)
3493
86
3494
87
//! Abstract base class for all \ref remoteControl service implementations. Different implementations of this class are mapped to
3495
88
//! different HTTP request paths. For each API request, the APIController finds out which service to use, and calls its get() or post() method.
3496
89
class AbstractAPIService : public QObject
3497
90
{
3498
91
	Q_OBJECT
3499
92
public:
3500
93
	//! Abstract constructor. The service name is used by the APIController for request path mapping.
3501
94
	AbstractAPIService(const QByteArray& serviceName, QObject* parent = 0) : QObject(parent), m_serviceName(serviceName)
3502
95
	{
3503
96
3504
97
	}
3505
98
3506
99
	virtual ~AbstractAPIService() { }
3507
100
3508
101
	//! Returns the service name, used for request path mapping by the APIController
3509
102
	QByteArray serviceName() { return m_serviceName; }
3510
103
3511
104
	//! Return true if the service can safely be run in the HTTP handler thread,
3512
105
	//! instead of having to queue it into the Stellarium main thread.
3513
106
	//! Default implementation returns false, i.e. no special threading precautions have to be used
3514
107
	//! in the get() and post() implementation.
3515
108
	//! @warning If the macro \c FORCE_THREADED_SERVICES is set, all services will be run
3516
109
	//! in the HTTP threads for testing, and this method will be ignored.
3517
110
	virtual bool supportsThreadedOperation() const;
3518
111
3519
112
	//! Called in the main thread each frame. Default implementation does nothing.
3520
113
	//! Can be used for ongoing actions, for example movement control.
3521
114
	virtual void update(double deltaTime);
3522
115
3523
116
	//! Wrapper around getImpl(), constructs an APIServiceResponse object for the response and passes it on
3524
117
	//! @note The thread this is called in depends on the supportThreadedOperation() return value
3525
118
	Q_INVOKABLE APIServiceResponse get(const QByteArray &operation, const APIParameters &parameters);
3526
119
	//! Wrapper around postImpl(), constructs an APIServiceResponse object for the response and passes it on
3527
120
	//! @note The thread this is called in depends on the supportThreadedOperation() return value
3528
121
	Q_INVOKABLE APIServiceResponse post(const QByteArray &operation, const APIParameters &parameters, const QByteArray& data);
3529
122
3530
123
protected:
3531
124
	//! Subclasses should implement this to define reactions to HTTP GET requests.
3532
125
	//! GET requests generally should only query data or program state, and not change it.
3533
126
	//! If there is an error with the request, use APIServiceResponse::writeRequestError to notify the client.
3534
127
	//! @param operation The operation string of the request (i.e. the part of the request URL after the service name, without parameters)
3535
128
	//! @param parameters The extracted service parameters (extracted from the URL)
3536
129
	//! @param response The response object, write your response into this
3537
130
	//! @note The thread this is called in depends on the supportThreadedOperation() return value
3538
131
	virtual void getImpl(const QByteArray& operation, const APIParameters& parameters, APIServiceResponse& response);
3539
132
	//! Subclasses should implement this to define reactions to HTTP POST requests.
3540
133
	//! POST requests generally should change data or perform some action.
3541
134
	//! If there is an error with the request, use APIServiceResponse::writeRequestError to notify the client.
3542
135
	//! @param operation The operation string of the request (i.e. the part of the request URL after the service name, without parameters)
3543
136
	//! @param parameters The extracted service parameters (extracted from the URL, and form data, if applicable)
3544
137
	//! @param data The unmodified data as sent from the client
3545
138
	//! @param response The response object, write your response into this
3546
139
	//! @note The thread this is called in depends on the supportThreadedOperation() return value
3547
140
	virtual void postImpl(const QByteArray& operation, const APIParameters& parameters, const QByteArray& data, APIServiceResponse& response);
3548
141
3549
142
	//! This defines the connection type QMetaObject::invokeMethod has to use inside a service: either Qt::DirectConnection for main thread handling, or
3550
143
	//! Qt::BlockingQueuedConnection for HTTP thread handling
3551
144
	static const Qt::ConnectionType SERVICE_DEFAULT_INVOKETYPE;
3552
145
3553
146
	//! Because the HTML descriptions in Stellarium are often not compatible
3554
147
	//! with "clean" HTML5 which is used for the main interface,
3555
148
	//! this method can be used to explicitely set the doctype
3556
149
	//! to 4.01 transitional for better results, and include the stylesheet
3557
150
	//! \c iframestyle.css
3558
151
	//! @param text The text to wrap with HTML document tags
3559
152
	//! @param title The title of the page
3560
153
	QString wrapHtml(QString& text, const QString& title) const;
3561
154
private:
3562
155
	QByteArray m_serviceName;
3563
156
};
3564
157
3565
158
//! @}
3566
159
3567
160
#endif
3568
0
161
3569
=== added file 'plugins/RemoteControl/src/CMakeLists.txt'
3570
--- plugins/RemoteControl/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
3571
+++ plugins/RemoteControl/src/CMakeLists.txt	2016-06-12 13:59:22 +0000
3572
@@ -0,0 +1,78 @@
3573
1
INCLUDE_DIRECTORIES(. gui qtwebapp)
3574
2
LINK_DIRECTORIES(${BUILD_DIR}/src)
3575
3
3576
4
SET(QtWebApp_SRCS
3577
5
  qtwebapp/httpserver/httpconnectionhandler.cpp
3578
6
  qtwebapp/httpserver/httpconnectionhandler.h
3579
7
  qtwebapp/httpserver/httpconnectionhandlerpool.cpp
3580
8
  qtwebapp/httpserver/httpconnectionhandlerpool.h
3581
9
  qtwebapp/httpserver/httpcookie.cpp
3582
10
  qtwebapp/httpserver/httpcookie.h
3583
11
  qtwebapp/httpserver/httpglobal.cpp
3584
12
  qtwebapp/httpserver/httpglobal.h
3585
13
  qtwebapp/httpserver/httplistener.cpp
3586
14
  qtwebapp/httpserver/httplistener.h
3587
15
  qtwebapp/httpserver/httprequest.cpp
3588
16
  qtwebapp/httpserver/httprequest.h
3589
17
  qtwebapp/httpserver/httprequesthandler.cpp
3590
18
  qtwebapp/httpserver/httprequesthandler.h
3591
19
  qtwebapp/httpserver/httpresponse.cpp
3592
20
  qtwebapp/httpserver/httpresponse.h
3593
21
  qtwebapp/httpserver/staticfilecontroller.cpp
3594
22
  qtwebapp/httpserver/staticfilecontroller.h
3595
23
  
3596
24
  qtwebapp/templateengine/template.cpp
3597
25
  qtwebapp/templateengine/template.h
3598
26
  qtwebapp/templateengine/templateglobal.h
3599
27
)
3600
28
3601
29
SET(RemoteControl_SRCS
3602
30
  AbstractAPIService.hpp
3603
31
  AbstractAPIService.cpp
3604
32
  APIController.hpp
3605
33
  APIController.cpp
3606
34
  MainService.hpp
3607
35
  MainService.cpp
3608
36
  ObjectService.hpp
3609
37
  ObjectService.cpp
3610
38
  LocationService.hpp
3611
39
  LocationService.cpp
3612
40
  LocationSearchService.hpp
3613
41
  LocationSearchService.cpp
3614
42
  RemoteControl.hpp
3615
43
  RemoteControl.cpp
3616
44
  RequestHandler.hpp
3617
45
  RequestHandler.cpp
3618
46
  ScriptService.hpp
3619
47
  ScriptService.cpp
3620
48
  SimbadService.hpp
3621
49
  SimbadService.cpp
3622
50
  StelActionService.hpp
3623
51
  StelActionService.cpp
3624
52
  StelPropertyService.hpp
3625
53
  StelPropertyService.cpp
3626
54
  ViewService.hpp
3627
55
  ViewService.cpp
3628
56
  gui/RemoteControlDialog.hpp
3629
57
  gui/RemoteControlDialog.cpp
3630
58
)
3631
59
3632
60
SET(RemoteControl_UIS
3633
61
  gui/remoteControlDialog.ui
3634
62
)
3635
63
3636
64
QT5_WRAP_UI(RemoteControl_UIS_H ${RemoteControl_UIS})
3637
65
3638
66
################# compiles resources files ############
3639
67
SET(RemoteControl_RES ../RemoteControl.qrc)
3640
68
QT5_ADD_RESOURCES(RemoteControl_RES_CXX ${RemoteControl_RES})
3641
69
3642
70
SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
3643
71
3644
72
ADD_LIBRARY(RemoteControl-static STATIC ${RemoteControl_SRCS} ${RemoteControl_RES_CXX} ${RemoteControl_UIS_H} ${QtWebApp_SRCS})
3645
73
QT5_USE_MODULES(RemoteControl-static Core Network Widgets)
3646
74
# The library target "RemoteControl-static" has a default OUTPUT_NAME of "RemoteControl-static", so change it.
3647
75
SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES OUTPUT_NAME "RemoteControl")
3648
76
TARGET_LINK_LIBRARIES(RemoteControl-static ${extLinkerOption})
3649
77
SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
3650
78
ADD_DEPENDENCIES(AllStaticPlugins RemoteControl-static)
3651
0
79
3652
=== added file 'plugins/RemoteControl/src/LocationSearchService.cpp'
3653
--- plugins/RemoteControl/src/LocationSearchService.cpp	1970-01-01 00:00:00 +0000
3654
+++ plugins/RemoteControl/src/LocationSearchService.cpp	2016-06-12 13:59:22 +0000
3655
@@ -0,0 +1,104 @@
3656
1
/*
3657
2
 * Stellarium Remote Control plugin
3658
3
 * Copyright (C) 2015 Florian Schaukowitsch
3659
4
 *
3660
5
 * This program is free software; you can redistribute it and/or
3661
6
 * modify it under the terms of the GNU General Public License
3662
7
 * as published by the Free Software Foundation; either version 2
3663
8
 * of the License, or (at your option) any later version.
3664
9
 *
3665
10
 * This program is distributed in the hope that it will be useful,
3666
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3667
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3668
13
 * GNU General Public License for more details.
3669
14
 *
3670
15
 * You should have received a copy of the GNU General Public License
3671
16
 * along with this program; if not, write to the Free Software
3672
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3673
18
 */
3674
19
3675
20
#include "LocationSearchService.hpp"
3676
21
3677
22
#include "StelApp.hpp"
3678
23
#include "StelCore.hpp"
3679
24
#include "StelModuleMgr.hpp"
3680
25
#include "StelLocationMgr.hpp"
3681
26
3682
27
#include <QJsonArray>
3683
28
#include <QJsonDocument>
3684
29
#include <QJsonObject>
3685
30
#include <QRegExp>
3686
31
3687
32
LocationSearchService::LocationSearchService(const QByteArray &serviceName, QObject *parent)
3688
33
	: AbstractAPIService(serviceName,parent), locMgr(LocationList())
3689
34
{
3690
35
	//this is run in the main thread
3691
36
	connect(&StelApp::getInstance().getLocationMgr(), SIGNAL(locationListChanged()), this, SLOT(mainLocationManagerUpdated()));
3692
37
	mainLocationManagerUpdated();
3693
38
}
3694
39
3695
40
void LocationSearchService::mainLocationManagerUpdated()
3696
41
{
3697
42
	//this is run in the main thread
3698
43
	locMgrMutex.lock();
3699
44
	//copy the contents of the location manager
3700
45
	locMgr.setLocations(StelApp::getInstance().getLocationMgr().getAll());
3701
46
	locMgrMutex.unlock();
3702
47
}
3703
48
3704
49
void LocationSearchService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
3705
50
{
3706
51
	if(operation=="search")
3707
52
	{
3708
53
		//parameter must be named "term" to be compatible with jQuery UI autocomplete without further JS code
3709
54
		QString term = QString::fromUtf8(parameters.value("term"));
3710
55
3711
56
		if(term.isEmpty())
3712
57
		{
3713
58
			response.writeRequestError("needs non-empty 'term' parameter");
3714
59
			return;
3715
60
		}
3716
61
3717
62
		//the filtering in the app is provided by QSortFilterProxyModel in the view
3718
63
		//we dont have that luxury, but we make sure the filtering happens in the separate HTTP thread
3719
64
		locMgrMutex.lock();
3720
65
		LocationMap allItems = locMgr.getAllMap();
3721
66
		locMgrMutex.unlock();
3722
67
3723
68
		QJsonArray results;
3724
69
		const QList<QString>& list = allItems.keys();
3725
70
3726
71
		//use a regexp in wildcard mode, the app does the same
3727
72
		QRegExp exp(term,Qt::CaseInsensitive, QRegExp::Wildcard);
3728
73
3729
74
		for(QList<QString>::const_iterator it = list.begin();it!=list.end();++it)
3730
75
		{
3731
76
			if(it->contains(exp))
3732
77
				results.append(*it);
3733
78
		}
3734
79
3735
80
		response.writeJSON(QJsonDocument(results));
3736
81
	}
3737
82
	else if(operation=="nearby")
3738
83
	{
3739
84
		QString sPlanet = QString::fromUtf8(parameters.value("planet"));
3740
85
		QString sLatitude = QString::fromUtf8(parameters.value("latitude"));
3741
86
		QString sLongitude = QString::fromUtf8(parameters.value("longitude"));
3742
87
		QString sRadius = QString::fromUtf8(parameters.value("radius"));
3743
88
3744
89
		float latitude = sLatitude.toFloat();
3745
90
		float longitude = sLongitude.toFloat();
3746
91
		float radius = sRadius.toFloat();
3747
92
3748
93
		locMgrMutex.lock();
3749
94
		LocationMap results = locMgr.pickLocationsNearby(sPlanet,longitude,latitude,radius);
3750
95
		locMgrMutex.unlock();
3751
96
3752
97
		response.writeJSON(QJsonDocument(QJsonArray::fromStringList(results.keys())));
3753
98
	}
3754
99
	else
3755
100
	{
3756
101
		//TODO some sort of service description?
3757
102
		response.writeRequestError("unsupported operation. GET: search,nearby");
3758
103
	}
3759
104
}
3760
0
105
3761
=== added file 'plugins/RemoteControl/src/LocationSearchService.hpp'
3762
--- plugins/RemoteControl/src/LocationSearchService.hpp	1970-01-01 00:00:00 +0000
3763
+++ plugins/RemoteControl/src/LocationSearchService.hpp	2016-06-12 13:59:22 +0000
3764
@@ -0,0 +1,58 @@
3765
1
/*
3766
2
 * Stellarium Remote Control plugin
3767
3
 * Copyright (C) 2015 Florian Schaukowitsch
3768
4
 *
3769
5
 * This program is free software; you can redistribute it and/or
3770
6
 * modify it under the terms of the GNU General Public License
3771
7
 * as published by the Free Software Foundation; either version 2
3772
8
 * of the License, or (at your option) any later version.
3773
9
 *
3774
10
 * This program is distributed in the hope that it will be useful,
3775
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3776
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3777
13
 * GNU General Public License for more details.
3778
14
 *
3779
15
 * You should have received a copy of the GNU General Public License
3780
16
 * along with this program; if not, write to the Free Software
3781
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3782
18
 */
3783
19
3784
20
#ifndef LOCATIONSEARCHSERVICE_HPP_
3785
21
#define LOCATIONSEARCHSERVICE_HPP_
3786
22
3787
23
#include "AbstractAPIService.hpp"
3788
24
#include "StelLocationMgr.hpp"
3789
25
#include <QMutex>
3790
26
3791
27
//! @ingroup remoteControl
3792
28
//! Provides predefined location search functionality, using the StelLocationMgr.
3793
29
//!
3794
30
//! @see \ref rcLocationSearchService, LocationService
3795
31
//! @note This service supports threaded operation
3796
32
class LocationSearchService : public AbstractAPIService
3797
33
{
3798
34
	Q_OBJECT
3799
35
public:
3800
36
	LocationSearchService(const QByteArray& serviceName, QObject* parent = 0);
3801
37
3802
38
	virtual ~LocationSearchService() {}
3803
39
3804
40
	//! We work on a copy of the StelLocationMgr, to prevent hitches as the web user is typing
3805
41
	//! @returns true
3806
42
	bool supportsThreadedOperation() const Q_DECL_OVERRIDE { return true; }
3807
43
protected:
3808
44
	//! @brief Implements the GET method.
3809
45
	//! @see \ref rcLocationSearchServiceGET
3810
46
	virtual void getImpl(const QByteArray& operation,const APIParameters& parameters, APIServiceResponse& response) Q_DECL_OVERRIDE;
3811
47
private slots:
3812
48
	// connected to the main location manager in the main thread
3813
49
	void mainLocationManagerUpdated();
3814
50
private:
3815
51
	//the location mgr is actually copied to be used in HTTP threads without blocking the main app
3816
52
	StelLocationMgr locMgr;
3817
53
	QMutex locMgrMutex;
3818
54
};
3819
55
3820
56
3821
57
3822
58
#endif
3823
0
59
3824
=== added file 'plugins/RemoteControl/src/LocationService.cpp'
3825
--- plugins/RemoteControl/src/LocationService.cpp	1970-01-01 00:00:00 +0000
3826
+++ plugins/RemoteControl/src/LocationService.cpp	2016-06-12 13:59:22 +0000
3827
@@ -0,0 +1,258 @@
3828
1
/*
3829
2
 * Stellarium Remote Control plugin
3830
3
 * Copyright (C) 2015 Florian Schaukowitsch
3831
4
 *
3832
5
 * This program is free software; you can redistribute it and/or
3833
6
 * modify it under the terms of the GNU General Public License
3834
7
 * as published by the Free Software Foundation; either version 2
3835
8
 * of the License, or (at your option) any later version.
3836
9
 *
3837
10
 * This program is distributed in the hope that it will be useful,
3838
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3839
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3840
13
 * GNU General Public License for more details.
3841
14
 *
3842
15
 * You should have received a copy of the GNU General Public License
3843
16
 * along with this program; if not, write to the Free Software
3844
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
3845
18
 */
3846
19
3847
20
#include "LocationService.hpp"
3848
21
3849
22
#include "StelApp.hpp"
3850
23
#include "StelCore.hpp"
3851
24
#include "StelFileMgr.hpp"
3852
25
#include "StelModuleMgr.hpp"
3853
26
#include "StelLocationMgr.hpp"
3854
27
#include "StelLocaleMgr.hpp"
3855
28
#include "StelTranslator.hpp"
3856
29
#include "SolarSystem.hpp"
3857
30
3858
31
#include <QFileInfo>
3859
32
#include <QMimeDatabase>
3860
33
#include <QJsonArray>
3861
34
#include <QJsonDocument>
3862
35
#include <QJsonObject>
3863
36
#include <QStringListModel>
3864
37
3865
38
LocationService::LocationService(const QByteArray &serviceName, QObject *parent) : AbstractAPIService(serviceName,parent)
3866
39
{
3867
40
	//this is run in the main thread
3868
41
	core = StelApp::getInstance().getCore();
3869
42
	locMgr = &StelApp::getInstance().getLocationMgr();
3870
43
	ssys = GETSTELMODULE(SolarSystem);
3871
44
}
3872
45
3873
46
void LocationService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
3874
47
{
3875
48
	if(operation=="list")
3876
49
	{
3877
50
		//for now, this does not return location objects (which would require a much larger data transfer), but only the location strings
3878
51
		//same as in the LocationDialog list
3879
52
3880
53
		//TODO not fully thread safe
3881
54
		QJsonArray list = QJsonArray::fromStringList(QStringList(locMgr->getAllMap().keys()));
3882
55
3883
56
		response.writeJSON(QJsonDocument(list));
3884
57
	}
3885
58
	else if(operation == "countrylist")
3886
59
	{
3887
60
		const StelTranslator& trans = *StelTranslator::globalTranslator;
3888
61
3889
62
		QStringList allCountries = StelApp::getInstance().getLocaleMgr().getAllCountryNames();
3890
63
		QJsonArray list;
3891
64
		foreach(QString str, allCountries)
3892
65
		{
3893
66
			QJsonObject obj;
3894
67
			obj.insert("name",str);
3895
68
			obj.insert("name_i18n",trans.qtranslate(str));
3896
69
			list.append(obj);
3897
70
		}
3898
71
3899
72
		response.writeJSON(QJsonDocument(list));
3900
73
	}
3901
74
	else if(operation == "planetlist")
3902
75
	{
3903
76
		const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();
3904
77
3905
78
		QStringList allPlanets = ssys->getAllPlanetEnglishNames();
3906
79
		QJsonArray list;
3907
80
		foreach(QString str, allPlanets)
3908
81
		{
3909
82
			QJsonObject obj;
3910
83
			obj.insert("name",str);
3911
84
			obj.insert("name_i18n",trans.qtranslate(str));
3912
85
			list.append(obj);
3913
86
		}
3914
87
3915
88
		response.writeJSON(QJsonDocument(list));
3916
89
	}
3917
90
	else if(operation=="planetimage")
3918
91
	{
3919
92
		//return the image file for the specified planet
3920
93
		//logic from LocationDialog
3921
94
3922
95
		QString planet = QString::fromUtf8(parameters.value("planet"));
3923
96
3924
97
		if(planet.isEmpty())
3925
98
		{
3926
99
			response.writeRequestError("requires 'planet' parameter");
3927
100
			return;
3928
101
		}
3929
102
3930
103
3931
104
		SolarSystem* ssm = GETSTELMODULE(SolarSystem);
3932
105
		PlanetP p = ssm->searchByEnglishName(planet);
3933
106
		if (p)
3934
107
		{
3935
108
			QString path = StelFileMgr::findFile("textures/"+p->getTextMapName());
3936
109
			QFile file(path);
3937
110
			if (path.isEmpty() || !file.exists())
3938
111
			{
3939
112
				response.setStatus(404,"not found");
3940
113
				response.setData("planet image not available");
3941
114
				qWarning() << "ERROR - could not find planet map for " << planet;
3942
115
				return;
3943
116
			}
3944
117
3945
118
			QMimeType mime = QMimeDatabase().mimeTypeForFile(path);
3946
119
3947
120
			if(file.open(QIODevice::ReadOnly))
3948
121
			{
3949
122
				//allow the image to be cached by browser (1 hour)
3950
123
				response.setHeader("Cache-Control","max-age="+QByteArray::number(60*60));
3951
124
				//response.setHeader("Content-Length",static_cast<int>(file.size()));
3952
125
				if(!mime.isDefault())
3953
126
				{
3954
127
					response.setHeader("Content-Type", mime.name().toLatin1());
3955
128
				}
3956
129
3957
130
				//load and write data
3958
131
				response.setData(file.readAll());
3959
132
			}
3960
133
			else
3961
134
			{
3962
135
				response.setStatus(500,"internal server error");
3963
136
				response.setData("could not open image file");
3964
137
			}
3965
138
		}
3966
139
		else
3967
140
		{
3968
141
			response.setStatus(404,"not found");
3969
142
			response.setData("planet id not found");
3970
143
			qWarning() << "ERROR - could not find planet " << planet;
3971
144
			return;
3972
145
		}
3973
146
	}
3974
147
	else
3975
148
	{
3976
149
		//TODO some sort of service description?
3977
150
		response.writeRequestError("unsupported operation. GET: list, countrylist, planetlist, planetimage");
3978
151
	}
3979
152
}
3980
153
3981
154
void LocationService::postImpl(const QByteArray& operation, const APIParameters &parameters, const QByteArray &data, APIServiceResponse &response)
3982
155
{
3983
156
	Q_UNUSED(data);
3984
157
3985
158
	if (operation == "setlocationfields")
3986
159
	{
3987
160
		QString id = QString::fromUtf8(parameters.value("id"));
3988
161
3989
162
		StelLocation loc;
3990
163
		if(!id.isEmpty())
3991
164
		{
3992
165
			//if an id is set, ignore everything else
3993
166
			//use an invoke here for reasons
3994
167
			QMetaObject::invokeMethod(locMgr,"locationForString",SERVICE_DEFAULT_INVOKETYPE,
3995
168
						  Q_RETURN_ARG(StelLocation, loc),
3996
169
						  Q_ARG(QString,id));
3997
170
3998
171
			if(loc.isValid())
3999
172
			{
4000
173
				//set location
4001
174
				QMetaObject::invokeMethod(core, "moveObserverTo", SERVICE_DEFAULT_INVOKETYPE,
4002
175
							  Q_ARG(StelLocation, loc),
4003
176
							  Q_ARG(double,0.0) );
4004
177
4005
178
				response.setData("ok");
4006
179
				return;
4007
180
			}
4008
181
			else
4009
182
			{
4010
183
				response.writeRequestError("invalid location id");
4011
184
				return;
4012
185
			}
4013
186
		}
4014
187
4015
188
		//copy current loc
4016
189
		loc = core->getCurrentLocation();
4017
190
4018
191
		//similar to StelScriptMainAPI::setObserverLocation
4019
192
		QString sLatitude = QString::fromUtf8(parameters.value("latitude"));
4020
193
		QString sLongitude = QString::fromUtf8(parameters.value("longitude"));
4021
194
		QString sAltitude = QString::fromUtf8(parameters.value("altitude"));
4022
195
4023
196
		QString name = QString::fromUtf8(parameters.value("name"));
4024
197
		QString country = QString::fromUtf8(parameters.value("country"));
4025
198
		QString planet = QString::fromUtf8(parameters.value("planet"));
4026
199
4027
200
		//check each field
4028
201
		bool doneSomething = false;
4029
202
		bool ok = false;
4030
203
		float latitude = sLatitude.toFloat(&ok);
4031
204
		if(ok && latitude != loc.latitude)
4032
205
		{
4033
206
			loc.latitude = latitude;
4034
207
			doneSomething = true;
4035
208
		}
4036
209
		float longitude = sLongitude.toFloat(&ok);
4037
210
		if(ok && longitude != loc.longitude)
4038
211
		{
4039
212
			loc.longitude = longitude;
4040
213
			doneSomething = true;
4041
214
		}
4042
215
		int altitude = sAltitude.toInt(&ok);
4043
216
		if(ok && altitude != loc.altitude)
4044
217
		{
4045
218
			loc.altitude = altitude;
4046
219
			doneSomething = true;
4047
220
		}
4048
221
		if(parameters.contains("name") && name != loc.name)
4049
222
		{
4050
223
			loc.name = name;
4051
224
			doneSomething = true;
4052
225
		}
4053
226
		if(!country.isEmpty() && country != loc.country)
4054
227
		{
4055
228
			loc.country = country;
4056
229
			doneSomething = true;
4057
230
		}
4058
231
4059
232
		if(!planet.isEmpty() && loc.planetName != planet)
4060
233
		{
4061
234
			if(ssys->searchByName(planet))
4062
235
			{
4063
236
				//set planet
4064
237
				loc.planetName = planet;
4065
238
				doneSomething = true;
4066
239
			}
4067
240
		}
4068
241
4069
242
		if(doneSomething)
4070
243
		{
4071
244
			//update the core
4072
245
			QMetaObject::invokeMethod(core,"moveObserverTo", SERVICE_DEFAULT_INVOKETYPE,
4073
246
						  Q_ARG(StelLocation, loc),
4074
247
						  Q_ARG(double, 0.0),
4075
248
						  Q_ARG(double, 0.0));
4076
249
		}
4077
250
4078
251
		response.setData("ok");
4079
252
	}
4080
253
	else
4081
254
	{
4082
255
		//TODO some sort of service description?
4083
256
		response.writeRequestError("unsupported operation. POST: setlocation, setlocationfields");
4084
257
	}
4085
258
}
4086
0
259
4087
=== added file 'plugins/RemoteControl/src/LocationService.hpp'
4088
--- plugins/RemoteControl/src/LocationService.hpp	1970-01-01 00:00:00 +0000
4089
+++ plugins/RemoteControl/src/LocationService.hpp	2016-06-12 13:59:22 +0000
4090
@@ -0,0 +1,56 @@
4091
1
/*
4092
2
 * Stellarium Remote Control plugin
4093
3
 * Copyright (C) 2015 Florian Schaukowitsch
4094
4
 *
4095
5
 * This program is free software; you can redistribute it and/or
4096
6
 * modify it under the terms of the GNU General Public License
4097
7
 * as published by the Free Software Foundation; either version 2
4098
8
 * of the License, or (at your option) any later version.
4099
9
 *
4100
10
 * This program is distributed in the hope that it will be useful,
4101
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4102
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4103
13
 * GNU General Public License for more details.
4104
14
 *
4105
15
 * You should have received a copy of the GNU General Public License
4106
16
 * along with this program; if not, write to the Free Software
4107
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
4108
18
 */
4109
19
4110
20
#ifndef LOCATIONSERVICE_HPP_
4111
21
#define LOCATIONSERVICE_HPP_
4112
22
4113
23
#include "AbstractAPIService.hpp"
4114
24
4115
25
class StelCore;
4116
26
class StelLocationMgr;
4117
27
class SolarSystem;
4118
28
4119
29
//! @ingroup remoteControl
4120
30
//! Provides methods to look up location-related information, and change the current location
4121
31
//!
4122
32
//! @see \ref rcLocationService, LocationService
4123
33
class LocationService : public AbstractAPIService
4124
34
{
4125
35
	Q_OBJECT
4126
36
public:
4127
37
	LocationService(const QByteArray& serviceName, QObject* parent = 0);
4128
38
4129
39
	virtual ~LocationService() {}
4130
40
4131
41
protected:
4132
42
	//! @brief Implements the HTTP GET requests
4133
43
	//! @see \ref rcLocationServiceGET
4134
44
	virtual void getImpl(const QByteArray& operation,const APIParameters& parameters, APIServiceResponse& response) Q_DECL_OVERRIDE;
4135
45
	//! @brief Implements the HTTP POST requests
4136
46
	//! @see \ref rcLocationServicePOST
4137
47
	virtual void postImpl(const QByteArray &operation, const APIParameters& parameters, const QByteArray &data, APIServiceResponse &response) Q_DECL_OVERRIDE;
4138
48
private:
4139
49
	StelCore* core;
4140
50
	StelLocationMgr* locMgr;
4141
51
	SolarSystem* ssys;
4142
52
};
4143
53
4144
54
4145
55
4146
56
#endif
4147
0
57
4148
=== added file 'plugins/RemoteControl/src/MainService.cpp'
4149
--- plugins/RemoteControl/src/MainService.cpp	1970-01-01 00:00:00 +0000
4150
+++ plugins/RemoteControl/src/MainService.cpp	2016-06-12 13:59:22 +0000
4151
@@ -0,0 +1,622 @@
4152
1
/*
4153
2
 * Stellarium Remote Control plugin
4154
3
 * Copyright (C) 2015 Florian Schaukowitsch
4155
4
 *
4156
5
 * This program is free software; you can redistribute it and/or
4157
6
 * modify it under the terms of the GNU General Public License
4158
7
 * as published by the Free Software Foundation; either version 2
4159
8
 * of the License, or (at your option) any later version.
4160
9
 *
4161
10
 * This program is distributed in the hope that it will be useful,
4162
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4163
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4164
13
 * GNU General Public License for more details.
4165
14
 *
4166
15
 * You should have received a copy of the GNU General Public License
4167
16
 * along with this program; if not, write to the Free Software
4168
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
4169
18
 */
4170
19
4171
20
#include "MainService.hpp"
4172
21
4173
22
#include "StelApp.hpp"
4174
23
#include "StelActionMgr.hpp"
4175
24
#include "StelCore.hpp"
4176
25
#include "LandscapeMgr.hpp"
4177
26
#include "StelLocaleMgr.hpp"
4178
27
#include "StelMainView.hpp"
4179
28
#include "StelModuleMgr.hpp"
4180
29
#include "StelMovementMgr.hpp"
4181
30
#include "StelObjectMgr.hpp"
4182
31
#include "StelPropertyMgr.hpp"
4183
32
#include "StelScriptMgr.hpp"
4184
33
#include "StelSkyCultureMgr.hpp"
4185
34
#include "StelTranslator.hpp"
4186
35
#include "StelUtils.hpp"
4187
36
4188
37
#include <QJsonDocument>
4189
38
4190
39
4191
40
MainService::MainService(const QByteArray &serviceName, QObject *parent)
4192
41
	: AbstractAPIService(serviceName,parent),
4193
42
	  moveX(0),moveY(0),lastMoveUpdateTime(0)
4194
43
{
4195
44
	//100 should be more than enough
4196
45
	//this only has to emcompass events that occur between 2 status updates
4197
46
	actionCache.setCapacity(100);
4198
47
	propCache.setCapacity(100);
4199
48
4200
49
	//this is run in the main thread
4201
50
	core = StelApp::getInstance().getCore();
4202
51
	actionMgr =  StelApp::getInstance().getStelActionManager();
4203
52
	lsMgr = GETSTELMODULE(LandscapeMgr);
4204
53
	localeMgr = &StelApp::getInstance().getLocaleMgr();
4205
54
	objMgr = &StelApp::getInstance().getStelObjectMgr();
4206
55
	mvmgr = GETSTELMODULE(StelMovementMgr);
4207
56
	propMgr = StelApp::getInstance().getStelPropertyManager();
4208
57
	scriptMgr = &StelApp::getInstance().getScriptMgr();
4209
58
	skyCulMgr = &StelApp::getInstance().getSkyCultureMgr();
4210
59
4211
60
	connect(actionMgr,SIGNAL(actionToggled(QString,bool)),this,SLOT(actionToggled(QString,bool)));
4212
61
	connect(propMgr,SIGNAL(stelPropChanged(QString,QVariant)),this,SLOT(propertyChanged(QString,QVariant)));
4213
62
4214
63
	Q_ASSERT(this->thread()==objMgr->thread());
4215
64
}
4216
65
4217
66
void MainService::update(double deltaTime)
4218
67
{
4219
68
	bool xZero = qFuzzyIsNull(moveX);
4220
69
	bool yZero = qFuzzyIsNull(moveY);
4221
70
4222
71
	//prevent sudden disconnects from moving endlessly
4223
72
	if((QDateTime::currentMSecsSinceEpoch() - lastMoveUpdateTime) > 1000)
4224
73
	{
4225
74
		if(!xZero || !yZero)
4226
75
			qDebug()<<"[MainService] move timeout";
4227
76
		moveX = moveY = .0f;
4228
77
	}
4229
78
4230
79
	//Similar to StelMovementMgr::updateMotion
4231
80
4232
81
	if(!xZero || !yZero)
4233
82
	{
4234
83
		double currentFov = mvmgr->getCurrentFov();
4235
84
		// the more it is zoomed, the lower the moving speed is (in angle)
4236
85
		double depl=0.00025*deltaTime*1000*currentFov;
4237
86
4238
87
		float deltaAz = moveX;
4239
88
		float deltaAlt = moveY;
4240
89
4241
90
		if (deltaAz<0)
4242
91
		{
4243
92
			deltaAz = -depl/30;
4244
93
			if (deltaAz<-0.2)
4245
94
				deltaAz = -0.2;
4246
95
		}
4247
96
		else
4248
97
		{
4249
98
			if (deltaAz>0)
4250
99
			{
4251
100
				deltaAz = (depl/30);
4252
101
				if (deltaAz>0.2)
4253
102
					deltaAz = 0.2;
4254
103
			}
4255
104
		}
4256
105
4257
106
		if (deltaAlt<0)
4258
107
		{
4259
108
			deltaAlt = -depl/30;
4260
109
			if (deltaAlt<-0.2)
4261
110
				deltaAlt = -0.2;
4262
111
		}
4263
112
		else
4264
113
		{
4265
114
			if (deltaAlt>0)
4266
115
			{
4267
116
				deltaAlt = depl/30;
4268
117
				if (deltaAlt>0.2)
4269
118
					deltaAlt = 0.2;
4270
119
			}
4271
120
		}
4272
121
4273
122
		mvmgr->panView(deltaAz,deltaAlt);
4274
123
4275
124
		//this is required to enable maximal fps for smoothness
4276
125
		StelMainView::getInstance().thereWasAnEvent();
4277
126
	}
4278
127
}
4279
128
4280
129
void MainService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
4281
130
{
4282
131
	if(operation=="status")
4283
132
	{
4284
133
		//a listing of the most common stuff that can change often
4285
134
4286
135
		QString sActionId = QString::fromUtf8(parameters.value("actionId"));
4287
136
		bool actionOk;
4288
137
		int actionId = sActionId.toInt(&actionOk);
4289
138
4290
139
		QString sPropId = QString::fromUtf8(parameters.value("propId"));
4291
140
		bool propOk;
4292
141
		int propId = sPropId.toInt(&propOk);
4293
142
4294
143
		QJsonObject obj;
4295
144
4296
145
		//// Location
4297
146
		const StelLocation& loc = core->getCurrentLocation();
4298
147
		{
4299
148
			QJsonObject obj2;
4300
149
			obj2.insert("name",loc.name);
4301
150
			obj2.insert("role",QString(loc.role));
4302
151
			obj2.insert("planet",loc.planetName);
4303
152
			obj2.insert("latitude",loc.latitude);
4304
153
			obj2.insert("longitude",loc.longitude);
4305
154
			obj2.insert("altitude",loc.altitude);
4306
155
			obj2.insert("country",loc.country);
4307
156
			obj2.insert("state",loc.state);
4308
157
			obj2.insert("landscapeKey",loc.landscapeKey);
4309
158
			obj.insert("location",obj2);
4310
159
		}
4311
160
4312
161
		//// Time related stuff
4313
162
		{
4314
163
			double jday = core->getJD();
4315
164
			double deltaT = core->getDeltaT() * StelCore::JD_SECOND;
4316
165
4317
166
			double gmtShift = localeMgr->getGMTShift(jday) / 24.0;
4318
167
4319
168
			QString utcIso = StelUtils::julianDayToISO8601String(jday,true).append('Z');
4320
169
			QString localIso = StelUtils::julianDayToISO8601String(jday+gmtShift,true);
4321
170
4322
171
			//time zone string
4323
172
			QString timeZone = localeMgr->getPrintableTimeZoneLocal(jday);
4324
173
4325
174
			QJsonObject obj2;
4326
175
			obj2.insert("jday",jday);
4327
176
			obj2.insert("deltaT",deltaT);
4328
177
			obj2.insert("gmtShift",gmtShift);
4329
178
			obj2.insert("timeZone",timeZone);
4330
179
			obj2.insert("utc",utcIso);
4331
180
			obj2.insert("local",localIso);
4332
181
			obj2.insert("isTimeNow",core->getIsTimeNow());
4333
182
			obj2.insert("timerate",core->getTimeRate());
4334
183
			obj.insert("time",obj2);
4335
184
		}
4336
185
4337
186
		//// Info about selected object (only primary)
4338
187
		{
4339
188
			QString infoStr;
4340
189
			QMetaObject::invokeMethod(this,"getInfoString",SERVICE_DEFAULT_INVOKETYPE,
4341
190
						  Q_RETURN_ARG(QString,infoStr));
4342
191
			obj.insert("selectioninfo",infoStr);
4343
192
		}
4344
193
4345
194
		//// Info about current view
4346
195
		{
4347
196
			QJsonObject obj2;
4348
197
4349
198
			// the aim fov may lie outside the min/max bounds, so constrain it
4350
199
			double fov = mvmgr->getAimFov();
4351
200
			if(fov < mvmgr->getMinFov())
4352
201
				fov = mvmgr->getMinFov();
4353
202
			else if (fov>mvmgr->getMaxFov())
4354
203
				fov = mvmgr->getMaxFov();
4355
204
4356
205
			obj2.insert("fov",fov);
4357
206
4358
207
			obj.insert("view",obj2);
4359
208
		}
4360
209
4361
210
		//// Info about changed actions & props (if requested)
4362
211
		{
4363
212
			if(actionOk)
4364
213
				obj.insert("actionChanges",getActionChangesSinceID(actionId));
4365
214
			if(propOk)
4366
215
				obj.insert("propertyChanges",getPropertyChangesSinceID(propId));
4367
216
		}
4368
217
4369
218
		response.writeJSON(QJsonDocument(obj));
4370
219
	}
4371
220
	else if(operation=="plugins")
4372
221
	{
4373
222
		// Retrieve list of plugins
4374
223
4375
224
		QJsonObject mainObj;
4376
225
4377
226
		StelModuleMgr& modMgr = StelApp::getInstance().getModuleMgr();
4378
227
		foreach(const StelModuleMgr::PluginDescriptor& desc, modMgr.getPluginsList())
4379
228
		{
4380
229
			QJsonObject pluginObj,infoObj;
4381
230
			pluginObj.insert("loadAtStartup", desc.loadAtStartup);
4382
231
			pluginObj.insert("loaded", desc.loaded);
4383
232
4384
233
			infoObj.insert("authors", desc.info.authors);
4385
234
			infoObj.insert("contact", desc.info.contact);
4386
235
			infoObj.insert("description", desc.info.description);
4387
236
			infoObj.insert("displayedName", desc.info.displayedName);
4388
237
			infoObj.insert("startByDefault", desc.info.startByDefault);
4389
238
			infoObj.insert("version", desc.info.version);
4390
239
4391
240
			pluginObj.insert("info",infoObj);
4392
241
			mainObj.insert(desc.info.id, pluginObj);
4393
242
		}
4394
243
4395
244
		response.writeJSON(QJsonDocument(mainObj));
4396
245
	}
4397
246
	else
4398
247
	{
4399
248
		//TODO some sort of service description?
4400
249
		response.writeRequestError("unsupported operation. GET: status, plugins");
4401
250
	}
4402
251
}
4403
252
4404
253
void MainService::postImpl(const QByteArray& operation, const APIParameters &parameters, const QByteArray &data, APIServiceResponse &response)
4405
254
{
4406
255
	Q_UNUSED(data);
4407
256
4408
257
	if(operation == "time")
4409
258
	{
4410
259
		bool doneSomething = false;
4411
260
		bool ok;
4412
261
4413
262
		//set the time + timerate
4414
263
		{
4415
264
			const QByteArray& raw = parameters.value("time");
4416
265
			if(!raw.isEmpty())
4417
266
			{
4418
267
				//parse time and set it
4419
268
				double jday = QString(raw).toDouble(&ok);
4420
269
				if(ok)
4421
270
				{
4422
271
					//check for invalid double (NaN, inf...)
4423
272
					//this will crash the app if it is allowed
4424
273
					if(qIsNaN(jday) || qIsInf(jday))
4425
274
					{
4426
275
						qWarning()<<"[RemoteControl] Prevented setting invalid time"<<jday<<", does the web interface have a bug?";
4427
276
						response.setData("error: invalid time value");
4428
277
						return;
4429
278
					}
4430
279
4431
280
					doneSomething = true;
4432
281
					//set new time
4433
282
					QMetaObject::invokeMethod(core,"setJD", SERVICE_DEFAULT_INVOKETYPE,
4434
283
								  Q_ARG(double,jday));
4435
284
				}
4436
285
			}
4437
286
		}
4438
287
		{
4439
288
			const QByteArray& raw = parameters.value("timerate");
4440
289
			if(!raw.isEmpty())
4441
290
			{
4442
291
				//parse timerate and set it
4443
292
				double rate = QString(raw).toDouble(&ok);
4444
293
				if(ok)
4445
294
				{
4446
295
					doneSomething = true;
4447
296
					//set new time rate
4448
297
					QMetaObject::invokeMethod(core,"setTimeRate", SERVICE_DEFAULT_INVOKETYPE,
4449
298
								  Q_ARG(double,rate));
4450
299
				}
4451
300
			}
4452
301
		}
4453
302
4454
303
		if(doneSomething)
4455
304
			response.setData("ok");
4456
305
		else
4457
306
			response.setData("error: invalid parameters, use time/timerate as double values");
4458
307
	}
4459
308
	else if(operation == "focus")
4460
309
	{
4461
310
		QString target = QString::fromUtf8(parameters.value("target"));
4462
311
4463
312
		//check target string first
4464
313
		if(target.isEmpty())
4465
314
		{
4466
315
			if(parameters.value("position").isEmpty())
4467
316
			{
4468
317
				//no parameters = clear focus
4469
318
				target = "";
4470
319
			}
4471
320
			else
4472
321
			{
4473
322
				//parse position
4474
323
				QJsonDocument doc = QJsonDocument::fromJson(parameters.value("position"));
4475
324
				QJsonArray arr = doc.array();
4476
325
				if(arr.size() == 3)
4477
326
				{
4478
327
					Vec3d pos;
4479
328
					pos[0] = arr.at(0).toDouble();
4480
329
					pos[1] = arr.at(1).toDouble();
4481
330
					pos[2] = arr.at(2).toDouble();
4482
331
4483
332
					//deselect and move
4484
333
					QMetaObject::invokeMethod(this,"focusPosition", SERVICE_DEFAULT_INVOKETYPE,
4485
334
								  Q_ARG(Vec3d,pos));
4486
335
					response.setData("ok");
4487
336
					return;
4488
337
				}
4489
338
4490
339
				response.writeRequestError("invalid position format");
4491
340
				return;
4492
341
			}
4493
342
		}
4494
343
4495
344
		bool result;
4496
345
		QMetaObject::invokeMethod(this,"focusObject",SERVICE_DEFAULT_INVOKETYPE,
4497
346
					  Q_RETURN_ARG(bool,result),
4498
347
					  Q_ARG(QString,target));
4499
348
4500
349
		response.setData(result ? "true" : "false");
4501
350
	}
4502
351
	else if(operation == "move")
4503
352
	{
4504
353
		QString xs = QString::fromUtf8(parameters.value("x"));
4505
354
		QString ys = QString::fromUtf8(parameters.value("y"));
4506
355
4507
356
		bool xOk,yOk;
4508
357
		float x = xs.toInt(&xOk);
4509
358
		float y = ys.toInt(&yOk);
4510
359
4511
360
		if(xOk || yOk)
4512
361
		{
4513
362
			QMetaObject::invokeMethod(this,"updateMovement", SERVICE_DEFAULT_INVOKETYPE,
4514
363
						  Q_ARG(float,x),
4515
364
						  Q_ARG(float,y),
4516
365
						  Q_ARG(bool,xOk),
4517
366
						  Q_ARG(bool,yOk));
4518
367
4519
368
			response.setData("ok");
4520
369
		}
4521
370
		else
4522
371
			response.writeRequestError("requires x or y parameter");
4523
372
	}
4524
373
	else if (operation == "fov")
4525
374
	{
4526
375
		QString fov = QString::fromUtf8(parameters.value("fov"));
4527
376
		bool ok;
4528
377
		double dFov = fov.toDouble(&ok);
4529
378
4530
379
		if(fov.isEmpty() || !ok)
4531
380
		{
4532
381
			response.writeRequestError("requires fov parameter");
4533
382
			return;
4534
383
		}
4535
384
4536
385
		QMetaObject::invokeMethod(this,"setFov",SERVICE_DEFAULT_INVOKETYPE,
4537
386
					  Q_ARG(double,dFov));
4538
387
4539
388
		response.setData("ok");
4540
389
	}
4541
390
	else
4542
391
	{
4543
392
		//TODO some sort of service description?
4544
393
		response.writeRequestError("unsupported operation. POST: time,focus,move,fov");
4545
394
	}
4546
395
}
4547
396
4548
397
StelObjectP MainService::getSelectedObject()
4549
398
{
4550
399
	const QList<StelObjectP>& list = objMgr->getSelectedObject();
4551
400
	if(list.isEmpty())
4552
401
		return StelObjectP();
4553
402
	return list.first();
4554
403
}
4555
404
4556
405
QString MainService::getInfoString()
4557
406
{
4558
407
	StelObjectP selectedObject = getSelectedObject();
4559
408
	if(selectedObject.isNull())
4560
409
		return QString();
4561
410
	return selectedObject->getInfoString(core,StelObject::AllInfo | StelObject::NoFont);
4562
411
}
4563
412
4564
413
bool MainService::focusObject(const QString &name)
4565
414
{
4566
415
	//StelDialog::gotoObject
4567
416
4568
417
	//if name is empty, unselect
4569
418
	if(name.isEmpty())
4570
419
	{
4571
420
		objMgr->unSelect();
4572
421
		return true;
4573
422
	}
4574
423
4575
424
	bool result = false;
4576
425
	if (objMgr->findAndSelectI18n(name) || objMgr->findAndSelect(name))
4577
426
	{
4578
427
		const QList<StelObjectP> newSelected = objMgr->getSelectedObject();
4579
428
		if (!newSelected.empty())
4580
429
		{
4581
430
			// Can't point to home planet
4582
431
			if (newSelected[0]->getEnglishName()!=core->getCurrentLocation().planetName)
4583
432
			{
4584
433
				mvmgr->moveToObject(newSelected[0], mvmgr->getAutoMoveDuration());
4585
434
				mvmgr->setFlagTracking(true);
4586
435
				result = true;
4587
436
			}
4588
437
			else
4589
438
			{
4590
439
				objMgr->unSelect();
4591
440
			}
4592
441
		}
4593
442
	}
4594
443
	return result;
4595
444
}
4596
445
4597
446
void MainService::focusPosition(const Vec3d &pos)
4598
447
{
4599
448
	objMgr->unSelect();
4600
449
	mvmgr->moveToJ2000(pos, mvmgr->getAutoMoveDuration());
4601
450
}
4602
451
4603
452
void MainService::updateMovement(float x, float y, bool xUpdated, bool yUpdated)
4604
453
{
4605
454
	if(xUpdated)
4606
455
	{
4607
456
		this->moveX = x;
4608
457
	}
4609
458
	if(yUpdated)
4610
459
	{
4611
460
		this->moveY = y;
4612
461
	}
4613
462
	qint64 curTime = QDateTime::currentMSecsSinceEpoch();
4614
463
	//qDebug()<<"updateMove"<<x<<y<<(curTime-lastMoveUpdateTime);
4615
464
	lastMoveUpdateTime = curTime;
4616
465
}
4617
466
4618
467
void MainService::setFov(double fov)
4619
468
{
4620
469
	//TODO calculate a better move duration here
4621
470
	mvmgr->zoomTo(fov,0.25f);
4622
471
}
4623
472
4624
473
void MainService::actionToggled(const QString &id, bool val)
4625
474
{
4626
475
	actionMutex.lock();
4627
476
	actionCache.append(ActionCacheEntry(id,val));
4628
477
	if(!actionCache.areIndexesValid())
4629
478
	{
4630
479
		//in theory, this can happen, but practically not so much
4631
480
		qWarning()<<"Action cache indices invalid";
4632
481
		actionCache.clear();
4633
482
	}
4634
483
	actionMutex.unlock();
4635
484
}
4636
485
4637
486
void MainService::propertyChanged(const QString &id, const QVariant &val)
4638
487
{
4639
488
	propMutex.lock();
4640
489
	propCache.append(PropertyCacheEntry(id,val));
4641
490
	if(!propCache.areIndexesValid())
4642
491
	{
4643
492
		//in theory, this can happen, but practically not so much
4644
493
		qWarning()<<"Property cache indices invalid";
4645
494
		propCache.clear();
4646
495
	}
4647
496
	propMutex.unlock();
4648
497
}
4649
498
4650
499
QJsonObject MainService::getActionChangesSinceID(int changeId)
4651
500
{
4652
501
	//changeId is the last id the interface is available
4653
502
	//or -2 if the interface just started
4654
503
	// -1 means the initial state was set
4655
504
4656
505
	QJsonObject obj;
4657
506
	QJsonObject changes;
4658
507
	int newId = changeId;
4659
508
4660
509
4661
510
	actionMutex.lock();
4662
511
	if(actionCache.isEmpty())
4663
512
	{
4664
513
		if(changeId!=-1)
4665
514
		{
4666
515
			//this is either the initial state (-2) or
4667
516
			//something is "broken", probably from an existing web interface that reconnected after restart
4668
517
			//force a full reload
4669
518
4670
519
			foreach(StelAction* ac, actionMgr->getActionList())
4671
520
			{
4672
521
				if(ac->isCheckable())
4673
522
				{
4674
523
					changes.insert(ac->getId(),ac->isChecked());
4675
524
				}
4676
525
			}
4677
526
			newId = -1;
4678
527
		}
4679
528
	}
4680
529
	else
4681
530
	{
4682
531
		if(changeId > actionCache.lastIndex() || changeId < (actionCache.firstIndex()-1))
4683
532
		{
4684
533
			//this is either the initial state (-2) or
4685
534
			//"broken" state again, force full reload
4686
535
			foreach(StelAction* ac, actionMgr->getActionList())
4687
536
			{
4688
537
				if(ac->isCheckable())
4689
538
				{
4690
539
					changes.insert(ac->getId(),ac->isChecked());
4691
540
				}
4692
541
			}
4693
542
			newId = actionCache.lastIndex();
4694
543
		}
4695
544
		else if(changeId < actionCache.lastIndex())
4696
545
		{
4697
546
			//create a "diff" between changeId to lastIndex
4698
547
			for(int i = changeId+1;i<=actionCache.lastIndex();++i)
4699
548
			{
4700
549
				const ActionCacheEntry& e = actionCache.at(i);
4701
550
				changes.insert(e.action,e.val);
4702
551
			}
4703
552
			newId = actionCache.lastIndex();
4704
553
		}
4705
554
		//else no changes happened, interface is at current state!
4706
555
	}
4707
556
	actionMutex.unlock();
4708
557
4709
558
	obj.insert("changes",changes);
4710
559
	obj.insert("id",newId);
4711
560
4712
561
	return obj;
4713
562
}
4714
563
4715
564
QJsonObject MainService::getPropertyChangesSinceID(int changeId)
4716
565
{
4717
566
	//changeId is the last id the interface is available
4718
567
	//or -2 if the interface just started
4719
568
	// -1 means the initial state was set
4720
569
	QJsonObject obj;
4721
570
	QJsonObject changes;
4722
571
	int newId = changeId;
4723
572
4724
573
	propMutex.lock();
4725
574
	if(propCache.isEmpty())
4726
575
	{
4727
576
		if(changeId!=-1)
4728
577
		{
4729
578
			//this is either the initial state (-2) or
4730
579
			//something is "broken", probably from an existing web interface that reconnected after restart
4731
580
			//force a full reload
4732
581
			const StelPropertyMgr::StelPropertyMap& map = propMgr->getPropertyMap();
4733
582
			for(StelPropertyMgr::StelPropertyMap::const_iterator it = map.constBegin();
4734
583
			    it!=map.constEnd();++it)
4735
584
			{
4736
585
				changes.insert(it.key(), QJsonValue::fromVariant((*it)->getValue()));
4737
586
			}
4738
587
			newId = -1;
4739
588
		}
4740
589
	}
4741
590
	else
4742
591
	{
4743
592
		if(changeId > propCache.lastIndex() || changeId < (propCache.firstIndex()-1))
4744
593
		{
4745
594
			//this is either the initial state (-2) or
4746
595
			//"broken" state again, force full reload
4747
596
			const StelPropertyMgr::StelPropertyMap& map = propMgr->getPropertyMap();
4748
597
			for(StelPropertyMgr::StelPropertyMap::const_iterator it = map.constBegin();
4749
598
			    it!=map.constEnd();++it)
4750
599
			{
4751
600
				changes.insert(it.key(), QJsonValue::fromVariant((*it)->getValue()));
4752
601
			}
4753
602
			newId = propCache.lastIndex();
4754
603
		}
4755
604
		else if(changeId < propCache.lastIndex())
4756
605
		{
4757
606
			//create a "diff" between changeId to lastIndex
4758
607
			for(int i = changeId+1;i<=propCache.lastIndex();++i)
4759
608
			{
4760
609
				const PropertyCacheEntry& e = propCache.at(i);
4761
610
				changes.insert(e.id,QJsonValue::fromVariant(e.val));
4762
611
			}
4763
612
			newId = propCache.lastIndex();
4764
613
		}
4765
614
		//else no changes happened, interface is at current state!
4766
615
	}
4767
616
	propMutex.unlock();
4768
617
4769
618
	obj.insert("changes",changes);
4770
619
	obj.insert("id",newId);
4771
620
4772
621
	return obj;
4773
622
}
4774
0
623
4775
=== added file 'plugins/RemoteControl/src/MainService.hpp'
4776
--- plugins/RemoteControl/src/MainService.hpp	1970-01-01 00:00:00 +0000
4777
+++ plugins/RemoteControl/src/MainService.hpp	2016-06-12 13:59:22 +0000
4778
@@ -0,0 +1,122 @@
4779
1
/*
4780
2
 * Stellarium Remote Control plugin
4781
3
 * Copyright (C) 2015 Florian Schaukowitsch
4782
4
 *
4783
5
 * This program is free software; you can redistribute it and/or
4784
6
 * modify it under the terms of the GNU General Public License
4785
7
 * as published by the Free Software Foundation; either version 2
4786
8
 * of the License, or (at your option) any later version.
4787
9
 *
4788
10
 * This program is distributed in the hope that it will be useful,
4789
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4790
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4791
13
 * GNU General Public License for more details.
4792
14
 *
4793
15
 * You should have received a copy of the GNU General Public License
4794
16
 * along with this program; if not, write to the Free Software
4795
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
4796
18
 */
4797
19
4798
20
#ifndef MAINSERVICE_HPP_
4799
21
#define MAINSERVICE_HPP_
4800
22
4801
23
#include "AbstractAPIService.hpp"
4802
24
4803
25
#include "StelObjectType.hpp"
4804
26
#include "VecMath.hpp"
4805
27
4806
28
#include <QContiguousCache>
4807
29
#include <QJsonObject>
4808
30
#include <QMutex>
4809
31
4810
32
class StelCore;
4811
33
class StelActionMgr;
4812
34
class LandscapeMgr;
4813
35
class StelLocaleMgr;
4814
36
class StelMovementMgr;
4815
37
class StelObjectMgr;
4816
38
class StelPropertyMgr;
4817
39
class StelScriptMgr;
4818
40
class StelSkyCultureMgr;
4819
41
4820
42
//! @ingroup remoteControl
4821
43
//! Implements the main API services, including the \c status operation which can be repeatedly polled to find the current state of the main program,
4822
44
//! including time, view, location, StelAction and StelProperty state changes, movement, script status ...
4823
45
//!
4824
46
//! @see @ref rcMainService
4825
47
class MainService : public AbstractAPIService
4826
48
{
4827
49
	Q_OBJECT
4828
50
public:
4829
51
	MainService(const QByteArray& serviceName, QObject* parent = 0);
4830
52
4831
53
	virtual ~MainService() {}
4832
54
4833
55
	//! Used to implement move functionality
4834
56
	virtual void update(double deltaTime) Q_DECL_OVERRIDE;
4835
57
4836
58
protected:
4837
59
	//! @brief Implements the GET operations
4838
60
	//! @see @ref rcMainServiceGET
4839
61
	virtual void getImpl(const QByteArray& operation,const APIParameters &parameters, APIServiceResponse& response) Q_DECL_OVERRIDE;
4840
62
	//! @brief Implements the HTTP POST operations
4841
63
	//! @see @ref rcMainServicePOST
4842
64
	virtual void postImpl(const QByteArray &operation, const APIParameters &parameters, const QByteArray &data, APIServiceResponse &response) Q_DECL_OVERRIDE;
4843
65
4844
66
private slots:
4845
67
	StelObjectP getSelectedObject();
4846
68
4847
69
	//! Returns the info string of the currently selected object
4848
70
	QString getInfoString();
4849
71
4850
72
	//! Like StelDialog::gotoObject
4851
73
	bool focusObject(const QString& name);
4852
74
	void focusPosition(const Vec3d& pos);
4853
75
4854
76
	void updateMovement(float x, float y, bool xUpdated, bool yUpdated);
4855
77
	void setFov(double fov);
4856
78
4857
79
	void actionToggled(const QString& id, bool val);
4858
80
	void propertyChanged(const QString& id, const QVariant& val);
4859
81
4860
82
private:
4861
83
	StelCore* core;
4862
84
	StelActionMgr* actionMgr;
4863
85
	LandscapeMgr* lsMgr;
4864
86
	StelLocaleMgr* localeMgr;
4865
87
	StelMovementMgr* mvmgr;
4866
88
	StelObjectMgr* objMgr;
4867
89
	StelPropertyMgr* propMgr;
4868
90
	StelScriptMgr* scriptMgr;
4869
91
	StelSkyCultureMgr* skyCulMgr;
4870
92
4871
93
	float moveX,moveY;
4872
94
	qint64 lastMoveUpdateTime;
4873
95
4874
96
	struct ActionCacheEntry
4875
97
	{
4876
98
		ActionCacheEntry(const QString& str,bool val) : action(str),val(val) {}
4877
99
		QString action;
4878
100
		bool val;
4879
101
	};
4880
102
4881
103
	//lists the recently toggled actions - this is a pseudo-circular buffer
4882
104
	QContiguousCache<ActionCacheEntry> actionCache;
4883
105
	QMutex actionMutex;
4884
106
	QJsonObject getActionChangesSinceID(int changeId);
4885
107
4886
108
	struct PropertyCacheEntry
4887
109
	{
4888
110
		PropertyCacheEntry(const QString& str, const QVariant& val) : id(str),val(val) {}
4889
111
		QString id;
4890
112
		QVariant val;
4891
113
	};
4892
114
	QContiguousCache<PropertyCacheEntry> propCache;
4893
115
	QMutex propMutex;
4894
116
	QJsonObject getPropertyChangesSinceID(int changeId);
4895
117
4896
118
};
4897
119
4898
120
4899
121
4900
122
#endif
4901
0
123
4902
=== added file 'plugins/RemoteControl/src/ObjectService.cpp'
4903
--- plugins/RemoteControl/src/ObjectService.cpp	1970-01-01 00:00:00 +0000
4904
+++ plugins/RemoteControl/src/ObjectService.cpp	2016-06-12 13:59:22 +0000
4905
@@ -0,0 +1,216 @@
4906
1
/*
4907
2
 * Stellarium Remote Control plugin
4908
3
 * Copyright (C) 2015 Florian Schaukowitsch
4909
4
 *
4910
5
 * This program is free software; you can redistribute it and/or
4911
6
 * modify it under the terms of the GNU General Public License
4912
7
 * as published by the Free Software Foundation; either version 2
4913
8
 * of the License, or (at your option) any later version.
4914
9
 *
4915
10
 * This program is distributed in the hope that it will be useful,
4916
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4917
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4918
13
 * GNU General Public License for more details.
4919
14
 *
4920
15
 * You should have received a copy of the GNU General Public License
4921
16
 * along with this program; if not, write to the Free Software
4922
17
 * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
4923
18
 */
4924
19
4925
20
#include "ObjectService.hpp"
4926
21
4927
22
#include "SearchDialog.hpp"
4928
23
#include "StelApp.hpp"
4929
24
#include "StelCore.hpp"
4930
25
#include "StelObjectMgr.hpp"
4931
26
#include "StelTranslator.hpp"
4932
27
4933
28
#include <QEventLoop>
4934
29
#include <QJsonArray>
4935
30
#include <QJsonDocument>
4936
31
#include <QJsonObject>
4937
32
#include <QSettings>
4938
33
#include <QMutex>
4939
34
#include <QThreadPool>
4940
35
#include <QRunnable>
4941
36
#include <QWaitCondition>
4942
37
4943
38
ObjectService::ObjectService(const QByteArray &serviceName, QObject *parent) : AbstractAPIService(serviceName,parent)
4944
39
{
4945
40
	//this is run in the main thread
4946
41
	core = StelApp::getInstance().getCore();
4947
42
	objMgr = &StelApp::getInstance().getStelObjectMgr();
4948
43
	useStartOfWords = StelApp::getInstance().getSettings()->value("search/flag_start_words", false).toBool();
4949
44
}
4950
45
4951
46
QStringList ObjectService::performSearch(const QString &text)
4952
47
{
4953
48
	//perform substitution greek text --> symbol
4954
49
	QString greekText = substituteGreek(text);
4955
50
4956
51
	QStringList matches;
4957
52
	if(greekText != text) {
4958
53
		matches = objMgr->listMatchingObjectsI18n(text, 3, useStartOfWords);
4959
54
		matches += objMgr->listMatchingObjects(text, 3, useStartOfWords);
4960
55
		matches += objMgr->listMatchingObjectsI18n(greekText, (8 - matches.size()), useStartOfWords);
4961
56
	} else {
4962
57
		//no greek replaced, saves 1 call
4963
58
		matches = objMgr->listMatchingObjectsI18n(text, 5, useStartOfWords);
4964
59
		matches += objMgr->listMatchingObjects(text, 5, useStartOfWords);
4965
60
	}
4966
61
4967
62
	return matches;
4968
63
}
4969
64
4970
65
QString ObjectService::substituteGreek(const QString &text)
4971
66
{
4972
67
	//use the searchdialog static method for that
4973
68
	return SearchDialog::substituteGreek(text);
4974
69
}
4975
70
4976
71
void ObjectService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
4977
72
{
4978
73
	//make sure the object still "lives" in the main Stel thread, even though
4979
74
	//we may currently be in the HTTP thread
4980
75
	Q_ASSERT(this->thread() == objMgr->thread());
4981
76
4982
77
	if(operation=="find")
4983
78
	{
4984
79
		//this may contain greek or other unicode letters
4985
80
		QString str = QString::fromUtf8(parameters.value("str"));
4986
81
		str = str.trimmed().toLower();
4987
82
4988
83
		if(str.isEmpty())
4989
84
		{
4990
85
			response.writeRequestError("empty search string");
4991
86
			return;
4992
87
		}
4993
88
4994
89
		//qDebug()<<"Search string"<<str;
4995
90
4996
91
		QStringList results;
4997
92
		QMetaObject::invokeMethod(this,"performSearch",SERVICE_DEFAULT_INVOKETYPE,
4998
93
					  Q_RETURN_ARG(QStringList,results),
4999
94
					  Q_ARG(QString,str));
5000
95
Status:	Merged
Merged at revision:	8441
Proposed branch:	lp:~registry/stellarium/socis2015
Merge into:	lp:stellarium
Diff against target:	72667 lines (+65875/-1760) 236 files modified CMakeLists.txt (+28/-9) cmake/Doxyfile.cmake (+8/-5) data/CMakeLists.txt (+5/-2) data/gui/normalStyle.css (+1/-1) doc/DoxygenLayout.xml (+1/-1) doc/doxygen.css (+2/-1) doc/mainpage.doxygen (+3/-3) doc/plugIns.doxygen (+1/-0) guide/plg_interfaces.tex (+95/-1) plugins/ArchaeoLines/src/ArchaeoLines.cpp (+27/-10) plugins/ArchaeoLines/src/ArchaeoLines.hpp (+23/-14) plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp (+8/-1) plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp (+1/-0) plugins/Oculars/src/Oculars.cpp (+57/-82) plugins/Oculars/src/Oculars.hpp (+15/-1) plugins/Oculars/src/gui/OcularsGuiPanel.cpp (+115/-132) plugins/RemoteControl/CMakeLists.txt (+46/-0) plugins/RemoteControl/COPYING (+340/-0) plugins/RemoteControl/RemoteControl.qrc (+6/-0) plugins/RemoteControl/doc/qtwebapp.doxygen (+35/-0) plugins/RemoteControl/doc/remoteControl.doxygen (+61/-0) plugins/RemoteControl/doc/remoteControlApi.doxygen (+461/-0) plugins/RemoteControl/doc/remoteControlWeb.doxygen (+564/-0) plugins/RemoteControl/src/APIController.cpp (+141/-0) plugins/RemoteControl/src/APIController.hpp (+64/-0) plugins/RemoteControl/src/AbstractAPIService.cpp (+159/-0) plugins/RemoteControl/src/AbstractAPIService.hpp (+160/-0) plugins/RemoteControl/src/CMakeLists.txt (+78/-0) plugins/RemoteControl/src/LocationSearchService.cpp (+104/-0) plugins/RemoteControl/src/LocationSearchService.hpp (+58/-0) plugins/RemoteControl/src/LocationService.cpp (+258/-0) plugins/RemoteControl/src/LocationService.hpp (+56/-0) plugins/RemoteControl/src/MainService.cpp (+622/-0) plugins/RemoteControl/src/MainService.hpp (+122/-0) plugins/RemoteControl/src/ObjectService.cpp (+216/-0) plugins/RemoteControl/src/ObjectService.hpp (+67/-0) plugins/RemoteControl/src/RemoteControl.cpp (+288/-0) plugins/RemoteControl/src/RemoteControl.hpp (+179/-0) plugins/RemoteControl/src/RequestHandler.cpp (+222/-0) plugins/RemoteControl/src/RequestHandler.hpp (+88/-0) plugins/RemoteControl/src/ScriptService.cpp (+169/-0) plugins/RemoteControl/src/ScriptService.hpp (+52/-0) plugins/RemoteControl/src/SimbadService.cpp (+193/-0) plugins/RemoteControl/src/SimbadService.hpp (+53/-0) plugins/RemoteControl/src/StelActionService.cpp (+115/-0) plugins/RemoteControl/src/StelActionService.hpp (+54/-0) plugins/RemoteControl/src/StelPropertyService.cpp (+113/-0) plugins/RemoteControl/src/StelPropertyService.hpp (+50/-0) plugins/RemoteControl/src/ViewService.cpp (+201/-0) plugins/RemoteControl/src/ViewService.hpp (+51/-0) plugins/RemoteControl/src/gui/RemoteControlDialog.cpp (+182/-0) plugins/RemoteControl/src/gui/RemoteControlDialog.hpp (+61/-0) plugins/RemoteControl/src/gui/remoteControlDialog.ui (+323/-0) plugins/RemoteControl/src/qtwebapp/copyright.txt (+11/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandler.cpp (+295/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandler.h (+146/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandlerpool.cpp (+137/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandlerpool.h (+119/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpcookie.cpp (+243/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpcookie.h (+112/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpglobal.cpp (+7/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpglobal.h (+30/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httplistener.cpp (+90/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httplistener.h (+113/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequest.cpp (+553/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequest.h (+235/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequesthandler.cpp (+21/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequesthandler.h (+50/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.cpp (+202/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.h (+163/-0) plugins/RemoteControl/src/qtwebapp/httpserver/staticfilecontroller.cpp (+185/-0) plugins/RemoteControl/src/qtwebapp/httpserver/staticfilecontroller.h (+117/-0) plugins/RemoteControl/src/qtwebapp/lgpl-3.0.txt (+165/-0) plugins/RemoteControl/src/qtwebapp/readme.txt (+7/-0) plugins/RemoteControl/src/qtwebapp/templateengine/template.cpp (+295/-0) plugins/RemoteControl/src/qtwebapp/templateengine/template.h (+187/-0) plugins/RemoteControl/src/qtwebapp/templateengine/templateglobal.h (+24/-0) plugins/RemoteControl/util/update_translationdata.py (+42/-0) plugins/RemoteControl/webroot/dejavusans-webfont.svg (+6922/-0) plugins/RemoteControl/webroot/dejavusansmono-webfont.svg (+3318/-0) plugins/RemoteControl/webroot/external/jquery-ui.css (+1225/-0) plugins/RemoteControl/webroot/iframestyle.css (+54/-0) plugins/RemoteControl/webroot/index.html (+496/-0) plugins/RemoteControl/webroot/js/api/actions.js (+142/-0) plugins/RemoteControl/webroot/js/api/flags.js (+54/-0) plugins/RemoteControl/webroot/js/api/location.js (+172/-0) plugins/RemoteControl/webroot/js/api/properties.js (+161/-0) plugins/RemoteControl/webroot/js/api/remotecontrol.js (+205/-0) plugins/RemoteControl/webroot/js/api/scripts.js (+63/-0) plugins/RemoteControl/webroot/js/api/search.js (+174/-0) plugins/RemoteControl/webroot/js/api/time.js (+377/-0) plugins/RemoteControl/webroot/js/api/trunc.js (+8/-0) plugins/RemoteControl/webroot/js/api/updatequeue.js (+40/-0) plugins/RemoteControl/webroot/js/api/viewcontrol.js (+131/-0) plugins/RemoteControl/webroot/js/api/viewoptions.js (+85/-0) plugins/RemoteControl/webroot/js/globalize.js (+1586/-0) plugins/RemoteControl/webroot/js/jquery-1.11.3.js (+10351/-0) plugins/RemoteControl/webroot/js/jquery-ui.js (+16617/-0) plugins/RemoteControl/webroot/js/jquery.ui.touch-punch.js (+180/-0) plugins/RemoteControl/webroot/js/main.js (+31/-0) plugins/RemoteControl/webroot/js/plugins/archaeolines.js (+7/-0) plugins/RemoteControl/webroot/js/require.js (+2103/-0) plugins/RemoteControl/webroot/js/settings.js (+22/-0) plugins/RemoteControl/webroot/js/translationdata.js (+33/-0) plugins/RemoteControl/webroot/js/ui/actions.js (+84/-0) plugins/RemoteControl/webroot/js/ui/combobox.js (+148/-0) plugins/RemoteControl/webroot/js/ui/jqueryuifixes.js (+162/-0) plugins/RemoteControl/webroot/js/ui/location.js (+237/-0) plugins/RemoteControl/webroot/js/ui/mainui.js (+334/-0) plugins/RemoteControl/webroot/js/ui/scripts.js (+90/-0) plugins/RemoteControl/webroot/js/ui/search.js (+267/-0) plugins/RemoteControl/webroot/js/ui/time.js (+223/-0) plugins/RemoteControl/webroot/js/ui/viewcontrol.js (+88/-0) plugins/RemoteControl/webroot/js/ui/viewoptions.js (+132/-0) plugins/RemoteControl/webroot/style.css (+889/-0) plugins/RemoteControl/webroot/style_tablet7in.css (+161/-0) plugins/RemoteControl/webroot/tablet7in.html (+690/-0) plugins/RemoteControl/webroot/translate_files (+17/-0) plugins/RemoteSync/CMakeLists.txt (+20/-0) plugins/RemoteSync/RemoteSync.qrc (+6/-0) plugins/RemoteSync/src/CMakeLists.txt (+43/-0) plugins/RemoteSync/src/RemoteSync.cpp (+276/-0) plugins/RemoteSync/src/RemoteSync.hpp (+159/-0) plugins/RemoteSync/src/SyncClient.cpp (+185/-0) plugins/RemoteSync/src/SyncClient.hpp (+71/-0) plugins/RemoteSync/src/SyncClientHandlers.cpp (+243/-0) plugins/RemoteSync/src/SyncClientHandlers.hpp (+89/-0) plugins/RemoteSync/src/SyncMessages.cpp (+171/-0) plugins/RemoteSync/src/SyncMessages.hpp (+127/-0) plugins/RemoteSync/src/SyncProtocol.cpp (+227/-0) plugins/RemoteSync/src/SyncProtocol.hpp (+191/-0) plugins/RemoteSync/src/SyncServer.cpp (+294/-0) plugins/RemoteSync/src/SyncServer.hpp (+86/-0) plugins/RemoteSync/src/SyncServerEventSenders.cpp (+104/-0) plugins/RemoteSync/src/SyncServerEventSenders.hpp (+131/-0) plugins/RemoteSync/src/SyncServerHandlers.cpp (+105/-0) plugins/RemoteSync/src/SyncServerHandlers.hpp (+61/-0) plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp (+207/-0) plugins/RemoteSync/src/gui/RemoteSyncDialog.hpp (+60/-0) plugins/RemoteSync/src/gui/remoteSyncDialog.ui (+373/-0) plugins/Scenery3d/src/Scenery3d.cpp (+4/-2) plugins/TextUserInterface/src/TextUserInterface.cpp (+6/-14) plugins/TextUserInterface/src/TextUserInterface.hpp (+0/-1) po/CMakeLists.txt (+3/-0) po/stellarium-remotecontrol/CMakeLists.txt (+73/-0) po/stellarium-remotecontrol/POTFILES.in (+23/-0) po/stellarium-remotecontrol/en.po (+325/-0) po/stellarium-remotecontrol/stellarium-remotecontrol-js.pot (+128/-0) po/stellarium-remotecontrol/stellarium-remotecontrol.pot (+600/-0) scripts/tests/real_time.ssc (+2/-2) src/CLIProcessor.cpp (+6/-1) src/CMakeLists.txt (+19/-0) src/StelLogger.cpp (+11/-0) src/StelLogger.hpp (+2/-0) src/StelMainView.cpp (+23/-5) src/core/SimbadSearcher.cpp (+20/-2) src/core/SimbadSearcher.hpp (+4/-1) src/core/StelActionMgr.cpp (+64/-54) src/core/StelActionMgr.hpp (+84/-37) src/core/StelApp.cpp (+19/-12) src/core/StelApp.hpp (+7/-4) src/core/StelAudioMgr.cpp (+52/-0) src/core/StelAudioMgr.hpp (+12/-0) src/core/StelCore.cpp (+108/-7) src/core/StelCore.hpp (+58/-10) src/core/StelLocation.cpp (+6/-0) src/core/StelLocation.hpp (+7/-0) src/core/StelLocationMgr.cpp (+34/-26) src/core/StelLocationMgr.hpp (+28/-29) src/core/StelModule.cpp (+6/-1) src/core/StelModule.hpp (+16/-3) src/core/StelModuleMgr.cpp (+4/-0) src/core/StelMovementMgr.cpp (+150/-33) src/core/StelMovementMgr.hpp (+74/-18) src/core/StelObject.cpp (+3/-1) src/core/StelObject.hpp (+8/-3) src/core/StelObjectModule.hpp (+1/-0) src/core/StelObjectType.hpp (+2/-0) src/core/StelObserver.cpp (+5/-3) src/core/StelObserver.hpp (+9/-1) src/core/StelProjector.cpp (+1/-0) src/core/StelProjector.hpp (+6/-3) src/core/StelProjectorClasses.cpp (+28/-17) src/core/StelPropertyMgr.cpp (+225/-0) src/core/StelPropertyMgr.hpp (+318/-0) src/core/StelRegionObject.hpp (+8/-6) src/core/StelSkyCultureMgr.cpp (+44/-1) src/core/StelSkyCultureMgr.hpp (+20/-1) src/core/StelSkyDrawer.cpp (+25/-20) src/core/StelSkyDrawer.hpp (+83/-27) src/core/StelTranslator.cpp (+5/-0) src/core/StelTranslator.hpp (+8/-0) src/core/StelUtils.cpp (+15/-5) src/core/StelUtils.hpp (+2/-2) src/core/VecMath.hpp (+16/-0) src/core/modules/Constellation.cpp (+3/-2) src/core/modules/Constellation.hpp (+3/-0) src/core/modules/ConstellationMgr.cpp (+66/-25) src/core/modules/ConstellationMgr.hpp (+43/-13) src/core/modules/LabelMgr.cpp (+4/-1) src/core/modules/LandscapeMgr.cpp (+50/-18) src/core/modules/LandscapeMgr.hpp (+80/-15) src/core/modules/MilkyWay.cpp (+1/-1) src/core/modules/MilkyWay.hpp (+8/-2) src/core/modules/Nebula.hpp (+9/-8) src/core/modules/NebulaMgr.cpp (+31/-16) src/core/modules/NebulaMgr.hpp (+58/-14) src/core/modules/SolarSystem.cpp (+34/-10) src/core/modules/SolarSystem.hpp (+55/-6) src/core/modules/SporadicMeteorMgr.cpp (+5/-2) src/core/modules/StarMgr.cpp (+1/-1) src/core/modules/StarMgr.hpp (+10/-5) src/core/modules/ZodiacalLight.cpp (+1/-0) src/core/modules/ZodiacalLight.hpp (+126/-120) src/gui/AtmosphereDialog.cpp (+3/-10) src/gui/ConfigurationDialog.cpp (+12/-27) src/gui/LocationDialog.cpp (+25/-40) src/gui/LocationDialog.hpp (+9/-0) src/gui/ScriptConsole.cpp (+24/-60) src/gui/ScriptConsole.hpp (+2/-0) src/gui/SearchDialog.cpp (+8/-34) src/gui/SearchDialog.hpp (+49/-6) src/gui/StelDialog.cpp (+405/-220) src/gui/StelDialog.hpp (+56/-5) src/gui/StelDialog_p.hpp (+110/-0) src/gui/StelGuiItems.hpp (+10/-3) src/gui/ViewDialog.cpp (+242/-388) src/gui/ViewDialog.hpp (+15/-18) src/gui/configurationDialog.ui (+5/-1) src/gui/viewDialog.ui (+6/-3) src/scripting/ScreenImageMgr.cpp (+8/-6) src/scripting/ScreenImageMgr.hpp (+5/-2) src/scripting/StelMainScriptAPI.cpp (+36/-13) src/scripting/StelMainScriptAPI.hpp (+37/-4) src/scripting/StelScriptMgr.cpp (+95/-26) src/scripting/StelScriptMgr.hpp (+56/-20)
To merge this branch:	bzr merge lp:~registry/stellarium/socis2015
Related bugs:	Link a bug report
Related blueprints:	Convert objects to use Qt properties (Medium)
Reviewer	Date Requested	Status
Fabien Chéreau	2016-06-04	Approve on 2016-06-13
gzotti	2016-06-04	Approve on 2016-06-04
Review via email: mp+296492@code.launchpad.net