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
e6f05a9c
Commit
e6f05a9c
authored
Jan 16, 2013
by
Pierre Kraemer
Browse files
update some nameOfType + SCHNApps: differential properties plugin
parent
7e9a2472
Changes
9
Hide whitespace changes
Inline
Side-by-side
SCHNApps/Plugins/differentialProperties/CMakeLists.txt
View file @
e6f05a9c
...
...
@@ -8,16 +8,19 @@ INCLUDE_DIRECTORIES(
SET
(
PLUGIN_SRC
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/src/differentialProperties.cpp
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/src/computeNormalsDialog.cpp
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/src/computeNormalDialog.cpp
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/src/computeCurvatureDialog.cpp
)
SET
(
PLUGIN_H
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/include/differentialProperties.h
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/include/computeNormalsDialog.h
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/include/computeNormalDialog.h
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/include/computeCurvatureDialog.h
)
SET
(
PLUGIN_FORM
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/forms/computeNormalsDialog.ui
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/forms/computeNormalDialog.ui
${
SCHNApps_ROOT_DIR
}
/Plugins/differentialProperties/forms/computeCurvatureDialog.ui
)
IF
(
${
CMAKE_BUILD_TYPE
}
STREQUAL Debug
)
...
...
SCHNApps/Plugins/differentialProperties/forms/computeNormal
s
Dialog.ui
→
SCHNApps/Plugins/differentialProperties/forms/computeNormalDialog.ui
View file @
e6f05a9c
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
ComputeNormal
s
Dialog
</class>
<widget
class=
"QDialog"
name=
"ComputeNormal
s
Dialog"
>
<class>
ComputeNormalDialog
</class>
<widget
class=
"QDialog"
name=
"ComputeNormalDialog"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
28
7
</width>
<height>
228
</height>
<width>
44
7
</width>
<height>
311
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Compute Normal
s
</string>
<string>
Compute Normal
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout
_2
"
>
<item>
<widget
class=
"QListWidget"
name=
"mapList"
/>
</item>
...
...
@@ -29,7 +29,7 @@
<item>
<widget
class=
"QComboBox"
name=
"combo_positionAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"
MinimumExpanding
"
vsizetype=
"Fixed"
>
<sizepolicy
hsizetype=
"
Preferred
"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
...
...
@@ -39,27 +39,53 @@
</layout>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
Normal attribute name :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"attributeName"
/>
</item>
</layout>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"check_createVBO"
>
<property
name=
"text"
>
<string>
create VBO
</string>
</property>
<property
name=
"checked"
>
<bool>
true
</bool>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
<string>
Normal attribute
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QLabel"
name=
"label_3"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"combo_normalAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"attributeName"
/>
</item>
</layout>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"check_createVBO"
>
<property
name=
"text"
>
<string>
create VBO
</string>
</property>
<property
name=
"checked"
>
<bool>
true
</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
...
...
@@ -94,7 +120,7 @@
<connection>
<sender>
button_ok
</sender>
<signal>
clicked()
</signal>
<receiver>
ComputeNormal
s
Dialog
</receiver>
<receiver>
ComputeNormalDialog
</receiver>
<slot>
accept()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
...
...
@@ -110,7 +136,7 @@
<connection>
<sender>
button_cancel
</sender>
<signal>
clicked()
</signal>
<receiver>
ComputeNormal
s
Dialog
</receiver>
<receiver>
ComputeNormalDialog
</receiver>
<slot>
reject()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
...
...
SCHNApps/Plugins/differentialProperties/include/computeNormal
s
Dialog.h
→
SCHNApps/Plugins/differentialProperties/include/computeNormalDialog.h
View file @
e6f05a9c
#ifndef _COMPUTENORMAL
S
_DIALOG_H_
#define _COMPUTENORMAL
S
_DIALOG_H_
#ifndef _COMPUTENORMAL_DIALOG_H_
#define _COMPUTENORMAL_DIALOG_H_
#include
"ui_computeNormal
s
Dialog.h"
#include
"ui_computeNormalDialog.h"
namespace
CGoGN
{
...
...
@@ -11,12 +11,12 @@ namespace SCHNApps
class
Window
;
class
ComputeNormal
s
Dialog
:
public
QDialog
,
public
Ui
::
ComputeNormal
s
Dialog
class
ComputeNormalDialog
:
public
QDialog
,
public
Ui
::
ComputeNormalDialog
{
Q_OBJECT
public:
ComputeNormal
s
Dialog
(
Window
*
w
);
ComputeNormalDialog
(
Window
*
w
);
void
init
();
public
slots
:
...
...
SCHNApps/Plugins/differentialProperties/include/differentialProperties.h
View file @
e6f05a9c
...
...
@@ -3,7 +3,8 @@
#include
"plugin.h"
#include
"computeNormalsDialog.h"
#include
"computeNormalDialog.h"
#include
"computeCurvatureDialog.h"
#include
"Topology/generic/functor.h"
#include
"Topology/generic/parameters.h"
...
...
@@ -21,6 +22,7 @@ struct PFP: public PFP_STANDARD
};
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
REAL
REAL
;
typedef
PFP
::
VEC3
VEC3
;
...
...
@@ -58,13 +60,17 @@ public:
virtual
void
mapUnlinked
(
View
*
view
,
MapHandlerGen
*
m
)
{}
public
slots
:
void
cb_openComputeNormalsDialog
();
void
cb_computeNormals
();
void
cb_openComputeNormalDialog
();
void
cb_openComputeCurvatureDialog
();
void
cb_computeNormal
();
void
cb_computeCurvature
();
private:
ComputeNormalsDialog
*
m_computeNormalsDialog
;
ComputeNormalDialog
*
m_computeNormalDialog
;
ComputeCurvatureDialog
*
m_computeCurvatureDialog
;
QAction
*
computeNormal
s
Action
;
QAction
*
computeNormalAction
;
QAction
*
computeCurvatureAction
;
};
...
...
SCHNApps/Plugins/differentialProperties/src/computeNormal
s
Dialog.cpp
→
SCHNApps/Plugins/differentialProperties/src/computeNormalDialog.cpp
View file @
e6f05a9c
#include
"computeNormal
s
Dialog.h"
#include
"computeNormalDialog.h"
#include
"differentialProperties.h"
#include
"window.h"
...
...
@@ -10,28 +10,30 @@ namespace CGoGN
namespace
SCHNApps
{
ComputeNormal
s
Dialog
::
ComputeNormal
s
Dialog
(
Window
*
w
)
:
m_window
(
w
)
ComputeNormalDialog
::
ComputeNormalDialog
(
Window
*
w
)
:
m_window
(
w
)
{
setupUi
(
this
);
connect
(
mapList
,
SIGNAL
(
itemSelectionChanged
()),
this
,
SLOT
(
cb_selectedMapChanged
()));
}
void
ComputeNormal
s
Dialog
::
init
()
void
ComputeNormalDialog
::
init
()
{
mapList
->
clear
();
combo_positionAttribute
->
clear
();
combo_normalAttribute
->
clear
();
attributeName
->
setText
(
"normal"
);
const
QList
<
MapHandlerGen
*>&
maps
=
m_window
->
getMapsList
();
foreach
(
MapHandlerGen
*
map
,
maps
)
mapList
->
addItem
(
map
->
getName
());
}
void
ComputeNormal
s
Dialog
::
cb_selectedMapChanged
()
void
ComputeNormalDialog
::
cb_selectedMapChanged
()
{
QList
<
QListWidgetItem
*>
currentItems
=
mapList
->
selectedItems
();
if
(
!
currentItems
.
empty
())
{
combo_positionAttribute
->
clear
();
combo_normalAttribute
->
clear
();
const
QString
&
mapname
=
currentItems
[
0
]
->
text
();
MapHandlerGen
*
mh
=
m_window
->
getMap
(
mapname
);
GenericMap
*
map
=
mh
->
getGenericMap
();
...
...
@@ -48,8 +50,13 @@ void ComputeNormalsDialog::cb_selectedMapChanged()
if
(
types
[
i
]
==
vec3TypeName
)
{
combo_positionAttribute
->
addItem
(
QString
::
fromStdString
(
names
[
i
]));
if
(
names
[
i
]
==
"position"
)
// try to select an attribute named "position"
if
(
names
[
i
]
==
"position"
)
// try to select a
positio
n attribute named "position"
combo_positionAttribute
->
setCurrentIndex
(
j
);
combo_normalAttribute
->
addItem
(
QString
::
fromStdString
(
names
[
i
]));
if
(
names
[
i
]
==
"normal"
)
// try to select a normal attribute named "normal"
combo_normalAttribute
->
setCurrentIndex
(
j
);
++
j
;
}
}
...
...
SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp
View file @
e6f05a9c
...
...
@@ -7,40 +7,54 @@
bool
DifferentialPropertiesPlugin
::
enable
()
{
m_computeNormalsDialog
=
new
ComputeNormalsDialog
(
m_window
);
m_computeNormalDialog
=
new
ComputeNormalDialog
(
m_window
);
m_computeCurvatureDialog
=
new
ComputeCurvatureDialog
(
m_window
);
computeNormal
s
Action
=
new
QAction
(
"Compute Normal
s
"
,
this
);
computeNormalAction
=
new
QAction
(
"Compute Normal"
,
this
);
computeCurvatureAction
=
new
QAction
(
"Compute Curvature"
,
this
);
addMenuAction
(
"Surface;Differential Properties;Compute Normal
s
"
,
computeNormal
s
Action
);
addMenuAction
(
"Surface;Differential Properties;Compute Normal"
,
computeNormalAction
);
addMenuAction
(
"Surface;Differential Properties;Compute Curvature"
,
computeCurvatureAction
);
connect
(
computeNormal
s
Action
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
cb_openComputeNormal
s
Dialog
()));
connect
(
computeCurvatureAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
cb_openCompute
Normals
Dialog
()));
connect
(
computeNormalAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
cb_openComputeNormalDialog
()));
connect
(
computeCurvatureAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
cb_openCompute
Curvature
Dialog
()));
connect
(
m_computeNormalsDialog
,
SIGNAL
(
accepted
()),
this
,
SLOT
(
cb_computeNormals
()));
connect
(
m_computeNormalsDialog
->
button_apply
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
cb_computeNormals
()));
connect
(
m_computeNormalDialog
,
SIGNAL
(
accepted
()),
this
,
SLOT
(
cb_computeNormal
()));
connect
(
m_computeNormalDialog
->
button_apply
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
cb_computeNormal
()));
connect
(
m_computeCurvatureDialog
,
SIGNAL
(
accepted
()),
this
,
SLOT
(
cb_computeCurvature
()));
connect
(
m_computeCurvatureDialog
->
button_apply
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
cb_computeCurvature
()));
return
true
;
}
void
DifferentialPropertiesPlugin
::
cb_openComputeNormalsDialog
()
void
DifferentialPropertiesPlugin
::
cb_openComputeNormalDialog
()
{
m_computeNormalDialog
->
init
();
m_computeNormalDialog
->
show
();
}
void
DifferentialPropertiesPlugin
::
cb_openComputeCurvatureDialog
()
{
m_compute
Normals
Dialog
->
init
();
m_compute
Normals
Dialog
->
show
();
m_compute
Curvature
Dialog
->
init
();
m_compute
Curvature
Dialog
->
show
();
}
void
DifferentialPropertiesPlugin
::
cb_computeNormal
s
()
void
DifferentialPropertiesPlugin
::
cb_computeNormal
()
{
QList
<
QListWidgetItem
*>
currentItems
=
m_computeNormal
s
Dialog
->
mapList
->
selectedItems
();
QList
<
QListWidgetItem
*>
currentItems
=
m_computeNormalDialog
->
mapList
->
selectedItems
();
if
(
!
currentItems
.
empty
())
{
const
QString
&
mapname
=
currentItems
[
0
]
->
text
();
MapHandler
<
PFP
>*
mh
=
reinterpret_cast
<
MapHandler
<
PFP
>*>
(
m_window
->
getMap
(
mapname
));
MAP
*
map
=
mh
->
getMap
();
std
::
string
positionName
=
m_computeNormalsDialog
->
combo_positionAttribute
->
currentText
().
toUtf8
().
constData
();
std
::
string
normalName
=
m_computeNormalsDialog
->
attributeName
->
text
().
toUtf8
().
constData
();
std
::
string
positionName
=
m_computeNormalDialog
->
combo_positionAttribute
->
currentText
().
toUtf8
().
constData
();
std
::
string
normalName
;
if
(
m_computeNormalDialog
->
attributeName
->
text
().
isEmpty
())
normalName
=
m_computeNormalDialog
->
combo_normalAttribute
->
currentText
().
toUtf8
().
constData
();
else
normalName
=
m_computeNormalDialog
->
attributeName
->
text
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
position
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
positionName
);
VertexAttribute
<
VEC3
>
normal
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
normalName
);
if
(
!
normal
.
isValid
())
...
...
@@ -48,7 +62,72 @@ void DifferentialPropertiesPlugin::cb_computeNormals()
Algo
::
Geometry
::
computeNormalVertices
<
PFP
>
(
*
map
,
position
,
normal
);
if
(
m_computeNormalsDialog
->
check_createVBO
->
checkState
()
==
Qt
::
Checked
)
if
(
m_computeNormalDialog
->
check_createVBO
->
checkState
()
==
Qt
::
Checked
)
mh
->
createVBO
(
normal
);
QList
<
View
*>
views
=
m_window
->
getViewsList
();
foreach
(
View
*
view
,
views
)
{
if
(
view
->
isLinkedToMap
(
mh
))
view
->
updateGL
();
}
}
}
void
DifferentialPropertiesPlugin
::
cb_computeCurvature
()
{
QList
<
QListWidgetItem
*>
currentItems
=
m_computeCurvatureDialog
->
mapList
->
selectedItems
();
if
(
!
currentItems
.
empty
())
{
const
QString
&
mapname
=
currentItems
[
0
]
->
text
();
MapHandler
<
PFP
>*
mh
=
reinterpret_cast
<
MapHandler
<
PFP
>*>
(
m_window
->
getMap
(
mapname
));
MAP
*
map
=
mh
->
getMap
();
std
::
string
positionName
=
m_computeCurvatureDialog
->
combo_positionAttribute
->
currentText
().
toUtf8
().
constData
();
std
::
string
normalName
=
m_computeCurvatureDialog
->
combo_normalAttribute
->
currentText
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
position
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
positionName
);
VertexAttribute
<
VEC3
>
normal
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
normalName
);
std
::
string
KmaxName
;
if
(
m_computeCurvatureDialog
->
KmaxAttributeName
->
text
().
isEmpty
())
KmaxName
=
m_computeCurvatureDialog
->
combo_KmaxAttribute
->
currentText
().
toUtf8
().
constData
();
else
KmaxName
=
m_computeCurvatureDialog
->
KmaxAttributeName
->
text
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
Kmax
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
KmaxName
);
if
(
!
Kmax
.
isValid
())
Kmax
=
map
->
addAttribute
<
VEC3
,
VERTEX
>
(
KmaxName
);
std
::
string
KminName
;
if
(
m_computeCurvatureDialog
->
KminAttributeName
->
text
().
isEmpty
())
KminName
=
m_computeCurvatureDialog
->
combo_KminAttribute
->
currentText
().
toUtf8
().
constData
();
else
KminName
=
m_computeCurvatureDialog
->
KminAttributeName
->
text
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
Kmin
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
KminName
);
if
(
!
Kmin
.
isValid
())
Kmin
=
map
->
addAttribute
<
VEC3
,
VERTEX
>
(
KminName
);
std
::
string
kmaxName
;
if
(
m_computeCurvatureDialog
->
kmaxAttributeName
->
text
().
isEmpty
())
kmaxName
=
m_computeCurvatureDialog
->
combo_kmaxAttribute
->
currentText
().
toUtf8
().
constData
();
else
kmaxName
=
m_computeCurvatureDialog
->
kmaxAttributeName
->
text
().
toUtf8
().
constData
();
VertexAttribute
<
REAL
>
kmax
=
map
->
getAttribute
<
REAL
,
VERTEX
>
(
kmaxName
);
if
(
!
kmax
.
isValid
())
kmax
=
map
->
addAttribute
<
REAL
,
VERTEX
>
(
kmaxName
);
std
::
string
kminName
;
if
(
m_computeCurvatureDialog
->
kminAttributeName
->
text
().
isEmpty
())
kminName
=
m_computeCurvatureDialog
->
combo_kminAttribute
->
currentText
().
toUtf8
().
constData
();
else
kminName
=
m_computeCurvatureDialog
->
kminAttributeName
->
text
().
toUtf8
().
constData
();
VertexAttribute
<
REAL
>
kmin
=
map
->
getAttribute
<
REAL
,
VERTEX
>
(
kminName
);
if
(
!
kmin
.
isValid
())
kmin
=
map
->
addAttribute
<
REAL
,
VERTEX
>
(
kminName
);
Algo
::
Geometry
::
computeCurvatureVertices_NormalCycles
<
PFP
>
(
*
map
,
position
,
normal
);
if
(
m_computeNormalDialog
->
check_createVBO
->
checkState
()
==
Qt
::
Checked
)
mh
->
createVBO
(
normal
);
QList
<
View
*>
views
=
m_window
->
getViewsList
();
...
...
include/Topology/generic/functor.h
View file @
e6f05a9c
...
...
@@ -198,51 +198,6 @@ public:
};
//
//class SelectorDartMarked : public FunctorSelect
//{
//public:
//protected:
// const DartMarker& m_dm;
//public:
// SelectorDartMarked(const DartMarker& dm): m_dm(dm) {}
// bool operator()(Dart d) const { return m_dm.isMarked(d); }
//};
//
//
//class SelectorCellMarked : public FunctorSelect
//{
//public:
//protected:
// const CellMarker& m_cm;
//public:
// SelectorCellMarked(const CellMarker& cm): m_cm(cm) {}
// bool operator()(Dart d) const { return m_cm.isMarked(d); }
//};
//
//class SelectorDartNotMarked : public FunctorSelect
//{
//public:
//protected:
// const DartMarker& m_dm;
//public:
// SelectorDartNotMarked(const DartMarker& dm): m_dm(dm) {}
// bool operator()(Dart d) const { return !m_dm.isMarked(d); }
//};
//
//
//template <typename MAP>
//class SelectorCellNotMarked : public FunctorSelect
//{
//public:
//protected:
// const CellMarker& m_cm;
//public:
// SelectorCellNotMarked(const CellMarker& cm): m_cm(cm) {}
// bool operator()(Dart d) const { return !m_cm.isMarked(d); }
//};
// Counting Functors : increment its value every time it is applied
/********************************************************/
...
...
include/Utils/nameTypes.h
View file @
e6f05a9c
...
...
@@ -40,23 +40,23 @@ std::string nameOfType(const T& v)
template
<
>
inline
std
::
string
nameOfType
(
const
char
&
v
)
{
return
"char"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
short
int
&
v
)
{
return
"short
int
"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
short
&
v
)
{
return
"short"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
int
&
v
)
{
return
"int"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
long
int
&
v
)
{
return
"long
int
"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
long
&
v
)
{
return
"long"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
long
long
&
v
)
{
return
"long long"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
long
long
&
v
)
{
return
"long long"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
char
&
v
)
{
return
"unsigned char"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
short
int
&
v
)
{
return
"unsigned short
int
"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
short
&
v
)
{
return
"unsigned short"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
int
&
v
)
{
return
"unsigned int"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
long
int
&
v
)
{
return
"unsigned long int"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
long
&
v
)
{
return
"unsigned long"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
unsigned
long
long
&
v
)
{
return
"unsigned long long"
;
}
template
<
>
inline
std
::
string
nameOfType
(
const
float
&
v
)
{
return
"float"
;
}
...
...
src/Topology/generic/genericmap.cpp
View file @
e6f05a9c
...
...
@@ -46,15 +46,18 @@ GenericMap::GenericMap() : m_nbThreads(1)
registerAttribute
<
Dart
>
(
"Dart"
);
registerAttribute
<
Mark
>
(
"Mark"
);
registerAttribute
<
long
>
(
"long"
);
registerAttribute
<
int
>
(
"int"
);
registerAttribute
<
short
>
(
"short"
);
registerAttribute
<
char
>
(
"char"
);
registerAttribute
<
short
>
(
"short"
);
registerAttribute
<
int
>
(
"int"
);
registerAttribute
<
long
>
(
"long"
);
registerAttribute
<
unsigned
long
>
(
"unsigned long"
);
registerAttribute
<
unsigned
int
>
(
"unsigned int"
);
registerAttribute
<
unsigned
short
>
(
"unsigned short"
);
registerAttribute
<
unsigned
char
>
(
"unsigned char"
);
registerAttribute
<
unsigned
short
>
(
"unsigned short"
);
registerAttribute
<
unsigned
int
>
(
"unsigned int"
);
registerAttribute
<
unsigned
long
>
(
"unsigned long"
);
registerAttribute
<
float
>
(
"float"
);
registerAttribute
<
double
>
(
"double"
);
registerAttribute
<
Geom
::
Vec2f
>
(
Geom
::
Vec2f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec3f
>
(
Geom
::
Vec3f
::
CGoGNnameOfType
());
...
...
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