ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-12 19:24:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL9355: Bad names of sub-shapes after explode

Browse Source
This commit is contained in:
jfa 2005-08-01 12:16:27 +00:00
parent cd1f268489
commit bfd83343c8
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/EntityGUI/EntityGUI_SubShapeDlg.cxx
View File

@ -1,23 +1,23 @@
// GEOM GEOMGUI : GUI for Geometry component // GEOM GEOMGUI : GUI for Geometry component
// //
// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either // License as published by the Free Software Foundation; either
// version 2.1 of the License. // version 2.1 of the License.
// //
// This library is distributed in the hope that it will be useful, // This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details. // Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public // You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software // License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org // See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
// //
// //
// //
@ -96,6 +96,8 @@ void EntityGUI_SubShapeDlg::Init()
myEditCurrentArgument = GroupPoints->LineEdit1; myEditCurrentArgument = GroupPoints->LineEdit1;
myObject = GEOM::GEOM_Object::_nil(); myObject = GEOM::GEOM_Object::_nil();
ResultName->setText("");
myWithShape = true; myWithShape = true;
/* type for sub shape selection */ /* type for sub shape selection */
@ -125,7 +127,7 @@ void EntityGUI_SubShapeDlg::Init()
connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged())); connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged()));
connect(GroupPoints->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(SubShapeToggled())); connect(GroupPoints->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(SubShapeToggled()));
connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
updateButtonState(); updateButtonState();
@ -152,7 +154,7 @@ void EntityGUI_SubShapeDlg::ClickOnOk()
bool EntityGUI_SubShapeDlg::ClickOnApply() bool EntityGUI_SubShapeDlg::ClickOnApply()
{ {
QAD_Application::getDesktop()->putInfo(tr("")); QAD_Application::getDesktop()->putInfo(tr(""));
/* Explode all sub shapes */ /* Explode all sub shapes */
if( isAllSubShapes() ) { if( isAllSubShapes() ) {
/* More than 30 subshapes : ask confirmation */ /* More than 30 subshapes : ask confirmation */
@ -291,7 +293,7 @@ void EntityGUI_SubShapeDlg::SetEditCurrentArgument()
{ {
GroupPoints->LineEdit1->setFocus(); GroupPoints->LineEdit1->setFocus();
myEditCurrentArgument = GroupPoints->LineEdit1; myEditCurrentArgument = GroupPoints->LineEdit1;
GroupPoints->CheckButton1->setChecked( FALSE ); GroupPoints->CheckButton1->setChecked( FALSE );
SubShapeToggled(); SubShapeToggled();
SelectionIntoArgument(); SelectionIntoArgument();
@ -303,7 +305,7 @@ void EntityGUI_SubShapeDlg::SetEditCurrentArgument()
// purpose : // purpose :
//================================================================================= //=================================================================================
void EntityGUI_SubShapeDlg::LineEditReturnPressed() void EntityGUI_SubShapeDlg::LineEditReturnPressed()
{ {
QLineEdit* send = (QLineEdit*)sender(); QLineEdit* send = (QLineEdit*)sender();
if(send == GroupPoints->LineEdit1) if(send == GroupPoints->LineEdit1)
SetEditCurrentArgument(); SetEditCurrentArgument();
@ -376,9 +378,9 @@ void EntityGUI_SubShapeDlg::ResetStateOfDialog()
GroupPoints->ComboBox1->insertItem("Edge"); GroupPoints->ComboBox1->insertItem("Edge");
GroupPoints->ComboBox1->insertItem("Vertex"); GroupPoints->ComboBox1->insertItem("Vertex");
GroupPoints->ComboBox1->insertItem("Shape"); GroupPoints->ComboBox1->insertItem("Shape");
myWithShape = true; myWithShape = true;
GroupPoints->ComboBox1->setCurrentItem( 8 - count + SelectedShapeType ); GroupPoints->ComboBox1->setCurrentItem( 8 - count + SelectedShapeType );
ComboTextChanged(); ComboTextChanged();
@ -402,13 +404,13 @@ void EntityGUI_SubShapeDlg::SubShapeToggled()
//================================================================================= //=================================================================================
// function : ComboTextChanged() // function : ComboTextChanged()
// purpose : // purpose :
//================================================================================= //=================================================================================
void EntityGUI_SubShapeDlg::ComboTextChanged() void EntityGUI_SubShapeDlg::ComboTextChanged()
{ {
/* Select sub shapes mode not checked */ /* Select sub shapes mode not checked */
updateButtonState(); updateButtonState();
SubShapeToggled(); SubShapeToggled();
} }
@ -519,7 +521,7 @@ bool EntityGUI_SubShapeDlg::isValid( QString& msg )
Standard_Boolean aResult = Standard_False; Standard_Boolean aResult = Standard_False;
GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aResult ); GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aResult );
if ( aResult && !anObj->_is_nil() ) { if ( aResult && !anObj->_is_nil() ) {
TColStd_IndexedMapOfInteger aMapIndex; TColStd_IndexedMapOfInteger aMapIndex;
mySelection->GetIndex( mySelection->firstIObject(), aMapIndex ); mySelection->GetIndex( mySelection->firstIObject(), aMapIndex );
@ -540,11 +542,11 @@ bool EntityGUI_SubShapeDlg::execute( ObjectList& objects )
{ {
GEOM::ListOfGO_var aList = GEOM::GEOM_IShapesOperations::_narrow( GEOM::ListOfGO_var aList = GEOM::GEOM_IShapesOperations::_narrow(
getOperation() )->MakeExplode( myObject, shapeType(), false ); getOperation() )->MakeExplode( myObject, shapeType(), false );
if ( !aList->length() ) if ( !aList->length() )
return false; return false;
// Throw away sub-shapes not selected by user if not in preview mode // Throw away sub-shapes not selected by user if not in preview mode
// and manual selection is active // and manual selection is active
if ( !isAllSubShapes() ) if ( !isAllSubShapes() )
{ {
@ -557,7 +559,7 @@ bool EntityGUI_SubShapeDlg::execute( ObjectList& objects )
TColStd_IndexedMapOfInteger aMapIndex; TColStd_IndexedMapOfInteger aMapIndex;
mySelection->GetIndex( mySelection->firstIObject(), aMapIndex ); mySelection->GetIndex( mySelection->firstIObject(), aMapIndex );
GEOM::GEOM_ILocalOperations_var aLocOp = GEOM::GEOM_ILocalOperations_var aLocOp =
getGeomEngine()->GetILocalOperations( getStudyId() ); getGeomEngine()->GetILocalOperations( getStudyId() );
for ( int i = 0, n = aList->length(); i < n; i++ ) for ( int i = 0, n = aList->length(); i < n; i++ )
@ -569,7 +571,7 @@ bool EntityGUI_SubShapeDlg::execute( ObjectList& objects )
else else
for ( int i = 0, n = aList->length(); i < n; i++ ) for ( int i = 0, n = aList->length(); i < n; i++ )
objects.push_back( GEOM::GEOM_Object::_duplicate( aList[i] ) ); objects.push_back( GEOM::GEOM_Object::_duplicate( aList[i] ) );
return objects.size(); return objects.size();
} }
@ -582,4 +584,3 @@ GEOM::GEOM_Object_ptr EntityGUI_SubShapeDlg::getFather( GEOM::GEOM_Object_ptr )
{ {
return myObject; return myObject;
} }