ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 16:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Undo mistaken commit

Browse Source
This commit is contained in:
apo 2005-03-23 05:56:25 +00:00
parent c111d3b520
commit 7a6418e0be
4 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SMESH_I/Makefile.in
View File

@ -45,7 +45,7 @@ EXPORT_HEADERS= \
SMESH_subMesh_i.hxx \
SMESH_Mesh_i.hxx \
SMESH_Hypothesis_i.hxx \
SMESH.hxx SMESH_Base.hxx SMESH_Factory.hxx
SMESH.hxx
EXPORT_PYSCRIPTS = smeshpy.py
@ -69,8 +69,7 @@ LIB_SRC = \
SMESH_3D_Algo_i.cxx \
SMESH_Filter_i.cxx \
SMESH_Group_i.cxx \
SMESH_Pattern_i.cxx \
SMESH_DumpPython.cxx
SMESH_Pattern_i.cxx
LIB_SERVER_IDL = SMESH_Gen.idl SMESH_Hypothesis.idl SMESH_Mesh.idl \
SALOME_Component.idl SALOME_Exception.idl \

29
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -418,7 +418,6 @@ void SMESH_Gen_i::SetCurrentStudy( SALOMEDS::Study_ptr theStudy )
if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() ) {
myStudyContextMap[ studyId ] = new StudyContext;
}
SetStudyID(studyId);
// set current study for geom engine
/*
if ( !CORBA::is_nil( GetGeomEngine() ) )
@ -491,9 +490,6 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
throw ( SALOME::SALOME_Exception )
{
Unexpect aCatch(SALOME_SalomeException);
using namespace SMESH;
FactoryHandler aFactory;
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" );
// create mesh
SMESH::SMESH_Mesh_var mesh = this->createMesh();
@ -504,15 +500,6 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
// publish mesh in the study
if ( CanPublishInStudy( mesh ) )
PublishMesh( myCurrentStudy, mesh.in() );
CORBA::String_var anEntry = theShapeObject->GetEntry();
aFactory->Register(TInvocationID(TResultCont(1,meshServant->GetID()),
GetID(),
"SMESH_Mesh",
"CreateMesh",
TArgumentCont(),
anEntry.in()));
return mesh._retn();
}
@ -555,9 +542,6 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
throw ( SALOME::SALOME_Exception )
{
Unexpect aCatch(SALOME_SalomeException);
using namespace SMESH;
FactoryHandler aFactory;
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMeshFromMED" );
// Retrieve mesh names from the file
@ -570,7 +554,6 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
theStatus = (SMESH::DriverMED_ReadStatus)aStatus;
if(theStatus == SMESH::DRS_OK){
aResult->length( aNames.size() );
TResultCont aResultCont;
int i = 0;
// Iterate through all meshes and create mesh objects
@ -591,15 +574,7 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
theStatus = status1;
aResult[i++] = SMESH::SMESH_Mesh::_duplicate( mesh );
aResultCont.push_back(meshServant->GetID());
}
aFactory->Register(TInvocationID(aResultCont,
GetID(),
"SMESH_Mesh",
"CreateMeshesFromMED",
TArgumentCont(1,std::string(theFileName)),
""));
}
return aResult._retn();
}
@ -803,10 +778,6 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
{
INFOS( "SMESH_Gen_i::Save" );
CORBA::Boolean anIsValidScript;
SALOMEDS::Study_var aStudy = theComponent->GetStudy();
SALOMEDS::TMPFile_var aDump = DumpPython(aStudy,false,anIsValidScript);
// ASSERT( theComponent->GetStudy()->StudyId() == myCurrentStudy->StudyId() )
// san -- in case <myCurrentStudy> differs from theComponent's study,
// use that of the component

10
src/SMESH_I/SMESH_Gen_i.hxx
View File

@ -44,7 +44,6 @@
#include "SMESH_Gen.hxx"
#include "GEOM_Client.hxx"
#include "SMESH_Factory.hxx"
#include <map>
@ -120,8 +119,7 @@ private:
// ==========================================================
class SMESH_Gen_i:
public virtual POA_SMESH::SMESH_Gen,
public virtual Engines_Component_i,
public virtual SMESH::Factory
public virtual Engines_Component_i
{
public:
// Get last created instance of the class
@ -209,11 +207,6 @@ public:
// ****************************************************
// Interface inherited methods (from SALOMEDS::Driver)
// ****************************************************
virtual
SALOMEDS::TMPFile*
DumpPython(CORBA::Object_ptr theStudy,
CORBA::Boolean theIsPublished,
CORBA::Boolean& theIsValidScript);
// Save SMESH data
SALOMEDS::TMPFile* Save( SALOMEDS::SComponent_ptr theComponent,
@ -378,5 +371,4 @@ private:
SALOMEDS::Study_var myCurrentStudy; // Current study
};
#endif

4
src/SMESH_I/SMESH_Mesh_i.hxx
View File

@ -42,7 +42,6 @@
#include "SMESH_subMesh.hxx"
#include "SALOME_GenericObj_i.hh"
#include "SMESH_Factory.hxx"
class SMESH_Gen_i;
class SMESH_GroupBase_i;
@ -51,8 +50,7 @@ class SMESH_GroupBase_i;
class SMESH_Mesh_i:
public virtual POA_SMESH::SMESH_Mesh,
public virtual SALOME::GenericObj_i,
public virtual SMESH::Base
public virtual SALOME::GenericObj_i
{
SMESH_Mesh_i();
SMESH_Mesh_i(const SMESH_Mesh_i&);