TelescopeClient.hpp   TelescopeClient.hpp 
skipping to change at line 39 skipping to change at line 39
#include <QHostAddress> #include <QHostAddress>
#include <QHostInfo> #include <QHostInfo>
#include <QList> #include <QList>
#include <QString> #include <QString>
#include <QTcpSocket> #include <QTcpSocket>
#include <QObject> #include <QObject>
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelCore.hpp" //Needed for getting StelNavigator instances #include "StelCore.hpp" //Needed for getting StelNavigator instances
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelNavigator.hpp"
#include "InterpolatedPosition.hpp" #include "InterpolatedPosition.hpp"
qint64 getNow(void); qint64 getNow(void);
enum Equinox { enum Equinox {
EquinoxJ2000, EquinoxJ2000,
EquinoxJNow EquinoxJNow
}; };
//! An abstract base class that should never be used directly, only inherit ed. //! An abstract base class that should never be used directly, only inherit ed.
skipping to change at line 139 skipping to change at line 138
} }
void telescopeGoto(const Vec3d &j2000Pos) void telescopeGoto(const Vec3d &j2000Pos)
{ {
desired_pos = j2000Pos; desired_pos = j2000Pos;
desired_pos.normalize(); desired_pos.normalize();
} }
bool hasKnownPosition(void) const bool hasKnownPosition(void) const
{ {
return true; return true;
} }
Vec3d getJ2000EquatorialPos(const StelNavigator*) const Vec3d getJ2000EquatorialPos(const StelCore*) const
{ {
return XYZ; return XYZ;
} }
private: private:
Vec3d XYZ; // j2000 position Vec3d XYZ; // j2000 position
Vec3d desired_pos; Vec3d desired_pos;
}; };
//! This TelescopeClient class can controll a telescope by communicating //! This TelescopeClient class can controll a telescope by communicating
skipping to change at line 170 skipping to change at line 169
{ {
hangup(); hangup();
} }
bool isConnected(void) const bool isConnected(void) const
{ {
//return (tcpSocket->isValid() && !wait_for_connection_estab lishment); //return (tcpSocket->isValid() && !wait_for_connection_estab lishment);
return (tcpSocket->state() == QAbstractSocket::ConnectedStat e); return (tcpSocket->state() == QAbstractSocket::ConnectedStat e);
} }
private: private:
Vec3d getJ2000EquatorialPos(const StelNavigator *nav=0) const; Vec3d getJ2000EquatorialPos(const StelCore* core=0) const;
bool prepareCommunication(); bool prepareCommunication();
void performCommunication(); void performCommunication();
void telescopeGoto(const Vec3d &j2000Pos); void telescopeGoto(const Vec3d &j2000Pos);
bool isInitialized(void) const bool isInitialized(void) const
{ {
return (!address.isNull()); return (!address.isNull());
} }
void performReading(void); void performReading(void);
void performWriting(void); void performWriting(void);
 End of changes. 3 change blocks. 
3 lines changed or deleted 2 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/