Skip to content

VC3D: link fibers in two gestures (Fiber Map "Link A and B", in-dialog link from a fiber-intersection X) #2217

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
hendrikschilling merged 8 commits into from
Oct 22, 2026
Merged

VC3D: link fibers in two gestures (Fiber Map "Link A and B", in-dialog link from a fiber-intersection X) #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5966b83
VC3D: link two fibers from the Fiber Map ("Link A and B", pending aut…
skyward7187 Oct 21, 2026
6a85404
VC3D auto-link: one gesture when an annotation had to be saved first
skyward7187 Oct 21, 2026
c23566a
Merge main (862142652) into fiber-link-simplify
skyward7187 Oct 22, 2026
fea6a53
VC3D auto-link: post-merge fixes
skyward7187 Oct 21, 2026
4c0f76d
VC3D auto-link: automatic pending links in their own solid palette (c…
skyward7187 Oct 21, 2026
9240867
VC3D line annotation: drawn-line anchor and nearest-line-position hel…
skyward7187 Oct 21, 2026
b623782
VC3D line annotation: extract the shared placement, link, choice and …
skyward7187 Oct 21, 2026
7cabd72
VC3D line annotation: "Link <current> and <other>" from a fiber-inter…
skyward7187 Oct 21, 2026
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 volume-cartographer/apps/VC3D/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ set(srcs
FiberMapKollesis.cpp
FiberMapKollesis.hpp
FiberNetworkLayout.cpp
FiberMapAutoLink.cpp
FiberNetworkLayout.hpp
FiberWindingSolver.cpp
FiberWindingSolver.hpp
Expand Down
16 changes: 11 additions & 5 deletions volume-cartographer/apps/VC3D/CWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8027,11 +8027,17 @@ void CWindow::CreateWidgets(void)
}
if (const auto it = linkInfoById.find(snapshot.id); it != linkInfoById.end()) {
chain.colorId = it->second->linkGroupId;
chain.pointLinkStates.assign(chain.points.size(), 0);
for (const auto& [cpIndex, pending] : it->second->linkedControlPoints) {
if (cpIndex >= 0 &&
cpIndex < static_cast<int>(chain.pointLinkStates.size())) {
chain.pointLinkStates[cpIndex] = pending ? 1 : 2;
chain.pointLinkMarks.assign(chain.points.size(), {});
for (const auto& mark : it->second->linkedControlPoints) {
if (mark.controlIndex >= 0 &&
mark.controlIndex < static_cast<int>(chain.pointLinkMarks.size())) {
FiberOverlayController::PointLinkMark& out =
chain.pointLinkMarks[static_cast<size_t>(mark.controlIndex)];
out.state = static_cast<uint8_t>(mark.state);
out.sameHv = mark.sameHv;
out.kollesisTermination = mark.kollesisTermination;
out.breakTag = mark.breakTag;
out.adjacent = mark.adjacent;
}
}
}
Expand Down
Loading
Loading