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
Merge multi-study removal branch.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index 42dad5775bddadc227098f0551b34c656aa2cbee..b412f118decabcaab2c3ad1fec4dcec414ee4313 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-105,7
+105,7
@@
void SMESHGUI_ConvToQuadOp::startOperation()
SMESHGUI_SelectionOp::startOperation();
SMESHGUI_SelectionOp::startOperation();
- myDlg->SetMediumNdsOnGeom(
fals
e );
+ myDlg->SetMediumNdsOnGeom(
tru
e );
myDlg->activateObject( 0 );
myDlg->ShowWarning( false );
myDlg->show();
myDlg->activateObject( 0 );
myDlg->ShowWarning( false );
myDlg->show();
@@
-129,7
+129,7
@@
void SMESHGUI_ConvToQuadOp::selectionDone()
try
{
QString anObjEntry = myDlg->selectedObject( 0 );
try
{
QString anObjEntry = myDlg->selectedObject( 0 );
- _PTR(SObject) pObj =
studyDS
()->FindObjectID( anObjEntry.toLatin1().data() );
+ _PTR(SObject) pObj =
SMESH::getStudy
()->FindObjectID( anObjEntry.toLatin1().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 =
studyDS
()->FindObjectID( anObjEntry.toLatin1().data() );
+ _PTR(SObject) pObj =
SMESH::getStudy
()->FindObjectID( anObjEntry.toLatin1().data() );
if ( !pObj )
{
dlg()->show();
if ( !pObj )
{
dlg()->show();
@@
-326,15
+326,18
@@
void SMESHGUI_ConvToQuadOp::onWarningWinFinished()
SMESHGUI_ConvToQuadOp::MeshDestinationType
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSource,
SMESHGUI_ConvToQuadOp::MeshDestinationType
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSource,
- bool* isMixOrder)
const
+ bool* isMixOrder)
{
SMESH::long_array_var nbElemOfType = idSource->GetMeshInfo();
{
SMESH::long_array_var nbElemOfType = idSource->GetMeshInfo();
- bool hasBiQuad = ( nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||
+ bool hasBiQuad = ( nbElemOfType[SMDSEntity_BiQuad_Triangle ] ||
+ nbElemOfType[SMDSEntity_BiQuad_Quadrangle ] ||
nbElemOfType[SMDSEntity_TriQuad_Hexa ] );
nbElemOfType[SMDSEntity_TriQuad_Hexa ] );
- bool hasLinStruct = ( nbElemOfType[SMDSEntity_Quadrangle ] ||
+ bool hasLinBiQuad = ( nbElemOfType[SMDSEntity_Triangle ] ||
+ nbElemOfType[SMDSEntity_Quadrangle ] ||
nbElemOfType[SMDSEntity_Hexa ] );
nbElemOfType[SMDSEntity_Hexa ] );
- bool hasQuadStruct = ( nbElemOfType[SMDSEntity_Quad_Quadrangle ] ||
+ bool hasQuadBiQuad = ( nbElemOfType[SMDSEntity_Quad_Triangle ] ||
+ nbElemOfType[SMDSEntity_Quad_Quadrangle ] ||
nbElemOfType[SMDSEntity_Quad_Hexa ] );
bool hasQuad = ( nbElemOfType[SMDSEntity_Quad_Edge ] ||
nbElemOfType[SMDSEntity_Quad_Hexa ] );
bool hasQuad = ( nbElemOfType[SMDSEntity_Quad_Edge ] ||
@@
-343,6
+346,7
@@
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
nbElemOfType[SMDSEntity_Quad_Tetra ] ||
nbElemOfType[SMDSEntity_Quad_Hexa ] ||
nbElemOfType[SMDSEntity_Quad_Pyramid ] ||
nbElemOfType[SMDSEntity_Quad_Tetra ] ||
nbElemOfType[SMDSEntity_Quad_Hexa ] ||
nbElemOfType[SMDSEntity_Quad_Pyramid ] ||
+ nbElemOfType[SMDSEntity_Quad_Polygon ] ||
nbElemOfType[SMDSEntity_Quad_Penta ] );
bool hasLin = ( nbElemOfType[SMDSEntity_Edge ] ||
nbElemOfType[SMDSEntity_Quad_Penta ] );
bool hasLin = ( nbElemOfType[SMDSEntity_Edge ] ||
@@
-351,14
+355,15
@@
SMESHGUI_ConvToQuadOp::DestinationMesh( const SMESH::SMESH_IDSource_var& idSourc
nbElemOfType[SMDSEntity_Tetra ] ||
nbElemOfType[SMDSEntity_Hexa ] ||
nbElemOfType[SMDSEntity_Pyramid ] ||
nbElemOfType[SMDSEntity_Tetra ] ||
nbElemOfType[SMDSEntity_Hexa ] ||
nbElemOfType[SMDSEntity_Pyramid ] ||
+ nbElemOfType[SMDSEntity_Polygon ] ||
nbElemOfType[SMDSEntity_Penta ] );
int tgtType = 0;
if ( hasBiQuad )
tgtType |= ( Quadratic | Linear );
nbElemOfType[SMDSEntity_Penta ] );
int tgtType = 0;
if ( hasBiQuad )
tgtType |= ( Quadratic | Linear );
- if ( hasLin
Struct
)
+ if ( hasLin
BiQuad
)
tgtType |= ( BiQuadratic | Quadratic );
tgtType |= ( BiQuadratic | Quadratic );
- if ( hasQuad
Struct
)
+ if ( hasQuad
BiQuad
)
tgtType |= ( BiQuadratic | Linear );
if ( hasQuad )
tgtType |= Linear;
tgtType |= ( BiQuadratic | Linear );
if ( hasQuad )
tgtType |= Linear;
@@
-377,7
+382,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 =
studyDS
()->FindObjectID( anObjEntry.toLatin1().data() );
+ _PTR(SObject) pObj =
SMESH::getStudy
()->FindObjectID( anObjEntry.toLatin1().data() );
if ( !pObj ) return;
SMESH::SMESH_IDSource_var idSource =
if ( !pObj ) return;
SMESH::SMESH_IDSource_var idSource =