Merge lp:~icrar/svmt/svmt-radio into lp:svmt

Proposed by David Reed
Status: Merged
Approved by: David Reed
Approved revision: 1481
Merged at revision: 1481
Proposed branch: lp:~icrar/svmt/svmt-radio
Merge into: lp:svmt
Diff against target: 77 lines (+7/-9)
3 files modified
src/SpatialGroup.hpp (+2/-2)
src/Svmt.cpp (+2/-3)
src/gui/SvmtGui.cpp (+3/-4)
To merge this branch: bzr merge lp:~icrar/svmt/svmt-radio
Reviewer Review Type Date Requested Status
David Reed Approve
Review via email: mp+87907@code.launchpad.net

Commit message

Merging branch

Description of the change

Updates to make svmt compatible with Stellarium 1.0

To post a comment you must log in.
Revision history for this message
David Reed (nurous) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/SpatialGroup.hpp'
2--- src/SpatialGroup.hpp 2010-07-28 12:39:15 +0000
3+++ src/SpatialGroup.hpp 2012-01-09 07:13:24 +0000
4@@ -37,8 +37,8 @@
5 virtual QString getType() const {return "SpatialGroup";}
6 virtual QString getEnglishName() const {return QString("[x%1]").arg(count);}
7 virtual QString getNameI18n() const {return getEnglishName();}
8- virtual Vec3d getJ2000EquatorialPos(const StelNavigator*) const {return footprint->getBoundingCap().n;}
9- virtual float getSelectPriority(const StelNavigator*) const {return -500.;}
10+ virtual Vec3d getJ2000EquatorialPos(const StelCore*) const {return footprint->getBoundingCap().n;}
11+ virtual float getSelectPriority(const StelCore*) const {return -500.;}
12 virtual Vec3f getInfoColor() const {return Vec3f(1,1,0);}
13 virtual double getAngularSize(const StelCore*) const {return 0.;}
14
15
16=== modified file 'src/Svmt.cpp'
17--- src/Svmt.cpp 2011-01-27 15:53:35 +0000
18+++ src/Svmt.cpp 2012-01-09 07:13:24 +0000
19@@ -24,7 +24,6 @@
20
21 #include "StelApp.hpp"
22 #include "StelModuleMgr.hpp"
23-#include "StelNavigator.hpp"
24 #include "StarMgr.hpp"
25 #include "StelFileMgr.hpp"
26 #include "StelCore.hpp"
27@@ -114,7 +113,7 @@
28 starMgr->setFlagSciNames(true);
29
30 StelApp::getInstance().getCore()->getSkyDrawer()->setTwinkleAmount(0.1);
31- StelApp::getInstance().getCore()->getNavigator()->setTimeRate(0);
32+ StelApp::getInstance().getCore()->setTimeRate(0);
33 GETSTELMODULE(StelMovementMgr)->setMountMode(StelMovementMgr::MountEquinoxEquatorial);
34 Vec3d vc(0.9999,0.0001,0.0001);
35 vc.normalize();
36@@ -174,7 +173,7 @@
37 {
38 // Update its whole content using a min crawler
39 QString crawlerConfigUrl = conf->value("SVMT/crawlerConfigFile", "http://svmt.hq.eso.org/1.2.0/crawlerConfig.json").toString();
40- crawler = new MiniCrawler(dynamic_cast<QeStoreTokyoCabinet*>(mainObservationList), QUrl(crawlerConfigUrl));
41+ crawler = new MiniCrawler(dynamic_cast<QeStoreTokyoCabinet*>(mainObservationList), crawlerConfigUrl);
42 crawler->setNetworkManager(StelApp::getInstance().getNetworkAccessManager());
43 QObject::connect(crawler, SIGNAL(finished()), this, SLOT(crawlerFinished()));
44 crawler->start();
45
46=== modified file 'src/gui/SvmtGui.cpp'
47--- src/gui/SvmtGui.cpp 2010-09-28 12:11:35 +0000
48+++ src/gui/SvmtGui.cpp 2012-01-09 07:13:24 +0000
49@@ -26,7 +26,6 @@
50 #include "StelJsonParser.hpp"
51 #include "StelTranslator.hpp"
52 #include "StelCore.hpp"
53-#include "StelNavigator.hpp"
54 #include "StelGuiItems.hpp"
55 #include "StelGui.hpp"
56 #include "StelModuleMgr.hpp"
57@@ -241,7 +240,7 @@
58 {
59 // Switch to archive browsing mode
60 movmgr->setMountMode(StelMovementMgr::MountEquinoxEquatorial);
61- StelApp::getInstance().getCore()->getNavigator()->setTimeRate(0.);
62+ StelApp::getInstance().getCore()->setTimeRate(0.);
63 landmgr->setFlagFog(false);
64 landmgr->setFlagLandscape(false);
65 landmgr->setFlagAtmosphere(false);
66@@ -285,9 +284,9 @@
67 loc.name = "Paranal";
68 loc.country = "Chile";
69 loc.planetName = "Earth";
70- StelApp::getInstance().getCore()->getNavigator()->moveObserverTo(loc, 0.);
71+ StelApp::getInstance().getCore()->moveObserverTo(loc, 0.);
72 movmgr->setMountMode(StelMovementMgr::MountAltAzimuthal);
73- StelApp::getInstance().getCore()->getNavigator()->setTimeRate(JD_SECOND);
74+ StelApp::getInstance().getCore()->setTimeRate(StelCore::JD_SECOND);
75 landmgr->setCurrentLandscapeID("paranal");
76 landmgr->setFlagFog(true);
77 landmgr->setFlagLandscape(true);

Subscribers

People subscribed via source and target branches