SceneInfo.hpp   SceneInfo.hpp 
skipping to change at line 18 skipping to change at line 18
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _SCENEINFO_HPP_ #ifndef _SCENEINFO_HPP_
#define _SCENEINFO_HPP_ #define _SCENEINFO_HPP_
#include "StelLocation.hpp" #include "StelLocation.hpp"
#include "VecMath.hpp" #include "VecMath.hpp"
#include <QMap> #include <QMap>
#include <QSharedPointer> #include <QSharedPointer>
skipping to change at line 154 skipping to change at line 154
static QMap<QString,QString> getNameToIDMap(); static QMap<QString,QString> getNameToIDMap();
static int initMetaType(); static int initMetaType();
}; };
struct StoredView; struct StoredView;
typedef QList<StoredView> StoredViewList; typedef QList<StoredView> StoredViewList;
//! A structure which stores a specific view position, view direction and F OV, together with a textual description. //! A structure which stores a specific view position, view direction and F OV, together with a textual description.
struct StoredView struct StoredView
{ {
StoredView() : position(0,0,0,0), view_fov(0,0,-1000), isGlobal(fals e) StoredView() : position(0,0,0,0), view_fov(0,0,-1000), isGlobal(fals e), jd(0.0), jdIsRelevant(false)
{} {}
//! A descriptive label //! A descriptive label
QString label; QString label;
//! A description of the view //! A description of the view
QString description; QString description;
//! Stored grid position + current eye height in 4th component //! Stored grid position + current eye height in 4th component
Vec4d position; Vec4d position;
//! Alt/Az angles in degrees + field of view //! Alt/Az angles in degrees + field of view
Vec3f view_fov; Vec3f view_fov;
//! True if this is a position stored next to the scene definition ( viewpoints.ini). If false, this is a user-defined view (from userdir\stella rium\scenery3d\userviews.ini). //! True if this is a position stored next to the scene definition ( viewpoints.ini). If false, this is a user-defined view (from userdir\stella rium\scenery3d\userviews.ini).
bool isGlobal; bool isGlobal;
//! Julian Date of interest.
double jd;
//! Indicate if stored date is potentially relevant
bool jdIsRelevant;
//! Returns a list of all global views of a scene. //! Returns a list of all global views of a scene.
//! If the scene is invalid, an empty list is returned. //! If the scene is invalid, an empty list is returned.
static StoredViewList getGlobalViewsForScene(const SceneInfo& scene) ; static StoredViewList getGlobalViewsForScene(const SceneInfo& scene) ;
//! Returns a list of all user-generated views of a scene. //! Returns a list of all user-generated views of a scene.
//! If the scene is invalid, an empty list is returned. //! If the scene is invalid, an empty list is returned.
static StoredViewList getUserViewsForScene(const SceneInfo& scene); static StoredViewList getUserViewsForScene(const SceneInfo& scene);
//! Saves the given user views to userviews.ini, replacing all views existing for this scene //! Saves the given user views to userviews.ini, replacing all views existing for this scene
//! The scene MUST be valid, will throw an assertion if not. //! The scene MUST be valid, will throw an assertion if not.
static void saveUserViews(const SceneInfo& scene, const StoredViewLi st& list); static void saveUserViews(const SceneInfo& scene, const StoredViewLi st& list);
 End of changes. 3 change blocks. 
2 lines changed or deleted 6 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/