TelescopeControl.hpp   TelescopeControl.hpp 
skipping to change at line 36 skipping to change at line 36
*/ */
#ifndef _TELESCOPE_CONTROL_HPP_ #ifndef _TELESCOPE_CONTROL_HPP_
#define _TELESCOPE_CONTROL_HPP_ #define _TELESCOPE_CONTROL_HPP_
#include "StelFader.hpp" #include "StelFader.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelJsonParser.hpp" #include "StelJsonParser.hpp"
#include "StelObjectModule.hpp" #include "StelObjectModule.hpp"
#include "StelProjectorType.hpp" #include "StelProjectorType.hpp"
#include "StelTextureTypes.hpp"
#include "TelescopeControlGlobals.hpp" #include "TelescopeControlGlobals.hpp"
#include "VecMath.hpp" #include "VecMath.hpp"
#include <QFile> #include <QFile>
#include <QFont> #include <QFont>
#include <QHash> #include <QHash>
#include <QMap> #include <QMap>
#include <QProcess> #include <QProcess>
#include <QSettings> #include <QSettings>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QTextStream> #include <QTextStream>
#include <QVariant> #include <QVariant>
class StelObject; class StelObject;
class StelPainter;
class StelProjector; class StelProjector;
class TelescopeClient; class TelescopeClient;
class TelescopeDialog; class TelescopeDialog;
class SlewDialog; class SlewDialog;
using namespace TelescopeControlGlobals; using namespace TelescopeControlGlobals;
typedef QSharedPointer<TelescopeClient> TelescopeClientP; typedef QSharedPointer<TelescopeClient> TelescopeClientP;
//! This class manages the controlling of one or more telescopes by one //! This class manages the controlling of one or more telescopes by one
skipping to change at line 80 skipping to change at line 82
public: public:
TelescopeControl(); TelescopeControl();
virtual ~TelescopeControl(); virtual ~TelescopeControl();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
virtual void init(); virtual void init();
virtual void deinit(); virtual void deinit();
virtual void update(double deltaTime); virtual void update(double deltaTime);
virtual void draw(StelCore * core, class StelRenderer* renderer); virtual void draw(StelCore * core);
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelObjectModule class // Methods defined in the StelObjectModule class
virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const; virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const;
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
virtual StelObjectP searchByName(const QString& name) const; virtual StelObjectP searchByName(const QString& name) const;
//! Find and return the list of at most maxNbItem objects auto-compl eting the passed object I18n name. //! Find and return the list of at most maxNbItem objects auto-compl eting the passed object I18n name.
//! @param objPrefix the case insensitive first letters of the searc hed object //! @param objPrefix the case insensitive first letters of the searc hed object
//! @param maxNbItem the maximum number of returned object names //! @param maxNbItem the maximum number of returned object names
skipping to change at line 197 skipping to change at line 199
//! Set the field of view circles color //! Set the field of view circles color
void setCircleColor(const Vec3f &c) {circleColor = c;} void setCircleColor(const Vec3f &c) {circleColor = c;}
//! Get the field of view circles color //! Get the field of view circles color
const Vec3f& getCircleColor() const {return circleColor;} const Vec3f& getCircleColor() const {return circleColor;}
//! Define font size to use for telescope names display //! Define font size to use for telescope names display
void setFontSize(int fontSize); void setFontSize(int fontSize);
//! slews a telescope to the selected object. //! slews a telescope to the selected object.
//! For use from the GUI. The telescope number will be //! For use from the GUI. The telescope number will be
//! deduced from the name of the QAction which triggered the slot. //! deduced from the name of the StelAction which triggered the slot .
void slewTelescopeToSelectedObject(); void slewTelescopeToSelectedObject();
//! slews a telescope to the point of the celestial sphere currently //! slews a telescope to the point of the celestial sphere currently
//! in the center of the screen. //! in the center of the screen.
//! For use from the GUI. The telescope number will be //! For use from the GUI. The telescope number will be
//! deduced from the name of the QAction which triggered the slot. //! deduced from the name of the StelAction which triggered the slot .
void slewTelescopeToViewDirection(); void slewTelescopeToViewDirection();
//! Used in the GUI //! Used in the GUI
void setFlagUseTelescopeServerLogs (bool b) {useTelescopeServerLogs = b;} void setFlagUseTelescopeServerLogs (bool b) {useTelescopeServerLogs = b;}
signals: signals:
void clientConnected(int slot, QString name); void clientConnected(int slot, QString name);
void clientDisconnected(int slot); void clientDisconnected(int slot);
private slots: private slots:
void setStelStyle(const QString& section); void setStelStyle(const QString& section);
//! Set translated keyboard shortcut descriptions. //! Set translated keyboard shortcut descriptions.
void translateActionDescriptions(); void translateActionDescriptions();
private: private:
//! Draw a nice animated pointer around the object if it's selected //! Draw a nice animated pointer around the object if it's selected
void drawPointer(const StelProjectorP& prj, const StelCore* core, cl ass StelRenderer* renderer); void drawPointer(const StelProjectorP& prj, const StelCore* core, St elPainter& sPainter);
//! Perform the communication with the telescope servers //! Perform the communication with the telescope servers
void communicate(void); void communicate(void);
LinearFader labelFader; LinearFader labelFader;
LinearFader reticleFader; LinearFader reticleFader;
LinearFader circleFader; LinearFader circleFader;
//! Colour currently used to draw telescope reticles //! Colour currently used to draw telescope reticles
Vec3f reticleColor; Vec3f reticleColor;
//! Colour currently used to draw telescope text labels //! Colour currently used to draw telescope text labels
skipping to change at line 251 skipping to change at line 253
Vec3f labelNightColor; Vec3f labelNightColor;
//! Colour used to draw field of view circles in normal mode, as set in the configuration file //! Colour used to draw field of view circles in normal mode, as set in the configuration file
Vec3f circleNormalColor; Vec3f circleNormalColor;
//! Colour used to draw field of view circles in night mode, as set in the configuration file //! Colour used to draw field of view circles in night mode, as set in the configuration file
Vec3f circleNightColor; Vec3f circleNightColor;
//! Font used to draw telescope text labels //! Font used to draw telescope text labels
QFont labelFont; QFont labelFont;
//Toolbar button to toggle the Slew window //Toolbar button to toggle the Slew window
QPixmap* pixmapHover;
QPixmap* pixmapOnIcon;
QPixmap* pixmapOffIcon;
StelButton* toolbarButton; StelButton* toolbarButton;
//! Telescope reticle texture //! Telescope reticle texture
class StelTextureNew* reticleTexture; StelTextureSP reticleTexture;
//! Telescope selection marker texture //! Telescope selection marker texture
class StelTextureNew* selectionTexture; StelTextureSP selectionTexture;
//! Contains the initialized telescope client objects representing t he telescopes that Stellarium is connected to or attempting to connect to. //! Contains the initialized telescope client objects representing t he telescopes that Stellarium is connected to or attempting to connect to.
QMap<int, TelescopeClientP> telescopeClients; QMap<int, TelescopeClientP> telescopeClients;
//! Contains QProcess objects of the currently running telescope ser ver processes that have been launched by Stellarium. //! Contains QProcess objects of the currently running telescope ser ver processes that have been launched by Stellarium.
QHash<int, QProcess*> telescopeServerProcess; QHash<int, QProcess*> telescopeServerProcess;
QStringList telescopeServers; QStringList telescopeServers;
QVariantMap telescopeDescriptions; QVariantMap telescopeDescriptions;
QHash<QString, DeviceModel> deviceModels; QHash<QString, DeviceModel> deviceModels;
QHash<ConnectionType, QString> connectionTypeNames; QHash<ConnectionType, QString> connectionTypeNames;
skipping to change at line 320 skipping to change at line 319
void addLogAtSlot(int slot); void addLogAtSlot(int slot);
void logAtSlot(int slot); void logAtSlot(int slot);
void removeLogAtSlot(int slot); void removeLogAtSlot(int slot);
QString actionGroupId; QString actionGroupId;
QString moveToSelectedActionId; QString moveToSelectedActionId;
QString moveToCenterActionId; QString moveToCenterActionId;
}; };
#include "fixx11h.h"
#include <QObject> #include <QObject>
#include "StelPluginInterface.hpp" #include "StelPluginInterface.hpp"
//! This class is used by Qt to manage a plug-in interface //! This class is used by Qt to manage a plug-in interface
class TelescopeControlStelPluginInterface : public QObject, public StelPlug inInterface class TelescopeControlStelPluginInterface : public QObject, public StelPlug inInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "stellarium.StelGuiPluginInterface/1.0")
Q_INTERFACES(StelPluginInterface) Q_INTERFACES(StelPluginInterface)
public: public:
virtual StelModule* getStelModule() const; virtual StelModule* getStelModule() const;
virtual StelPluginInfo getPluginInfo() const; virtual StelPluginInfo getPluginInfo() const;
}; };
#endif /*_TELESCOPE_CONTROL_HPP_*/ #endif /*_TELESCOPE_CONTROL_HPP_*/
 End of changes. 11 change blocks. 
10 lines changed or deleted 9 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/