From 014026668081f98efd9fb48db9afb277e6097c35 Mon Sep 17 00:00:00 2001 From: ouv Date: Thu, 24 Sep 2009 11:12:57 +0000 Subject: [PATCH] Issue 0020089: EDF 887 MED : Take into account 0D elements (MED_POINT1) --- resources/SalomeApp.xml | 1 + src/OBJECT/VISU_MeshAct.cxx | 4 ++++ src/OBJECT/VISU_ScalarMapAct.cxx | 5 ++++- src/VISUGUI/VISU_msg_en.ts | 4 ++++ src/VISUGUI/VisuGUI.cxx | 5 +++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index f35f3f11..5e96f572 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -54,6 +54,7 @@ + diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx index 410d91bf..10315b1b 100644 --- a/src/OBJECT/VISU_MeshAct.cxx +++ b/src/OBJECT/VISU_MeshAct.cxx @@ -74,6 +74,10 @@ VISU_MeshAct int aQuadraticAngle = aResourceMgr->integerValue( "VISU", "max_angle", 2); mySurfaceActor->SetQuadraticArcAngle(aQuadraticAngle); myEdgeActor->SetQuadraticArcAngle(aQuadraticAngle); + + int anElem0DSize = aResourceMgr->integerValue( "VISU", "elem0d_size", 5); + GetSurfaceProperty()->SetPointSize(anElem0DSize); + GetEdgeProperty()->SetPointSize(anElem0DSize); } } diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx index 028eaf8c..35d3f3da 100644 --- a/src/OBJECT/VISU_ScalarMapAct.cxx +++ b/src/OBJECT/VISU_ScalarMapAct.cxx @@ -254,6 +254,10 @@ VISU_ScalarMapAct int aQuadraticAngle = aResourceMgr->integerValue( "VISU", "max_angle", 2); mySurfaceActor->SetQuadraticArcAngle(aQuadraticAngle); myEdgeActor->SetQuadraticArcAngle(aQuadraticAngle); + + int anElem0DSize = aResourceMgr->integerValue( "VISU", "elem0d_size", 5); + mySurfaceActor->GetProperty()->SetPointSize(anElem0DSize); + myEdgeActor->GetProperty()->SetPointSize(anElem0DSize); } } @@ -464,7 +468,6 @@ VISU_ScalarMapAct SetBarVisibility(anActor->GetBarVisibility()); myPointsActor->DeepCopy( anActor->myPointsActor ); SetShading(anActor->IsShading()); - GetEdgeProperty()->DeepCopy(anActor->GetEdgeProperty()); } } diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts index 986a8221..50b7642a 100644 --- a/src/VISUGUI/VISU_msg_en.ts +++ b/src/VISUGUI/VISU_msg_en.ts @@ -165,6 +165,10 @@ number of time stamps or number of components is not the same! VISU_EDGE_COLOR Edge Color + + VISU_ELEM0D_SIZE + Size of 0D elements + VISU_FEATURE_EDGES Feature edges diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 8ea7c889..d44e6e7f 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -3993,6 +3993,11 @@ void VisuGUI::createPreferences() setPreferenceProperty( maxAngle, "min", 1 ); setPreferenceProperty( maxAngle, "max", 90 ); + int elem0DSize = addPreference( tr( "VISU_ELEM0D_SIZE" ), representGr, LightApp_Preferences::IntSpin, "VISU", "elem0d_size" ); + setPreferenceProperty( elem0DSize, "min", 1 ); + setPreferenceProperty( elem0DSize, "max", 10 ); + addPreference( "", representGr, LightApp_Preferences::Space ); + int shrFac = addPreference( tr( "VISU_SHRINK_FACTOR" ), representGr, LightApp_Preferences::IntSpin, "VISU", "shrink_factor" ); setPreferenceProperty( shrFac, "min", 20 ); setPreferenceProperty( shrFac, "max", 100 ); -- 2.39.2