Skip to content

GitLab

Commit 4e5b3285 authored by Jan Möbius's avatar Jan Möbius
Browse files

Resturucture some includes to make BaseObjects QObjects 

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@7782 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 8d43c458
Hide whitespace changes
Inline Side-by-side
Core/Core.cc
View file @ 4e5b3285
......@@ -100,7 +100,8 @@
#include <OpenMesh/Core/System/omstream.hh>
#include "OpenFlipper/common/TypesInternal.hh"
#include <OpenFlipper/common/BaseObjectCore.hh>
#include <OpenFlipper/common/TypesInternal.hh>
#define WIDGET_HEIGHT 800
#define WIDGET_WIDTH 800
......
common/BaseObject.cc
View file @ 4e5b3285
......@@ -54,6 +54,7 @@
//== INCLUDES =================================================================
#include "BaseObjectCore.hh"
#include "Types.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
......@@ -67,7 +68,9 @@
*/
static int idGenerator = 1;
BaseObject::BaseObject(const BaseObject& _object) {
BaseObject::BaseObject(const BaseObject& _object) :
QObject()
{
id_ = idGenerator;
++idGenerator;
persistentId_ = _object.persistentId_;
......@@ -90,6 +93,7 @@ BaseObject::BaseObject(const BaseObject& _object) {
}
BaseObject::BaseObject(BaseObject* _parent) :
QObject() ,
id_(-1),
persistentId_(-1),
objectType_(DATA_UNKNOWN),
......
common/BaseObject.hh
View file @ 4e5b3285
......@@ -61,6 +61,8 @@
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/DataTypes.hh>
#include <QObject>
#include <QString>
#include <QList>
#include <QStringList>
......@@ -77,7 +79,10 @@
* This is the basic Data class providing the functions common to all objects.
* If the Datacontrol Plugin is available, a Tree structure will be generated allowing groups of objects.
*/
class DLLEXPORTONLY BaseObject {
class DLLEXPORTONLY BaseObject : public QObject {
Q_OBJECT
friend class BaseObjectData;
public :
......
common/BaseObjectCore.hh 0 → 100644
View file @ 4e5b3285
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 6727 $ *
* $Author: moebius $ *
* $Date: 2009-08-05 08:03:50 +0200 (Mi, 05. Aug 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// Types
//
//=============================================================================
/**
* \file BaseObjectCore.hh
* This File contains the Basic object handling only used by the Core
*/
#ifndef BASEOBJECTCORE_HH
#define BASEOBJECTCORE_HH
#include <OpenFlipper/common/BaseObject.hh>
//=============================================================================
#endif // BASEOBJECTCORE_HH defined
//=============================================================================
common/BaseObjectData.cc
View file @ 4e5b3285
......@@ -54,6 +54,7 @@
#include "Types.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <ACG/Scenegraph/SceneGraph.hh>
#include <OpenFlipper/common/BaseObjectCore.hh>
//== TYPEDEFS =================================================================
......
common/BaseObjectData.hh
View file @ 4e5b3285
......@@ -63,7 +63,8 @@
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include "BaseObject.hh"
#include <OpenFlipper/common/BaseObject.hh>
#include <QObject>
#include <vector>
#include <ACG/Scenegraph/MaterialNode.hh>
#include <ACG/Scenegraph/SeparatorNode.hh>
......@@ -96,6 +97,8 @@ typedef ACG::SceneGraph::StencilRefNode StencilRefNode;
*/
class DLLEXPORT BaseObjectData : public BaseObject
{
Q_OBJECT
public:
/** \brief copy constructor
......
common/DataTypes.hh 0 → 100644
View file @ 4e5b3285
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 7697 $ *
* $Author: moebius $ *
* $Date: 2009-11-30 17:40:00 +0100 (Mo, 30. Nov 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// Types
//
//=============================================================================
/**
* \file DataTypes.hh
* This File contains the basic type informations
*/
#ifndef DATATYPES_HH
#define DATATYPES_HH
//== includes =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <ACG/Math/Matrix4x4T.hh>
#include <ACG/Math/VectorT.hh>
#include <limits.h>
#include <QIcon>
#include <QMetaType>
//== Global Typedefs =================================================================
/** \brief Predefined datatypes
*
* Here are several datatypes which have predefined ids. This might be changed to runtime added
* datatypes in the future.
*/
/// None of the other Objects
#define DATA_UNKNOWN 0
/// Items used for Grouping
#define DATA_GROUP 1
/// Triangle Mesh objects
#define DATA_TRIANGLE_MESH typeId("TriangleMesh")
#define DATA_TRIANGLE_MESH_CONST_ID 2
/// Poly Mesh Objects
#define DATA_POLY_MESH typeId("PolyMesh")
#define DATA_POLY_MESH_CONST_ID 4
/// Identifier for all available objects
const unsigned int DATA_ALL = UINT_MAX;
typedef unsigned int DataType;
//== TYPEDEFS =================================================================
/// Standard Type for 3d Vector used for scripting
typedef ACG::Vec3d Vector;
/// Standard Type for id Lists used for scripting
typedef std::vector< int > idList;
/// Standard Type for a 4x4 Matrix used for scripting
typedef ACG::Matrix4x4d Matrix4x4;
Q_DECLARE_METATYPE(idList);
Q_DECLARE_METATYPE(QVector< int >);
Q_DECLARE_METATYPE(Vector);
Q_DECLARE_METATYPE(Matrix4x4);
//================================================================================================
/** @name Functions for adding dataTypes
* @{ */
//================================================================================================
/** Adds a datatype and returns the id for the new type
*
* @param _name Internal name for the new DataType
* @param _readableName Human readable Name for this type ( Use tr to make it translatable )
*/
DLLEXPORT
DataType addDataType(QString _name, QString _readableName);
/// Given a dataType Identifier string this function will return the id of the datatype
DLLEXPORT
DataType typeId(QString _name);
/** \brief Get the name of a type with given id
*
* The ids are organized in a bitfield. So use either the macro for getting the type id or
* use the id directly (they have to be power of 2! ... Bitfield)
*/
DLLEXPORT
QString typeName(DataType _id);
/** \brief Get the number of registered types
*
* This function will return the number of types registered to the core. You can use it to
* iterate over all types.
*
* \Note Remember that the types are organized in a bitfield!
*/
DLLEXPORT
uint typeCount();
/** @} */
//================================================================================================
/** @name Datatype Name handling
* @{ */
//================================================================================================
/// Get DataType Human readable name ( this name might change. Use the typeName insted! )
DLLEXPORT
QString dataTypeName( DataType _id );
/// Get DataType Human readable name ( this name might change. Use the typeName insted! )
DLLEXPORT
QString dataTypeName( QString _typeName);
/// Set DataType Human readable name
DLLEXPORT
void setDataTypeName( DataType _id, QString _name );
/// Set DataType Human readable name
DLLEXPORT
void setDataTypeName( QString _typeName, QString _name );
/** @} */
//================================================================================================
/** @name Datatype Icons
* @{ */
//================================================================================================
/// Get a string with the filename of the icon for the DataType name
DLLEXPORT
QString typeIconName(QString _name);
/// Get a string with the filename of the icon for the DataType
DLLEXPORT
QString typeIconName(DataType _id);
/** \brief Get an QIcon associated with the given datatype
*
* The icons are loaded once when set and then the reference is returned here.
* This reduces the time when frequently requesting the icons (e.g. DataControl)
*/
DLLEXPORT
QIcon& typeIcon(DataType _id);
/// Set an Icon for a given DataType
DLLEXPORT
void setTypeIcon( DataType _id , QString _icon);
/// Set an Icon for a given DataType
DLLEXPORT
void setTypeIcon( QString _name , QString _icon );
/** @} */
//=============================================================================
#endif // DATATYPES_HH defined
//=============================================================================
common/GroupObject.hh
View file @ 4e5b3285
......@@ -62,6 +62,7 @@
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/BaseObject.hh>
#include <QList>
//== TYPEDEFS =================================================================
......
common/Types.cc
View file @ 4e5b3285
......@@ -57,8 +57,8 @@
//== INCLUDES =================================================================
#include "Types.hh"
#include "TypesInternal.hh"
#include "DataTypes.hh"
#include <map>
#include <QCoreApplication>
#include <OpenFlipper/common/GlobalOptions.hh>
......
common/Types.hh
View file @ 4e5b3285
......@@ -58,155 +58,17 @@
#ifndef TYPES_HH
#define TYPES_HH
#include <OpenFlipper/common/GlobalDefines.hh>
#include <limits.h>
#include <QIcon>
//== Global Typedefs =================================================================
/** \brief Predefined datatypes
*
* Here are several datatypes which have predefined ids. This might be changed to runtime added
* datatypes in the future.
*/
/// None of the other Objects
#define DATA_UNKNOWN 0
/// Items used for Grouping
#define DATA_GROUP 1
/// Triangle Mesh objects
#define DATA_TRIANGLE_MESH typeId("TriangleMesh")
#define DATA_TRIANGLE_MESH_CONST_ID 2
/// Poly Mesh Objects
#define DATA_POLY_MESH typeId("PolyMesh")
#define DATA_POLY_MESH_CONST_ID 4
/// Identifier for all available objects
const unsigned int DATA_ALL = UINT_MAX;
typedef unsigned int DataType;
// TODO: Make types runtime addable
//== INCLUDES =================================================================
// This include defines all required datatype handling functions
#include <OpenFlipper/common/DataTypes.hh>
#include "BaseObject.hh"
#include "GroupObject.hh"
#include "BaseObjectData.hh"
//== TYPEDEFS =================================================================
/// Standard Type for 3d Vector used for scripting
typedef ACG::Vec3d Vector;
/// Standard Type for id Lists used for scripting
typedef std::vector< int > idList;
/// Standard Type for a 4x4 Matrix used for scripting
typedef ACG::Matrix4x4d Matrix4x4;
Q_DECLARE_METATYPE(idList);
Q_DECLARE_METATYPE(QVector< int >);
Q_DECLARE_METATYPE(Vector);
Q_DECLARE_METATYPE(Matrix4x4);
/// Vector Type containing the Data Objects
typedef std::vector<BaseObjectData*> DataContainer;
//================================================================================================
/** @name Functions for adding dataTypes
* @{ */
//================================================================================================
/** Adds a datatype and returns the id for the new type
*
* @param _name Internal name for the new DataType
* @param _readableName Human readable Name for this type ( Use tr to make it translatable )
*/
DLLEXPORT
DataType addDataType(QString _name, QString _readableName);
/// Given a dataType Identifier string this function will return the id of the datatype
DLLEXPORT
DataType typeId(QString _name);
/** \brief Get the name of a type with given id
*
* The ids are organized in a bitfield. So use either the macro for getting the type id or
* use the id directly (they have to be power of 2! ... Bitfield)
*/
DLLEXPORT
QString typeName(DataType _id);
/** \brief Get the number of registered types
*
* This function will return the number of types registered to the core. You can use it to
* iterate over all types.
*
* \Note Remember that the types are organized in a bitfield!
*/
DLLEXPORT
uint typeCount();
/** @} */
//================================================================================================
/** @name Datatype Name handling
* @{ */
//================================================================================================
/// Get DataType Human readable name ( this name might change. Use the typeName insted! )
DLLEXPORT
QString dataTypeName( DataType _id );
/// Get DataType Human readable name ( this name might change. Use the typeName insted! )
DLLEXPORT
QString dataTypeName( QString _typeName);
/// Set DataType Human readable name
DLLEXPORT
void setDataTypeName( DataType _id, QString _name );
/// Set DataType Human readable name
DLLEXPORT
void setDataTypeName( QString _typeName, QString _name );
/** @} */
//================================================================================================
/** @name Datatype Icons
* @{ */
//================================================================================================
/// Get a string with the filename of the icon for the DataType name
DLLEXPORT
QString typeIconName(QString _name);
/// Get a string with the filename of the icon for the DataType
DLLEXPORT
QString typeIconName(DataType _id);
/** \brief Get an QIcon associated with the given datatype
*
* The icons are loaded once when set and then the reference is returned here.
* This reduces the time when frequently requesting the icons (e.g. DataControl)
*/
DLLEXPORT
QIcon& typeIcon(DataType _id);
/// Set an Icon for a given DataType
DLLEXPORT
void setTypeIcon( DataType _id , QString _icon);
/// Set an Icon for a given DataType
DLLEXPORT
void setTypeIcon( QString _name , QString _icon );
/** @} */
//=============================================================================
#endif // TYPES_HH defined
......
common/TypesInternal.hh
View file @ 4e5b3285
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 7673 $ *
* $Author: moebius $ *
* $Date: 2009-11-30 12:45:38 +0100 (Mo, 30. Nov 2009) $ *
* *
\*===========================================================================*/
//=============================================================================
//
// Types
//
//=============================================================================
/**
* \file TypesInternal.hh
* This File contains the functions for internal communication between types and
* the core. Do not use in Plugins!!!
*/
#ifndef TYPESINTERNAL_HH
#define TYPESINTERNAL_HH
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <OpenFlipper/common/Types.hh>
DLLEXPORT
void initializeTypes();
//=============================================================================
#endif // TYPESINTERNAL_HH defined
//=============================================================================
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *