From 5833e0dfb008023351d7168aba5013edb17ca490 Mon Sep 17 00:00:00 2001 From: dmv Date: Thu, 2 Apr 2009 08:38:34 +0000 Subject: [PATCH] IPAL20955 Plot2d scene popup has no "Show, Hide, Show only" items --- src/VISUGUI/VisuGUI.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index e7c55605..6898111b 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -1302,11 +1302,12 @@ VisuGUI VISU_ActorBase* anActorBase = NULL; VISU::Prs3d_i* aPrs3d = NULL; SVTK_ViewWindow* aViewWindow = NULL; - float oldlwid; + float oldlwid = 1; bool isPrs3d = false; if (GetPrs3dSelectionInfo(this, aPrs3d, aViewWindow, anActor)) { isPrs3d = true; + oldlwid = anActor->GetLineWidth(); } else { aViewWindow = GetActiveViewWindow(this); @@ -1321,7 +1322,7 @@ VisuGUI VisuGUI_CursorDlg* CursorDlg = new VisuGUI_CursorDlg (GetDesktop(this), (const char*)tr("DLG_LINEWIDTH_TITLE").toLatin1(), TRUE); - CursorDlg->helpFileName = "viewing_3d_presentations_intro_page.html#width_opacity_anchor"; + CursorDlg->helpFileName = "viewing_3d_presentations_page.html#width_opacity_anchor"; CursorDlg->Comment1->setText(tr("DLG_LINEWIDTH_CMT1")); CursorDlg->Comment2->setText(tr("DLG_LINEWIDTH_CMT2")); CursorDlg->SpinBox1->setMinimum(1); @@ -2949,13 +2950,13 @@ VisuGUI QString aComponent = "( selcount=1 and canBeDisplayed and isVisuComponent )"; QString anEraseRule = "( selcount>0 and ({true} in $canBeDisplayed) and (" + aPrsVisible + - " or (client='ObjectBrowser' and (" + aTableOrContHide + orCurveVisible + "))) ) or " + aComponent; + " or ( (" + aTableOrContHide + orCurveVisible + "))) ) or " + aComponent; QString aDisplayRule = "( selcount>0 and ({true} in $canBeDisplayed) and (" + aPrsInvisible + - " or (client='ObjectBrowser' and (" + aTableOrContShow + orCurveInvisible + "))) ) or " + aComponent; + " or ( (" + aTableOrContShow + orCurveInvisible + "))) ) or " + aComponent; QString aDOnlyRule = "( selcount>0 and ({true} in $canBeDisplayed) and (($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "})" - " or (client='ObjectBrowser' and ((type='VISU::TTABLE' and nbChildren>0) or" + " or ( ((type='VISU::TTABLE' and nbChildren>0) or" " ($type in {'VISU::TCURVE' 'VISU::TCONTAINER'})))) ) or" + aComponent; QString aScalarBarHideRule = "( selcount>0 and ($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "}) and isScalarMapAct=1 and " + aPrsVisible + " and isScalarBarVisible )"; -- 2.30.2