Merge remote-tracking branch 'origin/master' into V9_dev

diff --git a/resources/SIERPINSKYCatalog.xml.in b/resources/SIERPINSKYCatalog.xml.in
index 20f65ad2c4d463ce994a5a9f2fe8433070e4207c..2c84a462db8aad7a2adf175620d76237b490cd11 100644 (file)
--- a/resources/SIERPINSKYCatalog.xml.in
+++ b/resources/SIERPINSKYCatalog.xml.in
@@ -30,7 +30,6 @@
             <component-author>Vadim SANDLER (VSR)</component-author>
             <component-version>@SALOMESIERPINSKY_VERSION@</component-version>
             <component-comment>unknown</component-comment>
-            <component-multistudy>0</component-multistudy>
             <component-icone>SIERPINSKY.png</component-icone>
             <constraint></constraint>
             <component-interface-list>

diff --git a/resources/schema1.xml b/resources/schema1.xml
index e6dfb34e91cab91c7b66f57e7d02984aa4e5efdf..a93289036fee91fa7ae2a701a0b5e953e010516e 100644 (file)
--- a/resources/schema1.xml
+++ b/resources/schema1.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
 <proc name="schema_1">
-   <property name="DefaultStudyID" value="6"/>
    <type name="string" kind="string"/>
    <struct name="Engines/dataref">
       <member name="ref" type="string"/>

diff --git a/resources/schema2.xml b/resources/schema2.xml
index 6298a997bba711861cfb284968110339c86c73e8..653614cbadfcf1f0a9d6eb8cd35d4c5d3ea7fa4d 100644 (file)
--- a/resources/schema2.xml
+++ b/resources/schema2.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
 <proc name="schema_2">
-   <property name="DefaultStudyID" value="6"/>
    <type name="string" kind="string"/>
    <struct name="Engines/dataref">
       <member name="ref" type="string"/>
@@ -129,13 +128,9 @@
   import VISU        
   orb = CORBA.ORB_init( [], CORBA.ORB_ID )          
   naming_service = SALOME_NamingServicePy.SALOME_NamingServicePy_i( orb )          
-  lcc = LifeCycleCORBA.LifeCycleCORBA( orb )          
-  studyManager = naming_service.Resolve( "myStudyManager" )._narrow( SALOMEDS.StudyManager )          
-  session = naming_service.Resolve( "/Kernel/Session" )._narrow( SALOME.Session )          
-  studyId = session.GetActiveStudyId()          
-  study = studyManager.GetStudyByID( studyId )          
+  lcc = LifeCycleCORBA.LifeCycleCORBA( orb )                 
+  session = naming_service.Resolve( "/Kernel/Session" )._narrow( SALOME.Session ) 
   aVisu = lcc.FindOrLoadComponent( "FactoryServer", "VISU" )          
-  aVisu.SetCurrentStudy( study )                
   aResult = aVisu.ImportFile( fileName );          
   aMesh = aVisu.MeshOnEntity( aResult, "Sierpinsky", VISU.NODE )          
   aViewManager = aVisu.GetViewManager()                                                            

diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
index 6d2192705f13b4e6078a3021a4eae578a5044864..3ddc8a8c291f41d2ce0b1ba47fab3bae66a5d84e 100644 (file)
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
@@ -169,7 +169,7 @@ CORBA::Boolean SIERPINSKY_Gen_i::ExportToMED( const char* theFileName, CORBA::Do
   }
   
   // create MED 2.2 file
-  MED::PWrapper aMed = MED::CrWrapper( theFileName, MED::eV2_2 );
+  MED::PWrapper aMed = MED::CrWrapperW( theFileName );
 
   // create 2D mesh
   MED::PMeshInfo aMesh = aMed->CrMeshInfo( 2, 2, "Sierpinsky" );