Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
7d4483cc
Commit
7d4483cc
authored
May 02, 2012
by
Sylvain Thery
Browse files
move qtui.h & qtinputs in Qt again (sorry)
add VertexAttribute/EdgeAttribute .... VertexAutoAttribute ... shortcuts types
parent
b3abfc41
Changes
16
Hide whitespace changes
Inline
Side-by-side
Apps/Examples/clipping.h
View file @
7d4483cc
...
...
@@ -28,11 +28,11 @@
#include
<iostream>
#include
"Utils/Qt/qtSimple.h"
#include
"Utils/qtInputs.h"
#include
"Utils/
Qt/
qtInputs.h"
#include
"ui_clipping.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/map/embeddedMap3.h"
...
...
Apps/Examples/mcmesh.h
View file @
7d4483cc
...
...
@@ -26,7 +26,7 @@
#include
"Utils/Qt/qtSimple.h"
#include
"ui_mcmesh.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/map2.h"
...
...
Apps/Examples/viewer.h
View file @
7d4483cc
...
...
@@ -26,7 +26,7 @@
#include
"Utils/Qt/qtSimple.h"
#include
"ui_viewer.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/embeddedMap2.h"
...
...
Apps/Examples/volumeExplorer.h
View file @
7d4483cc
...
...
@@ -46,7 +46,7 @@
#include
"Utils/frameManipulator.h"
#include
"ui_volumeExplorer.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
using
namespace
CGoGN
;
...
...
Apps/Tuto/show_traversors.h
View file @
7d4483cc
...
...
@@ -56,7 +56,7 @@
#include
"ui_show_traversors.h"
// inclure qtui.h juste après le ui_xxx.h
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
using
namespace
CGoGN
;
...
...
Apps/Tuto/tuto5.h
View file @
7d4483cc
...
...
@@ -57,7 +57,7 @@
#include
"ui_tuto5.h"
// inclure qtui.h juste après le ui_xxx.h
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
using
namespace
CGoGN
;
...
...
Apps/Tuto/tuto_oper2.h
View file @
7d4483cc
...
...
@@ -40,7 +40,7 @@
#include
"ui_tuto_oper2.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Utils/Qt/qtSimple.h"
#include
"Utils/cgognStream.h"
...
...
Apps/Tuto/tuto_oper3.h
View file @
7d4483cc
...
...
@@ -40,7 +40,7 @@
#include
"ui_tuto_oper3.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Utils/Qt/qtSimple.h"
#include
"Utils/cgognStream.h"
...
...
Apps/Tuto/tuto_orbits.h
View file @
7d4483cc
...
...
@@ -57,7 +57,7 @@
#include
"ui_tuto_orbits.h"
// inclure qtui.h juste après le ui_xxx.h
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
using
namespace
CGoGN
;
...
...
Debug/CMakeLists.txt
View file @
7d4483cc
...
...
@@ -93,7 +93,8 @@ IF(WITH_QT)
file
(
GLOB_RECURSE
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
}
)
SET
(
files_utils_withQt
${
files_utils
}
${
files_utils_qt
}
${
UTILS_QT_HEADERS_MOC
}
)
...
...
Release/CMakeLists.txt
View file @
7d4483cc
...
...
@@ -89,7 +89,8 @@ IF(WITH_QT)
file
(
GLOB_RECURSE
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
}
)
SET
(
files_utils_withQt
${
files_utils
}
${
files_utils_qt
}
${
UTILS_QT_HEADERS_MOC
}
)
...
...
include/Topology/generic/attributeHandler.h
View file @
7d4483cc
...
...
@@ -189,6 +189,49 @@ public:
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
#include
"Topology/generic/attributeHandler.hpp"
...
...
include/Topology/generic/autoAttributeHandler.h
View file @
7d4483cc
...
...
@@ -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
#endif
include/Utils/qtInputs.h
→
include/Utils/
Qt/
qtInputs.h
View file @
7d4483cc
File moved
include/Utils/qtui.h
→
include/Utils/
Qt/
qtui.h
View file @
7d4483cc
File moved
src/Utils/qtinputs.cpp
View file @
7d4483cc
...
...
@@ -22,7 +22,7 @@
* *
*******************************************************************************/
#include
"Utils/qtInputs.h"
#include
"Utils/
Qt/
qtInputs.h"
#include
<iostream>
namespace
CGoGN
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment