Merge lp:~petr-kubanek/stellarium/stellarium into lp:stellarium

Proposed by Petr Kubánek
Status: Superseded
Proposed branch: lp:~petr-kubanek/stellarium/stellarium
Merge into: lp:stellarium
Diff against target: 876 lines (+478/-43)
13 files modified
plugins/TelescopeControl/CMakeLists.txt (+1/-1)
plugins/TelescopeControl/resources/device_models.json (+1/-1)
plugins/TelescopeControl/src/CMakeLists.txt (+2/-0)
plugins/TelescopeControl/src/TelescopeControl.cpp (+63/-16)
plugins/TelescopeControl/src/TelescopeControl.hpp (+3/-3)
plugins/TelescopeControl/src/TelescopeControlGlobals.hpp (+1/-0)
plugins/TelescopeControl/src/clients/TelescopeClient.cpp (+5/-0)
plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp (+175/-0)
plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp (+61/-0)
plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp (+46/-16)
plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp (+1/-0)
plugins/TelescopeControl/src/gui/TelescopeDialog.cpp (+8/-1)
plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui (+111/-5)
To merge this branch: bzr merge lp:~petr-kubanek/stellarium/stellarium
Reviewer Review Type Date Requested Status
gzotti Needs Fixing
Alexander Wolf Approve
Petr Kubánek (community) Needs Resubmitting
Bogdan Marinov Pending
Review via email: mp+320818@code.launchpad.net

This proposal has been superseded by a proposal from 2017-04-06.

Commit message

Support for RTS2 JSON API telescopes.

Description of the change

I added support for RTS2 JSON API protocols. All RTS2 supported telescopes can now have position shown in Stellarium, with goto abilities as well.

To post a comment you must log in.
Revision history for this message
Alexander Wolf (alexwolf) wrote :

Please resolve conflict (see stars/default/stars_hip_sp_0v0_0.cat.THIS file)

review: Needs Fixing
9219. By gzotti

Guide: Added reference for DE43x. Fixed build scripts to update Index once more just before final run.

9220. By Alexander Wolf

Fixed COSPAR designator parser

9221. By gzotti

Fixed wrong extinction coordinate frame of Zodiacal Light

9222. By Alexander Wolf

Apply translations for public testing (v0.90.0.9222)

Revision history for this message
gzotti (georg-zotti) wrote :

Hi!
In
void TelescopeClientJsonRts2::telescopeGoto(const Vec3d &j2000Pos)

you can use SteUtils::void rectToSphe(double *lng, double *lat, const Vec3d& v);

I must install RTS2 before I can further comment.

9223. By Alexander Wolf

Let's enable low resolution to all to avoid reports about 'problem' by an annoying rich people with the HighDPI devices but who cannot change properties of shortcut!

9224. By gzotti

Merge branch gpsd-nmea: Add support for GPSD service daemon or serially attached GPS devices.

9225. By gzotti

Add cmake script to find libgps

9226. By Alexander Wolf

refactor cmake scripts for GPS

9227. By Alexander Wolf

New lines for translation

9228. By gzotti

Oops: Restored plugin compilability.

9229. By Alexander Wolf

Updated visual style of GPS button

9230. By gzotti

Allow direct GPS device connection also on Linux/Mac, as fallback when gpsd is not available.

9231. By gzotti

Add a few more timezone replacements.

9232. By Alexander Wolf

Changed permissions for SUG script

9233. By Alexander Wolf

Updated cmake style

9234. By Alexander Wolf

Code refactoring; updated InnoSetup script

9235. By gzotti

Fixed a missing initialisation (avoids crash at program end)

9236. By Florian Schaukowitsch

Better encapsulation of GPS support without unnecessary dependency leaks and better modularity.
Revert r9228 because this is no longer necessary.

9237. By gzotti

GPS support: Doc completion and handling of misconfiguration when more than 1 port is available.

9238. By gzotti

Guide: more GPS/bluetooth remarks.

9239. By gzotti

Make map in LocationDialog resizable.

9240. By gzotti

Docfixes, attempt to fix location cursor position on first load. (unsolved)

9241. By Alexander Wolf

A small visual fix

9242. By gzotti

Fix resize-dependent updates for StelDialogs, e.g. location cursor position on first load.

9243. By Alexander Wolf

Fixed stupid bug in Scenery3D plugin

Revision history for this message
Petr Kubánek (petr-kubanek) wrote :

Hi,

I removed old catalogue version, which caused the conflict. I also use now rectToSphe, which seems to work as a charm (although the calculations done in this function seems to be different from what I had in code).

However, other telescope clients still use make-up version of conversion. Shall I rewrite others clients to use rectToSphe as well?

Revision history for this message
Petr Kubánek (petr-kubanek) wrote :

> Please resolve conflict (see stars/default/stars_hip_sp_0v0_0.cat.THIS file)

Fixed, hope this will propagate to merge request as well.

Revision history for this message
Petr Kubánek (petr-kubanek) wrote :

> Please resolve conflict (see stars/default/stars_hip_sp_0v0_0.cat.THIS file)

review: Needs Resubmitting
Revision history for this message
Petr Kubánek (petr-kubanek) wrote :

> Hi!
> In
> void TelescopeClientJsonRts2::telescopeGoto(const Vec3d &j2000Pos)
>
> you can use SteUtils::void rectToSphe(double *lng, double *lat, const Vec3d&
> v);
>
> I must install RTS2 before I can further comment.

You can work with RTS2 dummy - grab source from GitHub, compile (I am working on Debian packages, but that's still a long way) and you should have dummy T0 in rts2-mon. Then connect (you will need to run rts2-httpd). Let me know if you hit any problems.

Revision history for this message
gzotti (georg-zotti) wrote :

Hi! I was not aware the other telescope clients also have this code. We should be able to fix that, thanks.

I have compiled RTS2 from github on my Ubuntu 16.04 notebook (CoreDuo from 2009), following instructions. Install worked well so far. I was totally unaware of this amazing project! I am also (far too seldom) observer, but only with a small EQ3 and (modified) DSLR, nothing stationary. (I have access to an EQ6 occasionally.) As a total beginner with RTS2, any intro manual you have available would be helpful. I will try to continue again on weekend.

Revision history for this message
Alexander Wolf (alexwolf) wrote :

It's OK for me now. Some visual improvements may be added after merge.

Georg?

review: Approve
9244. By Alexander Wolf

Updated default catalogs of plugins

9245. By Alexander Wolf

Revised stars names

9246. By Alexander Wolf

Revised stars names

Revision history for this message
gzotti (georg-zotti) wrote :

We will fix the GUI to only show the relevant settings depending on which type of telescope is being configured.

Petr, I was able to install on Ubuntu 16.04, sudo services rts2 start, and see (dummy) T0 and can write commands into the rts2 console. (park, move 90 0, etc. ) rts2-httpd requires database, I have installed the stars database as described in RUN, retried starting rts2-httpd, but rts2-mon still complains that I shall check that root can connect to database. (could not connect to database "stars" on line 162.) I am also not really familiar with postgresql usage, maybe I am doing something wrong.

On the other side, I have set up an RTS2 telescope on my Windows PC with your version.

from the logfile:

connectionType: 5 initString: "RTS2 dummy Telescope:RTS2:J2000:http://gzotti:PASSWORD@192.168.xxx.yyy:8889"
Creating telescope "RTS2 dummy Telescope:RTS2:J2000:http://gzotti:PASSWORD@192.168.xxx.yyy:8889" ; name/type/equinox/params: "RTS2 dummy Telescope" "RTS2" J2000 "http://gzotti:XXXXXX@192.168.xxx.yyy:8889"
TelescopeRTS2 paramaters: "http://gzotti:PASSWORD@192.168.xxx.yyy:8889"
request url: "http://gzotti:PASSWORD@192.168.xxx.yyy:8889/api/devbytype?t=2"
TelescopeRTS2 error QNetworkReply::NetworkError(ConnectionRefusedError)

The telescope overview panel in Stellarium states "connected", and I see a telescope control panel for my RTS2 dummy telescope, but it shows default all-0 coordinates, not the currently set 6h00/0° RA/DEC (from rts2-mon move 90 0). So it seems more than likely that connection has not been properly established and "ConnectionRefused" is not properly handled yet. As I understand, this would connect to the running rts2-httpd, but it does not run...

When I am connected (or not) to RTS2 like this, quitting Stellarium results in a crash.

Sorry, I am total beginner with RTS2 and automated telescopes. A guide book "RTS2 for dummies" or so would be helpful. And then a thorough book about robotic observatories with RTS2 with instructions, sectioned by topic, not alphabetized (where to start reading the manpages?))

It would be perfect if you can add a section on RTS2 to the Guide: in guide/plg_atTheTelescope.tex. Not a complete RTS2 manual, but things to take case of, etc. Don't bother with too much formatting, we will likely edit a bit, but just to get info from you on what is important, like having rts2-httpd running.

I will try to follow the postgresql instructions now, maybe I can get this to work.

review: Needs Fixing
Revision history for this message
gzotti (georg-zotti) wrote :

I restarted with the database part and instructions from RUN and rts2.org/faq.html. When I add myself as database user, I can look into the database, fine. But rts2-https must be started by root, and then there is an error

gzotti@alcyone:~/DEV/rts2/src$ sudo rts2-httpd
[sudo] Passwort für gzotti:
2017-04-01T23:41:29.319 CET rts2-httpd 1 cannot connect to DB 'stars'. Please check if the database server is running (on specified port, or on port 5432, which is the default one; please be aware that RTS2 does not parse PostgreSQL configuration, so if the database is running on the non-default port, it will not be accessible unless you specify the port). Also please make sure that the current user, root(0) can log into database: could not connect to database "stars" on line 162
2017-04-01T23:41:29.320 CET rts2-httpd 1 cannot init daemon, exiting

gzotti@alcyone:~/DEV/rts2/src$ rts2-httpd
2017-04-01T23:42:05.060 CET rts2-httpd 1 cannot create lock file /var/run/rts2_HTTPD: Permission denied - do you have correct permission? Try to run daemon as root (sudo,..)

I finally made /var/run write-all, deleted rts2_HTTPD (as root), and was able to start rts2-httpd as myself, but this seems sub-optimal. Now I have an error in Stellarium's log.txt

TelescopeRTS2 error QNetworkReply::NetworkError(AuthenticationRequiredError)

User and password are visible in the Stellarium logfile like in the previous report and are correct.

Interesting: I wanted to connect to this webserver in Firefox. I see the menu, but a click on a menu entry opened the auth panel. my login&password don't work. I may have overlooked this: do I have another name when using rts2, and where would I have configured this? (I assue these are the auth. data I also need to give in Stellarium...) In the database I use the same username that I use in Ubuntu.

I am getting closer, but must have overlooked something.

review: Needs Information
9247. By Alexander Wolf

Upated templates for translation

9248. By Alexander Wolf

Apply translations for public testing (v0.90.0.9248)

Revision history for this message
gzotti (georg-zotti) wrote :

Hah, I have found the rts2 wiki, and rts2-user -a <name>, finally. I still would like to find a complete beginner's guide to RTS2: When to use Linux user account, Database user name (and what to do as root, what as postgres, what as regular user -- I can have 20 years of Linux experience, never used postgresql!), rts2 user name. Basically an advanced amateur's guide to building a remote robotic observatory with RTS2, is there something available? (May be some affordable print-on-demand book, or even a €15 PDF to download a current doc (this may give you some gratification), it would just have to be complete and correct.) RTS2 seems very complete, but the settings overwhelm me.

Now I have connection, and messages in log.txt like

request url: "http://gzotti:PASSWORD@192.168.xxx.yyy:8889/api/get?d=T0"
TelescopeRTS2 error QNetworkReply::NetworkError(NoError)
TelescopeRTS2 object false "no error occurred" 0 120 0
TelescopeRTS2 RADEC 2.0944 0
request url: "http://gzotti:PASSWORD@192.168.xxx.yyy:8889/api/get?d=T0"
TelescopeRTS2 error QNetworkReply::NetworkError(NoError)
TelescopeRTS2 object false "no error occurred" 0 120 0
TelescopeRTS2 RADEC 2.0944 0
request url: "http://gzotti:PASSWORD@192.168.xxx.yyy:8889/api/get?d=T0"

The 0 120 0 may come from the move 120 0 issued earlier in rts2-mon.

I assumed the rts2 was in OFF mode, switched ON in rts2-mon. In Stellarium, I tried in the telescope panel "Move telescope to [current object], [SLEW]". The entries in the logfile get more, but no change. rts2-mon shows the OBJ coordinates 2h/15° from another command given "move 30 15", and the logfile has

TelescopeRTS2 error QNetworkReply::NetworkError(NoError)
TelescopeRTS2 object false "no error occurred" 0 30 15
TelescopeRTS2 RADEC 0.523599 0.261799

It appears the SLEW command is not transferred to RTS2. But I also don't see a telescope marker on screen at 30°/15°. I don't know whether RTS2 has disabled the T0 telescope for safety during daylight or something (I have switched State:ON in rts2-mon before). I can apparently issue move commands in rts2-mon, these coordinates are displayed in rts2-mon, are transferred to Stellarium, but no telescope marker is visible, and I cannot isssue a GOTO command from Stellarium that would impress rts2-mon in any way.

So I see some connection is established, but something is likely still misconfigured.

review: Needs Information
Revision history for this message
gzotti (georg-zotti) wrote :

