Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_ImportSource2D_i.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
index 29d14804dc30becf2212cd7a4848536d0c5842fe..19d27e8990c92c5de406a5440b417a720b855feb 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
+++ b/
src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
al
sses
+// SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
la
sses
// File : StdMeshers_ImportSource2D_i.cxx
// Module : SMESH
//
// File : StdMeshers_ImportSource2D_i.cxx
// Module : SMESH
//
@@
-50,14
+50,11
@@
using namespace std;
//=============================================================================
StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i( PortableServer::POA_ptr thePOA,
//=============================================================================
StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i( PortableServer::POA_ptr thePOA,
- int theStudyId,
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
::SMESH_Gen* theGenImpl )
: SALOME::GenericObj_i( thePOA ),
SMESH_Hypothesis_i( thePOA )
{
- MESSAGE( "StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i" );
myBaseImpl = new ::StdMeshers_ImportSource2D( theGenImpl->GetANewId(),
myBaseImpl = new ::StdMeshers_ImportSource2D( theGenImpl->GetANewId(),
- theStudyId,
theGenImpl );
_groupEntries = new SMESH::string_array();
}
theGenImpl );
_groupEntries = new SMESH::string_array();
}
@@
-72,7
+69,6
@@
StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i( PortableServer::POA_pt
StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i()
{
StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i()
{
- MESSAGE( "StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i" );
}
//=============================================================================
}
//=============================================================================
@@
-83,21
+79,19
@@
StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i()
void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& groups)
{
void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& groups)
{
- MESSAGE( "StdMeshers_ImportSource2D_i::SetSourceFaces" );
ASSERT( myBaseImpl );
try
{
std::vector<SMESH_Group*> smesh_groups;
std::vector<string> entries;
ASSERT( myBaseImpl );
try
{
std::vector<SMESH_Group*> smesh_groups;
std::vector<string> entries;
- SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy();
- for ( int i = 0; i < groups.length(); ++i )
+ for ( CORBA::ULong i = 0; i < groups.length(); ++i )
if ( SMESH_GroupBase_i* gp_i = SMESH::DownCast<SMESH_GroupBase_i*>( groups[i] ))
{
if ( gp_i->GetType() != SMESH::FACE )
THROW_SALOME_CORBA_EXCEPTION("Wrong group type", SALOME::BAD_PARAM);
smesh_groups.push_back( gp_i->GetSmeshGroup() );
if ( SMESH_GroupBase_i* gp_i = SMESH::DownCast<SMESH_GroupBase_i*>( groups[i] ))
{
if ( gp_i->GetType() != SMESH::FACE )
THROW_SALOME_CORBA_EXCEPTION("Wrong group type", SALOME::BAD_PARAM);
smesh_groups.push_back( gp_i->GetSmeshGroup() );
- SALOMEDS::SObject_var so = SMESH_Gen_i::
ObjectToSObject(study,
groups[i]);
+ SALOMEDS::SObject_var so = SMESH_Gen_i::
GetSMESHGen()->ObjectToSObject(
groups[i]);
if ( !so->_is_nil())
{
CORBA::String_var entry = so->GetID();
if ( !so->_is_nil())
{
CORBA::String_var entry = so->GetID();
@@
-109,7
+103,7
@@
void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& grou
_groupEntries = new SMESH::string_array;
_groupEntries->length( entries.size ());
_groupEntries = new SMESH::string_array;
_groupEntries->length( entries.size ());
- for (
in
t i = 0; i < entries.size(); ++i )
+ for (
size_
t i = 0; i < entries.size(); ++i )
_groupEntries[i] = entries[i].c_str();
}
catch ( SALOME_Exception& S_ex )
_groupEntries[i] = entries[i].c_str();
}
catch ( SALOME_Exception& S_ex )
@@
-129,7
+123,6
@@
void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& grou
SMESH::string_array* StdMeshers_ImportSource2D_i::GetSourceFaces()
{
SMESH::string_array* StdMeshers_ImportSource2D_i::GetSourceFaces()
{
- MESSAGE( "StdMeshers_ImportSource2D_i::GetImportSource" );
SMESH::string_array_var res = new SMESH::string_array( _groupEntries );
return res._retn();
}
SMESH::string_array_var res = new SMESH::string_array( _groupEntries );
return res._retn();
}
@@
-172,14
+165,13
@@
char* StdMeshers_ImportSource2D_i::SaveTo()
std::ostringstream os;
os << " " << _groupEntries->length();
std::ostringstream os;
os << " " << _groupEntries->length();
- SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy();
- for ( int i = 0; i < _groupEntries->length(); ++i )
+ for ( CORBA::ULong i = 0; i < _groupEntries->length(); ++i )
{
// entry
os << " " << _groupEntries[i];
// id
{
// entry
os << " " << _groupEntries[i];
// id
- SALOMEDS::SObject_var groupSO =
study
->FindObjectID( _groupEntries[i] );
+ SALOMEDS::SObject_var groupSO =
SMESH_Gen_i::GetSMESHGen()->getStudyServant()
->FindObjectID( _groupEntries[i] );
CORBA::Object_var groupObj;
if ( !groupSO->_is_nil() ) {
groupObj = groupSO->GetObject();
CORBA::Object_var groupObj;
if ( !groupSO->_is_nil() ) {
groupObj = groupSO->GetObject();
@@
-210,7
+202,7
@@
void StdMeshers_ImportSource2D_i::LoadFrom( const char* theStream )
_groupEntries = new SMESH::string_array;
_groupEntries->length( nbGroups );
std::string id, entry;
_groupEntries = new SMESH::string_array;
_groupEntries->length( nbGroups );
std::string id, entry;
- for (
int
i = 0; i < _groupEntries->length(); ++i )
+ for (
CORBA::ULong
i = 0; i < _groupEntries->length(); ++i )
{
if ( is >> entry )
_groupEntries[i] = entry.c_str();
{
if ( is >> entry )
_groupEntries[i] = entry.c_str();
@@
-263,7
+255,6
@@
void StdMeshers_ImportSource2D_i::UpdateAsMeshesRestored()
::StdMeshers_ImportSource2D* StdMeshers_ImportSource2D_i::GetImpl()
{
::StdMeshers_ImportSource2D* StdMeshers_ImportSource2D_i::GetImpl()
{
- MESSAGE( "StdMeshers_ImportSource2D_i::GetImpl" );
return ( ::StdMeshers_ImportSource2D* )myBaseImpl;
}
return ( ::StdMeshers_ImportSource2D* )myBaseImpl;
}