ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-15 08:50:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix some error. Build complete

Browse Source
This commit is contained in:
Viktor UZLOV 2021-02-11 11:11:25 +03:00
parent a9c899c3a0
commit 6b9f5b0da6
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Controls/SMESH_Controls.cxx
View File

@ -34,6 +34,7 @@
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "SMESH_MeshAlgos.hxx" #include "SMESH_MeshAlgos.hxx"
#include "SMESH_OctreeNode.hxx" #include "SMESH_OctreeNode.hxx"
#include "SMESH_Comment.hxx"
#include <GEOMUtils.hxx> #include <GEOMUtils.hxx>
#include <Basics_Utils.hxx> #include <Basics_Utils.hxx>
@ -3295,39 +3296,39 @@ void RangeOfIds::GetRangeStr( TCollection_AsciiString& theResStr )
smIdType aMinId = myMin[i]; smIdType aMinId = myMin[i];
smIdType aMaxId = myMax[i]; smIdType aMaxId = myMax[i];
TCollection_AsciiString aStr; SMESH_Comment aStr;
if ( aMinId != IntegerFirst() ) if ( aMinId != IntegerFirst() )
aStr += FromIdType<int>(aMinId); aStr << aMinId;
aStr += "-"; aStr += "-";
if ( aMaxId != IntegerLast() ) if ( aMaxId != std::numeric_limits<smIdType>::max() )
aStr += FromIdType<int>(aMaxId); aStr << aMaxId;
// find position of the string in result sequence and insert string in it // find position of the string in result sequence and insert string in it
if ( anIntSeq.Length() == 0 ) if ( anIntSeq.Length() == 0 )
{ {
anIntSeq.Append( aMinId ); anIntSeq.Append( aMinId );
aStrSeq.Append( aStr ); aStrSeq.Append( (const char*)aStr );
} }
else else
{ {
if ( aMinId < anIntSeq.First() ) if ( aMinId < anIntSeq.First() )
{ {
anIntSeq.Prepend( aMinId ); anIntSeq.Prepend( aMinId );
aStrSeq.Prepend( aStr ); aStrSeq.Prepend( (const char*)aStr );
} }
else if ( aMinId > anIntSeq.Last() ) else if ( aMinId > anIntSeq.Last() )
{ {
anIntSeq.Append( aMinId ); anIntSeq.Append( aMinId );
aStrSeq.Append( aStr ); aStrSeq.Append( (const char*)aStr );
} }
else else
for ( int j = 1, k = anIntSeq.Length(); j <= k; j++ ) for ( int j = 1, k = anIntSeq.Length(); j <= k; j++ )
if ( aMinId < anIntSeq( j ) ) if ( aMinId < anIntSeq( j ) )
{ {
anIntSeq.InsertBefore( j, aMinId ); anIntSeq.InsertBefore( j, aMinId );
aStrSeq.InsertBefore( j, aStr ); aStrSeq.InsertBefore( j, (const char*)aStr );
break; break;
} }
} }

12
src/SMDS/SMDS_VolumeTool.cxx
View File

@ -978,14 +978,14 @@ namespace
{ {
if (( myOri = ( n1->GetID() < n2->GetID() ))) if (( myOri = ( n1->GetID() < n2->GetID() )))
{ {
first = FromIdType<int>(n1->GetID()); first = n1->GetID();
second = FromIdType<int>(n2->GetID()); second = n2->GetID();
} }
else else
{ {
myOri = -1; myOri = -1;
first = FromIdType<int>(n2->GetID()); first = n2->GetID();
second = FromIdType<int>(n1->GetID()); second = n1->GetID();
} }
myOri *= ori; myOri *= ori;
} }
@ -2210,7 +2210,7 @@ const SMDS_MeshVolume* SMDS_VolumeTool::Element() const
//purpose : return element ID //purpose : return element ID
//======================================================================= //=======================================================================
int SMDS_VolumeTool::ID() const smIdType SMDS_VolumeTool::ID() const
{ {
return myVolume ? FromIdType<int>(myVolume->GetID()) : 0; return myVolume ? myVolume->GetID() : 0;
} }

4
src/SMDS/SMDS_VolumeTool.hxx
View File

@ -31,6 +31,8 @@
#include "SMESH_SMDS.hxx" #include "SMESH_SMDS.hxx"
#include <smIdType.hxx>
class SMDS_MeshElement; class SMDS_MeshElement;
class SMDS_MeshNode; class SMDS_MeshNode;
class SMDS_MeshVolume; class SMDS_MeshVolume;
@ -72,7 +74,7 @@ class SMDS_EXPORT SMDS_VolumeTool
const SMDS_MeshVolume* Element() const; const SMDS_MeshVolume* Element() const;
// return element // return element
int ID() const; smIdType ID() const;
// return element ID // return element ID
bool IsPoly() const { return myPolyedre; } bool IsPoly() const { return myPolyedre; }

2
src/SMESHDS/SMESHDS_GroupBase.cxx
View File

@ -154,7 +154,7 @@ bool SMESHDS_GroupBase::Contains (const smIdType theID)
bool SMESHDS_GroupBase::Contains (const SMDS_MeshElement* elem) bool SMESHDS_GroupBase::Contains (const SMDS_MeshElement* elem)
{ {
if ( elem ) if ( elem )
return Contains( FromIdType<int>(elem->GetID()) ); return Contains( elem->GetID() );
return false; return false;
} }

2
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -992,7 +992,7 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::displaySimulation()
SMESH::TPolySimulation::TVTKIds aVTKIds_faces; SMESH::TPolySimulation::TVTKIds aVTKIds_faces;
while( anIter->more() ) while( anIter->more() )
if ( const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next() ){ if ( const SMDS_MeshNode* aNode = (SMDS_MeshNode*)anIter->next() ){
vtkIdType aId = myActor->GetObject()->GetNodeVTKId( FromIdType<int>(aNode->GetID()) ); vtkIdType aId = myActor->GetObject()->GetNodeVTKId( aNode->GetID() );
aVTKIds.push_back(aId); aVTKIds.push_back(aId);
aVTKIds_faces.push_back(aId); aVTKIds_faces.push_back(aId);
} }