[Kstars-devel] kdeedu/kstars/kstars

[Jasem Mutlaq]

CVS commit by mutlaqja: 

The 'Center in Telescope' details dialog button is now functional.

CCMAIL: kstars-devel at kde.org


  M +73 -3     detaildialog.cpp   1.56
  M +1 -1      tools/observinglist.cpp   1.11


--- kdeedu/kstars/kstars/detaildialog.cpp  #1.55:1.56
@@ -28,4 +28,5 @@
 #include <kpushbutton.h>
 #include <klistview.h>
+#include <klineedit.h>
 
 #include "detaildialog.h"
@@ -50,4 +51,10 @@
 #include "thumbnailpicker.h"
 
+#include "indielement.h"
+#include "indiproperty.h"
+#include "indidevice.h"
+#include "indimenu.h"
+#include "devicemanager.h"
+
 LogEdit::LogEdit( QWidget *parent, const char *name ) : KTextEdit( parent, name ) 
 {
@@ -86,5 +93,5 @@ DetailDialog::DetailDialog(SkyObject *o,
         connect( Data->ObsListButton, SIGNAL( clicked() ), this, SLOT( addToObservingList() ) );
         connect( Data->CenterButton, SIGNAL( clicked() ), this, SLOT( centerMap() ) );
-        connect( Data->CenterButton, SIGNAL( clicked() ), this, SLOT( centerTelescope() ) );
+        connect( Data->ScopeButton, SIGNAL( clicked() ), this, SLOT( centerTelescope() ) );
         connect( Data->Image, SIGNAL( clicked() ), this, SLOT( updateThumbnail() ) );
 }
@@ -888,6 +895,69 @@ void DetailDialog::centerMap() {
 }
 
-void DetailDialog::centerTelescope() {
-        //FIXME: point telescope at selectedObject
+void DetailDialog::centerTelescope()
+{
+
+  INDI_D *indidev;
+  INDI_P *eqCoord, *onSet;
+  INDI_E *RAEle, *DecEle, *ConnectEle;
+  bool useJ2000( false);
+  SkyPoint sp;
+  
+  // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
+  // i.e. the first telescope we find!
+  
+  INDIMenu *imenu = ksw->getINDIMenu();
+  
+  for (unsigned int i=0; i < imenu->mgr.count() ; i++)
+  {
+    for (unsigned int j=0; j < imenu->mgr.at(i)->indi_dev.count(); j++)
+    {
+       indidev = imenu->mgr.at(i)->indi_dev.at(j);
+       eqCoord = indidev->findProp("EQUATORIAL_EOD_COORD");
+       if (eqCoord == NULL)
+       {
+         eqCoord = indidev->findProp("EQUATORIAL_COORD");
+         useJ2000 = true;
+       }
+       
+       if (eqCoord == NULL) continue;
+       
+       ConnectEle = indidev->findElem("CONNECT");
+       if (!ConnectEle) continue;
+       
+       if (ConnectEle->state == PS_OFF)
+       {
+         KMessageBox::error(0, i18n("Telescope %1 is offline. Please connect and retry again.").arg(indidev->label));
+         return;
+       }
+
+       RAEle = eqCoord->findElement("RA");
+       if (!RAEle) continue;
+       DecEle = eqCoord->findElement("DEC");
+       if (!DecEle) continue;
+       
+       onSet = indidev->findProp("ON_COORD_SET");
+       if (!onSet) continue;
+       
+       onSet->activateSwitch("SLEW");
+       
+       sp.set (selectedObject->ra(), selectedObject->dec());
+       
+       if (useJ2000)
+         sp.apparentCoord(ksw->data()->ut().djd(), (long double) J2000);
+
+       // Use JNow coordinate as required by INDI
+       RAEle->write_w->setText(QString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second()));
+       DecEle->write_w->setText(QString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec()));
+       
+       eqCoord->newText();
+       
+       return;
+    }
+  }
+       
+  // We didn't find any telescopes
+  KMessageBox::sorry(0, i18n("KStars did not find any active telescopes."));
+        
 }
 

--- kdeedu/kstars/kstars/tools/observinglist.cpp  #1.10:1.11
@@ -339,5 +339,5 @@ void ObservingList::slotSlewToObject()
          sp.apparentCoord(ks->data()->ut().djd(), (long double) J2000);
 
-           // Use J2000 coordinate as required by INDI
+       // Use JNow coordinate as required by INDI
        RAEle->write_w->setText(QString("%1:%2:%3").arg(sp.ra()->hour()).arg(sp.ra()->minute()).arg(sp.ra()->second()));
        DecEle->write_w->setText(QString("%1:%2:%3").arg(sp.dec()->degree()).arg(sp.dec()->arcmin()).arg(sp.dec()->arcsec()));