Commit 7d4483cc authored by Sylvain Thery's avatar Sylvain Thery

move qtui.h & qtinputs in Qt again (sorry)

add VertexAttribute/EdgeAttribute .... VertexAutoAttribute ... shortcuts types
parent b3abfc41
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
#include <iostream> #include <iostream>
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/qtInputs.h" #include "Utils/Qt/qtInputs.h"
#include "ui_clipping.h" #include "ui_clipping.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/embeddedMap3.h" #include "Topology/map/embeddedMap3.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "ui_mcmesh.h" #include "ui_mcmesh.h"
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/map2.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "ui_viewer.h" #include "ui_viewer.h"
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/embeddedMap2.h" #include "Topology/map/embeddedMap2.h"
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "Utils/frameManipulator.h" #include "Utils/frameManipulator.h"
#include "ui_volumeExplorer.h" #include "ui_volumeExplorer.h"
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include "ui_show_traversors.h" #include "ui_show_traversors.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include "ui_tuto5.h" #include "ui_tuto5.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "ui_tuto_oper2.h" #include "ui_tuto_oper2.h"
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "ui_tuto_oper3.h" #include "ui_tuto_oper3.h"
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
#include "Utils/Qt/qtSimple.h" #include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include "ui_tuto_orbits.h" #include "ui_tuto_orbits.h"
// inclure qtui.h juste après le ui_xxx.h // inclure qtui.h juste après le ui_xxx.h
#include "Utils/qtui.h" #include "Utils/Qt/qtui.h"
using namespace CGoGN ; using namespace CGoGN ;
......
...@@ -93,7 +93,8 @@ IF(WITH_QT) ...@@ -93,7 +93,8 @@ IF(WITH_QT)
file( file(
GLOB_RECURSE GLOB_RECURSE
utils_qt_headers utils_qt_headers
${CGoGN_ROOT_DIR}/include/Utils/Qt/qt*.h ) ${CGoGN_ROOT_DIR}/include/Utils/Qt/qtgl.h
${CGoGN_ROOT_DIR}/include/Utils/Qt/qtSimple.h )
QT4_WRAP_CPP(UTILS_QT_HEADERS_MOC ${utils_qt_headers}) QT4_WRAP_CPP(UTILS_QT_HEADERS_MOC ${utils_qt_headers})
SET (files_utils_withQt ${files_utils} ${files_utils_qt} ${UTILS_QT_HEADERS_MOC}) SET (files_utils_withQt ${files_utils} ${files_utils_qt} ${UTILS_QT_HEADERS_MOC})
......
...@@ -89,7 +89,8 @@ IF(WITH_QT) ...@@ -89,7 +89,8 @@ IF(WITH_QT)
file( file(
GLOB_RECURSE GLOB_RECURSE
utils_qt_headers utils_qt_headers
${CGoGN_ROOT_DIR}/include/Utils/Qt/qt*.h ) ${CGoGN_ROOT_DIR}/include/Utils/Qt/qtgl.h
${CGoGN_ROOT_DIR}/include/Utils/Qt/qtSimple.h )
QT4_WRAP_CPP(UTILS_QT_HEADERS_MOC ${utils_qt_headers}) QT4_WRAP_CPP(UTILS_QT_HEADERS_MOC ${utils_qt_headers})
SET (files_utils_withQt ${files_utils} ${files_utils_qt} ${UTILS_QT_HEADERS_MOC}) SET (files_utils_withQt ${files_utils} ${files_utils_qt} ${UTILS_QT_HEADERS_MOC})
......
...@@ -189,6 +189,49 @@ public: ...@@ -189,6 +189,49 @@ public:
void next(unsigned int& iter) const; void next(unsigned int& iter) const;
} ; } ;
/**
* shortcut class for Vertex Attribute (Handler)
*/
template <typename T>
class VertexAttribute : public AttributeHandler<T,VERTEX>
{
public:
void operator=(const AttributeHandler<T,VERTEX>& ta) { this->AttributeHandler<T,VERTEX>::operator=(ta);}
};
/**
* shortcut class for Edge Attribute (Handler)
*/
template <typename T>
class EdgeAttribute : public AttributeHandler<T,EDGE>
{
public:
void operator=(const AttributeHandler<T,EDGE>& ta) { this->AttributeHandler<T,EDGE>::operator=(ta);}
};
/**
* shortcut class for Face Attribute (Handler)
*/
template <typename T>
class FaceAttribute : public AttributeHandler<T,FACE>
{
public:
void operator=(const AttributeHandler<T,FACE>& ta) { this->AttributeHandler<T,FACE>::operator=(ta);}
};
/**
* shortcut class for Volume Attribute (Handler)
*/
template <typename T>
class VolumeAttribute : public AttributeHandler<T,VOLUME>
{
public:
void operator=(const AttributeHandler<T,VOLUME>& ta) { this->AttributeHandler<T,VOLUME>::operator=(ta);}
};
} // namespace CGoGN } // namespace CGoGN
#include "Topology/generic/attributeHandler.hpp" #include "Topology/generic/attributeHandler.hpp"
......
...@@ -65,6 +65,48 @@ public: ...@@ -65,6 +65,48 @@ public:
} }
} ; } ;
/**
* shortcut class for Vertex AutoAttribute (Handler)
*/
template <typename T>
class VertexAutoAttribute : public AutoAttributeHandler<T,VERTEX>
{
public:
VertexAutoAttribute(AttribMap& m, const std::string& nameAttr = ""):AutoAttributeHandler<T,VERTEX>(m,nameAttr) {}
};
/**
* shortcut class for Edge AutoAttribute (Handler)
*/
template <typename T>
class EdgeAutoAttribute : public AutoAttributeHandler<T,EDGE>
{
public:
EdgeAutoAttribute(AttribMap& m, const std::string& nameAttr = ""):AutoAttributeHandler<T,EDGE>(m,nameAttr) {}
};
/**
* shortcut class for Face AutoAttribute (Handler)
*/
template <typename T>
class FaceAutoAttribute : public AutoAttributeHandler<T,FACE>
{
public:
FaceAutoAttribute(AttribMap& m, const std::string& nameAttr = ""):AutoAttributeHandler<T,FACE>(m,nameAttr) {}
};
/**
* shortcut class for Volume AutoAttribute (Handler)
*/
template <typename T>
class VolumeAutoAttribute : public AutoAttributeHandler<T,VOLUME>
{
public:
VolumeAutoAttribute(AttribMap& m, const std::string& nameAttr = ""):AutoAttributeHandler<T,VOLUME>(m,nameAttr) {}
};
} // namespace CGoGN } // namespace CGoGN
#endif #endif
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* * * *
*******************************************************************************/ *******************************************************************************/
#include "Utils/qtInputs.h" #include "Utils/Qt/qtInputs.h"
#include <iostream> #include <iostream>
namespace CGoGN namespace CGoGN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment