TelescopeControl.hpp   TelescopeControl.hpp 
skipping to change at line 121 skipping to change at line 121
void saveConfiguration(); void saveConfiguration();
//! Saves to telescopes.json a list of the parameters of the active telescope clients. //! Saves to telescopes.json a list of the parameters of the active telescope clients.
void saveTelescopes(); void saveTelescopes();
//! Loads from telescopes.json the parameters of telescope clients a nd initializes them. If there are already any initialized telescope clients , they are removed. //! Loads from telescopes.json the parameters of telescope clients a nd initializes them. If there are already any initialized telescope clients , they are removed.
void loadTelescopes(); void loadTelescopes();
//These are public, but not slots, because they don't use sufficient validation. Scripts shouldn't be able to add/remove telescopes, only to po int them. //These are public, but not slots, because they don't use sufficient validation. Scripts shouldn't be able to add/remove telescopes, only to po int them.
//! Adds a telescope description containing the given properties. DO ES NOT VALIDATE its parameters. If serverName is specified, portSerial shou ld be specified too. Call saveTelescopes() to write the modified configurat ion to disc. Call startTelescopeAtSlot() to start this telescope. //! Adds a telescope description containing the given properties. DO ES NOT VALIDATE its parameters. If serverName is specified, portSerial shou ld be specified too. Call saveTelescopes() to write the modified configurat ion to disc. Call startTelescopeAtSlot() to start this telescope.
//! @param portSerial must be a valid serial port name for the parti cular platform, e.g. "COM1" for Microsoft Windows of "/dev/ttyS0" for Linux //! @param portSerial must be a valid serial port name for the parti cular platform, e.g. "COM1" for Microsoft Windows of "/dev/ttyS0" for Linux
bool addTelescopeAtSlot(int slot, ConnectionType connectionType, QSt ring name, QString host = QString("localhost"), int portTCP = DEFAULT_TCP_P ORT, int delay = DEFAULT_DELAY, bool connectAtStartup = false, QList<double > circles = QList<double>(), QString serverName = QString(), QString portSe rial = QString()); bool addTelescopeAtSlot(int slot, ConnectionType connectionType, QSt ring name, QString equinox, QString host = QString("localhost"), int portTC P = DEFAULT_TCP_PORT, int delay = DEFAULT_DELAY, bool connectAtStartup = fa lse, QList<double> circles = QList<double>(), QString serverName = QString( ), QString portSerial = QString());
//! Retrieves a telescope description. Returns false if the slot is empty. Returns empty serverName and portSerial if the description contains no server. //! Retrieves a telescope description. Returns false if the slot is empty. Returns empty serverName and portSerial if the description contains no server.
bool getTelescopeAtSlot(int slot, ConnectionType& connectionType, QS tring& name, QString& host, int& portTCP, int& delay, bool& connectAtStartu p, QList<double>& circles, QString& serverName, QString& portSerial); bool getTelescopeAtSlot(int slot, ConnectionType& connectionType, QS tring& name, QString& equinox, QString& host, int& portTCP, int& delay, boo l& connectAtStartup, QList<double>& circles, QString& serverName, QString& portSerial);
//! Removes info from the tree. Should it include stopTelescopeAtSlo t()? //! Removes info from the tree. Should it include stopTelescopeAtSlo t()?
bool removeTelescopeAtSlot(int slot); bool removeTelescopeAtSlot(int slot);
//! Starts a telescope at the given slot, getting its description wi th getTelescopeAtSlot(). Creates a TelescopeClient object and starts a serv er process if necessary. //! Starts a telescope at the given slot, getting its description wi th getTelescopeAtSlot(). Creates a TelescopeClient object and starts a serv er process if necessary.
bool startTelescopeAtSlot(int slot); bool startTelescopeAtSlot(int slot);
//! Stops the telescope at the given slot. Destroys the TelescopeCli ent object and terminates the server process if necessary. //! Stops the telescope at the given slot. Destroys the TelescopeCli ent object and terminates the server process if necessary.
bool stopTelescopeAtSlot(int slot); bool stopTelescopeAtSlot(int slot);
//! Stops all telescopes, but without removing them like deleteAllTe lescopes(). //! Stops all telescopes, but without removing them like deleteAllTe lescopes().
bool stopAllTelescopes(); bool stopAllTelescopes();
//! Checks if there's a TelescopeClient object at a given slot, i.e. if there's an active telescope at that slot. //! Checks if there's a TelescopeClient object at a given slot, i.e. if there's an active telescope at that slot.
bool isExistingClientAtSlot(int slot); bool isExistingClientAtSlot(int slot);
//! Checks if the TelescopeClient object at a given slot is connecte d to a server. //! Checks if the TelescopeClient object at a given slot is connecte d to a server.
bool isConnectedClientAtSlot(int slot); bool isConnectedClientAtSlot(int slot);
//! Returns a list of the currently connected clients //! Returns a list of the currently connected clients
QHash<int, QString> getConnectedClientsNames(); QHash<int, QString> getConnectedClientsNames();
//! Returns the module-specific style sheet.
//! The main StelStyle instance should be passed.
const StelStyle getModuleStyleSheet(const StelStyle& style);
bool getFlagUseServerExecutables() {return useServerExecutables;} bool getFlagUseServerExecutables() {return useServerExecutables;}
//! Forces a call of loadDeviceModels(). Stops all active telescopes . //! Forces a call of loadDeviceModels(). Stops all active telescopes .
void setFlagUseServerExecutables(bool b); void setFlagUseServerExecutables(bool b);
const QString& getServerExecutablesDirectoryPath(); const QString& getServerExecutablesDirectoryPath();
//! Forces a call of loadDeviceModels(). Stops all active telescopes . //! Forces a call of loadDeviceModels(). Stops all active telescopes .
bool setServerExecutablesDirectoryPath(const QString& newPath); bool setServerExecutablesDirectoryPath(const QString& newPath);
bool getFlagUseTelescopeServerLogs () {return useTelescopeServerLogs ;} bool getFlagUseTelescopeServerLogs () {return useTelescopeServerLogs ;}
public slots: public slots:
skipping to change at line 271 skipping to change at line 267
QHash<int, QFile*> telescopeServerLogFiles; QHash<int, QFile*> telescopeServerLogFiles;
QHash<int, QTextStream*> telescopeServerLogStreams; QHash<int, QTextStream*> telescopeServerLogStreams;
bool useServerExecutables; bool useServerExecutables;
QString serverExecutablesDirectoryPath; QString serverExecutablesDirectoryPath;
//GUI //GUI
TelescopeDialog * telescopeDialog; TelescopeDialog * telescopeDialog;
SlewDialog * slewDialog; SlewDialog * slewDialog;
//Styles
QByteArray * normalStyleSheet;
QByteArray * nightStyleSheet;
//! Used internally. Checks if the argument is a valid slot number. //! Used internally. Checks if the argument is a valid slot number.
bool isValidSlotNumber(int slot); bool isValidSlotNumber(int slot);
bool isValidPort(uint port); bool isValidPort(uint port);
bool isValidDelay(int delay); bool isValidDelay(int delay);
//! Start the telescope server defined for a given slot in a new QPr ocess //! Start the telescope server defined for a given slot in a new QPr ocess
//! @param slot the slot number //! @param slot the slot number
//! @param serverName the short form of the server name (e.g. "Dummy " for "TelescopeServerDummy") //! @param serverName the short form of the server name (e.g. "Dummy " for "TelescopeServerDummy")
//! @param tcpPort TCP slot the server should listen to //! @param tcpPort TCP slot the server should listen to
bool startServerAtSlot(int slot, QString serverName, int tcpPort, QS tring serialPort); bool startServerAtSlot(int slot, QString serverName, int tcpPort, QS tring serialPort);
//! Stop the telescope server at a given slot, terminating the proce ss //! Stop the telescope server at a given slot, terminating the proce ss
bool stopServerAtSlot(int slot); bool stopServerAtSlot(int slot);
//! A wrapper for TelescopeClient::create(). Used internally by load Telescopes() and startTelescopeAtSlot(). Does not perform any validation on its arguments. //! A wrapper for TelescopeClient::create(). Used internally by load Telescopes() and startTelescopeAtSlot(). Does not perform any validation on its arguments.
bool startClientAtSlot(int slot, ConnectionType connectionType, QStr ing name, QString host, int portTCP, int delay, QList<double> circles, QStr ing serverName = QString(), QString portSerial = QString()); bool startClientAtSlot(int slot, ConnectionType connectionType, QStr ing name, QString equinox, QString host, int portTCP, int delay, QList<doub le> circles, QString serverName = QString(), QString portSerial = QString() );
//! Returns true if the TelescopeClient at this slot has been stoppe d successfully or doesn't exist //! Returns true if the TelescopeClient at this slot has been stoppe d successfully or doesn't exist
bool stopClientAtSlot(int slot); bool stopClientAtSlot(int slot);
//! Compile a list of the executables in the /servers folder //! Compile a list of the executables in the /servers folder
void loadTelescopeServerExecutables(); void loadTelescopeServerExecutables();
//! Loads the list of supported telescope models. Calls loadTelescop eServerExecutables() internally. //! Loads the list of supported telescope models. Calls loadTelescop eServerExecutables() internally.
void loadDeviceModels(); void loadDeviceModels();
 End of changes. 5 change blocks. 
11 lines changed or deleted 3 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/