X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGenerationGUI%2FGenerationGUI_PipeDlg.cxx;h=c00a0c27529c5f17f8e9656c381d07284d956373;hb=46f10dcf9b67067b776a44fff6e5dde7bc9ed465;hp=edcbec331bdabc0c7ba8e7ed7ba295a3b5d98fb0;hpb=b5261a981848dacc6b428a95d0e7731ebb8fdc91;p=modules%2Fgeom.git diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index edcbec331..c00a0c275 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -36,11 +37,6 @@ #include #include -#include -#include -#include -#include -#include #include #include @@ -54,7 +50,14 @@ //================================================================================= GenerationGUI_PipeDlg::GenerationGUI_PipeDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl) - : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl) + : GEOMBase_Skeleton (theGeometryGUI, parent, modal, fl), + myGenGroupCheckGP (0), + myPrefixLblGP (0), + myPrefixEditGP (0), + myStepByStepCheckGMP (0), + myGenGroupCheckGMP (0), + myPrefixLblGMP (0), + myPrefixEditGMP (0) { QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_PIPE"))); QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); @@ -82,6 +85,19 @@ GenerationGUI_PipeDlg::GenerationGUI_PipeDlg (GeometryGUI* theGeometryGUI, QWidg GroupPoints->PushButton3->setIcon(image1); GroupPoints->CheckButton1->setText(tr("GEOM_SELECT_UNPUBLISHED_EDGES")); + // Add widgets for group generation + QGridLayout *aLayoutGP = (QGridLayout *)GroupPoints->GroupBox1->layout(); + + myGenGroupCheckGP = + new QCheckBox(tr("GEOM_GENERATE_GROUPS"), GroupPoints->GroupBox1); + myPrefixLblGP = + new QLabel (tr("GEOM_GROUP_NAME_PREFIX"), GroupPoints->GroupBox1); + myPrefixEditGP = new QLineEdit(GroupPoints->GroupBox1); + + aLayoutGP->addWidget(myGenGroupCheckGP, 4, 0, 1, 3); + aLayoutGP->addWidget(myPrefixLblGP, 5, 0, 1, 2); + aLayoutGP->addWidget(myPrefixEditGP, 5, 2); + GroupMakePoints = new DlgRef_3Sel2Check3Spin(centralWidget()); GroupMakePoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); @@ -93,6 +109,12 @@ GenerationGUI_PipeDlg::GenerationGUI_PipeDlg (GeometryGUI* theGeometryGUI, QWidg GroupMakePoints->PushButton3->setIcon(image1); GroupMakePoints->CheckBox1->setText(tr("GEOM_WITH_CONTACT")); GroupMakePoints->CheckBox2->setText(tr("GEOM_WITH_CORRECTION")); + GroupMakePoints->SpinBox1->setAttribute(Qt::WA_DeleteOnClose); + GroupMakePoints->SpinBox2->setAttribute(Qt::WA_DeleteOnClose); + GroupMakePoints->SpinBox3->setAttribute(Qt::WA_DeleteOnClose); + GroupMakePoints->TextLabel4->setAttribute(Qt::WA_DeleteOnClose); + GroupMakePoints->TextLabel5->setAttribute(Qt::WA_DeleteOnClose); + GroupMakePoints->TextLabel6->setAttribute(Qt::WA_DeleteOnClose); GroupMakePoints->SpinBox1->close(); GroupMakePoints->SpinBox2->close(); GroupMakePoints->SpinBox3->close(); @@ -100,6 +122,22 @@ GenerationGUI_PipeDlg::GenerationGUI_PipeDlg (GeometryGUI* theGeometryGUI, QWidg GroupMakePoints->TextLabel5->close(); GroupMakePoints->TextLabel6->close(); + // Add widgets for group generation + QGridLayout *aLayoutGMP = (QGridLayout *)GroupMakePoints->GroupBox1->layout(); + + myStepByStepCheckGMP = + new QCheckBox(tr("GEOM_STEP_BY_STEP"), GroupMakePoints->GroupBox1); + myGenGroupCheckGMP = + new QCheckBox(tr("GEOM_GENERATE_GROUPS"), GroupMakePoints->GroupBox1); + myPrefixLblGMP = + new QLabel (tr("GEOM_GROUP_NAME_PREFIX"), GroupMakePoints->GroupBox1); + myPrefixEditGMP = new QLineEdit(GroupMakePoints->GroupBox1); + + aLayoutGMP->addWidget(myStepByStepCheckGMP, 8, 0, 1, 3); + aLayoutGMP->addWidget(myGenGroupCheckGMP, 9, 0, 1, 3); + aLayoutGMP->addWidget(myPrefixLblGMP, 10, 0, 1, 2); + aLayoutGMP->addWidget(myPrefixEditGMP, 10, 2); + QVBoxLayout* layout = new QVBoxLayout(centralWidget()); layout->setMargin(0); layout->setSpacing(6); layout->addWidget(GroupPoints); @@ -167,6 +205,10 @@ void GenerationGUI_PipeDlg::Init() connect(GroupMakePoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(GroupMakePoints->CheckBox1, SIGNAL(clicked()), this, SLOT(processPreview())); connect(GroupMakePoints->CheckBox2, SIGNAL(clicked()), this, SLOT(processPreview())); + connect(myStepByStepCheckGMP, SIGNAL(clicked()), this, SLOT(processPreview())); + connect(myGenGroupCheckGP, SIGNAL(toggled(bool)), this, SLOT(GenGroupClicked(bool))); + connect(myGenGroupCheckGMP, SIGNAL(toggled(bool)), this, SLOT(GenGroupClicked(bool))); + connect(myStepByStepCheckGMP, SIGNAL(toggled(bool)), this, SLOT(StepByStepClicked(bool))); initName(tr("GEOM_PIPE")); resize(100,100); @@ -178,6 +220,7 @@ void GenerationGUI_PipeDlg::Init() GroupPoints->PushButton1->click(); SelectionIntoArgument(); + updateGenGroup(); } //================================================================================= @@ -196,6 +239,8 @@ void GenerationGUI_PipeDlg::ConstructorsClicked( int constructorId ) GroupPoints->PushButton3->hide(); GroupPoints->LineEdit3->hide(); GroupPoints->PushButton1->click(); + myGenGroupCheckGP->setChecked(false); + resetGenGroup(myGenGroupCheckGP, false, true); break; case 1: GroupMakePoints->hide(); @@ -204,11 +249,16 @@ void GenerationGUI_PipeDlg::ConstructorsClicked( int constructorId ) GroupPoints->PushButton3->show(); GroupPoints->LineEdit3->show(); GroupPoints->PushButton1->click(); + myGenGroupCheckGP->setChecked(false); + resetGenGroup(myGenGroupCheckGP, false, true); break; case 2: GroupPoints->hide(); GroupMakePoints->show(); GroupMakePoints->PushButton1->click(); + myStepByStepCheckGMP->setChecked(false); + myGenGroupCheckGMP->setChecked(false); + resetGenGroup(myGenGroupCheckGMP, false, true); break; default: break; @@ -230,7 +280,7 @@ void GenerationGUI_PipeDlg::SelectionTypeButtonClicked() { globalSelection(); if ( GroupPoints->CheckButton1->isChecked() ) { - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); + localSelection( TopAbs_EDGE ); } else { TColStd_MapOfInteger aMap; aMap.Add(GEOM_COMPOUND); @@ -241,6 +291,7 @@ void GenerationGUI_PipeDlg::SelectionTypeButtonClicked() if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) { myEditCurrentArgument->setText(""); myPath.nullify(); + updateGenGroup(); } processPreview(); } @@ -307,6 +358,7 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() else if ( myBaseObjects.isEmpty() ) GroupPoints->PushButton1->click(); } + updateGenGroup(); } else if (myEditCurrentArgument == GroupPoints->LineEdit3) { myVec = getSelected( TopAbs_EDGE ); @@ -320,7 +372,6 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() } } else if ( myEditCurrentArgument == GroupMakePoints->LineEdit1 ) { - myBaseObjects.clear(); QList types; types << TopAbs_EDGE << TopAbs_WIRE << TopAbs_FACE << TopAbs_SHELL; QList objects = getSelected( types, -1 ); @@ -331,8 +382,7 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() } } else if ( myEditCurrentArgument == GroupMakePoints->LineEdit2 ) { - myLocations.clear(); - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX ); + localSelection( TopAbs_VERTEX ); QList objects = getSelected( TopAbs_VERTEX, -1 ); GEOMBase::Synchronize( myLocations, objects ); if ( !myLocations.isEmpty() ) { @@ -348,6 +398,7 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() QString aName = GEOMBase::GetName( myPath.get() ); myEditCurrentArgument->setText( aName ); } + updateGenGroup(); } processPreview(); @@ -377,7 +428,7 @@ void GenerationGUI_PipeDlg::SetEditCurrentArgument() myEditCurrentArgument = GroupPoints->LineEdit2; if ( GroupPoints->CheckButton1->isChecked() ) { - localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); + localSelection( TopAbs_EDGE ); } else { TColStd_MapOfInteger aMap; aMap.Add(GEOM_COMPOUND); @@ -390,7 +441,7 @@ void GenerationGUI_PipeDlg::SetEditCurrentArgument() else if(send == GroupPoints->PushButton3) { myEditCurrentArgument = GroupPoints->LineEdit3; GroupPoints->CheckButton1->setEnabled(false); - localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + localSelection(TopAbs_EDGE); } GroupMakePoints->PushButton1->setDown(false); @@ -483,24 +534,42 @@ bool GenerationGUI_PipeDlg::isValid (QString&) //================================================================================= bool GenerationGUI_PipeDlg::execute (ObjectList& objects) { - GEOM::GEOM_Object_var anObj; + GEOM::ListOfGO_var aList; GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation()); + bool doGroups = !IsPreview(); + + myGroupObjectsMap.clear(); + switch( getConstructorId() ) { case 0: case 1: + if (doGroups) { + doGroups = myGenGroupCheckGP->isEnabled() && + myGenGroupCheckGP->isChecked(); + } + for (int i = 0; i < myBaseObjects.count(); i++) { switch ( getConstructorId() ) { case 0 : - anObj = anOper->MakePipe(myBaseObjects[i].get(), myPath.get()); - break; + aList = anOper->MakePipe(myBaseObjects[i].get(), + myPath.get(), doGroups); + break; case 1 : - anObj = anOper->MakePipeBiNormalAlongVector(myBaseObjects[i].get(), myPath.get(), myVec.get()); - break; + aList = anOper->MakePipeBiNormalAlongVector + (myBaseObjects[i].get(), myPath.get(), myVec.get(), doGroups); + break; + } + + if (aList->length() > 0) { + if (doGroups) { + addGroups(aList); + } + + if (!aList[0]->_is_nil()) { + objects.push_back(aList[0]._retn()); + } } - - if (!anObj->_is_nil()) - objects.push_back(anObj._retn()); } break; case 2: @@ -510,17 +579,37 @@ bool GenerationGUI_PipeDlg::execute (ObjectList& objects) myBaseGO->length( myBaseObjects.count() ); myLocationsGO->length( myLocations.count() ); for (int i = 0; i < myBaseObjects.count(); i++) { - myBaseGO[i] = myBaseObjects[i].copy(); + myBaseGO[i] = myBaseObjects[i].copy(); } for (int i = 0; i < myLocations.count(); i++) { - myLocationsGO[i] = myLocations[i].copy(); + myLocationsGO[i] = myLocations[i].copy(); + } + + if (doGroups) { + doGroups = myGenGroupCheckGMP->isEnabled() && + myGenGroupCheckGMP->isChecked(); + } + + bool isWithContact = GroupMakePoints->CheckBox1->isEnabled() && + GroupMakePoints->CheckBox1->isChecked(); + bool isWithCorrection = GroupMakePoints->CheckBox2->isEnabled() && + GroupMakePoints->CheckBox2->isChecked(); + + aList = anOper->MakePipeWithDifferentSections + (myBaseGO.in(), myLocationsGO.in(), myPath.get(), + isWithContact, isWithCorrection, + myStepByStepCheckGMP->isChecked(), + doGroups); + + if (aList->length() > 0) { + if (doGroups) { + addGroups(aList); + } + + if (!aList[0]->_is_nil()) { + objects.push_back(aList[0]._retn()); + } } - - anObj = anOper->MakePipeWithDifferentSections(myBaseGO.in(), myLocationsGO.in(), myPath.get(), - GroupMakePoints->CheckBox1->isChecked(), - GroupMakePoints->CheckBox2->isChecked()); - if (!anObj->_is_nil()) - objects.push_back(anObj._retn()); } break; default: @@ -547,3 +636,185 @@ bool GenerationGUI_PipeDlg::extractPrefix() const { return myBaseObjects.count() > 1; } + +//================================================================================= +// function : restoreSubShapes +// purpose : virtual method to restore tree of argument's sub-shapes under +// the resulting shape. Redefined from GEOMBase_Helper class. +//================================================================================= +void GenerationGUI_PipeDlg::restoreSubShapes + (SALOMEDS::Study_ptr theStudy, SALOMEDS::SObject_ptr theSObject) +{ + QCheckBox *aGenGroupCheck = NULL; + QLineEdit *aPrefixEdit = NULL; + + switch (getConstructorId()) { + case 0 : + case 1 : + aGenGroupCheck = myGenGroupCheckGP; + aPrefixEdit = myPrefixEditGP; + break; + case 2 : + aGenGroupCheck = myGenGroupCheckGMP; + aPrefixEdit = myPrefixEditGMP; + break; + default: + break; + } + + if (aGenGroupCheck == NULL || !aGenGroupCheck->isChecked()) { + return; + } + + // get Object from SObject + GEOM::GEOM_Object_var aFather = GEOM::GEOM_Object::_narrow + (theSObject->GetObject()); + + if (CORBA::is_nil(aFather)) { + return; + } + + ObjectMap::const_iterator anIter = + myGroupObjectsMap.find(aFather->GetEntry()); + QString aPrefix = aPrefixEdit->text(); + bool hasPrefix = !aPrefix.isEmpty(); + + if (anIter != myGroupObjectsMap.end()) { + QList::const_iterator it = anIter->second.begin(); + + for (; it != anIter->second.end(); it++) { + // Compose the name + QString aName; + + if (hasPrefix) { + aName = aPrefix + "_"; + } + + aName += tr((*it)->GetName()); + getGeomEngine()->AddInStudy(theStudy, (*it).get(), + aName.toStdString().c_str(), aFather); + } + } +} + +//================================================================================= +// function : getSourceObjects +// purpose : virtual method to get source objects +//================================================================================= +QList GenerationGUI_PipeDlg::getSourceObjects() +{ + QList res(myBaseObjects); + res << myPath << myVec; + for (int i = 0; i < myLocations.count(); i++) + res << myLocations[i]; + return res; +} + +//================================================================================= +// function : GenGroupClicked +// purpose : Slot to treat checking "Generate groups" check box. +//================================================================================= +void GenerationGUI_PipeDlg::GenGroupClicked(bool isChecked) +{ + resetGenGroup((QCheckBox *)sender(), isChecked, false); +} + +//================================================================================= +// function : StepByStepClicked +// purpose : Slot to treat checking "Step-by-step generation" check box. +//================================================================================= +void GenerationGUI_PipeDlg::StepByStepClicked(bool isChecked) +{ + GroupMakePoints->CheckBox1->setEnabled(!isChecked); + GroupMakePoints->CheckBox2->setEnabled(!isChecked); +} + +//================================================================================= +// function : updateGenGroup +// purpose : Update "Generate groups" widgets depending on the path. +//================================================================================= +void GenerationGUI_PipeDlg::updateGenGroup() +{ + bool isEnable = true; + + if (myPath) { + // Check if the path is closed. + TopoDS_Shape aShapePath; + + if (GEOMBase::GetShape(myPath.get(), aShapePath)) { + isEnable = GEOMUtils::IsOpenPath(aShapePath); + } + } + + QCheckBox *aGenGroupCheck = NULL; + + switch (getConstructorId()) { + case 0 : + case 1 : + aGenGroupCheck = myGenGroupCheckGP; + break; + case 2 : + aGenGroupCheck = myGenGroupCheckGMP; + break; + default: + break; + } + + if (aGenGroupCheck != NULL) { + const bool isChecked = aGenGroupCheck->isChecked(); + + aGenGroupCheck->setEnabled(isEnable); + resetGenGroup(aGenGroupCheck, isEnable && isChecked, false); + } +} + +//================================================================================= +// function : resetGenGroup +// purpose : Resets data of "Generate groups" widgets. +//================================================================================= +void GenerationGUI_PipeDlg::resetGenGroup(QCheckBox *theGenGroup, + const bool isChecked, + const bool isClearPrefix) +{ + QLabel *aPrefixLbl = NULL; + QLineEdit *aPrefixEdit = NULL; + + if (theGenGroup == myGenGroupCheckGP) { + aPrefixLbl = myPrefixLblGP; + aPrefixEdit = myPrefixEditGP; + } else if (theGenGroup == myGenGroupCheckGMP) { + aPrefixLbl = myPrefixLblGMP; + aPrefixEdit = myPrefixEditGMP; + } + + if (aPrefixLbl != NULL) { + aPrefixLbl->setEnabled(isChecked); + aPrefixEdit->setEnabled(isChecked); + + if (isClearPrefix) { + aPrefixEdit->setText(""); + } + } +} + +//================================================================================= +// function : addGroups +// purpose : Add result groups to the list of groups. +//================================================================================= +void GenerationGUI_PipeDlg::addGroups(GEOM::ListOfGO_var &theResult) +{ + const int aNbObj = theResult->length(); + + if (aNbObj > 0) { + if (!theResult[0]->_is_nil()) { + QString anEntry = theResult[0]->GetEntry(); + int i; + + for (i = 1; i < aNbObj; ++i) { + if (!theResult[i]->_is_nil()) { + myGroupObjectsMap[anEntry].append(GEOM::GeomObjPtr(theResult[i])); + } + } + } + } +}