[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jason Harris]

SVN commit 765046 by harris:

Do not reset the focus position when closing the Options dialog.  (in
general, always write updated focus position data to the Options
object whenever changes are made.  Before I was only sendig the focus
position to the Options object in slotAboutToQuit())

Backporting to 4.0 branch as well.

CCMAIL: kstars-devel at kde.org



 M  +1 -6      kstarsinit.cpp  
 M  +6 -0      skymap.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/kstarsinit.cpp #765045:765046
@@ -665,9 +665,7 @@
 
     data()->setSnapNextFocus();
     map()->setDestination( map()->focusPoint() );
-    map()->destination()->EquatorialToHorizontal( LST(), geo()->lat() );
     map()->setFocus( map()->destination() );
-    map()->focus()->EquatorialToHorizontal( LST(), geo()->lat() );
 
     map()->showFocusCoords();
 
@@ -702,11 +700,8 @@
         ((KSPlanetBase*)map()->focusObject())->addToTrail();
         data()->temporaryTrail = true;
     }
-
-    //Store focus coords in Options object before calling applyConfig()
-    Options::setFocusRA( map()->focus()->ra()->Hours() );
-    Options::setFocusDec( map()->focus()->dec()->Degrees() );
 }
+
 void KStars::buildGUI() {
     //create the skymap
     skymap = SkyMap::Create( data(), this );
--- trunk/KDE/kdeedu/kstars/kstars/skymap.cpp #765045:765046
@@ -588,6 +588,9 @@
     m_rotAxis = m_rotAxis.inverse();
 
     Focus.set( ra, dec );
+    Options::setFocusRA( ra );
+    Options::setFocusDec( dec );
+
     focus()->EquatorialToHorizontal( data->LST, data->geo()->lat() );
 }
 
@@ -599,6 +602,9 @@
     focus()->setAlt(alt);
     focus()->setAz(az);
     focus()->HorizontalToEquatorial( data->LST, data->geo()->lat() );
+    Options::setFocusRA( focus()->ra()->Hours() );
+    Options::setFocusDec( focus()->dec()->Degrees() );
+
     slewing = false;
 
     oldfocus()->set( focus()->ra(), focus()->dec() );