Issue 0020089: EDF 887 MED : Take into account 0D elements (MED_POINT1)

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index f35f3f117f883cff9a7ac81879108b1b54a8004d..5e96f572013c7c0844720090daa5e6e9e716b406 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -54,6 +54,7 @@
     <parameter name="floating_point_precision" value="6"/>
     <parameter name="quadratic_mode"           value="0"  />
     <parameter name="max_angle"                value="2"  />
+    <parameter name="elem0d_size"              value="5"  />
     <parameter name="represent_shading"        value="false"/>
     <parameter name="feature_edges_angle"      value="30.0"/>
     <parameter name="show_feature_edges"       value="true"/>

diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx
index 410d91bf94c9c13f128b6155d0e28af4ef6f799e..10315b1bb18687dc169784e717cd9790d4c27dac 100644 (file)
--- 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 028eaf8c8b5098cc848be4a591a87fb2ce9c9b00..35d3f3da85f607018bb4ede928c606ddb0139e37 100644 (file)
--- 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 986a8221a12a3ad5672899256ba2bb133c53ffbf..50b7642a781dd44acfd404db667c4c57687938b0 100644 (file)
--- 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!</translation>
             <source>VISU_EDGE_COLOR</source>
             <translation>Edge Color</translation>
         </message>
+        <message>
+            <source>VISU_ELEM0D_SIZE</source>
+            <translation>Size of 0D elements</translation>
+        </message>
         <message>
             <source>VISU_FEATURE_EDGES</source>
             <translation>Feature edges</translation>

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 8ea7c889097f4e46d54f6072b2aa5b5350a4fe3a..d44e6e7f3972d73251aff9b46a06f01f2c9c2ad6 100644 (file)
--- 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 );