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
Merge branch V7_3_1_BR
[modules/geom.git]
/
src
/
BooleanGUI
/
BooleanGUI_Dialog.cxx
diff --git
a/src/BooleanGUI/BooleanGUI_Dialog.cxx
b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index bd49c95d2c7956075a5880baec70d85ad060aeff..3ee6ba47c2aa31eba07019d3cc8eeced8484c011 100644
(file)
--- a/
src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/
src/BooleanGUI/BooleanGUI_Dialog.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-93,7
+93,7
@@
BooleanGUI_Dialog::BooleanGUI_Dialog (const int theOperation, GeometryGUI* theGe
mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
mainFrame()->RadioButton3->close();
mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
mainFrame()->RadioButton3->close();
- myGroup = new DlgRef_2Sel2Spin
1
Check(centralWidget());
+ myGroup = new DlgRef_2Sel2Spin
3
Check(centralWidget());
myGroup->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
if (myOperation == BooleanGUI::CUT) {
myGroup->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
if (myOperation == BooleanGUI::CUT) {
@@
-108,21
+108,30
@@
BooleanGUI_Dialog::BooleanGUI_Dialog (const int theOperation, GeometryGUI* theGe
myGroup->TextLabel2->hide();
myGroup->PushButton2->hide();
myGroup->LineEdit2->hide();
myGroup->TextLabel2->hide();
myGroup->PushButton2->hide();
myGroup->LineEdit2->hide();
+
+ if (myOperation == BooleanGUI::FUSE) {
+ myGroup->CheckBox2->setText(tr("GEOM_BOOL_REMOVE_EXTRA_EDGES"));
+ }
}
myGroup->PushButton1->setIcon(image1);
myGroup->LineEdit1->setReadOnly(true);
}
myGroup->PushButton1->setIcon(image1);
myGroup->LineEdit1->setReadOnly(true);
- if (myOperation != BooleanGUI::FUSE && myOperation != BooleanGUI::COMMON) {
- myGroup->PushButton2->setIcon(image1);
- myGroup->LineEdit2->setReadOnly(true);
+ if (myOperation != BooleanGUI::FUSE) {
+ myGroup->CheckBox2->hide();
+
+ if (myOperation != BooleanGUI::COMMON) {
+ myGroup->PushButton2->setIcon(image1);
+ myGroup->LineEdit2->setReadOnly(true);
+ }
}
myGroup->TextLabel3->hide();
myGroup->TextLabel4->hide();
myGroup->SpinBox_DX->hide();
myGroup->SpinBox_DY->hide();
}
myGroup->TextLabel3->hide();
myGroup->TextLabel4->hide();
myGroup->SpinBox_DX->hide();
myGroup->SpinBox_DY->hide();
- myGroup->CheckButton1->setText(tr("GEOM_CHECK_SELF_INTERSECTIONS"));
+ myGroup->CheckBox3->hide();
+ myGroup->CheckBox1->setText(tr("GEOM_CHECK_SELF_INTERSECTIONS"));
QVBoxLayout* layout = new QVBoxLayout(centralWidget());
layout->setMargin(0); layout->setSpacing(6);
QVBoxLayout* layout = new QVBoxLayout(centralWidget());
layout->setMargin(0); layout->setSpacing(6);
@@
-158,7
+167,12
@@
void BooleanGUI_Dialog::Init()
myGroup->LineEdit1->setText("");
myGroup->LineEdit2->setText("");
myGroup->LineEdit1->setText("");
myGroup->LineEdit2->setText("");
- myGroup->CheckButton1->setChecked(true);
+ myGroup->CheckBox1->setChecked(true);
+
+ if (myOperation == BooleanGUI::FUSE) {
+ myGroup->CheckBox2->setChecked(true);
+ }
+
myObject1.nullify();
reset();
myObject1.nullify();
reset();
@@
-409,11
+423,16
@@
bool BooleanGUI_Dialog::execute (ObjectList& objects)
GEOM::GEOM_Object_var anObj;
GEOM::GEOM_IBooleanOperations_var anOper = GEOM::GEOM_IBooleanOperations::_narrow(getOperation());
GEOM::GEOM_Object_var anObj;
GEOM::GEOM_IBooleanOperations_var anOper = GEOM::GEOM_IBooleanOperations::_narrow(getOperation());
- const bool isCheckSelfInte = myGroup->CheckB
utton
1->isChecked();
+ const bool isCheckSelfInte = myGroup->CheckB
ox
1->isChecked();
switch (myOperation) {
case BooleanGUI::FUSE:
switch (myOperation) {
case BooleanGUI::FUSE:
- anObj = anOper->MakeFuseList(myObjects, isCheckSelfInte);
+ {
+ const bool isRmExtraEdges = myGroup->CheckBox2->isChecked();
+
+ anObj = anOper->MakeFuseList
+ (myObjects, isCheckSelfInte, isRmExtraEdges);
+ }
break;
case BooleanGUI::COMMON:
anObj = anOper->MakeCommonList(myObjects, isCheckSelfInte);
break;
case BooleanGUI::COMMON:
anObj = anOper->MakeCommonList(myObjects, isCheckSelfInte);