Skip to content

Fix the triggering in PickPointsInteractor when there are linesets pr… #6499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssheorey merged 5 commits into from
Dec 26, 2023
+19 −3
Merged

Fix the triggering in PickPointsInteractor when there are linesets pr… #6499

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
837a76f
Fix the triggering in PickPointsInteractor when there are linesets pr…
Nov 20, 2023
4d00414
Add description to the CHANGELOG.md
Nov 21, 2023
9b3623a
Fix erroneous lineset iterators from previous bugfix
EwingKang Nov 23, 2023
6c555ad
Merge branch 'main' into fix_linset_select
EwingKang Dec 12, 2023
323275a
Merge branch 'main' of github.com:isl-org/Open3D into fix_linset_select
ssheorey Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
* Check for support of CUDA Memory Pools at runtime (#4679)
* Fix `toString`, `CreateFromPoints` methods and improve docs in `AxisAlignedBoundingBox`. 🐛📝
* Migrate Open3d documentation to furo theme ✨ (#6470)
* Fix geometry picker Error when LineSet objects are presented

## 0.13

Expand Down
22 changes: 19 additions & 3 deletions cpp/open3d/visualization/gui/PickPointsInteractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#include "open3d/geometry/Image.h"
#include "open3d/geometry/PointCloud.h"
#include "open3d/geometry/TriangleMesh.h"
#include "open3d/geometry/LineSet.h"
#include "open3d/t/geometry/PointCloud.h"
#include "open3d/t/geometry/TriangleMesh.h"
#include "open3d/t/geometry/LineSet.h"
#include "open3d/utility/Logging.h"
#include "open3d/visualization/gui/Events.h"
#include "open3d/visualization/rendering/MaterialRecord.h"
Expand Down Expand Up @@ -161,15 +163,28 @@ void PickPointsInteractor::SetPickableGeometry(
auto mesh = dynamic_cast<const geometry::TriangleMesh *>(pg.geometry);
auto tmesh =
dynamic_cast<const t::geometry::TriangleMesh *>(pg.tgeometry);
auto lineset = dynamic_cast<const geometry::LineSet *>(pg.geometry);
auto tlineset =
dynamic_cast<const t::geometry::LineSet *>(pg.tgeometry);
if (cloud) {
points_.insert(points_.end(), cloud->points_.begin(),
cloud->points_.end());
} else if (mesh) {
points_.insert(points_.end(), mesh->vertices_.begin(),
mesh->vertices_.end());
} else if (tcloud || tmesh) {
const auto &tpoints = (tcloud ? tcloud->GetPointPositions()
: tmesh->GetVertexPositions());
} else if (lineset) {
points_.insert(points_.end(), lineset->points_.begin(),
lineset->points_.end());
}
else if (tcloud || tmesh || tlineset) {
core::Tensor tpoints;
if(tcloud) {
tpoints = tcloud->GetPointPositions();
} else if (tmesh) {
tpoints = tmesh->GetVertexPositions();
} else if (tlineset) {
tpoints = tlineset->GetPointPositions();
}
const size_t n = tpoints.NumElements();
float *pts = (float *)tpoints.GetDataPtr();
points_.reserve(points_.size() + n);
Expand Down Expand Up @@ -203,6 +218,7 @@ void PickPointsInteractor::SetPickableGeometry(
// picking_scene_->AddGeometry(pg.name, tmesh, mat);
}
}
//TODO what about Lineset selection?
}
// add safety but invalid obj
lookup_->Add("", points_.size());
Expand Down