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
Additional change to fix the preview problem
[modules/geom.git]
/
src
/
RepairGUI
/
RepairGUI_RemoveIntWiresDlg.cxx
diff --git
a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index 8079b166d4e3c0fd2a82df72c20a4563c8d6c499..6bfdbb1ff7a524c3f607776a6829c57c91c8aec8 100644
(file)
--- a/
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.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 : RepairGUI_RemoveIntWiresDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
// GEOM GEOMGUI : GUI for Geometry component
// File : RepairGUI_RemoveIntWiresDlg.cxx
// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
@@
-122,6
+123,7
@@
void RepairGUI_RemoveIntWiresDlg::Init()
GroupPoints->PushButton1->click();
SelectionIntoArgument();
GroupPoints->PushButton1->click();
SelectionIntoArgument();
+ resize(100,100);
}
//=================================================================================
}
//=================================================================================
@@
-130,6
+132,7
@@
void RepairGUI_RemoveIntWiresDlg::Init()
//=================================================================================
void RepairGUI_RemoveIntWiresDlg::ClickOnOk()
{
//=================================================================================
void RepairGUI_RemoveIntWiresDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if (ClickOnApply())
ClickOnCancel();
}
if (ClickOnApply())
ClickOnCancel();
}
@@
-171,9
+174,8
@@
void RepairGUI_RemoveIntWiresDlg::SelectionIntoArgument()
Handle(SALOME_InteractiveObject) anIO = aSelList.First();
if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
Handle(SALOME_InteractiveObject) anIO = aSelList.First();
if (myEditCurrentArgument == GroupPoints->LineEdit1) { // face selection
- Standard_Boolean aRes;
- myObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
- if (aRes && GEOMBase::IsShape(myObject)) {
+ myObject = GEOMBase::ConvertIOinGEOMObject( anIO );
+ if ( GEOMBase::IsShape(myObject) ) {
myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
// clear selection
myEditCurrentArgument->setText(GEOMBase::GetName(myObject));
// clear selection
@@
-259,7
+261,7
@@
void RepairGUI_RemoveIntWiresDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
{
GEOMBase_Skeleton::ActivateThisDialog();
connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
- this, SLOT( SelectionIntoArgument() ) );
+
this, SLOT( SelectionIntoArgument() ) );
myEditCurrentArgument = GroupPoints->LineEdit1;
myEditCurrentArgument->setText( "" );
myEditCurrentArgument = GroupPoints->LineEdit1;
myEditCurrentArgument->setText( "" );
@@
-305,8
+307,8
@@
bool RepairGUI_RemoveIntWiresDlg::isValid (QString&)
//=================================================================================
bool RepairGUI_RemoveIntWiresDlg::execute (ObjectList& objects)
{
//=================================================================================
bool RepairGUI_RemoveIntWiresDlg::execute (ObjectList& objects)
{
- GEOM::GEOM_
Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow(getOperation())->
-
RemoveIntWires(myObject, myWiresInd);
+ GEOM::GEOM_
IHealingOperations_var anOper = GEOM::GEOM_IHealingOperations::_narrow(getOperation());
+
GEOM::GEOM_Object_var anObj = anOper->
RemoveIntWires(myObject, myWiresInd);
bool aResult = !anObj->_is_nil();
if (aResult)
bool aResult = !anObj->_is_nil();
if (aResult)