mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-24 16:30:34 +05:00
Typo and whitespace fixes by Kunda
http://www.salome-platform.org/forum/forum_9/454200149#834683007
This commit is contained in:
eap
parent
328926550c
commit
f4dd52ae3d
@ -6,9 +6,9 @@ Creating groups
|
||||
|
||||
In MESH you can create a group of elements of a certain type. The main way to create a group, is to
|
||||
select in the **Mesh** menu **Create Group** item (also available in the context menu of the mesh).
|
||||
To create a group you should define the following:
|
||||
To create a group you should define the following:
|
||||
|
||||
* **Mesh** - the mesh whose elements will form your group. You can select your mesh in the Objet Browser or in the 3D viewer.
|
||||
* **Mesh** - the mesh whose elements will form your group. You can select your mesh in the Object Browser or in the 3D viewer.
|
||||
* **Elements Type** - set of radio buttons allows to select the type of elements which will form your group:
|
||||
* **Nodes**
|
||||
* **0D Element**
|
||||
@ -32,7 +32,7 @@ Mesh module distinguishes between the three Group types:
|
||||
the following ways:
|
||||
|
||||
* By adding all entities of the chosen type existing in the mesh. For this, turn on the **Select All** check-box. In this mode all controls, which allow selecting the entities, are disabled.
|
||||
* By choosing entities manually with the mouse in the 3D Viewer. For this, turn on the **Enable manual edition** check box. You can click on an element in the 3D viewer and it will be highlighted. After that click the **Add** button and the ID of this element will be added to the list. The **Set filter** button allows to define the filter for selection of the elements for your group. See more about filters on the :ref:`selection_filter_library_page` page.
|
||||
* By choosing entities manually with the mouse in the 3D Viewer. For this, turn on the **Enable manual edition** check box. You can click on an element in the 3D viewer and it will be highlighted. After that click the **Add** button and the ID of this element will be added to the list. The **Set filter** button allows to define the filter for selection of the elements for your group. See more about filters on the :ref:`selection_filter_library_page` page.
|
||||
* By adding entities from either a sub-mesh or another group. For this, turn on the **Enable manual edition** check box. **Select from** fields group allows to select a sub-mesh or a group of the appropriate type and to **Add** their elements to the group.
|
||||
|
||||
In the **manual edition** mode you can
|
||||
@ -62,7 +62,7 @@ For example, to create a new group containing all faces of an existing group and
|
||||
.. centered::
|
||||
Brown cells belong to a group defined manually
|
||||
|
||||
**See Also** a sample TUI Script of a :ref:`tui_create_standalone_group` operation.
|
||||
**See Also** a sample TUI Script of a :ref:`tui_create_standalone_group` operation.
|
||||
|
||||
|
||||
.. _group_on_geom:
|
||||
@ -79,7 +79,7 @@ To define a group, click the *Selection* button |sel| and choose
|
||||
* *Direct geometry selection* to select a shape in the Object Browser or in the Viewer;
|
||||
* *Find geometry by mesh element selection* to activate a dialog which retrieves a shape by the selected element generated on this shape.
|
||||
|
||||
.. note::
|
||||
.. note::
|
||||
This choice is available only if the mesh elements are already generated.
|
||||
|
||||
.. image:: ../images/a-creategroup.png
|
||||
@ -101,11 +101,11 @@ After confirmation of the operation a new group of mesh elements will be created
|
||||
"Group on Filter"
|
||||
#################
|
||||
|
||||
To create a group on filter check **Group on filter** in the **Group type** field.
|
||||
The group on filter contains the elements of a certain type satisfying the defined filter.
|
||||
To create a group on filter check **Group on filter** in the **Group type** field.
|
||||
The group on filter contains the elements of a certain type satisfying the defined filter.
|
||||
Group contents are dynamically updated if the mesh is modified.
|
||||
|
||||
To define a group, click the **Set filter** button and define criteria of the filter in the opened dialog. After the operation is confirmed, a new group of mesh elements will be created. See more about filters on the :ref:`selection_filter_library_page` page.
|
||||
To define a group, click the **Set filter** button and define criteria of the filter in the opened dialog. After the operation is confirmed, a new group of mesh elements will be created. See more about filters on the :ref:`selection_filter_library_page` page.
|
||||
|
||||
.. image:: ../images/creategroup_on_filter.png
|
||||
:align: center
|
||||
|
||||
@ -85,8 +85,8 @@ bool SMESH_PreviewActorsCollection::Init( const TopoDS_Shape& theShape,
|
||||
|
||||
// Handle( SALOME_InteractiveObject ) anIO = new SALOME_InteractiveObject();
|
||||
// anIO->setEntry( theEntry.toUtf8().constData() );
|
||||
|
||||
// get indexes of seleted elements
|
||||
|
||||
// get indexes of selected elements
|
||||
TopExp::MapShapes( theMainShape, myMapOfShapes );
|
||||
TopExp_Explorer exp( theShape, theType );
|
||||
QSet<int> indices;
|
||||
|
||||
@ -50,11 +50,11 @@ public:
|
||||
//! To publish the actor an all its internal devices
|
||||
virtual
|
||||
void
|
||||
AddToRender(vtkRenderer* theRendere);
|
||||
AddToRender(vtkRenderer* theRendere);
|
||||
|
||||
virtual void SetVisibility( int theVisibility );
|
||||
|
||||
//! Initialiaze the instance completely
|
||||
//! Initialize the instance completely
|
||||
virtual void
|
||||
Initialize();
|
||||
|
||||
@ -78,7 +78,7 @@ public:
|
||||
vtkUnstructuredGrid* my0DGrid;
|
||||
vtkUnstructuredGrid* myBallGrid;
|
||||
TVisualObjPtr myVisualObj;
|
||||
|
||||
|
||||
SMESH_SVTKActor();
|
||||
virtual ~SMESH_SVTKActor();
|
||||
};
|
||||
|
||||
@ -550,7 +550,7 @@ namespace
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Warn the user about presence of not supported elements
|
||||
QString format;
|
||||
std::vector< SMESH::EntityType > notSupportedElemTypes, presentNotSupported;
|
||||
@ -673,7 +673,7 @@ namespace
|
||||
|
||||
QList< QPair< GEOM::ListOfFields_var, QString > > aFieldList;
|
||||
|
||||
// Get a file name to write in and additional otions
|
||||
// Get a file name to write in and additional options
|
||||
if ( isUNV || isDAT || isGMF ) // Export w/o options
|
||||
{
|
||||
if ( isUNV )
|
||||
@ -797,8 +797,8 @@ namespace
|
||||
if ( !anInitialPath.isEmpty() )
|
||||
fd->setDirectory( anInitialPath );
|
||||
fd->selectFile(aMeshName);
|
||||
|
||||
|
||||
|
||||
|
||||
QListView *lview = fd->findChild<QListView*>("listView");
|
||||
if( lview ) {
|
||||
lview->setMinimumHeight(200);
|
||||
@ -1491,7 +1491,7 @@ namespace
|
||||
presentEntities = presentEntities | SMESH_Actor::e0DElements;
|
||||
if ( !(presentEntities & SMESH_Actor::eBallElem) && anActor->GetObject()->GetNbEntities( SMDSAbs_Ball ) )
|
||||
presentEntities = presentEntities | SMESH_Actor::eBallElem;
|
||||
|
||||
|
||||
// as we know that all types of elements are present, we can exit the loop
|
||||
if ( presentEntities == SMESH_Actor::eAllEntity )
|
||||
break;
|
||||
@ -1529,7 +1529,7 @@ namespace
|
||||
dlg.setShrinkCoef( int( shrinkCoef * 100. ) );
|
||||
// hide unused controls
|
||||
dlg.showControls( presentEntities, hasNodes );
|
||||
|
||||
|
||||
if ( dlg.exec() ) {
|
||||
nodeColor = dlg.nodeColor();
|
||||
markerType = dlg.nodeMarkerType();
|
||||
@ -1563,7 +1563,7 @@ namespace
|
||||
if ( !IObject->hasEntry() ) continue;
|
||||
SMESH_Actor* anActor = SMESH::FindActorByEntry( IObject->getEntry() );
|
||||
if ( !anActor ) continue;
|
||||
|
||||
|
||||
// nodes: color, marker
|
||||
anActor->SetNodeColor( nodeColor.redF(), nodeColor.greenF(), nodeColor.blueF() );
|
||||
if ( markerType != VTK::MT_USER ) {
|
||||
@ -1608,17 +1608,17 @@ namespace
|
||||
aColor = nodeColor; break;
|
||||
case SMESH::EDGE:
|
||||
aColor = edgeColor; break;
|
||||
case SMESH::FACE:
|
||||
case SMESH::FACE:
|
||||
aColor = faceColor; break;
|
||||
case SMESH::VOLUME:
|
||||
aColor = volumeColor; break;
|
||||
case SMESH::ELEM0D:
|
||||
case SMESH::ELEM0D:
|
||||
aColor = elem0dColor; break;
|
||||
case SMESH::BALL:
|
||||
case SMESH::BALL:
|
||||
aColor = ballColor; break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
|
||||
if ( aColor.isValid() ) {
|
||||
SALOMEDS::Color aGroupColor;
|
||||
aGroupColor.R = aColor.redF();
|
||||
@ -1843,7 +1843,7 @@ namespace
|
||||
v = qMax( uint(0), qMin ( v, size-1 ) );
|
||||
return v;
|
||||
}
|
||||
|
||||
|
||||
} //namespace
|
||||
|
||||
void SMESHGUI::OnEditDelete()
|
||||
@ -2142,20 +2142,20 @@ bool SMESHGUI::automaticUpdate( SMESH::SMESH_IDSource_ptr theMesh,
|
||||
SMESH::long_array_var info = theMesh->GetMeshInfo();
|
||||
long nbOdElems = info[SMDSEntity_0D];
|
||||
long nbEdges = info[SMDSEntity_Edge] + info[SMDSEntity_Quad_Edge];
|
||||
long nbFaces = info[SMDSEntity_Triangle] + info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_BiQuad_Triangle] +
|
||||
info[SMDSEntity_Quadrangle] + info[SMDSEntity_Quad_Quadrangle] + info[SMDSEntity_BiQuad_Quadrangle] +
|
||||
long nbFaces = info[SMDSEntity_Triangle] + info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_BiQuad_Triangle] +
|
||||
info[SMDSEntity_Quadrangle] + info[SMDSEntity_Quad_Quadrangle] + info[SMDSEntity_BiQuad_Quadrangle] +
|
||||
info[SMDSEntity_Polygon] + info[SMDSEntity_Quad_Polygon];
|
||||
long nbVolumes = info[SMDSEntity_Tetra] + info[SMDSEntity_Quad_Tetra] +
|
||||
info[SMDSEntity_Hexa] + info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_TriQuad_Hexa] +
|
||||
info[SMDSEntity_Pyramid] + info[SMDSEntity_Quad_Pyramid] +
|
||||
long nbVolumes = info[SMDSEntity_Tetra] + info[SMDSEntity_Quad_Tetra] +
|
||||
info[SMDSEntity_Hexa] + info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_TriQuad_Hexa] +
|
||||
info[SMDSEntity_Pyramid] + info[SMDSEntity_Quad_Pyramid] +
|
||||
info[SMDSEntity_Penta] + info[SMDSEntity_Quad_Penta] + info[SMDSEntity_BiQuad_Penta] +
|
||||
info[SMDSEntity_Polyhedra] +
|
||||
info[SMDSEntity_Polyhedra] +
|
||||
info[SMDSEntity_Hexagonal_Prism];
|
||||
long nbBalls = info[SMDSEntity_Ball];
|
||||
|
||||
long requestedSize = nbOdElems + nbBalls + nbEdges + nbFaces + nbVolumes;
|
||||
*nbElements = requestedSize;
|
||||
|
||||
|
||||
*entities = SMESH_Actor::eAllEntity;
|
||||
*hidden = 0;
|
||||
|
||||
@ -3161,7 +3161,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
|
||||
SALOME_ListIteratorOfListIO It( selected );
|
||||
for ( ; It.More(); It.Next() ) {
|
||||
SMESHGUI_MeshInfoDlg* dlg = new SMESHGUI_MeshInfoDlg( SMESHGUI::desktop(), page );
|
||||
dlg->showInfo( It.Value() );
|
||||
dlg->showInfo( It.Value() );
|
||||
dlg->show();
|
||||
}
|
||||
}
|
||||
@ -4273,8 +4273,8 @@ void SMESHGUI::initialize( CAM_Application* app )
|
||||
addElemTb = createTool( tr( "TB_ADD" ), QString( "SMESHAddElementToolbar" ) ),
|
||||
addNonElemTb = createTool( tr( "TB_ADDNON" ), QString( "SMESHAddElementToolbar" ) ),
|
||||
remTb = createTool( tr( "TB_REM" ), QString( "SMESHRemoveToolbar" ) ),
|
||||
//renumbTb = createTool( tr( "TB_RENUMBER" ), QString( "SMESHRenumberingToolbar" ) ),
|
||||
transformTb = createTool( tr( "TB_TRANSFORM" ), QString( "SMESHTransformationToolbar" ) ),
|
||||
//renumbTb = createTool( tr( "TB_RENUMBER" ), QString( "SMESHRenumberingToolbar" ) ),
|
||||
transformTb = createTool( tr( "TB_TRANSFORM" ), QString( "SMESHTransformationToolbar" ) ),
|
||||
modifyTb = createTool( tr( "TB_MODIFY" ), QString( "SMESHModificationToolbar" ) ),
|
||||
measuremTb = createTool( tr( "TB_MEASUREM" ), QString( "SMESHMeasurementsToolbar" ) ),
|
||||
dispModeTb = createTool( tr( "TB_DISP_MODE" ), QString( "SMESHDisplayModeToolbar" ) );
|
||||
@ -5305,7 +5305,7 @@ void SMESHGUI::createPreferences()
|
||||
|
||||
int numGroup = addPreference( tr( "PREF_GROUP_NUMBERING" ), meshTab );
|
||||
setPreferenceProperty( numGroup, "columns", 2 );
|
||||
|
||||
|
||||
addPreference( tr( "PREF_NUMBERING_NODE" ), numGroup, LightApp_Preferences::Color, "SMESH", "numbering_node_color" );
|
||||
addVtkFontPref( tr( "PREF_NUMBERING_FONT" ), numGroup, "numbering_node_font", true );
|
||||
|
||||
@ -5731,7 +5731,7 @@ const char* gPathSep = "|"; // character used to separate paths
|
||||
* \brief Store visual parameters
|
||||
*
|
||||
* This method is called just before the study document is saved.
|
||||
* Store visual parameters in AttributeParameter attribue(s)
|
||||
* Store visual parameters in AttributeParameter attribute(s)
|
||||
*/
|
||||
void SMESHGUI::storeVisualParameters (int savePoint)
|
||||
{
|
||||
@ -6083,7 +6083,7 @@ typedef std::map<int, TPlaneInfoList> TPlaneInfoMap;
|
||||
* \brief Restore visual parameters
|
||||
*
|
||||
* This method is called after the study document is opened.
|
||||
* Restore visual parameters from AttributeParameter attribue(s)
|
||||
* Restore visual parameters from AttributeParameter attribute(s)
|
||||
*/
|
||||
void SMESHGUI::restoreVisualParameters (int savePoint)
|
||||
{
|
||||
@ -6197,7 +6197,7 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
|
||||
aPlaneData.Mode = aPropertyValueList[0].toInt( &ok );
|
||||
if( !ok )
|
||||
continue;
|
||||
|
||||
|
||||
ok = false;
|
||||
aPlaneData.isOpenGLClipping = aPropertyValueList[1].toInt( &ok );
|
||||
if( !ok )
|
||||
@ -6697,9 +6697,9 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
|
||||
// Clipping
|
||||
else if (paramNameStr.startsWith("ClippingPlane")) {
|
||||
QStringList vals = val.split(gDigitsSep, QString::SkipEmptyParts);
|
||||
// old format - val looks like "Off" or "1:0:0:0.5:0:0"
|
||||
// old format - val looks like "Off" or "1:0:0:0.5:0:0"
|
||||
// (mode(relative), is OpenGL clipping plane, orientation, distance, two angles)
|
||||
// or "0:1:1:10.5:1.0:1.0:15.0:10.0:10.0"
|
||||
// or "0:1:1:10.5:1.0:1.0:15.0:10.0:10.0"
|
||||
// (mode(absolute), is OpenGL clipping plane, orientation, base point(x, y, z), direction (dx, dy, dz))
|
||||
// new format - val looks like "Off" or "0" (plane id)
|
||||
// (note: in new format "Off" value is used only for consistency,
|
||||
@ -6899,10 +6899,10 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// update all VTK views
|
||||
QList<SUIT_ViewManager*> lst;
|
||||
@ -6918,7 +6918,7 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
|
||||
while( vtkActor* aVTKActor = anAllActors->GetNextActor() )
|
||||
if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) )
|
||||
anActor->SetOpenGLClippingPlane();
|
||||
|
||||
|
||||
vtkView->getRenderer()->ResetCameraClippingRange();
|
||||
vtkView->Repaint();
|
||||
}
|
||||
@ -7037,7 +7037,7 @@ void SMESHGUI::message( const QString& msg )
|
||||
name = SMESH::fromUtf8(obj->GetName());
|
||||
if ( name.isEmpty() )
|
||||
return;
|
||||
|
||||
|
||||
if ( data.last() == "stop" )
|
||||
application()->putInfo( tr( "MESH_LOADING_MSG_FINISHED" ).arg( name ) );
|
||||
else
|
||||
@ -7078,7 +7078,7 @@ bool SMESHGUI::renameAllowed( const QString& entry) const {
|
||||
return false;
|
||||
|
||||
SalomeApp_DataObject* obj = dynamic_cast<SalomeApp_DataObject*>(appStudy->findObjectByEntry(entry));
|
||||
|
||||
|
||||
if(!obj)
|
||||
return false;
|
||||
|
||||
@ -7108,17 +7108,17 @@ bool SMESHGUI::renameObject( const QString& entry, const QString& name) {
|
||||
SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( application() );
|
||||
if( !anApp )
|
||||
return false;
|
||||
|
||||
|
||||
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() );
|
||||
|
||||
if(!appStudy)
|
||||
return false;
|
||||
|
||||
|
||||
_PTR(Study) aStudy = appStudy->studyDS();
|
||||
|
||||
|
||||
if(!aStudy)
|
||||
return false;
|
||||
|
||||
|
||||
bool aLocked = (_PTR(AttributeStudyProperties)(appStudy->studyDS()->GetProperties()))->IsLocked();
|
||||
if ( aLocked ) {
|
||||
SUIT_MessageBox::warning ( anApp->desktop(), QObject::tr("WRN_WARNING"), QObject::tr("WRN_STUDY_LOCKED") );
|
||||
|
||||
@ -691,9 +691,9 @@ SMESH_Mesh_i::addHypothesis(GEOM::GEOM_Object_ptr aSubShape,
|
||||
//use PseudoShape in case if mesh has no shape
|
||||
if(HasShapeToMesh())
|
||||
myLocSubShape = _gen_i->GeomObjectToShape( aSubShape);
|
||||
else
|
||||
else
|
||||
myLocSubShape = _impl->GetShapeToMesh();
|
||||
|
||||
|
||||
const int hypId = anHyp->GetId();
|
||||
std::string error;
|
||||
status = _impl->AddHypothesis( myLocSubShape, hypId, &error );
|
||||
@ -1018,7 +1018,7 @@ SMESH_Mesh_i::CreateGroupFromGEOM (SMESH::ElementType theElemType,
|
||||
TopoDS_Shape aShape = _gen_i->GeomObjectToShape( theGeomObj );
|
||||
if ( !aShape.IsNull() )
|
||||
{
|
||||
aNewGroup =
|
||||
aNewGroup =
|
||||
SMESH::SMESH_GroupOnGeom::_narrow( createGroup( theElemType, theName, aShape ));
|
||||
|
||||
if ( _gen_i->CanPublishInStudy( aNewGroup ) )
|
||||
@ -1410,7 +1410,7 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::IntersectGroups( SMESH::SMESH_GroupBase_ptr
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
\brief Intersect list of groups. New group is created. All mesh elements that
|
||||
\brief Intersect list of groups. New group is created. All mesh elements that
|
||||
are present in all initial groups simultaneously are added to the new one.
|
||||
\param theGroups list of groups
|
||||
\param theName name of group to be created
|
||||
@ -1495,7 +1495,7 @@ SMESH_Mesh_i::IntersectListOfGroups(const SMESH::ListOfGroups& theGroups,
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
/*!
|
||||
* New group is created. All mesh elements that are present in
|
||||
* a main group but is not present in a tool group are added to the new one
|
||||
*/
|
||||
@ -1558,7 +1558,7 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::CutGroups( SMESH::SMESH_GroupBase_ptr theGr
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
\brief Cut lists of groups. New group is created. All mesh elements that are
|
||||
\brief Cut lists of groups. New group is created. All mesh elements that are
|
||||
present in main groups but do not present in tool groups are added to the new one
|
||||
\param theMainGroups list of main groups
|
||||
\param theToolGroups list of tool groups
|
||||
@ -1567,8 +1567,8 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::CutGroups( SMESH::SMESH_GroupBase_ptr theGr
|
||||
*/
|
||||
//=============================================================================
|
||||
SMESH::SMESH_Group_ptr
|
||||
SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups,
|
||||
const SMESH::ListOfGroups& theToolGroups,
|
||||
SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups,
|
||||
const SMESH::ListOfGroups& theToolGroups,
|
||||
const char* theName )
|
||||
throw (SALOME::SALOME_Exception)
|
||||
{
|
||||
@ -4296,7 +4296,7 @@ SMESH::long_array* SMESH_Mesh_i::GetSubMeshNodesId(const CORBA::Long ShapeID,
|
||||
|
||||
return aResult._retn();
|
||||
}
|
||||
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
* Returns type of elements for given submesh
|
||||
@ -4328,9 +4328,9 @@ SMESH::ElementType SMESH_Mesh_i::GetSubMeshElementType(const CORBA::Long ShapeID
|
||||
|
||||
SMESH_CATCH( SMESH::throwCorbaException );
|
||||
|
||||
return type;
|
||||
return type;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
@ -4404,7 +4404,7 @@ SMESH::long_array* SMESH_Mesh_i::GetNodeInverseElements(const CORBA::Long id)
|
||||
|
||||
// find inverse elements
|
||||
SMDS_ElemIteratorPtr eIt = aNode->GetInverseElementIterator();
|
||||
aResult->length( aNode->NbInverseElements() );
|
||||
aResult->length( aNode->NbInverseElements() );
|
||||
for( int i = 0; eIt->more(); ++i )
|
||||
{
|
||||
const SMDS_MeshElement* elem = eIt->next();
|
||||
@ -4540,7 +4540,7 @@ CORBA::Long SMESH_Mesh_i::GetShapeID(const CORBA::Long id)
|
||||
|
||||
//=============================================================================
|
||||
/*!
|
||||
* For given element returns ID of result shape after
|
||||
* For given element returns ID of result shape after
|
||||
* ::FindShape() from SMESH_MeshEditor
|
||||
* If there is not element for given ID - returns -1
|
||||
*/
|
||||
@ -5205,7 +5205,7 @@ void SMESH_Mesh_i::checkGroupNames()
|
||||
int nbGrp = NbGroups();
|
||||
if ( !nbGrp )
|
||||
return;
|
||||
|
||||
|
||||
SMESH::ListOfGroups* grpList = 0;
|
||||
// avoid dump of "GetGroups"
|
||||
{
|
||||
@ -5401,10 +5401,10 @@ SALOMEDS::TMPFile* SMESH_Mesh_i::GetVtkUgStream()
|
||||
aWriter->Write();
|
||||
char* str = aWriter->GetOutputString();
|
||||
int size = aWriter->GetOutputStringLength();
|
||||
|
||||
//Allocate octect buffer of required size
|
||||
|
||||
//Allocate octet buffer of required size
|
||||
CORBA::Octet* OctetBuf = SALOMEDS::TMPFile::allocbuf(size);
|
||||
//Copy ostrstream content to the octect buffer
|
||||
//Copy ostrstream content to the octet buffer
|
||||
memcpy(OctetBuf, str, size);
|
||||
//Create and return TMPFile
|
||||
SeqFile = new SALOMEDS::TMPFile(size, size, OctetBuf, 1);
|
||||
@ -5735,7 +5735,7 @@ class SMESH_DimHyp
|
||||
}
|
||||
return isShared;
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//! check algorithms
|
||||
static bool checkAlgo(const SMESHDS_Hypothesis* theA1,
|
||||
@ -5749,7 +5749,7 @@ class SMESH_DimHyp
|
||||
return strcmp( theA1->GetName(), theA2->GetName() ) == 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//! Check if sub-shape hypotheses are concurrent
|
||||
bool IsConcurrent(const SMESH_DimHyp* theOther) const
|
||||
@ -5801,7 +5801,7 @@ class SMESH_DimHyp
|
||||
|
||||
return ( this->_subMesh->GetId() < theOther->_subMesh->GetId() );
|
||||
}
|
||||
|
||||
|
||||
}; // end of SMESH_DimHyp
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
@ -5809,7 +5809,7 @@ typedef list<const SMESH_DimHyp*> TDimHypList;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
void addDimHypInstance(const int theDim,
|
||||
void addDimHypInstance(const int theDim,
|
||||
const TopoDS_Shape& theShape,
|
||||
const SMESH_Algo* theAlgo,
|
||||
const SMESH_subMesh* theSubMesh,
|
||||
@ -5822,7 +5822,7 @@ void addDimHypInstance(const int theDim,
|
||||
dimHyp->_hypotheses.push_front(theAlgo);
|
||||
listOfdimHyp.push_back( dimHyp );
|
||||
}
|
||||
|
||||
|
||||
SMESH_DimHyp* dimHyp = const_cast<SMESH_DimHyp*>( listOfdimHyp.back() );
|
||||
dimHyp->_hypotheses.insert( dimHyp->_hypotheses.end(),
|
||||
theHypList.begin(), theHypList.end() );
|
||||
@ -5881,7 +5881,7 @@ void unionLists(TListOfInt& theListOfId,
|
||||
if ( find_first_of( theListOfId.begin(), theListOfId.end(),
|
||||
otherListOfId.begin(), otherListOfId.end() ) == theListOfId.end() )
|
||||
continue;
|
||||
|
||||
|
||||
// union two lists (from source into target)
|
||||
TListOfInt::iterator it2 = otherListOfId.begin();
|
||||
for ( ; it2 != otherListOfId.end(); it2++ ) {
|
||||
@ -6034,7 +6034,7 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
|
||||
addDimHypInstance( j, aSubMeshShape, anAlgo, sm, hypList, dimHypListArr );
|
||||
}
|
||||
} // end iterations on submesh
|
||||
|
||||
|
||||
// iterate on created dimension-hypotheses and check for concurrents
|
||||
for ( int i = 0; i < 4; i++ ) {
|
||||
const TDimHypList& listOfDimHyp = dimHypListArr[i];
|
||||
@ -6059,9 +6059,9 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
removeDimHyps(dimHypListArr);
|
||||
|
||||
|
||||
// now, minimize the number of concurrent groups
|
||||
// Here we assume that lists of submeshes can have same submesh
|
||||
// in case of multi-dimension algorithms, as result
|
||||
@ -6130,7 +6130,7 @@ TListOfListOfInt SMESH_Mesh_i::findConcurrentSubMeshes()
|
||||
|
||||
mesh.SetMeshOrder( subMeshOrder );
|
||||
res = true;
|
||||
|
||||
|
||||
SMESH::SMESH_Mesh_var me = _this();
|
||||
_gen_i->UpdateIcons( me );
|
||||
|
||||
@ -6379,5 +6379,3 @@ _GET_ITER_DEFINE( SMDS_VolumeIteratorPtr, volumesIterator, SMDS_MeshVolume, SMDS
|
||||
// END Implementation of SMESH_MeshPartDS
|
||||
//
|
||||
//================================================================================
|
||||
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
/// may only be needed to be called in case if mesh objects are
|
||||
/// created when no active study is set to %SMESH component.
|
||||
/// In this case, mentioned functions can be used to forcibly
|
||||
/// publish existing objects in the currrently active study.
|
||||
/// publish existing objects in the currently active study.
|
||||
///
|
||||
/// Note that if there are no open study, these methods will do
|
||||
/// nothing.
|
||||
@ -185,7 +185,7 @@ namespace
|
||||
{
|
||||
SUIT_ViewManager* vm = app->getViewManager( SVTK_Viewer::Type(), create );
|
||||
if ( vm )
|
||||
{
|
||||
{
|
||||
window = dynamic_cast<SALOME_View*>( vm->getViewModel() );
|
||||
}
|
||||
}
|
||||
@ -259,45 +259,45 @@ namespace
|
||||
props.nodeColor.b );
|
||||
props.markerType = actor->GetMarkerType();
|
||||
props.markerScale = actor->GetMarkerScale();
|
||||
|
||||
|
||||
actor->GetEdgeColor( props.edgeColor.r,
|
||||
props.edgeColor.g,
|
||||
props.edgeColor.b );
|
||||
props.edgeWidth = qMax( (int)actor->GetLineWidth(), 1 );
|
||||
|
||||
|
||||
actor->GetSufaceColor( props.surfaceColor.r,
|
||||
props.surfaceColor.g,
|
||||
props.surfaceColor.b,
|
||||
props.surfaceColor.delta );
|
||||
|
||||
|
||||
actor->GetVolumeColor( props.volumeColor.r,
|
||||
props.volumeColor.g,
|
||||
props.volumeColor.b,
|
||||
props.volumeColor.delta );
|
||||
|
||||
|
||||
actor->Get0DColor( props.elem0dColor.r,
|
||||
props.elem0dColor.g,
|
||||
props.elem0dColor.b );
|
||||
props.elem0dSize = qMax( (int)actor->Get0DSize(), 1 );
|
||||
|
||||
|
||||
actor->GetBallColor( props.ballColor.r,
|
||||
props.ballColor.g,
|
||||
props.ballColor.b );
|
||||
props.ballScale = qMax( actor->GetBallScale(), 1e-2 );
|
||||
|
||||
|
||||
actor->GetOutlineColor( props.outlineColor.r,
|
||||
props.outlineColor.g,
|
||||
props.outlineColor.b );
|
||||
props.outlineWidth = qMax( (int)actor->GetOutlineWidth(), 1 );
|
||||
|
||||
|
||||
actor->GetFacesOrientationColor( props.orientationColor.r,
|
||||
props.orientationColor.g,
|
||||
props.orientationColor.b );
|
||||
props.orientationScale = actor->GetFacesOrientationScale();
|
||||
props.orientation3d = actor->GetFacesOrientation3DVectors();
|
||||
|
||||
|
||||
props.shrinkFactor = actor->GetShrinkFactor();
|
||||
|
||||
|
||||
props.opacity = actor->GetOpacity();
|
||||
}
|
||||
return props;
|
||||
@ -320,47 +320,47 @@ namespace
|
||||
props.nodeColor.b );
|
||||
if ( props.markerType != VTK::MT_USER )
|
||||
actor->SetMarkerStd( props.markerType, props.markerScale );
|
||||
|
||||
|
||||
actor->SetEdgeColor( props.edgeColor.r,
|
||||
props.edgeColor.g,
|
||||
props.edgeColor.b );
|
||||
actor->SetLineWidth( qMax( (double)props.edgeWidth, 1. ) );
|
||||
|
||||
|
||||
actor->SetSufaceColor( props.surfaceColor.r,
|
||||
props.surfaceColor.g,
|
||||
props.surfaceColor.b,
|
||||
props.surfaceColor.delta );
|
||||
|
||||
|
||||
actor->SetVolumeColor( props.volumeColor.r,
|
||||
props.volumeColor.g,
|
||||
props.volumeColor.b,
|
||||
props.volumeColor.delta );
|
||||
|
||||
|
||||
actor->Set0DColor( props.elem0dColor.r,
|
||||
props.elem0dColor.g,
|
||||
props.elem0dColor.b );
|
||||
actor->Set0DSize( qMax( (double)props.elem0dSize, 1. ) );
|
||||
|
||||
|
||||
actor->SetBallColor( props.ballColor.r,
|
||||
props.ballColor.g,
|
||||
props.ballColor.b );
|
||||
actor->SetBallScale( qMax( props.ballScale, 1e-2 ) );
|
||||
|
||||
|
||||
actor->SetOutlineColor( props.outlineColor.r,
|
||||
props.outlineColor.g,
|
||||
props.outlineColor.b );
|
||||
actor->SetOutlineWidth( qMax( (double)props.outlineWidth, 1. ) );
|
||||
|
||||
|
||||
actor->SetFacesOrientationColor( props.orientationColor.r,
|
||||
props.orientationColor.g,
|
||||
props.orientationColor.b );
|
||||
actor->SetFacesOrientationScale( props.orientationScale );
|
||||
actor->SetFacesOrientation3DVectors( props.orientation3d );
|
||||
|
||||
|
||||
actor->SetShrinkFactor( props.shrinkFactor );
|
||||
|
||||
|
||||
actor->SetOpacity( props.opacity );
|
||||
|
||||
|
||||
view->Repaint();
|
||||
}
|
||||
}
|
||||
@ -705,7 +705,7 @@ void SMESH_Swig::update(const char* uid)
|
||||
TUpdateEvent( const char* uid ) : myUid( uid ) {}
|
||||
virtual void Execute()
|
||||
{
|
||||
Handle(SALOME_InteractiveObject) io =
|
||||
Handle(SALOME_InteractiveObject) io =
|
||||
new SALOME_InteractiveObject( myUid, "SMESH", "" );
|
||||
SMESH::Update( io, true );
|
||||
}
|
||||
@ -1719,7 +1719,7 @@ public:
|
||||
|
||||
if ( !selMgr )
|
||||
return;
|
||||
|
||||
|
||||
selMgr->clearFilters();
|
||||
|
||||
SVTK_ViewWindow* vw = SMESH::GetViewWindow();
|
||||
@ -1727,10 +1727,10 @@ public:
|
||||
return;
|
||||
|
||||
SMESH_Actor* actor = SMESH::FindActorByEntry( myUid );
|
||||
|
||||
|
||||
if ( !actor || !actor->hasIO() )
|
||||
return;
|
||||
|
||||
|
||||
Handle(SALOME_InteractiveObject) io = actor->getIO();
|
||||
SALOME_ListIO ios;
|
||||
ios.Append( io );
|
||||
@ -1738,7 +1738,7 @@ public:
|
||||
|
||||
if ( vw->SelectionMode() == ActorSelection )
|
||||
return;
|
||||
|
||||
|
||||
TColStd_MapOfInteger idMap;
|
||||
std::vector<int>::const_iterator it;
|
||||
for ( it = myIds.begin(); it != myIds.end(); ++it )
|
||||
@ -1770,7 +1770,7 @@ void SMESH_Swig::select(const char* uid, std::vector<int> ids, bool append)
|
||||
if ( sobject )
|
||||
ProcessVoidEvent( new TSelectListEvent( sobject->GetID().c_str(), ids, append ) );
|
||||
}
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////
|
||||
/// \brief Select element of the mesh, sub-mesh or group.
|
||||
/// \param uid Mesh object's study UID or IOR.
|
||||
@ -1814,7 +1814,7 @@ public:
|
||||
|
||||
if ( !selMgr )
|
||||
return;
|
||||
|
||||
|
||||
selMgr->clearFilters();
|
||||
|
||||
SVTK_ViewWindow* vw = SMESH::GetViewWindow();
|
||||
@ -1822,10 +1822,10 @@ public:
|
||||
return;
|
||||
|
||||
SMESH_Actor* actor = SMESH::FindActorByEntry( myUid );
|
||||
|
||||
|
||||
if ( !actor || !actor->hasIO() )
|
||||
return;
|
||||
|
||||
|
||||
Handle(SALOME_InteractiveObject) io = actor->getIO();
|
||||
SALOME_ListIO ios;
|
||||
ios.Append( io );
|
||||
@ -1833,7 +1833,7 @@ public:
|
||||
|
||||
if ( vw->SelectionMode() != EdgeOfCellSelection )
|
||||
return;
|
||||
|
||||
|
||||
SVTK_IndexedMapOfIds idMap;
|
||||
std::vector<std::pair<int, int> >::const_iterator it;
|
||||
for ( it = myIds.begin(); it != myIds.end(); ++it )
|
||||
@ -1961,7 +1961,7 @@ public:
|
||||
void SMESH_Swig::setSelectionMode(SelectionMode mode, int viewUid)
|
||||
{
|
||||
init();
|
||||
ProcessVoidEvent( new TSetSelectionModeEvent( mode, viewUid ) );
|
||||
ProcessVoidEvent( new TSetSelectionModeEvent( mode, viewUid ) );
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////
|
||||
@ -1973,17 +1973,17 @@ public:
|
||||
typedef std::vector<int> TResult;
|
||||
TResult myResult;
|
||||
const char* myUid;
|
||||
|
||||
|
||||
TGetSelectedEvent( const char* uid )
|
||||
: myUid( uid ) {}
|
||||
|
||||
|
||||
virtual void Execute()
|
||||
{
|
||||
SVTK_ViewWindow* vw = SMESH::GetViewWindow();
|
||||
if ( !vw )
|
||||
return;
|
||||
|
||||
SVTK_Selector* selector = vw->GetSelector();
|
||||
SVTK_Selector* selector = vw->GetSelector();
|
||||
if ( !selector )
|
||||
return;
|
||||
|
||||
@ -2026,10 +2026,10 @@ public:
|
||||
typedef std::vector<std::pair<int, int> > TResult;
|
||||
TResult myResult;
|
||||
const char* myUid;
|
||||
|
||||
|
||||
TGetSelectedPairEvent( const char* uid )
|
||||
: myUid( uid ) {}
|
||||
|
||||
|
||||
virtual void Execute()
|
||||
{
|
||||
SVTK_ViewWindow* vw = SMESH::GetViewWindow();
|
||||
@ -2039,7 +2039,7 @@ public:
|
||||
if ( vw->SelectionMode() != EdgeOfCellSelection )
|
||||
return;
|
||||
|
||||
SVTK_Selector* selector = vw->GetSelector();
|
||||
SVTK_Selector* selector = vw->GetSelector();
|
||||
if ( !selector )
|
||||
return;
|
||||
|
||||
|
||||
@ -455,7 +455,7 @@ namespace {
|
||||
int nbEdges = thePrism.myNbEdgesInWires.front(); // nb outer edges
|
||||
int nbSides = nbEdges;
|
||||
|
||||
|
||||
|
||||
list< TopoDS_Edge >::const_iterator edgeIt = thePrism.myBottomEdges.begin();
|
||||
std::advance( edgeIt, nbEdges-1 );
|
||||
TopoDS_Edge prevE = *edgeIt;
|
||||
@ -523,7 +523,7 @@ namespace {
|
||||
// isPrevStraight = isCurStraight;
|
||||
// iPrev = iE;
|
||||
// }
|
||||
|
||||
|
||||
return nbSides;
|
||||
}
|
||||
|
||||
@ -562,7 +562,7 @@ namespace {
|
||||
|
||||
//=======================================================================
|
||||
//function : StdMeshers_Prism_3D
|
||||
//purpose :
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
StdMeshers_Prism_3D::StdMeshers_Prism_3D(int hypId, SMESH_Gen* gen)
|
||||
@ -594,7 +594,7 @@ StdMeshers_Prism_3D::~StdMeshers_Prism_3D()
|
||||
|
||||
//=======================================================================
|
||||
//function : CheckHypothesis
|
||||
//purpose :
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
bool StdMeshers_Prism_3D::CheckHypothesis(SMESH_Mesh& aMesh,
|
||||
@ -921,7 +921,7 @@ bool StdMeshers_Prism_3D::getWallFaces( Prism_3D::TPrismTopo & thePrism,
|
||||
StdMeshers_Quadrangle_2D* quadAlgo = TQuadrangleAlgo::instance( this, myHelper );
|
||||
|
||||
TopTools_MapOfShape faceMap;
|
||||
TopTools_IndexedDataMapOfShapeListOfShape edgeToFaces;
|
||||
TopTools_IndexedDataMapOfShapeListOfShape edgeToFaces;
|
||||
TopExp::MapShapesAndAncestors( thePrism.myShape3D,
|
||||
TopAbs_EDGE, TopAbs_FACE, edgeToFaces );
|
||||
|
||||
@ -1652,7 +1652,7 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
|
||||
for ( size_t iN = 1; iN < srcNodeStr.size(); ++iN ) // add segments
|
||||
{
|
||||
// find an EDGE to set a new segment
|
||||
std::pair<int, TopAbs_ShapeEnum> id2type =
|
||||
std::pair<int, TopAbs_ShapeEnum> id2type =
|
||||
myHelper->GetMediumPos( newNodes[ iN-1 ], newNodes[ iN ] );
|
||||
if ( id2type.second != TopAbs_EDGE )
|
||||
{
|
||||
@ -1672,7 +1672,7 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
|
||||
{
|
||||
SMESH_MeshEditor::TListOfListOfNodes lln( 1, list< const SMDS_MeshNode* >() );
|
||||
lln.back().push_back ( vn );
|
||||
lln.back().push_front( newNodes[ iN-isPrev ] ); // to keep
|
||||
lln.back().push_front( newNodes[ iN-isPrev ] ); // to keep
|
||||
SMESH_MeshEditor( mesh ).MergeNodes( lln );
|
||||
}
|
||||
}
|
||||
@ -1997,7 +1997,7 @@ bool StdMeshers_Prism_3D::Evaluate(SMESH_Mesh& theMesh,
|
||||
std::vector<int> aVec = (*anIt).second;
|
||||
nb2d += Max(aVec[SMDSEntity_Quadrangle],aVec[SMDSEntity_Quad_Quadrangle]);
|
||||
}
|
||||
|
||||
|
||||
MapShapeNbElemsItr anIt = aResMap.find( meshFaces[NumBase-1] );
|
||||
std::vector<int> aVec = (*anIt).second;
|
||||
bool IsQuadratic = (aVec[SMDSEntity_Quad_Triangle]>aVec[SMDSEntity_Triangle]) ||
|
||||
@ -2310,7 +2310,7 @@ bool StdMeshers_Prism_3D::projectBottomToTop( const gp_Trsf & bottom
|
||||
{
|
||||
return true;
|
||||
}
|
||||
NSProjUtils::TNodeNodeMap& n2nMap =
|
||||
NSProjUtils::TNodeNodeMap& n2nMap =
|
||||
(NSProjUtils::TNodeNodeMap&) TProjction2dAlgo::instance( this )->GetNodesMap();
|
||||
n2nMap.clear();
|
||||
|
||||
@ -2395,7 +2395,7 @@ bool StdMeshers_Prism_3D::projectBottomToTop( const gp_Trsf & bottom
|
||||
meshDS->MoveNode( topNode, distXYZ[1], distXYZ[2], distXYZ[3] ); // transform can be inaccurate
|
||||
}
|
||||
// create node column
|
||||
TNode2ColumnMap::iterator bN_col =
|
||||
TNode2ColumnMap::iterator bN_col =
|
||||
myBotToColumnMap.insert( make_pair ( bN, TNodeColumn() )).first;
|
||||
TNodeColumn & column = bN_col->second;
|
||||
column.resize( zSize );
|
||||
@ -2543,7 +2543,7 @@ double StdMeshers_Prism_3D::getSweepTolerance( const Prism_3D::TPrismTopo& thePr
|
||||
for ( int iN = 0; iN < nbNodes; ++iN )
|
||||
nodes[ iN ] = nIt->next();
|
||||
nodes.back() = nodes[0];
|
||||
|
||||
|
||||
// loop on links
|
||||
double dist2;
|
||||
for ( int iN = 0; iN < nbNodes; ++iN )
|
||||
@ -2784,8 +2784,8 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
|
||||
EdgeWithNeighbors() {}
|
||||
bool IsInternal() const { return !_edge.IsNull() && _edge.Orientation() == TopAbs_INTERNAL; }
|
||||
};
|
||||
// PrismSide contains all FACEs linking a bottom EDGE with a top one.
|
||||
struct PrismSide
|
||||
// PrismSide contains all FACEs linking a bottom EDGE with a top one.
|
||||
struct PrismSide
|
||||
{
|
||||
TopoDS_Face _face; // a currently treated upper FACE
|
||||
TopTools_IndexedMapOfShape *_faces; // all FACEs (pointer because of a private copy constructor)
|
||||
@ -2923,7 +2923,7 @@ namespace // utils used by StdMeshers_Prism_3D::IsApplicable()
|
||||
}
|
||||
return edges.size();
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
/*!
|
||||
* \brief Return number of faces sharing given edges
|
||||
@ -3536,7 +3536,7 @@ bool StdMeshers_PrismAsBlock::Init(SMESH_MesherHelper* helper,
|
||||
SMESH_Block::init();
|
||||
myShapeIDMap.Clear();
|
||||
myShapeIndex2ColumnMap.clear();
|
||||
|
||||
|
||||
int wallFaceIds[ NB_WALL_FACES ] = { // to walk around a block
|
||||
SMESH_Block::ID_Fx0z, SMESH_Block::ID_F1yz,
|
||||
SMESH_Block::ID_Fx1z, SMESH_Block::ID_F0yz
|
||||
@ -4064,7 +4064,7 @@ void StdMeshers_PrismAsBlock::faceGridToPythonDump(const SMESH_Block::TShapeID f
|
||||
<< n << ", " << n+1 << ", "
|
||||
<< n+nb+2 << ", " << n+nb+1 << "]) " << endl;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -4216,8 +4216,8 @@ Adaptor3d_Curve* StdMeshers_PrismAsBlock::TSideFace::VertiCurve(const bool isMax
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Return geometry of the top or bottom curve
|
||||
* \param isTop -
|
||||
* \retval Adaptor3d_Curve* -
|
||||
* \param isTop -
|
||||
* \retval Adaptor3d_Curve* -
|
||||
*/
|
||||
//================================================================================
|
||||
|
||||
@ -4473,7 +4473,7 @@ gp_Pnt StdMeshers_PrismAsBlock::TSideFace::Value(const Standard_Real U,
|
||||
meshDS->IndexToShape( notFaceID2 ),
|
||||
*myHelper.GetMesh(),
|
||||
TopAbs_FACE );
|
||||
if ( face.IsNull() )
|
||||
if ( face.IsNull() )
|
||||
throw SALOME_Exception("StdMeshers_PrismAsBlock::TSideFace::Value() face.IsNull()");
|
||||
int faceID = meshDS->ShapeToIndex( face );
|
||||
me->mySurface = me->myShapeID2Surf[ faceID ];
|
||||
@ -4603,7 +4603,7 @@ int StdMeshers_PrismAsBlock::TSideFace::InsertSubShapes(TBlockShapes& shapeMap)
|
||||
if ( v1.ShapeType() == TopAbs_VERTEX ) {
|
||||
nbInserted += SMESH_Block::Insert( v1, vertIdVec[ 1 ], shapeMap);
|
||||
}
|
||||
|
||||
|
||||
// from V1 column
|
||||
SMESH_Block::GetEdgeVertexIDs( edgeIdVec[ V1_EDGE ], vertIdVec);
|
||||
GetColumns(1, col1, col2 );
|
||||
@ -4651,7 +4651,7 @@ int StdMeshers_PrismAsBlock::TSideFace::InsertSubShapes(TBlockShapes& shapeMap)
|
||||
// if ( edgeID = edgeIdVec[ _v1 ]) edgeID = edgeIdVec[ _v0 ];
|
||||
// else edgeID = edgeIdVec[ _v1 ];
|
||||
// SMESH_Block::Insert( sideEdge, edgeID, shapeMap);
|
||||
|
||||
|
||||
// // top edge
|
||||
// TopoDS_Edge topEdge = GetEdge( TOP_EDGE );
|
||||
// SMESH_Block::Insert( topEdge, edgeIdVec[ _u1 ], shapeMap);
|
||||
@ -4689,7 +4689,7 @@ void StdMeshers_PrismAsBlock::TSideFace::dumpNodes(int nbNodes) const
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Creates TVerticalEdgeAdaptor
|
||||
* \brief Creates TVerticalEdgeAdaptor
|
||||
* \param columnsMap - node column map
|
||||
* \param parameter - normalized parameter
|
||||
*/
|
||||
@ -4764,7 +4764,7 @@ void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) con
|
||||
TParam2ColumnIt col, col2;
|
||||
TParam2ColumnMap* u2cols = side->GetColumns();
|
||||
side->GetColumns( u , col, col2 );
|
||||
|
||||
|
||||
int j, i = myV ? mySide->ColumnHeight()-1 : 0;
|
||||
|
||||
const SMDS_MeshNode* n = 0;
|
||||
@ -4793,7 +4793,7 @@ void StdMeshers_PrismAsBlock::THorizontalEdgeAdaptor::dumpNodes(int nbNodes) con
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Costructor of TPCurveOnHorFaceAdaptor fills its map of
|
||||
* \brief Constructor of TPCurveOnHorFaceAdaptor fills its map of
|
||||
* normalized parameter to node UV on a horizontal face
|
||||
* \param [in] sideFace - lateral prism side
|
||||
* \param [in] isTop - is \a horFace top or bottom of the prism
|
||||
|
||||
Loading…
Reference in New Issue
Block a user