kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

rename 2d tool classes to be consistent with 3d classes

Browse Source
This commit is contained in:
wmayer
2016-11-21 14:29:51 +01:00
parent 9fe280ed63
commit 2d8e70085e
42 changed files with 950 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Points/Gui/ViewProvider.cpp
View File

@@ -408,9 +408,9 @@ void ViewProviderScattered::updateData(const App::Property* prop)
void ViewProviderScattered::cut(const std::vector<SbVec2f>& picked, Gui::View3DInventorViewer &Viewer)
{
// create the polygon from the picked points
Base::Polygon2D cPoly;
Base::Polygon2d cPoly;
for (std::vector<SbVec2f>::const_iterator it = picked.begin(); it != picked.end(); ++it) {
cPoly.Add(Base::Vector2D((*it)[0],(*it)[1]));
cPoly.Add(Base::Vector2d((*it)[0],(*it)[1]));
}
// get a reference to the point feature
@@ -430,7 +430,7 @@ void ViewProviderScattered::cut(const std::vector<SbVec2f>& picked, Gui::View3DI
// project from 3d to 2d
vol.projectToScreen(pt, pt);
if (cPoly.Contains(Base::Vector2D(pt[0],pt[1])))
if (cPoly.Contains(Base::Vector2d(pt[0],pt[1])))
removeIndices.push_back(index);
}
@@ -560,9 +560,9 @@ void ViewProviderStructured::updateData(const App::Property* prop)
void ViewProviderStructured::cut(const std::vector<SbVec2f>& picked, Gui::View3DInventorViewer &Viewer)
{
// create the polygon from the picked points
Base::Polygon2D cPoly;
Base::Polygon2d cPoly;
for (std::vector<SbVec2f>::const_iterator it = picked.begin(); it != picked.end(); ++it) {
cPoly.Add(Base::Vector2D((*it)[0],(*it)[1]));
cPoly.Add(Base::Vector2d((*it)[0],(*it)[1]));
}
// get a reference to the point feature
@@ -586,7 +586,7 @@ void ViewProviderStructured::cut(const std::vector<SbVec2f>& picked, Gui::View3D
// project from 3d to 2d
vol.projectToScreen(pt, pt);
if (cPoly.Contains(Base::Vector2D(pt[0],pt[1]))) {
if (cPoly.Contains(Base::Vector2d(pt[0],pt[1]))) {
invalidatePoints = true;
vec.Set(nan, nan, nan);
}