I just observed: when I freshly connect to the RTS dummy telescope, I have a telescope marker at the coordinates which I have set in rts2-mon. Any slew commmand from stellarium makes the marker disappear, and rts2-mon shows no change in position (command ignored). Disconnect/connect shows it at the old location.

When I issue a "move" command in rts2-mon, the telescope marker in Stellarium moves! So the telescope pointing record is properly transmitted, at least.

Revision history for this message
Petr Kubánek (petr-kubanek) wrote :

In users database is (added) column, which describes which devices a user can command. Default is NULL, meaning none. When you set it to all (*) as this:
<pre>
psql stars
update users set allowed_devices = '*';
</pre>
you will be able to command devices. It looks as connection brokes after error and is not reconnected. I will investigate this issue.

Revision history for this message
gzotti (georg-zotti) wrote :

Ah, that sounds like it. I hope I can try tonight, maybe only on Wednesday. Please handle the connection errors at least with diagnostic messages to the logfile like "cannot connect, is rts2-httpd running on <IP address>?"; "User XXX unknown. Use rts2-user -a XXX to create"; "User XXX cannot control telescope. See manual for details." and please write this section for our guide (there is a \sectionauthor*{} macro to mark personal contributions). You made incredible software, but is is quite advanced and users will flood us *or you* with emails with always the same questions when these are not easily answered in manuals :-) When you write a general manual for RTS2, I am afraid this should include a short intro to psql. If you don't have the time (I understand we are all busy), maybe some DIY observatory maker can write such intro booklet for beginners while he is building it, based on his own experiences and pitfalls. The telescope parameters look impressive alone, all those mount tweaks, ...

Is there a useful scenario for RTS2 with mobile telescope? Just to run an automated night of captures from an object list? (No dome, no weather sensors, ... just a mount, DSLR or CCD, optional filter wheel, optional autofocuser?) Not sure about the resources, but they don't look too big. RTS2 could maybe run on a small low-power ARM SBC or so (think Raspberry Pi3?).

Revision history for this message
gzotti (georg-zotti) wrote :

OK, after this database update I was able to slew the dummy RTS2 telescope.

However, the crash-on-exit persists. I have only Telescope plugin active. When I exit immediately after program start, all is OK. When I press the telescope button and see the panel "No telescopes connected", I press "configure", I see the unconnected RTS2 and an unconnected Stellarium Dummy telescope. When I quit Stellarium at this point, already here I have a crash. So it does not even require connection, only being (partially?) loaded. Maybe some uninitialized pointer?

review: Needs Fixing
Revision history for this message
gzotti (georg-zotti) wrote :

Strange: The logfile indicates Telescope plugin has been successfully unloaded. We did have a few days recently where trunk crashed on exit. Maybe your latest merge was in these days. Can you merge from trunk again before resubmitting, maybe the problem is somewhere entirely else.

review: Needs Fixing
9249. By Alexander Wolf

Fixed typo in name of dark nebula LDN 935

9250. By Alexander Wolf

Updated behaviour of Windows Installer (Added an optional task for delete all user data during uninstall process.)

9251. By Alexander Wolf

Updated cmake script for ISS

9252. By Alexander Wolf

Restoration of build without GPS support

9253. By Alexander Wolf

Added support an asterisms for the sky cultures ('big asterisms' are supported at the moment)

9254. By gzotti

GPS: better identification for existing serial ports.

9255. By Alexander Wolf

Updated asterisms list

9256. By Alexander Wolf

Updated asterisms list

9257. By Alexander Wolf

Typofixes for asterisms

9258. By Alexander Wolf

Typofixe for asterism

9259. By gzotti

A few more asterisms

9260. By Alexander Wolf

Extract names of asterisms for translation

9261. By gzotti

A few GUI text improvements

Revision history for this message
Petr Kubánek (petr-kubanek) wrote :

I merged again from trunk, and also I made parts irrelevant for the setting to be hidden from the dialog box. So if you choose local, you will see only serial port & type, remote hostname and port, and RTS2 URL, username and password.

I do not see any crash, Stellarium exits cleanly without core dump on all ocassion. If you can please try again, and if you see a crash, try to be as specific as possible about conditions causing it.

9262. By Alexander Wolf

Added context support for constellations and asterisms names

9263. By Alexander Wolf

Added support RTS2 for Telescope Control Plugin

9264. By Alexander Wolf

Let's make description of mount type translatable...

9265. By Alexander Wolf

Oops... new lines for translation

9266. By Alexander Wolf

Updated contributors list for Telescope Control plugin

9267. By gzotti

Avoid broken script when calling waitFor() after the point in time to wait. Also simplified code somewhat.

9268. By Marcos Cardinot

Meteor Showers plugin - update catalog of meteor showers (IMO 2017)
http://www.imo.net/files/meteor-shower/cal2017.pdf

9269. By Alexander Wolf

Added SN 2017cbv

9270. By Alexander Wolf

Apply translations for public testing (v0.90.0.9270)

9271. By Alexander Wolf

Avoid mixing enum types

9272. By Alexander Wolf

A few cosmetic fixes

9273. By Alexander Wolf

Updated templates for translation

9274. By Alexander Wolf

Revert revision 9271

9275. By gzotti

obvious fix for Comet::infoMap(): derive from Planet, not StelObject.

9276. By Alexander Wolf

Updated translations

9277. By Alexander Wolf

Added support Catalan (Valencian) language

9278. By Marcos Cardinot

Meteor Showers plugin - update catalog

9279. By Alexander Wolf

New lines for translation

9280. By Alexander Wolf

I've introduced a new option in config.ini file - astro/
flag_forced_meteor_activity=(false|true) - for planetariums to enable a
show of sporadic meteors activity without atmosphere.

9281. By gzotti

Merged-in Petr Kubanek's RTS2 updates, and added a few more bits of info in the Guide.

9282. By Alexander Wolf

New lines for translation

9283. By Alexander Wolf

Apply translations for public testing (v0.90.0.9283); Added improvements for AstroCalc tool

9284. By Alexander Wolf

Updated templates for translation

9285. By Alexander Wolf

Updated time steps for AstroCalc/Ephemeris tool

9286. By Alexander Wolf

Avoid warnings

9287. By Alexander Wolf

Fixed stupid bug

9288. By Alexander Wolf

Added a line for the approximate time of the meridian crossing in AstroCalc tool

9289. By Alexander Wolf

A small improvement for previous fix

9290. By Petr Kubanek

Telescope+Satellites plugin: Add TLE tracking to RTS2 telescopes!

9291. By Alexander Wolf

Updated list of locations

9292. By Alexander Wolf

This patch re-enables different star scales in the ocular plugin, even separately for ocular and CCD views, and cleans up some excessive code in that plugin.

9293. By Alexander Wolf

Added information on magnification of the combination of eyepiece/lens/telescope in proportions of the telescope diameters

9294. By gzotti

Guide updates with note on RTS2 satellite tracking and more details of star scales management in the Oculars plugin.

9295. By gzotti

Added another timezone hack: the binary location file, when prepared on Linux, was missing the one zone unknown on Linux. Translations must go in both directions. :-o

9296. By Alexander Wolf

SUG: Updated Bortle scale chapter

9297. By Alexander Wolf

Increased an accuracy of 'Altitude vs. Time' diagram

9298. By Alexander Wolf

Updated API comments for 'Altitude vs. Time' diagram

9299. By Alexander Wolf

The next iteration to improve the accuracy of the 'Altitude vs. Time' diagram (accuracy is 3 minutes - it's acceptable for the rude graph)

9300. By Alexander Wolf

Updated template for translation

9301. By Alexander Wolf

Let's show version of the script (Scripting Engine)

9302. By Alexander Wolf

A small language fix

9303. By Alexander Wolf

Re-generate all templates for translation

9304. By Alexander Wolf

Let's make unselectable a planet where we are located.

9305. By Alexander Wolf

A small improvement for returnToHome feature.

9306. By gzotti

Update a label (apparent mag instead of absolute Mag)

9307. By Alexander Wolf

Updated headers for AstroCalc tools

9308. By Alexander Wolf

A small fix for TCP (thanks Coverity)

9309. By Alexander Wolf

Updated names for DSO

9310. By Alexander Wolf

Updated scripts and scripting engine

9311. By Alexander Wolf

Updated list of DSO's names

9312. By Alexander Wolf

Obvious fix for issue of reloading of DSO names when filter of catalogs is updated.

9313. By Alexander Wolf

Apply translations for public testing (v0.90.0.9313)

9314. By Alexander Wolf

Added configurable options to AstroCalc tool

9315. By Alexander Wolf

Added support Kabyle language

9316. By Alexander Wolf

Updated star names from Bright Star Catalogue, 5th Revised Ed. (Hoffleit+, 1991)

9317. By Alexander Wolf

Typofix

9318. By Alexander Wolf

some optimizations

9319. By Alexander Wolf

Restore searchable for telescope names

9320. By Alexander Wolf

Apply translations for public testing (v0.90.0.9320)

9321. By Alexander Wolf

Fixes and optimizations

9322. By Alexander Wolf

Obvious fixes (thanks Clang)

9323. By Alexander Wolf

Updated AstroCalc tool

9324. By Alexander Wolf

Updated AstroCalc tool

9325. By Alexander Wolf

Added special case - Dark Doodad Nebula

9326. By Alexander Wolf

Fixed the opposition/conjunction longitude line: the line follows the ecliptic pole on date now (+ it applicable for Earth only)

9327. By Alexander Wolf

Fixed small cosmetic bug for SIMBAD status line

9328. By Alexander Wolf

Updated Exoplanets plugin: added more data for analysis

9329. By Alexander Wolf

Added first edition of 'What's Up Tonight' tool for AstroCalc

9330. By Alexander Wolf

Fixed very stupid bug for Date & Time dialog... Again./stellarium!

9331. By Alexander Wolf

Added an improvement for WUT (through 'dirty hack' at the moment)

9332. By Alexander Wolf

Updated Bookmarks tool

9333. By Alexander Wolf

Removed extra-long tooltip

9334. By Alexander Wolf

Added context for WUT abbreviature

9335. By Alexander Wolf

Updated templates for translation

9336. By Alexander Wolf

Obvious improvement for AstroCalc/WUT

9337. By Alexander Wolf

Added tool to remove custom markers by coordinates

9338. By Alexander Wolf

Added improvements for custom markers

9339. By Alexander Wolf

Added new method in the Core - getMouseJ2000Pos(); code refactor for Pointer Coordinates plugin and Custom Objects

9340. By Alexander Wolf

Updated SUG

9341. By Alexander Wolf

Updated translations

9342. By Alexander Wolf

Code simplification

9343. By Alexander Wolf

Updated Boomarks tool to save/restore custom markers

9344. By Alexander Wolf

Updated templates to translation

9345. By Alexander Wolf

A small improvement for Bookmarks tool

9346. By Alexander Wolf

Added another small improvement for Bookmarks tool

9347. By Alexander Wolf

Added two methods for checking position of celestial object above horizon

9348. By Alexander Wolf

updated API docs

9349. By Alexander Wolf

Added calculation of list of visible object for current location (AstroCalc)

9350. By Alexander Wolf

Added improvements for AstroCalc sort of names

9351. By Alexander Wolf

Apply translations

9352. By Alexander Wolf

Added column for extra data

9353. By Alexander Wolf

Updated templates

9354. By Alexander Wolf

Fixed stupid bug

9355. By espie <email address hidden>

missing include on OpenBSD, fd_set not defined

9356. By Alexander Wolf

Added support double and variable stars for AstroCalc tool

9357. By Alexander Wolf

Added support translation novae names (parse nova name to extract
constellation name and year of flash);
Added bright lists of double and variable stars to Search Tool

9358. By Alexander Wolf

Improve Nova name parser

9359. By Alexander Wolf

Added context to better translation of constellation names (genitive)

9360. By Alexander Wolf

Apply translations for inner testing; Fixed issue for Bright Nova Plugin

9361. By Alexander Wolf

Updated contributors list

9362. By Alexander Wolf

Speed-up calculations for some types of phenomena

9363. By Alexander Wolf

Let's improve placing of the exoplanet systems

9364. By Alexander Wolf

Added customized buttons for toggle ICRS/Galactic grids

9365. By Alexander Wolf

Let's create and set directory for screenshots when user doing a screenshot and option main/screenshot_dir is not set.

9366. By Alexander Wolf

Added customized buttons for toggle an ecliptic grid and constellation boundaries

9367. By Alexander Wolf

The limit for diameter of binoculars aperture upped to 200mm

9368. By Alexander Wolf

New lines for translation

9369. By Alexander Wolf

Added import/export bookmarks

9370. By Alexander Wolf

Obvious fix for import bookmarks

9371. By Alexander Wolf

Added confirmation before deleting landscape

9372. By Alexander Wolf

Let's try guess name of location and use it when spaceship is landing

9373. By Alexander Wolf

Updated names of deep-sky objects (source: the list of 'The 500 Best
Deep Sky Objects' by Don Pensack; https://www.cloudynights.com/topic/
472872-500-best-dso-list/)

9374. By Alexander Wolf

Code refactoring

9375. By Alexander Wolf

Apply translations for public testing

9376. By gzotti

Addendum to r9373: Finally allow comments in DSO name list. Please use this to allow tracing the source of some rarely used or questionable names. If possible, add in older sources.

9377. By gzotti

Guide: small addenda

9378. By Alexander Wolf

Typofix

9379. By Alexander Wolf

Typofix

9380. By Alexander Wolf

Updated calculation for boundaries of IAU constellations

9381. By Alexander Wolf

A small fix for Pointer Coordinates plugin

9382. By Alexander Wolf

Updated default supernovae catalog

9383. By gzotti

Addendum to r9380: improved rounding errors issue for constellation borders. But it seems constellation border data files need fixes.

9384. By gzotti

GUI Typofixes

9385. By Alexander Wolf

Extract lines for translation

9386. By gzotti

Guide: added an example for Scenery3d.

9387. By gzotti

Merge-in SoCiS2016: Irregular solar system objects, RemoteSync plugin, Scenery3D improvements. Big merge, and raises Qt requirement to Qt5.4.

9388. By Alexander Wolf

Extract new lines for translation

9389. By Alexander Wolf

Cosmetic changes + extract new lines for translation

9390. By Alexander Wolf

Code refactoring for AstroCalc tool and DSO.

Added new option to toggle usage of measure unit mag/arcmin^2 or mag/
arcsec^2 for the surface brightness (astro/flag_surface_brightness_arcsec
= false).

9391. By Alexander Wolf

Oops... extract new lines for translation

9392. By Alexander Wolf

Updated Stellarium User Guide

9393. By gzotti

Add config option for planet apparent magnitude configuration

9394. By Alexander Wolf

Refactoring the GUI

9395. By Alexander Wolf

Added option to toggle the usage the buttons background on bottom bar

9396. By Alexander Wolf

Fixed saving a new option

9397. By Alexander Wolf

Added an optional indication of mount mode

9398. By Alexander Wolf

Added description to the planets magnitude algorithm

9399. By Alexander Wolf

Show proper motions for some stars

9400. By Alexander Wolf

Typofixes

9401. By Alexander Wolf

Addendum of convert to StelProperty usage; Added an 'Additional
settings' block for selected object info.

9402. By gzotti

typofix

9403. By gzotti

updates of description strings

9404. By Alexander Wolf

fixes and extract lines for translation

9405. By Alexander Wolf

Apply translations for public testing

9406. By Alexander Wolf

Obvious cosmetic fixes

9407. By Alexander Wolf

Fixed compilation error

9408. By Alexander Wolf

Re-fix previous revision

9409. By Alexander Wolf

Fixed translation on-the-fly issue for AstroCalc tool

9410. By gzotti

Converted constellations_spans.dat to the original HMS format to avoid rounding errors.

9411. By Alexander Wolf

Added contrast index for DSO

9412. By Alexander Wolf

Rearrange the data for putting of contrast index

9413. By gzotti

Fix several Coverity issues

9414. By Alexander Wolf

Updated API docs

9415. By Alexander Wolf

Another small improvement for AstroCalc tool

9416. By gzotti

More Coverity issues

9417. By Alexander Wolf

a small fix

9418. By Alexander Wolf

Extension of features for AstroCalc/Ephemeris Tool

9419. By Alexander Wolf

Updated AstroCalc/Alt. vs Time tool

9420. By gzotti

Another Coverity calmer.

9421. By Alexander Wolf

Added AstroCalc/Graphs feature

9422. By Alexander Wolf

Oops... added tabicons

9423. By gzotti

Guide: started chapter on RemoteSync

9424. By Alexander Wolf

Coverity fix

9425. By Alexander Wolf

Added function 'Angular size vs. Time' to the AstroCalc/Graphs tool

9426. By Alexander Wolf

Updated lines for translation

9427. By Alexander Wolf

AstroCalc/Ephemeris can use horizontal coordinates also - welcome to
analemma :)

9428. By Alexander Wolf

Updated AstroCalc/Ephemeris tool; removed script 'Analemma'

9429. By Alexander Wolf

Updated lines for translation

9430. By Alexander Wolf

Added function 'Phase angle vs. Time' to the AstroCalc/Graphs tool

9431. By Alexander Wolf

Updated lines for translation

9432. By gzotti

New attempt at a Coverity issue, and some refactoring (use Q_NULLPTR).

9433. By gzotti

Q_NULLPTR refactoring completed for all plugins.

9434. By Alexander Wolf

Fixed crash when AstroCalc tool is active and we are on the spaceship; Cosmetic fix for UI; Restore building for GCC/Debug

9435. By Florian Schaukowitsch

Update the main page documentation and architecture image to reflect current situation
Use the SVG directly in the documentation, with the PNG as a fallback

9436. By gzotti

More cleanups (Q_NULLPTR and fixed a cast size warning)

9437. By Alexander Wolf

Fixed AstroCalc/Ephemeris tool

9438. By gzotti

Guide: small bib update

9439. By gzotti

Add coathanger asterism

9440. By gzotti

Added lowres 3D model of 67P

9441. By Florian Schaukowitsch

StelOpenGLArray: zero-initialize everything, use zero size instead of negative offset to determine unset atttributes. Remove QObject inheritance (really not required here)

9442. By gzotti

add const qualifier to a few get methods.

9443. By gzotti

Attempt to fix a Coverity issue

9444. By Alexander Wolf

Refactoring the source code

9445. By gzotti

fix line properties handling

9446. By Alexander Wolf

Updated names of deep-sky objects

9447. By Alexander Wolf

A small fix for name of LDN 906

9448. By gzotti

A slight speedup to the satellites plugin.
Further refactoring, added const qualifier to several methods.

9449. By Alexander Wolf

Do not show satellites when time rate is over JD/sec!

9450. By Alexander Wolf

Reduce switching between projections for Satellites plugin

9451. By Alexander Wolf

Obvious addition for previous revision (make satellites selectable again)

9452. By Alexander Wolf

Added small fix for satellites orbites

9453. By Alexander Wolf

Bump the version of Satellites plugin

9454. By Alexander Wolf

Speed-up satellites...

9455. By Alexander Wolf

Apply translations for public testing

9456. By gzotti

Avoid wrong painter state switch. This avoids also a bug which disabled the bright flare-type Iridium point source drawing. [Apparently only on some Geforce Windows systems?]

9457. By 375gnu

Updated Belarusian translation for skycultures

9458. By Alexander Wolf

Added new option to configure behaviour of Satellites (Satellites/time_rate_limit = 1.0)

9459. By Alexander Wolf

Updated DSO names

9460. By Florian Schaukowitsch

Add RemoteSync plugin documentation to guide

9461. By Florian Schaukowitsch

Doxygen changes:
Remove custom doc-header.html and doxygen.css style (modifications were very minor, but the replacements cause some incompatibility with newer versions)
Move some of the old styles into the extrastyle.css override, as recommended by Doxygen
Remove jquery.js, should be automatically copied correctly
Workaround for a buggy patch (https://bugs.launchpad.net/ubuntu/+source/doxygen/+bug/1631169, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622147) on Doxygen for Debian-based distros, which prevents copying dynsections.js (which is required for collapsible sections). This fix requires the JS search engine to be enabled.

9462. By gzotti

Guide: add small section on scintillation. Allow optional argument for \indexterm macro.

9463. By gzotti

Add a scripting function to retrieve property names (helpful for configuring RemoteSync).

9464. By Alexander Wolf

Added 3 additional catalogs to our DSO catalog

9465. By Alexander Wolf

Fixed saving new catalogs...

9466. By Alexander Wolf

Updated SUG

9467. By Alexander Wolf

Updated line for translation

9468. By Alexander Wolf

Updated lines for translation and language improvements

9469. By Alexander Wolf

Updated names of DSO

9470. By Alexander Wolf

Typofixes

9471. By gzotti

typofixes

9472. By Alexander Wolf

Updates for DSO catalogue:
- let's use packing and archiving the data to reduce size of package
- improvements for diagnostic messages
- improvements for the converter of data
- use version 3.1 of catalogue
- use data from PGC up to magnitude 15.5 for DSO (over 83000 objects)

9473. By Alexander Wolf

Removed names for too faint objects

9474. By gzotti

Update cmake variable name (deprecated since Qt5.1, failed in Qt5.9)

9475. By Alexander Wolf

Updated DSO names

9476. By Alexander Wolf

Fixed for DSO catalog

9477. By Alexander Wolf

Another fix for DSO catalog

9478. By Alexander Wolf

Damn! Restore missed data for DSO catalog

9479. By Alexander Wolf

Allowed to see the groups of the artificial satellites now

9480. By Alexander Wolf

Updated all templates for translation

9481. By Alexander Wolf

Added Belarusian sky culture (thanks for Tsimafei Nassenik-Avilin and Johan Meuris)

9482. By Alexander Wolf

Re-pack Stellarium DSO Catalog

9483. By gzotti

Add CMakeLists.txt to Belarusian skyculture

9484. By Alexander Wolf

Apply translations for public testing

9485. By Florian Schaukowitsch

Some CMake cleanup for Windows builds
Specify the WinMM library only in the CMake file instead of two seperate places for MinGW/MSVC
Removed custom compile/linker flags for the "windows" subsystem and use the WIN32 CMake target option instead
Re-enable some disabled MSVC warnings (and fixed the issues associated with them), and document what the other disables do

9486. By Alexander Wolf

A small optimization for DSO

9487. By Alexander Wolf

SUG: Updated chepters for DSO and config options

9488. By Alexander Wolf

Added list of bright stars with high proper motion to the Lists feature of Search Tool and AstroCalc/Positions feature

9489. By gzotti

Fixed a preprocessor macro redefinition warning.

9490. By gzotti

RemoteSync: Improved GUI for property sync exclusion finetuning, and fixed storing of the config.

9491. By Alexander Wolf

Speed-up DSO rendering (tested on over one million objects)

9492. By Alexander Wolf

New lines for translation

9493. By Alexander Wolf

Updated RemoteSync's GUI

9494. By Alexander Wolf

Updated limit for proper motion

9495. By Alexander Wolf

Apply translations for public testing

9496. By Alexander Wolf

Fixed l10n support for AstroCalc

9497. By gzotti

Merge split_ssystem. From now on we have separate ssystem_major.ini and ssystem_minor.ini. Only the latter shall be editable for the users. The SS editor still lists Pluto for deletion, but does not delete it. SS editor allows deletion of several objects at once, or loading of SS objects in ini format (e.g. ssystem_1000comets.ini).

9498. By gzotti

Don't offer Pluto for deletion. :-)

9499. By Alexander Wolf

Update data for translation

9500. By gzotti

Reconnect Earth pointer in GridlinesMgr after changes in SolarSystemEditor.

9501. By gzotti

Properly reset planet scale after reloading solar system.

9502. By Alexander Wolf

Updated action name

9503. By Alexander Wolf

Extended AstroCalc/WUT feature

9504. By gzotti

Add lunar magnitude to sky brightness computation (brightness variation during lunar eclipses!)

9505. By Alexander Wolf

Cosmetic fix

9506. By Alexander Wolf

Updated standard edition of DSO Catalog

9507. By Alexander Wolf

Updated info for proper motion of stars

9508. By Alexander Wolf

A small obvious fix...

9509. By Alexander Wolf

refactoring the code of StarWrapper class...

9510. By Alexander Wolf

Updated the code for special case of drawing orbits

9511. By gzotti

re-calibrated ocean landscape

9512. By gzotti

Add property handling for the labels.

9513. By gzotti

Update RemoteControl panels with new functionality. Also use mostly sliders on the 7in layout.

9514. By gzotti

Guide: Update index and Solar System Editor and RemoteSync plugins.

9515. By Alexander Wolf

Updated templates for translation

9516. By gzotti

Updated a few DSO names.

9517. By Alexander Wolf

Guide: Updated chapter 'The User Interface'

9518. By Alexander Wolf

Updated rules for loading textures of Solar system bodies

9519. By Alexander Wolf

Added TODO's and warning for texture loading...

9520. By Alexander Wolf

Updated AstroCalc tool and related SUG chapters

9521. By gzotti

Guide: A few minor corrections

9522. By Alexander Wolf

Fixes for kinetic scrolling for AstroCalc on Windows

9523. By Alexander Wolf

Updated DSO catalog

9524. By gzotti

Guide: Further corrections.

9525. By Alexander Wolf

Guide: a small cosmetic fix for TOC of Chapter III

9526. By Alexander Wolf

Fixed couple minor bugs in Satellites plugin

9527. By Alexander Wolf

improve fix from previous revision

9528. By Alexander Wolf

other couple tiny fixes...

9529. By Alexander Wolf

Apply translations for public testing

9530. By Alexander Wolf

revert 'fix' for orbits

9531. By Yuri Chornoivan

Added Ukrainian translation for Belarusian skyculture

9532. By Alexander Wolf

Fixed switching horizontal/equatorial coordinates for Solar system objects (AstroCalc/Positions)

9533. By Alexander Wolf

Updated AstroCalc/WUT

9534. By Alexander Wolf

Updated AstroCalc/WUT

9535. By Alexander Wolf

Updated AstroCalc/WUT (final...)

9536. By Alexander Wolf

A final update AstroCalc/WUT tool

9537. By Alexander Wolf

Fixed crash when observer is flying on spaceship

9538. By Alexander Wolf

Added context and improve English phrase

9539. By Alexander Wolf

Obvious fixes for AstroCalc (for advanced users)

9540. By Alexander Wolf

Cosmetix fix for advanced users of AstroCalc tool

9541. By Alexander Wolf

Another cosmetic fixes for advanced users in AstroCalc tool

9542. By gzotti

Scenery3D: Store torchlight and coordinate display flag to config.

9543. By gzotti

Solve issues of r9537

9544. By gzotti

removed useless vertex color data from asteroid models.

9545. By Alexander Wolf

Fixes in AstroCalc tool

9546. By gzotti

Tentative changelog proposal for 0.16

9547. By gzotti

Guide: add note on DSO catalog selection effects in AstroCalc.

9548. By Alexander Wolf

Changed behaviour of DSO catalogs filter + changes in AstroCalc/WUT tool

9549. By Alexander Wolf

Updated filters for DSO objects in AstroCalc/WUT tool

9550. By Alexander Wolf

Updated rules for usage DSO filters in AstroCalc tool

9551. By Alexander Wolf

Updated sorting rules for AstroCalc/Positions tool

9552. By gzotti

Guide: minor fixes

9553. By Alexander Wolf

Updated tab rules for Search Tool

9554. By gzotti

Improvement of topographic correction, not sure if it is a geometrically correct fix yet.

9555. By henrysky

Added missed zh_HK zh_TW zh_CN descriptions for western sky-culture

9556. By Alexander Wolf

Updated filters for Solar system bodies (AstroCalc/Positions)

9557. By Alexander Wolf

A possible fix for 4K devices

9558. By Alexander Wolf

Another possible fix for 4K devices

9559. By Alexander Wolf

Another possible fix for 4K devices

9560. By Alexander Wolf

Added 'time speed' for tooltip of time; Fixed English terms

9561. By Alexander Wolf

Added improvement for previous revision

9562. By Alexander Wolf

Added Belarusian description for Belarusian sky culture

9563. By Alexander Wolf

A final fix for Retina?

9564. By gzotti

Adding Hawaiian Starlines Skyculture, contributed by the Pacific Voyaging Society. We could remove the Polynesian skyculture, this seems superseded.

9565. By Alexander Wolf

Hawaiian Starlines translatable now...

9566. By Tanmoy Saha

Added bengali description of belarusian sky culture

9567. By Alexander Wolf

Apply translations for public testing (v0.16.0RC2)

9568. By Alexander Wolf

Added saving an angular separation option for phenomena; Typofixes

9569. By Alexander Wolf

cosmetic fix for AstroCalc

9570. By gzotti

Nutation fix for infostring ecliptical coordinates data.

9571. By gzotti

Guide: small additions

9572. By gzotti

Add a tentative fix (a bit hackish currently) for the Solar light time correction/aberration. It seems to resolve eclipse times! :-) But it should be reviewed for general applicability or use on the other planets.

