Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CGoGN
CGoGN
Commits
4c937c0e
Commit
4c937c0e
authored
Jun 22, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugs
parent
7cb93846
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
6 deletions
+35
-6
SCHNApps/Plugins/surface_selection/include/surface_selection.h
...pps/Plugins/surface_selection/include/surface_selection.h
+2
-1
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
+2
-2
SCHNApps/Plugins/surface_selection/src/surface_selection_dockTab.cpp
...ugins/surface_selection/src/surface_selection_dockTab.cpp
+1
-1
SCHNApps/src/controlDock_mapTab.cpp
SCHNApps/src/controlDock_mapTab.cpp
+30
-2
No files found.
SCHNApps/Plugins/surface_selection/include/surface_selection.h
View file @
4c937c0e
...
...
@@ -23,7 +23,8 @@ enum SelectionMethod
struct
MapParameters
{
MapParameters
()
:
selectionMethod
(
SingleCell
)
selectionMethod
(
SingleCell
),
color
(
255
,
0
,
0
)
{}
VertexAttribute
<
PFP2
::
VEC3
,
PFP2
::
MAP
>
positionAttribute
;
...
...
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
View file @
4c937c0e
...
...
@@ -183,8 +183,8 @@ void Surface_Selection_Plugin::drawMap(View* view, MapHandlerGen* map)
case
WithinSphere
:
{
PFP2
::
MAP
*
m
=
static_cast
<
MapHandler
<
PFP2
>*>
(
map
)
->
getMap
();
std
::
vector
<
PFP2
::
VEC3
>
selectionPoint
;
selectionPoint
.
push_back
((
p
.
positionAttribute
[
m_selectingEdge
.
dart
]
+
(
p
.
positionAttribute
[
m
->
phi1
(
m_selectingEdge
.
dart
)])
/
2.0
f
)
)
;
//selectionPoint.push_back(p.positionAttribute[m_selectingEdge.dart]);
selectionPoint
.
push_back
((
p
.
positionAttribute
[
m_selectingEdge
.
dart
]
+
p
.
positionAttribute
[
m
->
phi1
(
m_selectingEdge
.
dart
)])
/
2.0
f
);
//
selectionPoint.push_back(p.positionAttribute[m_selectingEdge.dart]);
m_selectionSphereVBO
->
updateData
(
selectionPoint
);
m_pointSprite
->
setAttributePosition
(
m_selectionSphereVBO
);
...
...
SCHNApps/Plugins/surface_selection/src/surface_selection_dockTab.cpp
View file @
4c937c0e
...
...
@@ -26,7 +26,7 @@ Surface_Selection_DockTab::Surface_Selection_DockTab(SCHNApps* s, Surface_Select
connect
(
combo_color
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
colorChanged
(
int
)));
// force color for map parameter updating
combo_color
->
setCurrentIndex
(
0
);
//
combo_color->setCurrentIndex(0);
}
...
...
SCHNApps/src/controlDock_mapTab.cpp
View file @
4c937c0e
...
...
@@ -237,10 +237,9 @@ void ControlDock_MapTab::selectedSelectorChanged()
m_selectedSelector
[
orbit
]
=
m_selectedMap
->
getCellSelector
(
orbit
,
items
[
0
]
->
text
());
m_schnapps
->
notifySelectedCellSelectorChanged
(
m_selectedSelector
[
orbit
]);
// RECORDING TODO
QTextStream
*
rec
=
m_schnapps
->
pythonStreamRecorder
();
if
(
rec
)
*
rec
<<
m_selectedMap
->
getName
()
<<
"
.setSelectedSelector("
<<
orbit
<<
",
\"
"
<<
items
[
0
]
->
text
()
<<
"
\"
);"
<<
endl
;
*
rec
<<
"schnapps
.setSelectedSelector
CurrentMap
("
<<
orbit
<<
",
\"
"
<<
items
[
0
]
->
text
()
<<
"
\"
);"
<<
endl
;
}
}
...
...
@@ -489,6 +488,35 @@ void ControlDock_MapTab::updateSelectedMapInfo()
}
}
}
else
{
for
(
unsigned
int
orbit
=
DART
;
orbit
<=
VOLUME
;
++
orbit
)
{
switch
(
orbit
)
{
case
DART
:
label_dartNbOrbits
->
setText
(
QString
::
number
(
0
));
label_dartNbCells
->
setText
(
QString
::
number
(
0
));
break
;
case
VERTEX
:
label_vertexNbOrbits
->
setText
(
QString
::
number
(
0
));
label_vertexNbCells
->
setText
(
QString
::
number
(
0
));
break
;
case
EDGE
:
label_edgeNbOrbits
->
setText
(
QString
::
number
(
0
));
label_edgeNbCells
->
setText
(
QString
::
number
(
0
));
break
;
case
FACE
:
label_faceNbOrbits
->
setText
(
QString
::
number
(
0
));
label_faceNbCells
->
setText
(
QString
::
number
(
0
));
break
;
case
VOLUME
:
label_volumeNbOrbits
->
setText
(
QString
::
number
(
0
));
label_volumeNbCells
->
setText
(
QString
::
number
(
0
));
break
;
}
}
}
b_updatingUI
=
false
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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