Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright notes (for 2010)
[modules/geom.git]
/
src
/
EntityGUI
/
EntityGUI_SubShapeDlg.cxx
diff --git
a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index 9dc4679bfc4f164a8f15f9a726ed1e29b2566ef6..dd73cfe930229fbb7aac6e3ac5dc3e48ce485492 100644
(file)
--- a/
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// GEOM GEOMGUI : GUI for Geometry component
// File : EntityGUI_SubShapeDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
// GEOM GEOMGUI : GUI for Geometry component
// File : EntityGUI_SubShapeDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@
-53,7
+54,7
@@
// TRUE to construct a modal dialog.
//=================================================================================
EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
// TRUE to construct a modal dialog.
//=================================================================================
EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
- bool modal, Qt::WindowFlags fl )
+
bool modal, Qt::WindowFlags fl )
: GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
{
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SUBSHAPE" ) ) );
: GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
{
QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SUBSHAPE" ) ) );
@@
-140,7
+141,7
@@
void EntityGUI_SubShapeDlg::Init()
connect( GroupPoints->CheckButton1, SIGNAL( stateChanged( int ) ), this, SLOT( SubShapeToggled() ) );
connect( myGeomGUI->getApp()->selectionMgr(),
connect( GroupPoints->CheckButton1, SIGNAL( stateChanged( int ) ), this, SLOT( SubShapeToggled() ) );
connect( myGeomGUI->getApp()->selectionMgr(),
- SIGNAL( currentSelectionChanged( )), this, SLOT( SelectionIntoArgument() ) );
+
SIGNAL( currentSelectionChanged( )), this, SLOT( SelectionIntoArgument() ) );
updateButtonState();
resize(100,100);
updateButtonState();
resize(100,100);
@@
-344,7
+345,7
@@
void EntityGUI_SubShapeDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(),
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(),
- SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
SubShapeToggled();
updateButtonState();
}
SubShapeToggled();
updateButtonState();
}
@@
-427,7
+428,7
@@
void EntityGUI_SubShapeDlg::ComboTextChanged()
// purpose :
//=================================================================================
unsigned int EntityGUI_SubShapeDlg::NumberOfSubShapes( const TopoDS_Shape& S,
// purpose :
//=================================================================================
unsigned int EntityGUI_SubShapeDlg::NumberOfSubShapes( const TopoDS_Shape& S,
- const int shapeType ) const
+
const int shapeType ) const
{
if ( S.IsNull() )
return 0;
{
if ( S.IsNull() )
return 0;
@@
-437,13
+438,13
@@
unsigned int EntityGUI_SubShapeDlg::NumberOfSubShapes( const TopoDS_Shape& S,
if ( S.ShapeType() == TopAbs_COMPOUND &&
( TopAbs_ShapeEnum(shapeType) == TopAbs_SHAPE ||
if ( S.ShapeType() == TopAbs_COMPOUND &&
( TopAbs_ShapeEnum(shapeType) == TopAbs_SHAPE ||
- TopAbs_ShapeEnum(shapeType) == TopAbs_COMPSOLID ||
- TopAbs_ShapeEnum(shapeType) == TopAbs_COMPOUND ) ) {
+
TopAbs_ShapeEnum(shapeType) == TopAbs_COMPSOLID ||
+
TopAbs_ShapeEnum(shapeType) == TopAbs_COMPOUND ) ) {
TopoDS_Iterator It( S, Standard_True, Standard_True );
for ( ; It.More(); It.Next() ) {
if ( M.Add( It.Value() ) ) {
if ( TopAbs_ShapeEnum( shapeType ) == TopAbs_SHAPE ||
TopoDS_Iterator It( S, Standard_True, Standard_True );
for ( ; It.More(); It.Next() ) {
if ( M.Add( It.Value() ) ) {
if ( TopAbs_ShapeEnum( shapeType ) == TopAbs_SHAPE ||
- TopAbs_ShapeEnum( shapeType ) == It.Value().ShapeType() ) {
+
TopAbs_ShapeEnum( shapeType ) == It.Value().ShapeType() ) {
index++;
}
}
index++;
}
}
@@
-574,18
+575,18
@@
bool EntityGUI_SubShapeDlg::execute (ObjectList& objects)
if (aSelList.Extent() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
if (aSelList.Extent() == 1) {
Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj =
- GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
+
GEOMBase::ConvertIOinGEOMObject(aSelList.First(), aResult);
if (aResult && !anObj->_is_nil()) {
if (aResult && !anObj->_is_nil()) {
- TColStd_IndexedMapOfInteger aMapIndex;
- aSelMgr->GetIndexes(aSelList.First(), aMapIndex);
+
TColStd_IndexedMapOfInteger aMapIndex;
+
aSelMgr->GetIndexes(aSelList.First(), aMapIndex);
- GEOM::GEOM_ILocalOperations_var aLocOp =
- getGeomEngine()->GetILocalOperations(getStudyId());
+
GEOM::GEOM_ILocalOperations_var aLocOp =
+
getGeomEngine()->GetILocalOperations(getStudyId());
- for (int i = 0, n = aList->length(); i < n; i++)
- if (aMapIndex.Contains(aLocOp->GetSubShapeIndex(myObject, aList[i])))
- objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
+
for (int i = 0, n = aList->length(); i < n; i++)
+
if (aMapIndex.Contains(aLocOp->GetSubShapeIndex(myObject, aList[i])))
+
objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
}
}
}
}
}
}