9573. By Alexander Wolf

SUG: Updating style of heading for appendicies and bibliography

9574. By Alexander Wolf

SUG: Updating style for \newFeature{} command and added few fixes

9575. By gzotti

Add preliminary elements for 1P/Halley (2061). Add model entry to all Halley element sets. Reduce tail brightness when zooming in. Restore 67P default element entry (with OBJ model).

9576. By Yuri Chornoivan

Added Ukraininan translation for Hawaiian Starlines skyculture + English typofix

9577. By gzotti

Guide: small fixes

9578. By Alexander Wolf

Guide: updated info for extended edition of Stellarium DSO catalog

9579. By Alexander Wolf

Guide: cosmetic fix

9580. By Alexander Wolf

Guide: another cosmetic fix

9581. By Alexander Wolf

Guide: let's use one style for numbering of version

9582. By gzotti

Guide: adapt changes around ssystem.ini split. Other small changes.

9583. By Launchpad Translations on behalf of stellarium

Launchpad automatic translations update.

9584. By gzotti

Guide: small corrections.

9585. By Alexander Wolf

Improve to strings consistency for Solar System Editor plug-in

9586. By Alexander Wolf

Let's avoid string overlap with FOV and FPS labels

9587. By Alexander Wolf

Polynesian sky culture has been removed (replaced by Hawaiian starlines)

9588. By gzotti

small reformatting, and added the one interesting URL from Polynesian skyculture.

9589. By gzotti

Hawaii skyculture: update acknowledgements section

9590. By Alexander Wolf

never update TLE's for any date before Oct 4, 1957, 19:28:34GMT ;-)

9591. By Alexander Wolf

merge translations and resolve conflicts

9592. By Alexander Wolf

Added two notations for unit of measurement of surface brightness

9593. By Danny Milosavljevic

Fixed Vector3 compilation error in unit tests

9594. By gzotti

Increase sky brightness during solar eclipse (really, there are only few stars visible.)

9595. By gzotti

Different approach to have light time from the sun corrected. Numerical result identical to the previous hackfix, just no rendering problems.

9596. By Alexander Wolf

Updated DSO names

9597. By Alexander Wolf

Typofix, sorry

9598. By Alexander Wolf

Added improvement for hide/unhide lines and grids in Oculars plugin

9599. By Alexander Wolf

Addendum to previous fix

9600. By Alexander Wolf

cosmetic changes

9601. By Alexander Wolf

merge translations for testing

9602. By Alexander Wolf

Added .gitignore file

9603. By gzotti

Guide: added reference.

9604. By Dan Smale <email address hidden>

Update to Maori sky culture

9605. By gzotti

Fix a conflict around landscape autoselection.

9606. By Alexander Wolf

Updated DSO names

9607. By Alexander Wolf

Updated DSO names

9608. By Alexander Wolf

Updated DSO names (a small addendum)

9609. By Alexander Wolf

Updated DSO names (a small addendum)

9610. By Alexander Wolf

Added few moons of Saturn (Phoebe, Epimetheus, Helene, Telesto, Calypso,
Atlas, Prometheus, Pandora, Pan) with classic elliptical orbits;
Added code to avoid conflicts for names of asteroids and moons

9611. By Alexander Wolf

Oops... added Janus (missed moon of Saturn from previous revision)

9612. By Alexander Wolf

Fixed testure for Janus

9613. By Alexander Wolf

Added support of IAU moon numbers;
Added few moons;
Rearrange data of ssystem_major.ini file.

9614. By Alexander Wolf

Updated behaviour of AstroCalc/Positions for new format of asteroids name

9615. By Alexander Wolf

Added angular size to AstroCalc/Positions tool

9616. By Alexander Wolf

Cosmetic fix for moons

9617. By Alexander Wolf

Updated templates for translation

9618. By Alexander Wolf

Apply translations for public testing

9619. By Alexander Wolf

Fixes for support new format of asteroid names

9620. By Alexander Wolf

Another fix for support new format of asteroid names (avoid conflicts for SSE plugin)

9621. By Alexander Wolf

Another few fixes for SSE plugin...

9622. By Alexander Wolf

Changed behaviour of filters for DSO catalogs

9623. By Alexander Wolf

A small cosmetic fix for HMS formatting

9624. By Alexander Wolf

Split getPositionInfoString() method on two parts

9625. By Alexander Wolf

Let's allow users to choose output formatting of coordinates of objects

9626. By Alexander Wolf

Cosmetic fix (avoid inconsistence data)

9627. By Alexander Wolf

oops... another obvious cosmetic fix

9628. By Alexander Wolf

A small fix for Windows ISS script

9629. By Alexander Wolf

Updated DSO names

9630. By Alexander Wolf

Cosmetic fix for AstroCalc/Positions tool

9631. By Alexander Wolf

Added optional debug info for HDPI devices + updated translation rules

9632. By Alexander Wolf

Oops... sorry for wrong debug data

9633. By gzotti

Try to enable document links for a few more plugins.

9634. By Alexander Wolf

Updated InfoString feature

9635. By Alexander Wolf

Fix for saving options

9636. By Alexander Wolf

Let's try reduce the nightmare in the code and behaviour for a 'new most wanted feature' >:-[

9637. By Alexander Wolf

Cosmetic fix + updating all templates

9638. By Alexander Wolf

Updated translations

9639. By Petr Kubanek

Merged Petr Kubanek's updates to the RTS2 telecope driver.

9640. By Alexander Wolf

Fixed crash when we on the spaceship

9641. By Alexander Wolf

Few fixes for Solar system to avoid conflicts and undefined behaviour

9642. By Alexander Wolf

Obvious fixes for dark nebulae in AstroCalc/Positions tool

9643. By Alexander Wolf

InfoString refactoring, part 1

9644. By Alexander Wolf

merge changes

9645. By Alexander Wolf

Cosmetic fix for TCP

9646. By Alexander Wolf

Addendum to previous fix

9647. By Alexander Wolf

Cosmetic fixes in GUI

9648. By Alexander Wolf

InfoString refactoring, part 2

9649. By Alexander Wolf

Cosmetic addendum to previous revision

9650. By gzotti

Fixed a small Coverity issue.

9651. By Alexander Wolf

InfoString refactoring, part 3

9652. By Alexander Wolf

Let's make same context for all cases of AU usage

9653. By Alexander Wolf

Apply translations for public testing

9654. By Alexander Wolf

Updated Solar System Editor plugin + fixes in SolarSystem class

9655. By Alexander Wolf

Fixed orientation angle and its data rendering

9656. By Alexander Wolf

Added special case for Jupiter's moons when they are in the shadow of
Jupiter

9657. By gzotti

Guide: small updates.

9658. By Alexander Wolf

Improve limit of magnitude for Oculars plugin

9659. By Alexander Wolf

Updated Oculars plugin

9660. By Alexander Wolf

Typofixes

9661. By Alexander Wolf

Updated AstroCalc/AltVsTime tool

9662. By Alexander Wolf

Updated DSO catalog (resolve cross-id issues)

9663. By Alexander Wolf

Updated DSO catalog (resolve cross-id issues)

9664. By Alexander Wolf

Updated DSO catalog to version 3.2

9665. By Alexander Wolf

Added new data from IAU Catalog of Star Names. Thanks to stefan8410 for bug report!

9666. By Alexander Wolf

Classification fix for DSO catalog

9667. By Alexander Wolf

Fixed search by lists

9668. By Alexander Wolf

Fixed translation switch issue for AstroCalc/Graphs tool

9669. By Alexander Wolf

Added support download zip archives with TLE data

9670. By Alexander Wolf

Added link to the Mike McCants' classified TLE data

9671. By Alexander Wolf

Fixed stupid typo issue

9672. By Alexander Wolf

Updated default list of TLEs sources

9673. By Alexander Wolf

Let's try to fix trackpad behaviour on macOS

9674. By Alexander Wolf

Apply translations for public testing

9675. By Alexander Wolf

Rearrange list of asteroids and add largest asteroids to translation list

9676. By Alexander Wolf

Typofix

9677. By Alexander Wolf

Remove patch from revision 9673

9678. By Alexander Wolf

Added context to translatable strings

9679. By Alexander Wolf

