From: ouv <ouv@opencascade.com>
Date: Thu, 24 Sep 2009 11:12:57 +0000 (+0000)
Subject: Issue 0020089: EDF 887 MED : Take into account 0D elements (MED_POINT1)
X-Git-Tag: V5_1_main_20090928~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=014026668081f98efd9fb48db9afb277e6097c35;p=modules%2Fvisu.git

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

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 @@
     <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 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!</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 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 );