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
22487: EDF 2778 SMESH: Add a GUI for the flat elements generation
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Mesh_i.cxx
diff --git
a/src/SMESH_I/SMESH_Mesh_i.cxx
b/src/SMESH_I/SMESH_Mesh_i.cxx
index f9ec3b9c7020efe065c731515876a9d1e110693f..2b230a593d9dc5f9e1182fd31bdc8d88fef09bca 100644
(file)
--- a/
src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/
src/SMESH_I/SMESH_Mesh_i.cxx
@@
-199,7
+199,8
@@
void SMESH_Mesh_i::SetShape( GEOM::GEOM_Object_ptr theShapeObject )
// to track changes of GEOM groups
SMESH::SMESH_Mesh_var mesh = _this();
addGeomGroupData( theShapeObject, mesh );
// to track changes of GEOM groups
SMESH::SMESH_Mesh_var mesh = _this();
addGeomGroupData( theShapeObject, mesh );
- _mainShapeTick = theShapeObject->GetTick();
+ if ( !CORBA::is_nil( theShapeObject ))
+ _mainShapeTick = theShapeObject->GetTick();
}
//================================================================================
}
//================================================================================
@@
-3070,7
+3071,7
@@
void SMESH_Mesh_i::ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
{
aMeshName = prepareMeshNameAndGroups(file, overwrite);
_impl->ExportMED( file, aMeshName.c_str(), auto_groups,
{
aMeshName = prepareMeshNameAndGroups(file, overwrite);
_impl->ExportMED( file, aMeshName.c_str(), auto_groups,
- version, 0, autoDimension, have0dField);
+ version, 0, autoDimension,
/*addODOnVertices=*/
have0dField);
meshDS = _impl->GetMeshDS();
}
else
meshDS = _impl->GetMeshDS();
}
else
@@
-3090,7
+3091,7
@@
void SMESH_Mesh_i::ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
}
SMESH_MeshPartDS* partDS = new SMESH_MeshPartDS( meshPart );
_impl->ExportMED( file, aMeshName.c_str(), auto_groups,
}
SMESH_MeshPartDS* partDS = new SMESH_MeshPartDS( meshPart );
_impl->ExportMED( file, aMeshName.c_str(), auto_groups,
- version, partDS, autoDimension, have0dField);
+ version, partDS, autoDimension,
/*addODOnVertices=*/
have0dField);
meshDS = tmpDSDeleter._obj = partDS;
}
meshDS = tmpDSDeleter._obj = partDS;
}
@@
-3176,7
+3177,7
@@
void SMESH_Mesh_i::exportMEDFields( DriverMED_W_Field& fieldWriter,
name.in(),
elemType,
comps->length(),
name.in(),
elemType,
comps->length(),
- ( dataType == GEOM::FDT_Int )))
+
/*isIntData=*/false ))//
( dataType == GEOM::FDT_Int )))
continue;
for ( size_t iC = 0; iC < comps->length(); ++iC )
continue;
for ( size_t iC = 0; iC < comps->length(); ++iC )
@@
-3263,9
+3264,9
@@
void SMESH_Mesh_i::exportMEDFields( DriverMED_W_Field& fieldWriter,
const SMDS_MeshElement* e = elemIt->next();
const int shapeID = e->getshapeId();
if ( shapeID < 1 || shapeID >= intVals.size() )
const SMDS_MeshElement* e = elemIt->next();
const int shapeID = e->getshapeId();
if ( shapeID < 1 || shapeID >= intVals.size() )
- fieldWriter.AddValue( noneIntValue );
+ fieldWriter.AddValue(
(double)
noneIntValue );
else
else
- fieldWriter.AddValue( intVals[ shapeID ]);
+ fieldWriter.AddValue(
(double)
intVals[ shapeID ]);
}
// write a step
}
// write a step
@@
-3303,17
+3304,17
@@
void SMESH_Mesh_i::exportMEDFields( DriverMED_W_Field& fieldWriter,
std::vector< std::string > compNames;
switch ( geomAssocFields[ iF ]) {
case 'v': case 'V':
std::vector< std::string > compNames;
switch ( geomAssocFields[ iF ]) {
case 'v': case 'V':
- fieldWriter.Set( meshDS, "_vertices_", SMDSAbs_Node, /*nbComps=*/2, /*isInt=*/
tru
e );
+ fieldWriter.Set( meshDS, "_vertices_", SMDSAbs_Node, /*nbComps=*/2, /*isInt=*/
fals
e );
compNames.push_back( "dim" );
break;
case 'e': case 'E':
compNames.push_back( "dim" );
break;
case 'e': case 'E':
- fieldWriter.Set( meshDS, "_edges_", SMDSAbs_Edge, /*nbComps=*/1, /*isInt=*/
tru
e );
+ fieldWriter.Set( meshDS, "_edges_", SMDSAbs_Edge, /*nbComps=*/1, /*isInt=*/
fals
e );
break;
case 'f': case 'F':
break;
case 'f': case 'F':
- fieldWriter.Set( meshDS, "_faces_", SMDSAbs_Face, /*nbComps=*/1, /*isInt=*/
tru
e );
+ fieldWriter.Set( meshDS, "_faces_", SMDSAbs_Face, /*nbComps=*/1, /*isInt=*/
fals
e );
break;
case 's': case 'S':
break;
case 's': case 'S':
- fieldWriter.Set( meshDS, "_solids_", SMDSAbs_Volume, /*nbComps=*/1, /*isInt=*/
tru
e );
+ fieldWriter.Set( meshDS, "_solids_", SMDSAbs_Volume, /*nbComps=*/1, /*isInt=*/
fals
e );
break;
default: continue;
}
break;
default: continue;
}
@@
-3334,14
+3335,14
@@
void SMESH_Mesh_i::exportMEDFields( DriverMED_W_Field& fieldWriter,
const int shapeID = e->getshapeId();
if ( shapeID < 1 )
{
const int shapeID = e->getshapeId();
if ( shapeID < 1 )
{
- fieldWriter.AddValue( -1 );
- fieldWriter.AddValue( -1 );
+ fieldWriter.AddValue(
(double)
-1 );
+ fieldWriter.AddValue(
(double)
-1 );
}
else
{
const TopoDS_Shape& S = meshDS->IndexToShape( shapeID );
}
else
{
const TopoDS_Shape& S = meshDS->IndexToShape( shapeID );
- fieldWriter.AddValue(
S.IsNull() ? -1 : shapeDim[ S.ShapeType() ]
);
- fieldWriter.AddValue( shapeID );
+ fieldWriter.AddValue(
(double) ( S.IsNull() ? -1 : shapeDim[ S.ShapeType() ])
);
+ fieldWriter.AddValue(
(double)
shapeID );
}
}
else
}
}
else
@@
-3350,9
+3351,9
@@
void SMESH_Mesh_i::exportMEDFields( DriverMED_W_Field& fieldWriter,
const SMDS_MeshElement* e = elemIt->next();
const int shapeID = e->getshapeId();
if ( shapeID < 1 )
const SMDS_MeshElement* e = elemIt->next();
const int shapeID = e->getshapeId();
if ( shapeID < 1 )
- fieldWriter.AddValue( -1 );
+ fieldWriter.AddValue(
(double)
-1 );
else
else
- fieldWriter.AddValue( shapeID );
+ fieldWriter.AddValue(
(double)
shapeID );
}
// write a step
}
// write a step