From 5fbf069b470dc1da31e171e8040624dbcf2af61c Mon Sep 17 00:00:00 2001 From: dmv Date: Tue, 27 Jan 2009 13:36:34 +0000 Subject: [PATCH] 0020137: EDF 931 VISU : Trihedron Issues --- src/OCCViewer/OCCViewer_ViewWindow.cxx | 4 ++-- src/SVTK/SVTK_ViewWindow.cxx | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx index f5f7144ea..242b3eeb0 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.cxx +++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx @@ -1457,13 +1457,13 @@ void OCCViewer_ViewWindow::setVisualParameters( const QString& parameters ) params.scaleX = paramsLst[13].toDouble(); params.scaleY = paramsLst[14].toDouble(); params.scaleZ = paramsLst[15].toDouble(); + params.isVisible = paramsLst[16].toDouble(); + params.size = paramsLst[17].toDouble(); } else { params.scaleX = 1.; params.scaleY = 1.; params.scaleZ = 1.; } - params.isVisible = paramsLst[16].toDouble(); - params.size = paramsLst[17].toDouble(); performRestoring( params ); } diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx index 50cd0b974..83329f265 100755 --- a/src/SVTK/SVTK_ViewWindow.cxx +++ b/src/SVTK/SVTK_ViewWindow.cxx @@ -1054,7 +1054,6 @@ SVTK_ViewWindow // apply graduated axes parameters SVTK_CubeAxesActor2D* gradAxesActor = GetCubeAxes(); if ( gradAxesActor && paramsLst.size() == nAllParams ) { - int i = nNormalParams+1, j = i + nGradAxisParams - 1; ::setGradAxisVisualParams( gradAxesActor->GetXAxisActor2D(), parameters.section( '*', i, j ) ); i = j + 1; j += nGradAxisParams; @@ -1066,14 +1065,14 @@ SVTK_ViewWindow gradAxesActor->VisibilityOn(); else gradAxesActor->VisibilityOff(); + } else if ( paramsLst.size() == nAllParams ) { + if ( paramsLst[90].toUShort() ) + GetTrihedron()->VisibilityOn(); + else + GetTrihedron()->VisibilityOff(); + + SetTrihedronSize(paramsLst[91].toDouble()); } - - if ( paramsLst[90].toUShort() ) - GetTrihedron()->VisibilityOn(); - else - GetTrihedron()->VisibilityOff(); - - SetTrihedronSize(paramsLst[91].toDouble()); } } -- 2.39.2