SearchDialog.cpp   SearchDialog.cpp 
skipping to change at line 38 skipping to change at line 38
#include "StelNavigator.hpp" #include "StelNavigator.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include <QTextEdit> #include <QTextEdit>
#include <QLabel> #include <QLabel>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QDebug> #include <QDebug>
#include <QFrame> #include <QFrame>
#include "StelMainGraphicsView.hpp"
#include "SimbadSearcher.hpp" #include "SimbadSearcher.hpp"
// Start of members for class CompletionLabel // Start of members for class CompletionLabel
CompletionLabel::CompletionLabel(QWidget* parent) : QLabel(parent), selecte dIdx(0) CompletionLabel::CompletionLabel(QWidget* parent) : QLabel(parent), selecte dIdx(0)
{ {
} }
CompletionLabel::~CompletionLabel() CompletionLabel::~CompletionLabel()
{ {
} }
skipping to change at line 221 skipping to change at line 220
ui->raDecLabel->setVisible(!b); ui->raDecLabel->setVisible(!b);
} }
void SearchDialog::manualPositionChanged() void SearchDialog::manualPositionChanged()
{ {
ui->completionLabel->clearValues(); ui->completionLabel->clearValues();
StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr); StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr);
Vec3d pos; Vec3d pos;
StelUtils::spheToRect(ui->RAAngleSpinBox->valueRadians(), ui->DEAngl eSpinBox->valueRadians(), pos); StelUtils::spheToRect(ui->RAAngleSpinBox->valueRadians(), ui->DEAngl eSpinBox->valueRadians(), pos);
mvmgr->setFlagTracking(false); mvmgr->setFlagTracking(false);
mvmgr->moveTo(pos, 0.05); mvmgr->moveToJ2000(pos, 0.05);
} }
void SearchDialog::onTextChanged(const QString& text) void SearchDialog::onTextChanged(const QString& text)
{ {
if (simbadReply) if (simbadReply)
{ {
disconnect(simbadReply, SIGNAL(statusChanged()), this, SLOT( onSimbadStatusChanged())); disconnect(simbadReply, SIGNAL(statusChanged()), this, SLOT( onSimbadStatusChanged()));
delete simbadReply; delete simbadReply;
simbadReply=NULL; simbadReply=NULL;
} }
skipping to change at line 316 skipping to change at line 315
if (name.isEmpty()) if (name.isEmpty())
return; return;
StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr); StelMovementMgr* mvmgr = GETSTELMODULE(StelMovementMgr);
if (simbadResults.contains(name)) if (simbadResults.contains(name))
{ {
close(); close();
Vec3d pos = simbadResults[name]; Vec3d pos = simbadResults[name];
objectMgr->unSelect(); objectMgr->unSelect();
pos = StelApp::getInstance().getCore()->getNavigator()->j200 mvmgr->moveToJ2000(pos, mvmgr->getAutoMoveDuration());
0ToEquinoxEqu(pos);
mvmgr->moveTo(pos, mvmgr->getAutoMoveDuration());
ui->lineEditSearchSkyObject->clear(); ui->lineEditSearchSkyObject->clear();
ui->completionLabel->clearValues(); ui->completionLabel->clearValues();
} }
else if (objectMgr->findAndSelectI18n(name)) else if (objectMgr->findAndSelectI18n(name))
{ {
const QList<StelObjectP> newSelected = objectMgr->getSelecte dObject(); const QList<StelObjectP> newSelected = objectMgr->getSelecte dObject();
if (!newSelected.empty()) if (!newSelected.empty())
{ {
close(); close();
ui->lineEditSearchSkyObject->clear(); ui->lineEditSearchSkyObject->clear();
ui->completionLabel->clearValues(); ui->completionLabel->clearValues();
// Can't point to home planet // Can't point to home planet
if (newSelected[0].get()!= (StelObject*)(StelApp::ge tInstance().getCore()->getNavigator()->getHomePlanet())) if (newSelected[0]->getEnglishName()!=StelApp::getIn stance().getCore()->getNavigator()->getCurrentLocation().name)
{ {
mvmgr->moveTo(newSelected[0]->getEquinoxEqua torialPos(StelApp::getInstance().getCore()->getNavigator()),mvmgr->getAutoM oveDuration()); mvmgr->moveToObject(newSelected[0], mvmgr->g etAutoMoveDuration());
mvmgr->setFlagTracking(true); mvmgr->setFlagTracking(true);
} }
else else
{ {
GETSTELMODULE(StelObjectMgr)->unSelect(); GETSTELMODULE(StelObjectMgr)->unSelect();
} }
} }
} }
simbadResults.clear(); simbadResults.clear();
} }
 End of changes. 5 change blocks. 
7 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/