diff --git a/dox/user_guides/visualization/images/visualization_selection_scheme_replaceExtra.svg b/dox/user_guides/visualization/images/visualization_selection_scheme_replaceExtra.svg new file mode 100644 index 0000000000..7e82fec688 --- /dev/null +++ b/dox/user_guides/visualization/images/visualization_selection_scheme_replaceExtra.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dox/user_guides/visualization/visualization.md b/dox/user_guides/visualization/visualization.md index be6016258d..0b88dc1f87 100644 --- a/dox/user_guides/visualization/visualization.md +++ b/dox/user_guides/visualization/visualization.md @@ -1040,7 +1040,7 @@ Select* methods of AIS_InteractiveContext accept some selection scheme as parame | :----- | :----- | :----- | :----- | :----- | | AIS_SelectionScheme_Replace | @figure{visualization_selection_scheme_replace.svg, ""} | | AIS_SelectionScheme_XOR | @figure{visualization_selection_scheme_XOR.svg, ""} | | AIS_SelectionScheme_Add | @figure{visualization_selection_scheme_add.svg, ""} | | AIS_SelectionScheme_Clear | @figure{visualization_selection_scheme_clear.svg, ""} | -| AIS_SelectionScheme_Remove | @figure{visualization_selection_scheme_remove.svg, ""} | | | | +| AIS_SelectionScheme_Remove | @figure{visualization_selection_scheme_remove.svg, ""} | | AIS_SelectionScheme_ReplaceExtra | @figure{visualization_selection_scheme_replaceExtra.svg, ""} | @subsection occt_visu_3_5 Standard Interactive Object Classes diff --git a/src/AIS/AIS_Selection.cxx b/src/AIS/AIS_Selection.cxx index 67d8266e91..2b55208576 100644 --- a/src/AIS/AIS_Selection.cxx +++ b/src/AIS/AIS_Selection.cxx @@ -149,6 +149,29 @@ void AIS_Selection::SelectOwners (const AIS_NArray1OfEntityOwner& thePickedOwner { return; } + case AIS_SelectionScheme_ReplaceExtra: + { + // If picked owners is equivalent to the selected then just clear selected + // Else go to AIS_SelectionScheme_Replace + if (thePickedOwners.Size() == myresult.Size()) + { + Standard_Boolean isTheSame = Standard_True; + for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next()) + { + if (!myResultMap.IsBound (aSelIter.Value())) + { + isTheSame = Standard_False; + break; + } + } + if (isTheSame) + { + Clear(); + return; + } + } + } + Standard_FALLTHROUGH case AIS_SelectionScheme_Replace: { Clear(); diff --git a/src/AIS/AIS_SelectionScheme.hxx b/src/AIS/AIS_SelectionScheme.hxx index ef5da37a7e..a5de1f3e0f 100644 --- a/src/AIS/AIS_SelectionScheme.hxx +++ b/src/AIS/AIS_SelectionScheme.hxx @@ -22,7 +22,9 @@ enum AIS_SelectionScheme AIS_SelectionScheme_Add, //!< adds detected object to current selection AIS_SelectionScheme_Remove, //!< removes detected object from the current selection AIS_SelectionScheme_XOR, //!< performs XOR for detected objects, other selected not touched - AIS_SelectionScheme_Clear //!< clears current selection + AIS_SelectionScheme_Clear, //!< clears current selection + AIS_SelectionScheme_ReplaceExtra, //!< replace with one difference: if result of replace is an empty, + //!< and current selection contains detected element, it will be selected }; #endif // _AIS_SelectionScheme_HeaderFile diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index 32d0d0c9a9..0bad61bb81 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -7264,6 +7264,10 @@ static Standard_Integer VSelect (Draw_Interpretor& , { aSelScheme = AIS_SelectionScheme_Replace; } + else if (anArg == "-replaceextra") + { + aSelScheme = AIS_SelectionScheme_ReplaceExtra; + } else if (anArg == "-xor" || anArg == "-shift") { @@ -14846,7 +14850,7 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands) "\n\t\t: When -closeOnEscape is specified, view will be closed on pressing Escape.", __FILE__, VDiffImage, group); theCommands.Add ("vselect", - "vselect x1 y1 [x2 y2 [x3 y3 ... xn yn]] [-allowoverlap 0|1] [-replace|-xor|-add|-remove]\n" + "vselect x1 y1 [x2 y2 [x3 y3 ... xn yn]] [-allowoverlap 0|1] [-replace|-replaceextra|-xor|-add|-remove]\n" "- emulates different types of selection:\n" "- 1) single click selection\n" "- 2) selection with rectangle having corners at pixel positions (x1,y1) and (x2,y2)\n" @@ -14855,7 +14859,7 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands) " If the flag is set to 1, both sensitives that were included completely and overlapped partially by defined \n" " rectangle or polygon will be detected, otherwise algorithm will chose only fully included sensitives.\n" " Default behavior is to detect only full inclusion. (partial inclusion - overlap - is not allowed by default)\n" - "- 5) selection scheme replace, xor, add or remove (replace by default)", + "- 5) selection scheme replace, replaceextra, xor, add or remove (replace by default)", __FILE__, VSelect, group); theCommands.Add ("vmoveto", "vmoveto [x y] [-reset]" diff --git a/tests/vselect/bugs/bug32205 b/tests/vselect/bugs/bug32205 new file mode 100644 index 0000000000..7a5ee196e2 --- /dev/null +++ b/tests/vselect/bugs/bug32205 @@ -0,0 +1,28 @@ +puts "========" +puts "0032205: Visualization - implementing new selection scheme in context - replace extra" +puts "========" +puts "" + +pload MODELING VISUALIZATION +box b1 0 0 0 10 10 10 +box b2 20 20 20 30 30 30 +vclear +vinit View1 +vaxo +vdisplay -dispMode 1 b1 b2 +vfit +vselprops selHighlight -dispMode -1 +vselect 0 0 400 400 -xor +if { ![string match "*Selected*" [vstate b1]] } { puts "Error: b1 should be selected."} +if { ![string match "*Selected*" [vstate b2]] } { puts "Error: b2 should be selected."} +vselect 200 200 -replaceExtra +if { [string match "*Selected*" [vstate b1]] } { puts "Error: b1 should not be selected."} +if { ![string match "*Selected*" [vstate b2]] } { puts "Error: b2 should be selected."} +vselect 200 200 -replaceExtra +if { [string match "*Selected*" [vstate b1]] } { puts "Error: b1 should not be selected."} +if { [string match "*Selected*" [vstate b2]] } { puts "Error: b2 should not be selected."} +vselect 200 200 -replaceExtra +if { [string match "*Selected*" [vstate b1]] } { puts "Error: b1 should not be selected."} +if { ![string match "*Selected*" [vstate b2]] } { puts "Error: b2 should be selected."} + +vdump $imagedir/${casename}.png