Repository navigation
Add per-object display modes to the Objects panel - #594
markomarkovic wants to merge 12 commits into
Conversation
aa64b4b to
aa56474
Compare
|
Rebased onto master to clear the conflicts with #590. The per-object display modes now work with the nested assembly tree that #590 introduced:
Both entry points to a mode — the radios and the properties editor's dropdown — go through the same path, so either one cascades. New tests cover the nested case: parts get their own radios and hold independent modes, a parent's mode cascades to its subtree, a hidden part stays hidden across a re-run with "Preserve properties on reload", and re-running a script that shows an assembly does not leak radio widgets. |
Introduces the display module: a per-object DisplayMode (Hidden, Wireframe, Transparent, Shaded), a panel-wide GlobalMode override, and effective_mode() resolving the two. HIDDEN always wins so an override never unhides an object.
Adds a per-object Display mode property (Hidden/Wireframe/Transparent/Shaded) to ObjectTreeItem and a panel-wide global mode on ObjectTree, emitting sigDisplayModesChanged/sigGlobalModeChanged with the resolved effective modes so the viewer can apply them.
Wires the object tree's display-mode signals to the viewer: apply_display_modes erases hidden objects and sets wireframe/shaded/transparency per object, and the Wireframe/Shaded/Transparent toolbar actions drive and reflect the global mode.
Replaces the name-column visibility checkbox with a row of mutually exclusive radios per object (Hidden/Wireframe/Transparent/Shaded) and an 'All' row that sets the global override. Radios are centered under centered header icons, and are torn down with the item so the joining QButtonGroup does not leak it.
aa56474 to
fee47a2
Compare
This reverts commit 6e5fbc6.
Attaching the four setItemWidget radios inside the insert loop made every later addChild/expandItem walk the view's persistent editor table, so addObjects was quadratic in the object count: the 400-shape render went from 0.23s to 1.28s locally and past the 2s test bound on CI. Inserting and expanding every item first and attaching the radios afterwards brings it back to 0.36s. The finally keeps items already added before a failing object (the partial-add case test_render_colors checks) with their radios.
|
Thanks @markomarkovic I noticed two issues while experimenting with this feature.
|
|
Thanks, I can reproduce the dark theme issue, I'll take care of it. Could you share a project that has colored sub-assemblies so I can reproduce and fix that too? Doesn't need to be that exact one, just a simple reproduction example would be helpful. |
|
It looks like I may have been wrong about the cause. It's the alpha in the import cadquery as cq
# If you change the a in the rgba to 1.0, the cq.Color becomes ignored
box = cq.Workplane().box(10, 10, 10)
box_assy = cq.Assembly()
box_assy.add(box, color=cq.Color(1.0, 0.0, 0.0, 0.5))
# Same problem with the alpha here
main_assy = cq.Assembly()
main_assy.add(cq.Workplane().box(10.0, 10.0, 10.0),
color=cq.Color(0.0, 1.0, 0.0, 0.5),
loc=cq.Location((20.0, 20.0, 0.0)))
# I am nesting assemblies here to make sure the fix reaches depth
# Same problem with the alpha here though
sub_assy = cq.Assembly()
sub_assy.add(cq.Workplane().box(10.0, 10.0, 10.0),
color=cq.Color(0.0, 0.0, 1.0, 0.5),
loc=cq.Location((20.0, 20.0, 20.0)))
main_assy.add(sub_assy)
show_object(box_assy)
show_object(main_assy) |
Draw the header icons in the palette's text color instead of qtawesome's default near-black, and lighten the tree's Window color under the dark theme so Fusion's radio and checkbox outlines stand out from the dark Base.
The color lives on the object's own shading aspect, which UnsetTransparency drops. It was called directly for a transparency of 0, and AIS_InteractiveContext::SetTransparency calls it too when leaving the transparent mode, so set the transparency on the object instead.
|
@jmwright Thanks for the repro, both issues are fixed:
|



Adds per-object display modes to the Objects panel. Each object can be shown as shaded, transparent, or wireframe, or hidden, chosen from a row of radios in the tree. An All row applies a single mode to every object at once as a global override, while each object keeps its own mode underneath.
Testing
New
tests/test_display.pycovers the state model;tests/test_app.pyadds pytest-qt coverage for the tree state, viewer application, and the panel radios. The existingtest_inspectwas updated for the new "All" row and the radio-based visibility control.pytest tests/— full suite passes.Depends on #593 — this branch is stacked on it, so until #593 merges the diff also shows the
main_window.pyLogViewer fix.Claude AI assisted with the implementation under my direction; design, testing, and review are mine.