Typofix :(

9680. By Alexander Wolf

Oops... restore Russian language file

9681. By gzotti

typofix

9682. By Alexander Wolf

A possible fix for trackpad issue on macOS

9683. By Alexander Wolf

Added workaround for bug LP: #1705832

9684. By Alexander Wolf

reduce numbers for eclipse factor data

9685. By Alexander Wolf

InfoString refactoring, part 4 (Pulsars plugin)

9686. By Alexander Wolf

InfoString refactoring, part 5

9687. By Alexander Wolf

InfoString refactoring, part 6

9688. By Alexander Wolf

cosmetic fix

9689. By Alexander Wolf

another cosmetic fix

9690. By Alexander Wolf

another infostring fix

9691. By Alexander Wolf

Small fix for context

9692. By Alexander Wolf

Updated description of landscapes

9693. By Alexander Wolf

Couple cosmetic fixes

9694. By Alexander Wolf

Apply translations for public testing

9695. By Alexander Wolf

Fixed couple stupid bugs in InnoSetup script

9696. By Alexander Wolf

Added workaround for bug #1705832

9697. By Alexander Wolf

Cosmetic fix

9698. By Alexander Wolf

Changed selection behaviour in Oculars plugin (go to back to series 0.12 and prior)

9699. By gzotti

revert r9698, but avoid selection of objects outside ocular circle in ocular mode.

9700. By Alexander Wolf

Fixed potential bug

9701. By Alexander Wolf

Added support of 'Strasbourg-ESO Catalogue of Galactic Planetary Nebulae' (Acker+, 1992)

9702. By Alexander Wolf

Fixed stupid misprint

9703. By Alexander Wolf

Guide: updated DSO chapter

9704. By Alexander Wolf

Added support 'A catalogue of Galactic supernova remnants' (Green, 2014)

9705. By Alexander Wolf

Added export the predictions of Iridium flares

9706. By Alexander Wolf

Guide: updated DSO chapter

9707. By Alexander Wolf

Updated DSO catalog (fixes stupid typos)

9708. By Alexander Wolf

Updated DSO catalog (an avoid issue for 'special case')

9709. By Alexander Wolf

Apply translations for public testing

9710. By Alexander Wolf

Updated DSO catalog (fixes morphology for SNR)

9711. By Alexander Wolf

Added meta information about version and edition into file of Stellarium DSO Catalog to avoid potential crash of Stellarium in the future (validation the version of catalog before loading)

9712. By Alexander Wolf

Added support 'A catalog of rich clusters of galaxies' (Abell+, 1989)

9713. By Alexander Wolf

Guide: Updated DSO chapter; fixed name of the catalog of rich clusters of galaxies

9714. By Alexander Wolf

rearrange filters for DSO

9715. By Alexander Wolf

Updated AstroCalc/WUT tool

9716. By Alexander Wolf

SUG updates + fixes stupid issues

9717. By Alexander Wolf

Updated list of DSO names

9718. By gzotti

Guide: small update

9719. By Alexander Wolf

Fixed bug in AstroCalc/Phenomena tool (issue in parsing of date format).

9720. By Alexander Wolf

Apply translations for public testing

9721. By Alexander Wolf

Added license info for two cmake modules (after discussion with Fabien Chereau)

9722. By Alexander Wolf

Added support of extra physical data for asteroids

9723. By Alexander Wolf

Obvious fix, sorry

9724. By gzotti

removed leftover default color values.

9725. By gzotti

Typofixes, add note on non-parallelisation

9726. By gzotti

Guide: small corrections

9727. By Alexander Wolf

Added support outlines for DSO

9728. By Alexander Wolf

Changed behaviour for DSO with outlines

9729. By Alexander Wolf

Updated outlines data

9730. By Alexander Wolf

A small fix

9731. By Alexander Wolf

A small fix

9732. By Alexander Wolf

Apply translations for public testing

9733. By Alexander Wolf

Improvements for DSO management

9734. By gzotti

Do not save current landscape as default when storing settings. (There is a dedicated option for this in the landscape dialog.)

9735. By Alexander Wolf

Added new time step: saros

9736. By Alexander Wolf

Fixed link for fileStructure.html file

9737. By Alexander Wolf

Extract new lines for translation

9738. By Alexander Wolf

A small tuning for visibility rules of DSO hints

9739. By Alexander Wolf

A small update for DSO hints

9740. By Alexander Wolf

Apply translations for public testing

9741. By Alexander Wolf

Updated license info for cmake modules

9742. By Alexander Wolf

Updated behaviour for draw of DSO outlines

9743. By Timothy Reaves <email address hidden>

Corrected the calculation for draeing a reticle on a HiDPI display.

9744. By Alexander Wolf

Added addendum checks for network connections

9745. By Alexander Wolf

Added addendum checks for network connections

9746. By Alexander Wolf

Updated behaviour of DSO hints

9747. By Alexander Wolf

Updated behaviour of DSO hints

9748. By Alexander Wolf

Oops... restore default size of DSO marker

9749. By Alexander Wolf

Added new time step: 7 sidereal days

9750. By Alexander Wolf

tune limits for DSO outlines

9751. By Alexander Wolf

Change default option to avoid possible artifacts on the macOS

9752. By Alexander Wolf

Updated plugins

9753. By Alexander Wolf

Updated Stellarium User Guide

9754. By Alexander Wolf

Updated Stellarium User Guide

9755. By Alexander Wolf

Updated Remote Control plugin

9756. By Alexander Wolf

A tiny optimization

9757. By Alexander Wolf

Apply translations for public testing

9758. By Alexander Wolf

Added support of comments for constellations_boundaries.dat file

9759. By SilverAstro

Added new binocular asterism: Davis' Dog

9760. By Alexander Wolf

Added support for small asterisms with lines by the equatorial coordinates

9761. By Alexander Wolf

oops... missing file

9762. By Alexander Wolf

Updated list of asterisms

9763. By Alexander Wolf

Typofix + small optimization for telescopic asterisms

9764. By Alexander Wolf

Updated SUG

9765. By Alexander Wolf

Updated list of asterisms

9766. By Alexander Wolf

Improve error info for asterisms

9767. By Alexander Wolf

Apply translations for public testing

9768. By Alexander Wolf

Updated list of asterisms

9769. By Alexander Wolf

Let's allow 'Un-Center' of selected object through keyboard and GUI button

9770. By Alexander Wolf

Updated SUG

9771. By Alexander Wolf

Fixed impossibility to select a planet after Astronomical Calculations is activated

9772. By Alexander Wolf

Apply translations for public testing

9773. By Alexander Wolf

Added new feature to the Pointer Coordinates plugin

9774. By Guillaume Chereau

Fix bug with unknown star in asterism

This should prevent a crash in the case when an asterism star given by
RA/DE coordinates cannot be found.

9775. By Guillaume Chereau

Remove some annoying logs

The property register logs seem rather useless so I remove them totally
(we can still uncomment the code during debugging if needed).

The texture memory logs can sometime be useful, so I leave them but we
have to use the --verbose option to see them. Most of the time we don't
need them.

9776. By Alexander Wolf

Apply translations for public testing

9777. By gzotti

Limited scope of some variables

9778. By Alexander Wolf

Updated texture of Earth's shadow

9779. By Alexander Wolf

Updated texture of Earth's shadow (revert back)

9780. By Sripath Roy Koganti

Update te.po (patch from github)

9781. By gzotti

Reduce warnings to one when loading OBJ with non-default w texture/vertex coordinates

9782. By gzotti

Better default values for material fade-in/fade-out times.

9783. By Alexander Wolf

Fixed building on Linux systems

9784. By Alexander Wolf

Fixed cross-ids of 42 bright double stars. Thanks stefan8410 for data

9785. By Alexander Wolf

Reduce memory usage

9786. By Alexander Wolf

Added ray helpers support (based on asterisms code)

9787. By Alexander Wolf

Updated list of ray helpers

9788. By Alexander Wolf

Added new asterism: Engagement ring of Polaris. Thanks for anonymous (community contribution)

9789. By Alexander Wolf

Apply translations for public testing + few cosmetic fixes

9790. By Alexander Wolf

Fixed init variables

9791. By Alexander Wolf

Added missing data. Thanks stefan8410 for report!

9792. By Alexander Wolf

Let's allow using images within description of landscapes

9793. By gzotti

Fixed magnitude computation for Jupiter's satellites (typos in Explan.Supl.2013).

9794. By gzotti

Guide: Added a reference for magnitudes of Jupiter's satellites.

9795. By Alexander Wolf

Updated time steps for AstroCalc/Ephemeris tool

9796. By Alexander Wolf

Apply translations for public testing

9797. By Alexander Wolf

Updated stellarium.appdata.xml file

9798. By Alexander Wolf

Updated list of DSO names

9799. By gzotti

Emit a warning if both d and Tr data are given for an OBJ/MTL material entry.

9800. By Alexander Wolf

Fixed crash of Stellarium when answer of freegeoip.net has wrong format (for example this host blocked by firewall or DNS server with HTML answer)

9801. By gzotti

Guide: Fixed a (c) date.

9802. By Alexander Wolf

Cosmetic fix for the GUI

9803. By Alexander Wolf

Cosmetic fix for the GUI

9804. By Alexander Wolf

Updated AstroCalc/Ephemeris tool

9805. By gzotti

illumination: Take eclipseFactor into account.

9806. By Alexander Wolf

Fixed translations issue in Script Console

9807. By Alexander Wolf

Fix GUI translation

9808. By Alexander Wolf

Apply translations for public testing

9809. By Alexander Wolf

StelLogger has been updated to support VS2017

9810. By Alexander Wolf

Fixed potential crash in DSO outlines

9811. By Alexander Wolf

Improvements for DSO outlines support

9812. By Alexander Wolf

Refactor drawing outlines of DSO

9813. By Alexander Wolf

Updates for Stellarium User Guide

9814. By Alexander Wolf

Fixes for ray helpers, asterisms and constellations support

9815. By Alexander Wolf

Obvious cosmetic fix

9816. By Alexander Wolf

Updated tab rules

9817. By Alexander Wolf

Apply translations for public testing + fixes for Script Console & file dialogs

9818. By Alexander Wolf

Added temporary solution for bug 1498616

9819. By Alexander Wolf

Added tool to save list of objects in AstroCalc/WUT tool

9820. By Alexander Wolf

Added tool to save celestial positions of objects in AstroCalc/Positions tool

9821. By Alexander Wolf

A small update for Satellites plugin

9822. By Alexander Wolf

Prepare to release 0.16.1

9823. By Alexander Wolf

Updated documents for some plugins

9824. By Alexander Wolf

Fixed filter for limiting by DSO mangitudes

9825. By Alexander Wolf

Fixed TestStelJsonParser fails

9826. By Alexander Wolf

Update previous fix: cosmetic changes

9827. By Alexander Wolf

Updated default build environment settings for Windows and Mac OS X

9828. By Alexander Wolf

Updated ICU rules for Qt 5.9+

9829. By Alexander Wolf

Cosmetic fix for ISS/ICU rules for Qt 5.9+

9830. By Tig la Pomme

Typofix

9831. By Alexander Wolf

Fixed issue an export CSV files when header of column has a comma (AstroCalc tool)

9832. By Nicolas Martignoni

Fixes and additions for French descriptions

9833. By Alexander Wolf

Fixed context support for constellations

9834. By Sveinn í Felli

Icelandic translation for a couple of skycultures

9835. By Alexander Wolf

Fixed sort order for 'Peak' in Meteor showers search

9836. By Marcos Cardinot

MeteorShowers plugin - better fix for #1719939

It simplifies the way how we sort items by storing the 'sorteable' item in the UserRole.

9837. By Alexander Wolf

Fixed location for stellarium.appdata.xml file

9838. By Alexander Wolf

Typofixes

9839. By Alexander Wolf

Port DSO outlines from HNSKY

9840. By Alexander Wolf

Fixed stupid bug for asterisms in Search Tool/Lists

9841. By Alexander Wolf

Merge SOCIS 2017 project: planetary surface nomenclature

9842. By Alexander Wolf

Updated templates

9843. By Alexander Wolf

Added English (defaul) po file for planetary features

9844. By Alexander Wolf

Updated translations stuff

9845. By Alexander Wolf

Updated translations stuff

9846. By Alexander Wolf

A small tune for nomenclature names

9847. By Alexander Wolf

Improve filters for planetary features

9848. By Alexander Wolf

A tiny optimization

9849. By gzotti

typofix

9850. By gzotti

Allow movement to selected nomenclature item.

9851. By gzotti

Small improvement of previous: deal with auto-atmosphere

9852. By Alexander Wolf

Apply translations for public testing + resolve conflicts

9853. By Alexander Wolf

Extract lines for translation

9854. By gzotti

Typofixes

9855. By Alexander Wolf

Extract updated lines for translation

9856. By Alexander Wolf

A small improvements for nomenclature

9857. By Alexander Wolf

Apply translations for inner testing

9858. By Alexander Wolf

A small improvements for nomenclature

9859. By Alexander Wolf

Another small improvements for nomenclature

9860. By Alexander Wolf

Re-arrange info lines

9861. By Alexander Wolf

Updated default list of asteroids

9862. By Alexander Wolf

Fixed issue for finding the celestial body for nomenclature record

9863. By Alexander Wolf

Updated behaviour of Search Tool for nomenclature

9864. By gzotti

Guide: some more accuracy notes.

9865. By gzotti

continue on r9851: also auto-load landscape when moving to selected planet.

9866. By gzotti

Added another OS detection logging function.
Cleanup: Removed pre-Qt5.4 ifdefs.

9867. By gzotti

Updated description

9868. By gzotti

added primitive sun landscape

9869. By Alexander Wolf

Added Russian translation for new landscape

9870. By Alexander Wolf

Fixed crash for Custom Objects

9871. By Fabien Chereau <email address hidden>

Made doxydoc lighter: html doc use 14MB instead of 64Mb

9872. By Alexander Wolf

Fixed output data for Exoplanets plugin

9873. By Alexander Wolf

Apply translations for public testing

9874. By qam1

Updated scripts

9875. By qam1

Updated description for scripts

9876. By Alexander Wolf

Added filters for nomenclature (Search Tool/Lists)

9877. By Tanmoy Saha

Updated Bengali description of landscapes

9878. By Alexander Wolf

Let's avoid inconsistency of computation for coordinates and potential crashes for nomenclature items + small speed-up.

9879. By Alexander Wolf

small fixes

9880. By Alexander Wolf

Apply latest translations

9881. By Alexander Wolf

Added support plural forms for translation

9882. By Alexander Wolf

Added plural rules

9883. By Alexander Wolf

Added tentative fix for light speed correction issue for nomenclature items

9884. By Alexander Wolf

Let's make deselectConstellations() method is public

9885. By Alexander Wolf

Added new time steps for AstroCalc/Ephemerides tool

9886. By Alexander Wolf

Fixed annoying malfunction in Oculars plugin (lost of tracking)

9887. By gzotti

Small update over r9883, and some simplifications/cleanup.

9888. By Alexander Wolf

Apply translations for inner testing

9889. By Alexander Wolf

Updated translations stuff

9890. By Alexander Wolf

Updated *.po files

9891. By Alexander Wolf

Fixed small issue

9892. By gzotti

Fix the new moons' rotation times. Add sane defaults to Planets. Update guide on that.

9893. By Alexander Wolf

Updated list of planetary nomenclature

9894. By Alexander Wolf

Fixed selecting of comets in AstroCalc/Positions tool

9895. By Alexander Wolf

Added subclasses to the list of Solar system objects in AstroCalc/Positions tool

9896. By Alexander Wolf

Changed default time step for AstroCalc/Phenomena tool

9897. By Alexander Wolf

Apply translations for public testing

9898. By Alexander Wolf

Let's reinstall flag for orbits to renew visibility of orbits

9899. By Alexander Wolf

Added config option to allow make visible orbits for major planets only

9900. By Alexander Wolf

Let's allow to hide nomenclature on the celestial body of observer

9901. By Alexander Wolf

Some rearranges of items on the Sky tab in the View dialog

9902. By Alexander Wolf

Minimize high of View dialog

9903. By Alexander Wolf

Cosmetic fix + added comment

9904. By Alexander Wolf

Fixed behaviour and style of tool for download star catalog

9905. By Guillaume Chereau

Add StelApp::getModule method

Just a shortcut for calling stelapp.getModuleMgr().getModule().

9906. By Guillaume Chereau

ViewDialog: try to use Qt properties when possible

Instead of direct access to the module functions.

This allow to remove some #include. It will also make it easier to
transition to a qml gui in the future.

9907. By Guillaume Chereau

Remove duplicated code

9908. By Guillaume Chereau

Remove some #include in ConfigurationDialog.cpp

Some were just unnecessary, and some could be replaced by using object
properties.

9909. By Guillaume Chereau

Remove some #include in LocationDialog.cpp

Trying to replace direct modules methods call with property access.

9910. By Alexander Wolf

Trying to replace direct modules methods call with property access

9911. By Alexander Wolf

Trying to replace direct modules methods call with property access

9912. By Alexander Wolf

Remove #include in ConfigureDSOColorsDialog.cpp file

9913. By Alexander Wolf

Trying to replace direct modules methods call with property access

9914. By Alexander Wolf

Typofix

9915. By Guillaume Chereau

Small fix in NomenclatureMgr

When we search around we have to be careful not to consider the items
whose position hasn't been computed yet. Otherwise we sometime get
crashes when we click in the sky.

I suspect this is what the initialized attribute might have been for,
since it is currently always set to true. For the moment I just did
a quick fix by initializing the pos to zero and checking that in the
search method.

9916. By Alexander Wolf

Updated list of names for planetary features

9917. By gzotti

Guide: add/update notes regarding Raspberry Pi

9918. By gzotti

typofix

9919. By Alexander Wolf

A small fix

9920. By Alexander Wolf

Added context support for Solar system bodies

9921. By Alexander Wolf

Apply translations for public testing

9922. By gzotti

Guide: Small corrections

9923. By Alexander Wolf

Guide: added planetary nomenclature appendix

9924. By Alexander Wolf

Guide: Added image for nomenclature

9925. By gzotti

Guide: typofixes

9926. By Alexander Wolf

Added angular size filter for DSO

9927. By Alexander Wolf

Small GUI fix

9928. By Alexander Wolf

Guide: small updates

9929. By Alexander Wolf

Extract new lines for translation

9930. By Alexander Wolf

Apply translations for public testing

9931. By gzotti

Tiny GUI fix

9932. By Alexander Wolf

Updated description of checkbox

9933. By Alexander Wolf

Improve performance for AstroCalc tool

9934. By Alexander Wolf

Updated description of checkbox

9935. By gzotti

Guide: small change in wording

9936. By gzotti

Nomenclature: precompute spherical coordinate in constructor

9937. By Alexander Wolf

Updated list of ray helpers

9938. By gzotti

Fix infostring for satellite features

9939. By Alexander Wolf

Updated proto for MPC

9940. By Alexander Wolf

Updated list of ray helpers

9941. By gzotti

typofix

9942. By guillaume-chereau

merged guillaume-chereau/stellarium/nomenclature-optimization. Nomenclature: cache item positions

9943. By Alexander Wolf

Apply translations for public testing + Added shortcut for nomenclature

9944. By gzotti

Fix small Coverity issue

9945. By gzotti

Scenery3d:
- Add plus/minus keys for elevation change on Macs without PgUp/PgDn.
- Better font scaling for HiDPI Macs (first try)

9946. By Alexander Wolf

Updated Triangulum constellation

9947. By Alexander Wolf

Typofix

9948. By Alexander Wolf

Added detection method info for exoplanets

9949. By Alexander Wolf

Added visual resolution info for Oculars plugin

9950. By Alexander Wolf

Updated list of translatable names for detection methods

9951. By Alexander Wolf

Fixed bug of positions for nomenclature when Solar system data is reloaded

9952. By Alexander Wolf

Added GUI options for color of exoplanet marker

9953. By qam1

Updated the solar system screen saver script

9954. By Alexander Wolf

Apply translations for public testing

9955. By Alexander Wolf

Updated list of planetary features

9956. By Alexander Wolf

Added new plugin: Distance Calculator (requested through twitter)

9957. By Alexander Wolf

Fix small Coverity issue

9958. By Alexander Wolf

Fixed shader for planet texture rendering

9959. By Alexander Wolf

Apply translations for public testing

9960. By gzotti

docfix

9961. By gzotti

add a default for night mode

9962. By gzotti

Start refactoring Oculars plugin to expose more StelProperties. (Allows accessing via RemoteControl)

9963. By Alexander Wolf

Move Distance Calculator plugin into the AstroCalc tool

9964. By gzotti

docfix

9965. By gzotti

RemoteControl: Add API command to retrieve view direction

9966. By gzotti

Oculars: Cleanup

9967. By Alexander Wolf

Updated README stuff

9968. By Alexander Wolf

Fixed sign for declination coordinate for Southern Iota Aquarids

9969. By Alexander Wolf

Updated AstroCalc/PC icons

9970. By gzotti

RemoteControl: allow view setting jNow, harmonize capitalisation for the parameters.

9971. By Alexander Wolf

Compute orbital resonances...

9972. By Alexander Wolf

Added improvements for AstroCalc/PC tool

9973. By Alexander Wolf

Apply translations for public testing

9974. By Alexander Wolf

Updated list of official star names

9975. By Alexander Wolf

Fixed behaviour for Telrad & Eyepiece modes

9976. By Alexander Wolf

Revert previous fix (he introduce other bug) + disable event iterations on the sky under Oculars GUI Panel

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/TelescopeControl/CMakeLists.txt'
2--- plugins/TelescopeControl/CMakeLists.txt 2016-04-23 13:33:16 +0000
3+++ plugins/TelescopeControl/CMakeLists.txt 2017-04-05 20:17:41 +0000
4@@ -3,7 +3,7 @@
5 # otherwise the local copy will be overwritten each time Stellarium is started.
6 SET(TELESCOPE_CONTROL_MAJOR "0")
7 SET(TELESCOPE_CONTROL_MINOR "2")
8-SET(TELESCOPE_CONTROL_PATCH "11")
9+SET(TELESCOPE_CONTROL_PATCH "12")
10 SET(TELESCOPE_CONTROL_VERSION "${TELESCOPE_CONTROL_MAJOR}.${TELESCOPE_CONTROL_MINOR}.${TELESCOPE_CONTROL_PATCH}")
11
12 IF(APPLE)
13
14=== modified file 'plugins/TelescopeControl/resources/device_models.json'
15--- plugins/TelescopeControl/resources/device_models.json 2016-04-23 13:33:16 +0000
16+++ plugins/TelescopeControl/resources/device_models.json 2017-04-05 20:17:41 +0000
17@@ -1,5 +1,5 @@
18 {
19- "version": "0.2.11",
20+ "version": "0.2.12",
21 "list" :
22 [
23 {
24
25=== modified file 'plugins/TelescopeControl/src/CMakeLists.txt'
26--- plugins/TelescopeControl/src/CMakeLists.txt 2016-06-21 14:43:30 +0000
27+++ plugins/TelescopeControl/src/CMakeLists.txt 2017-04-05 20:17:41 +0000
28@@ -22,6 +22,8 @@
29 clients/TelescopeClientDirectLx200.cpp
30 clients/TelescopeClientDirectNexStar.hpp
31 clients/TelescopeClientDirectNexStar.cpp
32+ clients/TelescopeClientJsonRts2.hpp
33+ clients/TelescopeClientJsonRts2.cpp
34 TelescopeControl.hpp
35 TelescopeControl.cpp
36 gui/SlewDialog.hpp
37
38=== modified file 'plugins/TelescopeControl/src/TelescopeControl.cpp'
39--- plugins/TelescopeControl/src/TelescopeControl.cpp 2016-11-28 14:24:21 +0000
40+++ plugins/TelescopeControl/src/TelescopeControl.cpp 2017-04-05 20:17:41 +0000
41@@ -101,6 +101,7 @@
42 connectionTypeNames.insert(ConnectionInternal, "internal");
43 connectionTypeNames.insert(ConnectionLocal, "local");
44 connectionTypeNames.insert(ConnectionRemote, "remote");
45+ connectionTypeNames.insert(ConnectionRTS2, "RTS2");
46 }
47
48 TelescopeControl::~TelescopeControl()
49@@ -746,6 +747,9 @@
50 int delay = 0;
51 QString deviceModelName;
52 QString portSerial;
53+ QString rts2Url("localhost");
54+ QString rts2Username("");
55+ QString rts2Password("");
56
57 if (connectionType == ConnectionInternal)
58 {
59@@ -789,15 +793,32 @@
60 }
61 }
62
63+ if (connectionType == ConnectionRTS2)
64+ {
65+ //Validation: Host name
66+ rts2Url = telescope.value("url").toString();
67+ if(rts2Url.isEmpty())
68+ {
69+ qDebug() << "[TelescopeControl] loadTelescopes(): No URL at slot" << key;
70+ map.remove(key);
71+ continue;
72+ }
73+ rts2Username = telescope.value("username").toString();
74+ rts2Password = telescope.value("password").toString();
75+ }
76+
77 if (connectionType != ConnectionVirtual)
78 {
79- //Validation: TCP port
80- portTCP = telescope.value("tcp_port").toInt();
81- if(!telescope.contains("tcp_port") || !isValidPort(portTCP))
82+ if (connectionType != ConnectionRTS2)
83 {
84- qDebug() << "[TelescopeControl] Unable to load telescope: No valid TCP port at slot" << key;
85- map.remove(key);
86- continue;
87+ //Validation: TCP port
88+ portTCP = telescope.value("tcp_port").toInt();
89+ if(!telescope.contains("tcp_port") || !isValidPort(portTCP))
90+ {
91+ qDebug() << "[TelescopeControl] Unable to load telescope: No valid TCP port at slot" << key;
92+ map.remove(key);
93+ continue;
94+ }
95 }
96
97 //Validation: Delay
98@@ -879,7 +900,7 @@
99 }
100 else
101 {
102- if(!startClientAtSlot(slot, connectionType, name, equinox, hostName, portTCP, delay, internalCircles))
103+ if(!startClientAtSlot(slot, connectionType, name, equinox, hostName, portTCP, delay, internalCircles, deviceModelName, portSerial, rts2Url, rts2Username, rts2Password))
104 {
105 qDebug() << "[TelescopeControl] Unable to create a telescope client at slot" << slot;
106 //Unnecessary due to if-else construction;
107@@ -903,7 +924,7 @@
108 telescopeDescriptions = result;
109 }
110
111-bool TelescopeControl::addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, bool connectAtStartup, QList<double> circles, QString deviceModelName, QString portSerial)
112+bool TelescopeControl::addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, bool connectAtStartup, QList<double> circles, QString deviceModelName, QString portSerial, QString rts2Url, QString rts2Username, QString rts2Password)
113 {
114 //Validation
115 if(!isValidSlotNumber(slot) || name.isEmpty() || equinox.isEmpty() || connectionType <= ConnectionNA || connectionType >= ConnectionCount)
116@@ -923,6 +944,15 @@
117 telescope.insert("host_name", host);
118 }
119
120+ if(connectionType == ConnectionRTS2)
121+ {
122+ if (rts2Url.isEmpty())
123+ return false;
124+ telescope.insert("url", rts2Url);
125+ telescope.insert("username", rts2Username);
126+ telescope.insert("password", rts2Password);
127+ }
128+
129 if(connectionType == ConnectionInternal)
130 {
131 if (!deviceModels.contains(deviceModelName))
132@@ -936,9 +966,12 @@
133
134 if (connectionType != ConnectionVirtual)
135 {
136- if (!isValidPort(portTCP))
137- return false;
138- telescope.insert("tcp_port", portTCP);
139+ if (connectionType != ConnectionRTS2)
140+ {
141+ if (!isValidPort(portTCP))
142+ return false;
143+ telescope.insert("tcp_port", portTCP);
144+ }
145
146 if (!isValidDelay(delay))
147 return false;
148@@ -960,7 +993,7 @@
149 return true;
150 }
151
152-bool TelescopeControl::getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& deviceModelName, QString& portSerial)
153+bool TelescopeControl::getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& deviceModelName, QString& portSerial, QString& rts2Url, QString& rts2Username, QString& rts2Password)
154 {
155 //Validation
156 if(!isValidSlotNumber(slot))
157@@ -996,6 +1029,12 @@
158 deviceModelName = telescope.value("device_model").toString();
159 portSerial = telescope.value("serial_port").toString();
160 }
161+ if(connectionType == ConnectionRTS2)
162+ {
163+ rts2Url = telescope.value("url").toString();
164+ rts2Username = telescope.value("username").toString();
165+ rts2Password = telescope.value("password").toString();
166+ }
167
168 return true;
169 }
170@@ -1027,7 +1066,10 @@
171 QList<double> circles;
172 QString deviceModelName;
173 QString portSerial;
174- if(!getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, portSerial))
175+ QString rts2Url;
176+ QString rts2Username;
177+ QString rts2Password;
178+ if(!getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, portSerial, rts2Url, rts2Username, rts2Password))
179 {
180 //TODO: Add debug
181 return false;
182@@ -1063,7 +1105,7 @@
183 }
184 else
185 {
186- if (startClientAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, circles))
187+ if (startClientAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, circles, deviceModelName, portSerial, rts2Url, rts2Username, rts2Password))
188 {
189 emit clientConnected(slot, name);
190 return true;
191@@ -1199,7 +1241,7 @@
192 return true;
193 }
194
195-bool TelescopeControl::startClientAtSlot(int slotNumber, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString deviceModelName, QString portSerial)
196+bool TelescopeControl::startClientAtSlot(int slotNumber, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString deviceModelName, QString portSerial, QString rts2Url, QString rts2Username, QString rts2Password)
197 {
198 //Validation
199 if(!isValidSlotNumber(slotNumber))
200@@ -1230,13 +1272,18 @@
201 initString = QString("%1:TCP:%2:%3:%4:%5").arg(name, equinox, "localhost", QString::number(portTCP), QString::number(delay));
202 break;
203
204+ case ConnectionRTS2:
205+ if (!rts2Url.isEmpty())
206+ initString = QString("%1:RTS2:%2:http://%3:%4@%5").arg(name, equinox, rts2Username, rts2Password, rts2Url);
207+ break;
208+
209 case ConnectionRemote:
210 default:
211 if (isValidPort(portTCP) && !host.isEmpty())
212 initString = QString("%1:TCP:%2:%3:%4:%5").arg(name, equinox, host, QString::number(portTCP), QString::number(delay));
213 }
214
215- //qDebug() << "initString:" << initString;
216+ qDebug() << "connectionType:" << connectionType << " initString:" << initString;
217
218 TelescopeClient* newTelescope = TelescopeClient::create(initString);
219 if (newTelescope)
220
221=== modified file 'plugins/TelescopeControl/src/TelescopeControl.hpp'
222--- plugins/TelescopeControl/src/TelescopeControl.hpp 2016-07-10 03:16:07 +0000
223+++ plugins/TelescopeControl/src/TelescopeControl.hpp 2017-04-05 20:17:41 +0000
224@@ -119,9 +119,9 @@
225 //These are public, but not slots, because they don't use sufficient validation. Scripts shouldn't be able to add/remove telescopes, only to point them.
226 //! Adds a telescope description containing the given properties. DOES NOT VALIDATE its parameters. If serverName is specified, portSerial should be specified too. Call saveTelescopes() to write the modified configuration to disc. Call startTelescopeAtSlot() to start this telescope.
227 //! @param portSerial must be a valid serial port name for the particular platform, e.g. "COM1" for Microsoft Windows of "/dev/ttyS0" for Linux
228- bool addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host = QString("localhost"), int portTCP = DEFAULT_TCP_PORT, int delay = DEFAULT_DELAY, bool connectAtStartup = false, QList<double> circles = QList<double>(), QString serverName = QString(), QString portSerial = QString());
229+ bool addTelescopeAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host = QString("localhost"), int portTCP = DEFAULT_TCP_PORT, int delay = DEFAULT_DELAY, bool connectAtStartup = false, QList<double> circles = QList<double>(), QString serverName = QString(), QString portSerial = QString(), QString rts2Url = QString(), QString rts2Username = QString(), QString rts2Password = QString());
230 //! Retrieves a telescope description. Returns false if the slot is empty. Returns empty serverName and portSerial if the description contains no server.
231- bool getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& serverName, QString& portSerial);
232+ bool getTelescopeAtSlot(int slot, ConnectionType& connectionType, QString& name, QString& equinox, QString& host, int& portTCP, int& delay, bool& connectAtStartup, QList<double>& circles, QString& serverName, QString& portSerial, QString& rts2Url, QString& rts2Username, QString& rts2Password);
233 //! Removes info from the tree. Should it include stopTelescopeAtSlot()?
234 bool removeTelescopeAtSlot(int slot);
235
236@@ -338,7 +338,7 @@
237 bool stopServerAtSlot(int slot);
238
239 //! A wrapper for TelescopeClient::create(). Used internally by loadTelescopes() and startTelescopeAtSlot(). Does not perform any validation on its arguments.
240- bool startClientAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString serverName = QString(), QString portSerial = QString());
241+ bool startClientAtSlot(int slot, ConnectionType connectionType, QString name, QString equinox, QString host, int portTCP, int delay, QList<double> circles, QString serverName = QString(), QString portSerial = QString(), QString rts2Url = QString(), QString rts2Username = QString(), QString rts2Password = QString());
242
243 //! Returns true if the TelescopeClient at this slot has been stopped successfully or doesn't exist
244 bool stopClientAtSlot(int slot);
245
246=== modified file 'plugins/TelescopeControl/src/TelescopeControlGlobals.hpp'
247--- plugins/TelescopeControl/src/TelescopeControlGlobals.hpp 2016-01-08 21:01:34 +0000
248+++ plugins/TelescopeControl/src/TelescopeControlGlobals.hpp 2017-04-05 20:17:41 +0000
249@@ -52,6 +52,7 @@
250 ConnectionInternal,
251 ConnectionLocal,
252 ConnectionRemote,
253+ ConnectionRTS2,
254 ConnectionCount
255 };
256
257
258=== modified file 'plugins/TelescopeControl/src/clients/TelescopeClient.cpp'
259--- plugins/TelescopeControl/src/clients/TelescopeClient.cpp 2017-03-13 11:34:19 +0000
260+++ plugins/TelescopeControl/src/clients/TelescopeClient.cpp 2017-04-05 20:17:41 +0000
261@@ -24,6 +24,7 @@
262 */
263
264 #include "TelescopeClient.hpp"
265+#include "TelescopeClientJsonRts2.hpp"
266 #include "TelescopeClientDirectLx200.hpp"
267 #include "TelescopeClientDirectNexStar.hpp"
268 #include "StelUtils.hpp"
269@@ -93,6 +94,10 @@
270 {
271 newTelescope = new TelescopeTCP(name, params, eq);
272 }
273+ else if (type == "RTS2")
274+ {
275+ newTelescope = new TelescopeClientJsonRts2(name, params, eq);
276+ }
277 else if (type == "TelescopeServerLx200") //BM: One of the rare occasions of painless extension
278 {
279 newTelescope= new TelescopeClientDirectLx200(name, params, eq);
280
281=== added file 'plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp'
282--- plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp 1970-01-01 00:00:00 +0000
283+++ plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.cpp 2017-04-05 20:17:41 +0000
284@@ -0,0 +1,175 @@
285+/*
286+ * RTS2 Json stellarium plugin
287+ *
288+ * Copyright (C) 2014-2016 Petr Kubanek
289+ *
290+ * This program is free software; you can redistribute it and/or
291+ * modify it under the terms of the GNU General Public License
292+ * as published by the Free Software Foundation; either version 2
293+ * of the License, or (at your option) any later version.
294+ *
295+ * This program is distributed in the hope that it will be useful,
296+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
297+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
298+ * GNU General Public License for more details.
299+ *
300+ * You should have received a copy of the GNU General Public License
301+ * along with this program; if not, write to the Free Software
302+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
303+ */
304+
305+#include "StelUtils.hpp"
306+
307+#include "QByteArray"
308+#include "QJsonArray"
309+#include "QJsonDocument"
310+#include "QJsonParseError"
311+#include "QJsonObject"
312+#include "QUrlQuery"
313+
314+#include "TelescopeClientJsonRts2.hpp"
315+
316+TelescopeClientJsonRts2::TelescopeClientJsonRts2(const QString &name, const QString &params, Equinox eq)
317+ : TelescopeClient(name)
318+ , networkManager(new QNetworkAccessManager)
319+ , equinox(eq)
320+ , baseurl("http://localhost:8889/")
321+ , telName("")
322+ , time_delay(500)
323+{
324+ // Example params:
325+ // petr:test@localhost:8889/tel
326+
327+ qDebug() << "TelescopeRTS2 paramaters: " << params;
328+
329+ baseurl.setUrl(params);
330+ if (!baseurl.isValid())
331+ {
332+ qWarning() << "TelescopeRTS2 invalid URL";
333+ return;
334+ }
335+
336+ QUrl rurl(baseurl);
337+
338+ rurl.setPath(baseurl.path() + "/api/devbytype");
339+
340+ QUrlQuery query;
341+ query.addQueryItem("t", "2");
342+ rurl.setQuery(query);
343+
344+ QNetworkRequest cfgRequest;
345+
346+ cfgRequest.setUrl(rurl);
347+
348+ qDebug() << "request url:" << rurl.toString();
349+
350+ connect(&networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*)));
351+
352+ networkManager.get(cfgRequest);
353+}
354+
355+TelescopeClientJsonRts2::~TelescopeClientJsonRts2(void)
356+{
357+}
358+
359+void TelescopeClientJsonRts2::replyFinished(QNetworkReply *reply)
360+{
361+ qDebug() << "TelescopeRTS2 error" << reply->error();
362+ if (reply->error() != QNetworkReply::NoError)
363+ {
364+ telName = "";
365+ return;
366+ }
367+
368+ QByteArray data = reply->readAll();
369+ //qDebug() << "TelescopeRTS2 data" << (QString) data;
370+
371+ QJsonDocument doc;
372+ QJsonParseError jsonError;
373+ doc = QJsonDocument::fromJson(data, &jsonError);
374+
375+ if (reply->url().path().endsWith("/api/devbytype"))
376+ {
377+ QJsonArray arr = doc.array();
378+ telName = arr[0].toString();
379+
380+ QUrl rurl(baseurl);
381+
382+ rurl.setPath(baseurl.path() + "/api/get");
383+
384+ QUrlQuery query;
385+ query.addQueryItem("d", telName);
386+ rurl.setQuery(query);
387+
388+ request.setUrl(rurl);
389+
390+ qDebug() << "request url:" << rurl.toString();
391+
392+ networkManager.get(request);
393+ }
394+ else if (reply->url().path().endsWith("/api/get"))
395+ {
396+ QJsonObject docObject = doc.object();
397+ QJsonObject dObject = docObject["d"].toObject();
398+ QJsonObject telObject = dObject["TEL"].toObject();
399+
400+ qDebug() << "TelescopeRTS2 object" << doc.isNull() << jsonError.errorString() << jsonError.offset << telObject["ra"].toDouble() << telObject["dec"].toDouble();
401+
402+ const double ra = telObject["ra"].toDouble() * M_PI / 180.0;
403+ const double dec = telObject["dec"].toDouble() * M_PI / 180.0;
404+ const double cdec = cos(dec);
405+
406+ qDebug() << "TelescopeRTS2 RADEC" << ra << dec;
407+
408+ Vec3d pos(cos(ra)*cdec, sin(ra)*cdec, sin(dec));
409+ interpolatedPosition.add(pos, getNow(), getNow(), 0);
410+
411+ qDebug() << "request url:" << request.url().toString();
412+
413+ networkManager.get(request);
414+ }
415+ else
416+ {
417+ qWarning() << "unhandled reply: " << reply->url().toString();
418+ }
419+}
420+
421+bool TelescopeClientJsonRts2::isConnected(void) const
422+{
423+ return telName.isEmpty() == false;
424+}
425+
426+Vec3d TelescopeClientJsonRts2::getJ2000EquatorialPos(const StelCore* core) const
427+{
428+ const qint64 now = getNow() - time_delay;
429+ return interpolatedPosition.get(now);
430+}
431+
432+void TelescopeClientJsonRts2::telescopeGoto(const Vec3d &j2000Pos)
433+{
434+ if (!isConnected())
435+ return;
436+
437+ double ra, dec;
438+ StelUtils::rectToSphe(&ra, &dec, j2000Pos);
439+
440+ QUrl set(baseurl);
441+ set.setPath(baseurl.path() + "/api/cmd");
442+
443+ QUrlQuery query;
444+ query.addQueryItem("d", telName);
445+ query.addQueryItem("c", QString("move+%1+%2").arg(ra * 180 / M_PI).arg(dec * 180 / M_PI));
446+ set.setQuery(query);
447+
448+ QNetworkRequest setR;
449+ setR.setUrl(set);
450+
451+ qDebug() << "GoTo request: " << set.toString();
452+
453+ networkManager.get(setR);
454+}
455+
456+bool TelescopeClientJsonRts2::hasKnownPosition(void) const
457+{
458+ return interpolatedPosition.isKnown();
459+}
460
461=== added file 'plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp'
462--- plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp 1970-01-01 00:00:00 +0000
463+++ plugins/TelescopeControl/src/clients/TelescopeClientJsonRts2.hpp 2017-04-05 20:17:41 +0000
464@@ -0,0 +1,61 @@
465+/*
466+ * RTS2 Json stellarium plugin
467+ *
468+ * Copyright (C) 2014-2016 Petr Kubanek
469+ *
470+ * This program is free software; you can redistribute it and/or
471+ * modify it under the terms of the GNU General Public License
472+ * as published by the Free Software Foundation; either version 2
473+ * of the License, or (at your option) any later version.
474+ *
475+ * This program is distributed in the hope that it will be useful,
476+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
477+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
478+ * GNU General Public License for more details.
479+ *
480+ * You should have received a copy of the GNU General Public License
481+ * along with this program; if not, write to the Free Software
482+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
483+ */
484+
485+#ifndef _TELESCOPE_CLIENT_JSON_RTS2_HPP_
486+#define _TELESCOPE_CLIENT_JSON_RTS2_HPP_
487+
488+#include "QNetworkAccessManager"
489+#include "QNetworkRequest"
490+#include "QNetworkReply"
491+#include "QUrl"
492+
493+#include "TelescopeClient.hpp"
494+
495+#include "StelCore.hpp"
496+
497+//! RTS2 JSON telescope.
498+class TelescopeClientJsonRts2 : public TelescopeClient
499+{
500+ Q_OBJECT
501+public:
502+ TelescopeClientJsonRts2(const QString &name, const QString &params, Equinox eq = EquinoxJ2000);
503+ ~TelescopeClientJsonRts2(void);
504+ virtual bool isConnected(void) const;
505+
506+ Vec3d getJ2000EquatorialPos(const StelCore* core=0) const;
507+
508+ void telescopeGoto(const Vec3d &j2000Pos);
509+ bool hasKnownPosition(void) const;
510+
511+private:
512+ QNetworkAccessManager networkManager;
513+ Equinox equinox;
514+ QUrl baseurl;
515+ QString telName;
516+ QNetworkRequest request;
517+ Vec3d position;
518+ InterpolatedPosition interpolatedPosition;
519+ int time_delay;
520+
521+private slots:
522+ void replyFinished(QNetworkReply *reply);
523+};
524+
525+#endif // _TELESCOPE_CLIENT_JSON_RTS2_HPP_
526
527=== modified file 'plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp'
528--- plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp 2017-01-05 15:28:52 +0000
529+++ plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp 2017-04-05 20:17:41 +0000
530@@ -43,7 +43,7 @@
531 , configuredSlot(0)
532 {
533 ui = new Ui_telescopeConfigurationDialog();
534-
535+
536 telescopeManager = GETSTELMODULE(TelescopeControl);
537
538 telescopeNameValidator = new QRegExpValidator (QRegExp("[^:\"]+"), this);//Test the update for JSON
539@@ -122,7 +122,7 @@
540 void TelescopeConfigurationDialog::createDialogContent()
541 {
542 ui->setupUi(dialog);
543-
544+
545 //Inherited connect
546 connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
547 connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(buttonDiscardPressed()));
548@@ -133,6 +133,7 @@
549 connect(ui->radioButtonTelescopeLocal, SIGNAL(toggled(bool)), this, SLOT(toggleTypeLocal(bool)));
550 connect(ui->radioButtonTelescopeConnection, SIGNAL(toggled(bool)), this, SLOT(toggleTypeConnection(bool)));
551 connect(ui->radioButtonTelescopeVirtual, SIGNAL(toggled(bool)), this, SLOT(toggleTypeVirtual(bool)));
552+ connect(ui->radioButtonTelescopeRTS2, SIGNAL(toggled(bool)), this, SLOT(toggleTypeRTS2(bool)));
553
554 connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(buttonSavePressed()));
555 connect(ui->pushButtonDiscard, SIGNAL(clicked()), this, SLOT(buttonDiscardPressed()));
556@@ -149,6 +150,10 @@
557 //Set the configuration panel in a predictable state
558 void TelescopeConfigurationDialog::initConfigurationDialog()
559 {
560+ ui->groupBoxConnectionSettings->hide();
561+ ui->groupBoxDeviceSettings->hide();
562+ ui->groupBoxRTS2Settings->hide();
563+
564 //Reusing code used in both methods that call this one
565 deviceModelNames = telescopeManager->getDeviceModels().keys();
566
567@@ -213,7 +218,7 @@
568 configuredSlot = slot;
569 initConfigurationDialog();
570 ui->stelWindowTitle->setText(q_("Configure Telescope"));
571-
572+
573 //Read the telescope properties
574 QString name;
575 ConnectionType connectionType;
576@@ -225,7 +230,10 @@
577 QList<double> circles;
578 QString deviceModelName;
579 QString serialPortName;
580- if(!telescopeManager->getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, serialPortName))
581+ QString rts2Url;
582+ QString rts2Username;
583+ QString rts2Password;
584+ if(!telescopeManager->getTelescopeAtSlot(slot, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, deviceModelName, serialPortName, rts2Url, rts2Username, rts2Password))
585 {
586 //TODO: Add debug
587 return;
588@@ -265,10 +273,17 @@
589 ui->radioButtonTelescopeConnection->setChecked(true);
590 ui->lineEditHostName->setText("localhost");
591 }
592- else
593+ else if (connectionType == ConnectionVirtual)
594 {
595 ui->radioButtonTelescopeVirtual->setChecked(true);
596 }
597+ else if (connectionType == ConnectionRTS2)
598+ {
599+ ui->radioButtonTelescopeRTS2->setChecked(true);
600+ ui->lineEditRTS2Url->setText(rts2Url);
601+ ui->lineEditRTS2Username->setText(rts2Username);
602+ ui->lineEditRTS2Password->setText(rts2Password);
603+ }
604
605 //Equinox
606 if (equinox == "JNow")
607@@ -310,16 +325,13 @@
608 ui->lineEditHostName->setText("localhost");
609 ui->spinBoxTCPPort->setValue(DEFAULT_TCP_PORT_FOR_SLOT(configuredSlot));
610
611- //Enable/disable controls
612- ui->labelHost->setEnabled(false);
613- ui->lineEditHostName->setEnabled(false);
614+ ui->groupBoxDeviceSettings->show();
615
616 ui->scrollArea->ensureWidgetVisible(ui->groupBoxTelescopeProperties);
617 }
618 else
619 {
620- ui->labelHost->setEnabled(true);
621- ui->lineEditHostName->setEnabled(true);
622+ ui->groupBoxDeviceSettings->hide();
623 }
624 }
625
626@@ -331,25 +343,38 @@
627 ui->lineEditHostName->setText("localhost");
628 ui->spinBoxTCPPort->setValue(DEFAULT_TCP_PORT_FOR_SLOT(configuredSlot));
629
630- ui->groupBoxDeviceSettings->setEnabled(false);
631+ ui->groupBoxConnectionSettings->show();
632
633 ui->scrollArea->ensureWidgetVisible(ui->groupBoxTelescopeProperties);
634 }
635 else
636 {
637- ui->groupBoxDeviceSettings->setEnabled(true);
638+ ui->groupBoxConnectionSettings->hide();
639 }
640 }
641
642 void TelescopeConfigurationDialog::toggleTypeVirtual(bool isChecked)
643 {
644- //TODO: This really should be done in the GUI
645- ui->groupBoxDeviceSettings->setEnabled(!isChecked);
646- ui->groupBoxConnectionSettings->setEnabled(!isChecked);
647-
648 ui->scrollArea->ensureWidgetVisible(ui->groupBoxTelescopeProperties);
649 }
650
651+void TelescopeConfigurationDialog::toggleTypeRTS2(bool isChecked)
652+{
653+ if(isChecked)
654+ {
655+ //Re-initialize values that may have been changed
656+ ui->lineEditRTS2Url->setText("localhost:8889");
657+
658+ ui->groupBoxRTS2Settings->show();
659+
660+ ui->scrollArea->ensureWidgetVisible(ui->groupBoxRTS2Settings);
661+ }
662+ else
663+ {
664+ ui->groupBoxRTS2Settings->hide();
665+ }
666+}
667+
668 void TelescopeConfigurationDialog::buttonSavePressed()
669 {
670 //Main telescope properties
671@@ -415,6 +440,11 @@
672 type = ConnectionVirtual;
673 telescopeManager->addTelescopeAtSlot(configuredSlot, type, name, equinox, QString(), portTCP, delay, connectAtStartup, circles);
674 }
675+ else if (ui->radioButtonTelescopeRTS2->isChecked())
676+ {
677+ type = ConnectionRTS2;
678+ telescopeManager->addTelescopeAtSlot(configuredSlot, type, name, equinox, host, portTCP, delay, connectAtStartup, circles, QString(), QString(), ui->lineEditRTS2Url->text(), ui->lineEditRTS2Username->text(), ui->lineEditRTS2Password->text());
679+ }
680
681 emit changesSaved(name, type);
682 }
683
684=== modified file 'plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp'
685--- plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp 2016-04-23 13:33:16 +0000
686+++ plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp 2017-04-05 20:17:41 +0000
687@@ -63,6 +63,7 @@
688 void toggleTypeLocal(bool);
689 void toggleTypeConnection(bool);
690 void toggleTypeVirtual(bool);
691+ void toggleTypeRTS2(bool);
692
693 void deviceModelSelected(const QString&);
694 bool validateHost(QString hostName);
695
696=== modified file 'plugins/TelescopeControl/src/gui/TelescopeDialog.cpp'
697--- plugins/TelescopeControl/src/gui/TelescopeDialog.cpp 2017-01-05 15:28:52 +0000
698+++ plugins/TelescopeControl/src/gui/TelescopeDialog.cpp 2017-04-05 20:17:41 +0000
699@@ -176,7 +176,10 @@
700 QList<double> circles;
701 QString serverName;
702 QString portSerial;
703- if(!telescopeManager->getTelescopeAtSlot(slotNumber, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, serverName, portSerial))
704+ QString rts2Url;
705+ QString rts2Username;
706+ QString rts2Password;
707+ if(!telescopeManager->getTelescopeAtSlot(slotNumber, connectionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, serverName, portSerial, rts2Url, rts2Username, rts2Password))
708 continue;
709
710 //Determine the server type
711@@ -502,6 +505,10 @@
712 // TRANSLATORS: Telescope connection type
713 typeLabel = N_("virtual");
714 break;
715+ case ConnectionRTS2:
716+ // TRANSLATORS: Telescope connection type
717+ typeLabel = N_("RTS2");
718+ break;
719 default:
720 ;
721 }
722
723=== modified file 'plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui'
724--- plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui 2016-04-23 15:55:46 +0000
725+++ plugins/TelescopeControl/src/gui/telescopeConfigurationDialog.ui 2017-04-05 20:17:41 +0000
726@@ -213,6 +213,28 @@
727 </widget>
728 </item>
729 <item>
730+ <widget class="QRadioButton" name="radioButtonTelescopeRTS2">
731+ <property name="sizePolicy">
732+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
733+ <horstretch>0</horstretch>
734+ <verstretch>0</verstretch>
735+ </sizepolicy>
736+ </property>
737+ <property name="minimumSize">
738+ <size>
739+ <width>0</width>
740+ <height>24</height>
741+ </size>
742+ </property>
743+ <property name="toolTip">
744+ <string>Telescope which is accessible through RTS2(.org) JSON API</string>
745+ </property>
746+ <property name="text">
747+ <string>RTS2 telescope</string>
748+ </property>
749+ </widget>
750+ </item>
751+ <item>
752 <widget class="QRadioButton" name="radioButtonTelescopeVirtual">
753 <property name="sizePolicy">
754 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
755@@ -243,9 +265,9 @@
756 <property name="geometry">
757 <rect>
758 <x>0</x>
759- <y>0</y>
760- <width>549</width>
761- <height>520</height>
762+ <y>-283</y>
763+ <width>547</width>
764+ <height>603</height>
765 </rect>
766 </property>
767 <layout class="QVBoxLayout" name="verticalLayoutScrollArea">
768@@ -580,7 +602,7 @@
769 <item row="0" column="0">
770 <widget class="QLabel" name="labelHost">
771 <property name="enabled">
772- <bool>false</bool>
773+ <bool>true</bool>
774 </property>
775 <property name="text">
776 <string>Host:</string>
777@@ -590,7 +612,7 @@
778 <item row="1" column="0">
779 <widget class="QLineEdit" name="lineEditHostName">
780 <property name="enabled">
781- <bool>false</bool>
782+ <bool>true</bool>
783 </property>
784 <property name="toolTip">
785 <string>Host name or IPv4 address of the machine that hosts the telescope server</string>
786@@ -640,6 +662,90 @@
787 </widget>
788 </item>
789 <item>
790+ <widget class="QGroupBox" name="groupBoxRTS2Settings">
791+ <property name="title">
792+ <string>RTS2 telescope settings</string>
793+ </property>
794+ <layout class="QGridLayout" name="gridLayout">
795+ <property name="leftMargin">
796+ <number>0</number>
797+ </property>
798+ <property name="topMargin">
799+ <number>0</number>
800+ </property>
801+ <property name="rightMargin">
802+ <number>0</number>
803+ </property>
804+ <property name="bottomMargin">
805+ <number>0</number>
806+ </property>
807+ <item row="0" column="0">
808+ <widget class="QLabel" name="labelRTS2Host">
809+ <property name="text">
810+ <string>URL:</string>
811+ </property>
812+ </widget>
813+ </item>
814+ <item row="2" column="0">
815+ <widget class="QLabel" name="labelRTS2Username">
816+ <property name="text">
817+ <string>Username:</string>
818+ </property>
819+ </widget>
820+ </item>
821+ <item row="2" column="1">
822+ <widget class="QLabel" name="labelRTS2Password">
823+ <property name="text">
824+ <string>Password:</string>
825+ </property>
826+ </widget>
827+ </item>
828+ <item row="3" column="0">
829+ <widget class="QLineEdit" name="lineEditRTS2Username">
830+ <property name="toolTip">
831+ <string>RTS2 username</string>
832+ </property>
833+ <property name="text">
834+ <string notr="true"/>
835+ </property>
836+ <property name="maxLength">
837+ <number>50</number>
838+ </property>
839+ </widget>
840+ </item>
841+ <item row="3" column="1">
842+ <widget class="QLineEdit" name="lineEditRTS2Password">
843+ <property name="toolTip">
844+ <string>RTS2 password</string>
845+ </property>
846+ <property name="text">
847+ <string notr="true"/>
848+ </property>
849+ <property name="maxLength">
850+ <number>50</number>
851+ </property>
852+ <property name="echoMode">
853+ <enum>QLineEdit::Password</enum>
854+ </property>
855+ </widget>
856+ </item>
857+ <item row="1" column="0" colspan="2">
858+ <widget class="QLineEdit" name="lineEditRTS2Url">
859+ <property name="toolTip">
860+ <string>URL of the machine that hosts the RTS2 JSON (httpd) server</string>
861+ </property>
862+ <property name="text">
863+ <string notr="true">localhost</string>
864+ </property>
865+ <property name="maxLength">
866+ <number>255</number>
867+ </property>
868+ </widget>
869+ </item>
870+ </layout>
871+ </widget>
872+ </item>
873+ <item>
874 <widget class="QGroupBox" name="groupBoxUserInterface">
875 <property name="title">
876 <string>User interface settings</string>