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 #40653][CEA] New mesh import export formats with meshio.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index b412f118decabcaab2c3ad1fec4dcec414ee4313..6a3fcf9b2dde3515f3797dc9ec502890813aad3c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-101,7
+101,7
@@
void SMESHGUI_ConvToQuadOp::startOperation()
}
connect( myDlg, SIGNAL( onClicked( int ) ), SLOT( ConnectRadioButtons( int ) ) );
}
connect( myDlg, SIGNAL( onClicked( int ) ), SLOT( ConnectRadioButtons( int ) ) );
- myHelpFileName = "convert_to_from_quadratic_mesh
_page
.html";
+ myHelpFileName = "convert_to_from_quadratic_mesh.html";
SMESHGUI_SelectionOp::startOperation();
SMESHGUI_SelectionOp::startOperation();
@@
-129,7
+129,7
@@
void SMESHGUI_ConvToQuadOp::selectionDone()
try
{
QString anObjEntry = myDlg->selectedObject( 0 );
try
{
QString anObjEntry = myDlg->selectedObject( 0 );
- _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.to
Latin1
().data() );
+ _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.to
Utf8
().data() );
if ( !pObj ) return;
SMESH::SMESH_IDSource_var idSource =
if ( !pObj ) return;
SMESH::SMESH_IDSource_var idSource =
@@
-204,7
+204,7
@@
bool SMESHGUI_ConvToQuadOp::onApply()
QString aMess;
QString anObjEntry = myDlg->selectedObject( 0 );
QString aMess;
QString anObjEntry = myDlg->selectedObject( 0 );
- _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.to
Latin1
().data() );
+ _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.to
Utf8
().data() );
if ( !pObj )
{
dlg()->show();
if ( !pObj )
{
dlg()->show();
@@
-265,7
+265,7
@@
bool SMESHGUI_ConvToQuadOp::onApply()
prop->Delete();
SMESH::MeshPreviewStruct_var previewData = aEditor->GetPreviewData();
prop->Delete();
SMESH::MeshPreviewStruct_var previewData = aEditor->GetPreviewData();
- myBadElemsPreview->SetData(
&
previewData.in() );
+ myBadElemsPreview->SetData( previewData.in() );
myBadElemsPreview->SetVisibility(true);
SUIT_MessageBox* mb = new SUIT_MessageBox(SUIT_MessageBox::Warning,
myBadElemsPreview->SetVisibility(true);
SUIT_MessageBox* mb = new SUIT_MessageBox(SUIT_MessageBox::Warning,
@@
-328,10
+328,11
@@
SMESHGUI_ConvToQuadOp::MeshDestinationType
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSource,
bool* isMixOrder)
{
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSource,
bool* isMixOrder)
{
- SMESH::
long
_array_var nbElemOfType = idSource->GetMeshInfo();
+ SMESH::
smIdType
_array_var nbElemOfType = idSource->GetMeshInfo();
bool hasBiQuad = ( nbElemOfType[SMDSEntity_BiQuad_Triangle ] ||
nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||
bool hasBiQuad = ( nbElemOfType[SMDSEntity_BiQuad_Triangle ] ||
nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||
+ nbElemOfType[SMDSEntity_BiQuad_Penta ] ||
nbElemOfType[SMDSEntity_TriQuad_Hexa ] );
bool hasLinBiQuad = ( nbElemOfType[SMDSEntity_Triangle ] ||
nbElemOfType[SMDSEntity_Quadrangle ] ||
nbElemOfType[SMDSEntity_TriQuad_Hexa ] );
bool hasLinBiQuad = ( nbElemOfType[SMDSEntity_Triangle ] ||
nbElemOfType[SMDSEntity_Quadrangle ] ||
@@
-382,7
+383,7
@@
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
void SMESHGUI_ConvToQuadOp::ConnectRadioButtons( int id )
{
QString anObjEntry = myDlg->selectedObject( 0 );
void SMESHGUI_ConvToQuadOp::ConnectRadioButtons( int id )
{
QString anObjEntry = myDlg->selectedObject( 0 );
- _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.to
Latin1
().data() );
+ _PTR(SObject) pObj = SMESH::getStudy()->FindObjectID( anObjEntry.to
Utf8
().data() );
if ( !pObj ) return;
SMESH::SMESH_IDSource_var idSource =
if ( !pObj ) return;
SMESH::SMESH_IDSource_var idSource =