From: vsr <vsr@opencascade.com>
Date: Tue, 12 Feb 2013 14:26:50 +0000 (+0000)
Subject: Merge from V6_main 11/02/2013
X-Git-Tag: before_mergefrom_V6_main_28Feb13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1578f02d018ca3deadc237df72ea1047be3de252;p=modules%2Fvisu.git

Merge from V6_main 11/02/2013
---

diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index d10fed3e..4c6dd99c 100644
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -94,7 +94,7 @@ libVisuConvertor_la_LDFLAGS= \
 	$(BOOST_LIB_DATE_TIME) \
 	$(VTK_LIBS) \
 	$(QT_LIBS) \
-	$(KERNEL_LDFLAGS) -lSALOMEBasics \
+	$(KERNEL_LDFLAGS) -lSALOMEBasics -lSALOMELocalTrace \
 	$(CAS_KERNEL) \
 	$(CAS_MATH) \
 	$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase \
diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index a8ee294e..5718d97d 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -24,7 +24,7 @@
 //  File   : VISU_MedConvertor.cxx
 //  Author : Alexey PETROV
 //  Module : VISU
-//
+
 #include "VISU_MedConvertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
@@ -33,6 +33,8 @@
 #include "MED_GaussUtils.hxx"
 #include "MED_Utilities.hxx"
 
+#include "utilities.h"
+
 #include "SALOMEconfig.h"
 
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
@@ -1454,31 +1456,45 @@ VISU_MedConvertor
       aMesh->myName = aMeshName;
       aMesh->myMeshInfo = aMeshInfo;
       aMesh->myNamedPointCoords(new VISU::TMEDNamedPointCoords());
-      
+
       INITMSG(MYDEBUG,"aMeshName = '"<<aMeshName<<
               "; aDim = "<<aDim<<"\n");
 
-      if(aType == MED::eNON_STRUCTURE){
+      if (aType == MED::eNON_STRUCTURE) {
 
-        if(MED::PNodeInfo aNodeInfo = myMed->GetPNodeInfo(aMeshInfo)){
-          MED::TEntityInfo anEntityInfo = myMed->GetEntityInfo(aMeshInfo);
+        if (MED::PNodeInfo aNodeInfo = myMed->GetPNodeInfo(aMeshInfo)) {
+          MED::TEntityInfo anEntityInfo = myMed->GetEntityInfo(aMeshInfo, MED::eNOD);
 
           aMesh->myNbPoints = aNodeInfo->GetNbElem();
           aMesh->myEntityInfo = anEntityInfo;
-        
-        
+
+          // Check connectivity (Mantis issue 0020483)
+          {
+            bool isDescConn = false;
+
+            MED::TEntityInfo aEntityInfoDesc = myMed->GetEntityInfo(aMeshInfo, MED::eDESC);
+            MED::TEntityInfo::iterator anEntityIterDesc = aEntityInfoDesc.begin();
+            for (; anEntityIterDesc != aEntityInfoDesc.end() && !isDescConn; anEntityIterDesc++) {
+              const MED::EEntiteMaillage& anEntity = anEntityIterDesc->first;
+              if (anEntity != MED::eNOEUD) isDescConn = true;
+            }
+
+            if (isDescConn)
+              INFOS("There are some elements in descending connectivity in med file. They were not read !!!");
+          }
+
 #ifndef _DEXCEPT_
           try{
 #endif
             INITMSG(MYDEBUG,"myNbPoints = "<<aMesh->myNbPoints<<
                     "; anEntityInfo.size() = "<<anEntityInfo.size()<<
                     "\n");
-            
+
             BuildMeshOnEntityMap(aMesh,
                                  anEntityInfo,
                                  aNodeInfo,
                                  myMed);
-            
+
 #ifndef _DEXCEPT_
           }catch(std::exception& exc){
             MSG(MYDEBUG,"Follow exception was occured in:\n"<<exc.what());
diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index d323b9df..63750e46 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -199,7 +199,6 @@ static int MYDEBUG = 0;
 VisuGUI
 ::VisuGUI():
   SalomeApp_Module( "VISU" ),
-  LightApp_Module("VISU"),
   myDisplayer( 0 ),
   mySlider( NULL ),
   mySweep( NULL )
diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 5f9e5708..074b5a66 100644
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -185,8 +185,7 @@ namespace VISU
 
 //---------------------------------------------------------------
 VisuGUI_Module::VisuGUI_Module() : 
-  VisuGUI(),
-  LightApp_Module("VISU")
+  VisuGUI()
 {
 }
 
diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 4ef802f8..f50496a5 100644
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -779,6 +779,7 @@ VISU::Result_i
 {
   if(MYDEBUG) MESSAGE("Result_i::Restore - " << thePrefix);
   mySObject = SALOMEDS::SObject::_duplicate(theSObject);
+  mySObject->Register(); // Increment reference counter to stored SObject
   mySComponent = mySObject->GetFatherComponent();
   myStudyDocument = theSObject->GetStudy();
   myStudy = VISU::GetStudy(myStudyDocument);