X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGenerationGUI%2FGenerationGUI_PipeDlg.cxx;h=1b75a21ab66ba4bc42b16fee82876a0e0b0e3cfa;hb=fae650357c2256670c6c928993133d7f4478fc38;hp=a1d4e7feddf5cdd82f74986ab3fdc95277fa329c;hpb=16f91b82f447624718787d47955b307588fa9fa8;p=modules%2Fgeom.git diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index a1d4e7fed..1b75a21ab 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -114,8 +114,8 @@ void GenerationGUI_PipeDlg::Init() GroupPoints->LineEdit1->setText(""); GroupPoints->LineEdit2->setText(""); GroupPoints->LineEdit3->setText(""); - myPath = myVec = GEOM::GEOM_Object::_nil(); - myOkBase = myOkPath = myOkVec = false; + myPath.nullify(); + myVec.nullify(); GroupPoints->CheckButton1->setEnabled(false); @@ -129,10 +129,6 @@ void GenerationGUI_PipeDlg::Init() connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(GroupPoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - connect(GroupPoints->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(SelectionTypeButtonClicked())); initName(tr("GEOM_PIPE")); @@ -155,27 +151,27 @@ void GenerationGUI_PipeDlg::ConstructorsClicked( int constructorId ) { erasePreview(); - switch (constructorId) - { - case 0: - { - GroupPoints->TextLabel3->hide(); - GroupPoints->PushButton3->hide(); - GroupPoints->LineEdit3->hide(); - break; - } - case 1: - { - GroupPoints->TextLabel3->show(); - GroupPoints->PushButton3->show(); - GroupPoints->LineEdit3->show(); - break; - } + switch (constructorId) { + case 0: + GroupPoints->TextLabel3->hide(); + GroupPoints->PushButton3->hide(); + GroupPoints->LineEdit3->hide(); + GroupPoints->PushButton1->click(); + break; + case 1: + GroupPoints->TextLabel3->show(); + GroupPoints->PushButton3->show(); + GroupPoints->LineEdit3->show(); + break; + default: + break; } + qApp->processEvents(); updateGeometry(); resize(100,100); + SelectionIntoArgument(); displayPreview(); } @@ -195,9 +191,9 @@ void GenerationGUI_PipeDlg::SelectionTypeButtonClicked() aMap.Add(GEOM_LINE); globalSelection(aMap); } - if(myEditCurrentArgument == GroupPoints->LineEdit2) { + if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) { myEditCurrentArgument->setText(""); - myOkPath = false; + myPath.nullify(); } displayPreview(); } @@ -223,7 +219,7 @@ bool GenerationGUI_PipeDlg::ClickOnApply() initName(); if ( getConstructorId() != 1 ) - ConstructorsClicked( getConstructorId() ); + ConstructorsClicked( getConstructorId() ); // activate selection and connect selection manager GroupPoints->PushButton1->click(); return true; @@ -237,110 +233,48 @@ void GenerationGUI_PipeDlg::SelectionIntoArgument() { erasePreview(); myEditCurrentArgument->setText(""); - if (myEditCurrentArgument == GroupPoints->LineEdit1) myOkBase = false; - else if (myEditCurrentArgument == GroupPoints->LineEdit2) myOkPath = false; - else if (myEditCurrentArgument == GroupPoints->LineEdit3) myOkVec = false; - - LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr(); - SALOME_ListIO aSelList; - aSelMgr->selectedObjects(aSelList); - - if (aSelList.Extent() < 1) - return; - - Standard_Boolean testResult = Standard_False; - GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult); - QString aName = GEOMBase::GetName(aSelectedObject); - - if (!testResult || aSelectedObject->_is_nil()) - return; - - TopoDS_Shape S; - if (!GEOMBase::GetShape(aSelectedObject, S)) - return; - - if (myEditCurrentArgument == GroupPoints->LineEdit1) { - myOkBase = false; - GEOMBase::ConvertListOfIOInListOfGO(aSelList, myBaseObjects, true); - if (aSelList.Extent() > 1) - aName = QString( "%1_objects").arg( aSelList.Extent() ); - - if ( aSelList.Extent() > 0 ) { - // check base shapes - for (int i=0; i < myBaseObjects.length(); i++) { - GEOMBase::GetShape(myBaseObjects[i], S); - if (S.ShapeType() == TopAbs_COMPSOLID || - /*S.ShapeType() == TopAbs_COMPOUND ||*/ - S.ShapeType() == TopAbs_SOLID || - S.ShapeType() == TopAbs_SHAPE) - return; - if ( getConstructorId() == 1 && - (S.ShapeType() == TopAbs_SHELL || - S.ShapeType() == TopAbs_VERTEX)) - return; - } - } - myEditCurrentArgument->setText(aName); - myOkBase = true; - } else if (myEditCurrentArgument == GroupPoints->LineEdit2 || - myEditCurrentArgument == GroupPoints->LineEdit3) { - myEditCurrentArgument == GroupPoints->LineEdit2 ? myOkPath = false : myOkVec = false; - bool myOk = false; - - if (myEditCurrentArgument == GroupPoints->LineEdit2 && !GroupPoints->CheckButton1->isChecked() ){ - myPath = aSelectedObject; - myOkPath = true; - myEditCurrentArgument->setText(aName); - } else { - TColStd_IndexedMapOfInteger aMap; - aSelMgr->GetIndexes(aSelList.First(), aMap); - if (aMap.Extent() == 1) { - int anIndex = aMap(1); - aName.append(":edge_" + QString::number(anIndex)); - - //Find SubShape Object in Father - GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName); - - if (aFindedObject->_is_nil()) { // Object not found in study - GEOM::GEOM_IShapesOperations_var aShapesOp = - getGeomEngine()->GetIShapesOperations(getStudyId()); - aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex); - myOk = true; - } else { // get Object from study - aSelectedObject = aFindedObject; - myOk = true; - } - } else { - myOk = true; - if (S.ShapeType() != TopAbs_EDGE) { - aSelectedObject = GEOM::GEOM_Object::_nil(); - aName = ""; - myOk = false; - } - } - if (myEditCurrentArgument == GroupPoints->LineEdit2) { - myPath = aSelectedObject; - myOkPath = myOk; - } else if (myEditCurrentArgument == GroupPoints->LineEdit3) { - myVec = aSelectedObject; - myOkVec = myOk; - } - myEditCurrentArgument->setText(aName); - - if (myOkPath) { - if (!myOkBase) - GroupPoints->PushButton1->click(); - else if (!myOkVec) - GroupPoints->PushButton3->click(); - } else if (myOkVec) { - if (!myOkBase) - GroupPoints->PushButton1->click(); - else if (!myOkPath) - GroupPoints->PushButton2->click(); - } + if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) { + myBaseObjects.clear(); + QList objects = getSelected( TopAbs_SHAPE, -1 ); + for ( int i = 0; i < objects.count(); i++ ) { + GEOM::shape_type stype = objects[i]->GetMaxShapeType(); + GEOM::shape_type maxallowed = getConstructorId() == 1 ? GEOM::FACE : GEOM::SHELL; + GEOM::shape_type minallowed = getConstructorId() == 1 ? GEOM::EDGE : GEOM::VERTEX; + if ( stype < maxallowed || stype > minallowed ) + continue; + myBaseObjects << objects[i]; + } + if ( !myBaseObjects.isEmpty() ) { + QString aName = myBaseObjects.count() > 1 ? QString( "%1_objects").arg( myBaseObjects.count() ) : GEOMBase::GetName( myBaseObjects[0].get() ); + myEditCurrentArgument->setText( aName ); + } + } + else if (myEditCurrentArgument == GroupPoints->LineEdit2) { + QList types; + types << TopAbs_EDGE << TopAbs_WIRE; + myPath = getSelected( types ); + if ( myPath ) { + QString aName = GEOMBase::GetName( myPath.get() ); + myEditCurrentArgument->setText( aName ); + if ( getConstructorId() == 1 && !myVec ) + GroupPoints->PushButton3->click(); + else if ( myBaseObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + } + } + else if (myEditCurrentArgument == GroupPoints->LineEdit3) { + myVec = getSelected( TopAbs_EDGE ); + if ( myVec ) { + QString aName = GEOMBase::GetName( myVec.get() ); + myEditCurrentArgument->setText( aName ); + if ( myBaseObjects.isEmpty() ) + GroupPoints->PushButton1->click(); + else if ( !myPath ) + GroupPoints->PushButton2->click(); } } + displayPreview(); } @@ -396,26 +330,6 @@ void GenerationGUI_PipeDlg::SetEditCurrentArgument() displayPreview(); } -//================================================================================= -// function : LineEditReturnPressed() -// purpose : -//================================================================================= -void GenerationGUI_PipeDlg::LineEditReturnPressed() -{ - QLineEdit* send = (QLineEdit*)sender(); - if (send == GroupPoints->LineEdit1 || - send == GroupPoints->LineEdit2 || - send == GroupPoints->LineEdit3) { - myEditCurrentArgument = send; - GEOMBase_Skeleton::LineEditReturnPressed(); - } - - if (send == GroupPoints->LineEdit2) - GroupPoints->CheckButton1->setEnabled(true); - else - GroupPoints->CheckButton1->setEnabled(false); -} - //================================================================================= // function : ActivateThisDialog() // purpose : @@ -454,12 +368,18 @@ GEOM::GEOM_IOperations_ptr GenerationGUI_PipeDlg::createOperation() //================================================================================= bool GenerationGUI_PipeDlg::isValid (QString&) { + bool ok = false; switch ( getConstructorId() ) { case 0 : - return myOkBase && myOkPath; + ok = !myBaseObjects.isEmpty() && myPath; + break; case 1 : - return myOkBase && myOkPath && myOkVec; + ok = !myBaseObjects.isEmpty() && myPath && myVec; + break; + default: + break; } + return ok; } //================================================================================= @@ -468,18 +388,17 @@ bool GenerationGUI_PipeDlg::isValid (QString&) //================================================================================= bool GenerationGUI_PipeDlg::execute (ObjectList& objects) { - GEOM::GEOM_Object_var anObj, aBase; + GEOM::GEOM_Object_var anObj; GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation()); - for (int i=0; i < myBaseObjects.length(); i++) { - aBase = myBaseObjects[i]; + for (int i = 0; i < myBaseObjects.count(); i++) { switch ( getConstructorId() ) { case 0 : - anObj = anOper->MakePipe(aBase, myPath); + anObj = anOper->MakePipe(myBaseObjects[i].get(), myPath.get()); break; case 1 : - anObj = anOper->MakePipeBiNormalAlongVector(aBase, myPath, myVec); + anObj = anOper->MakePipeBiNormalAlongVector(myBaseObjects[i].get(), myPath.get(), myVec.get()); break; } @@ -495,11 +414,8 @@ bool GenerationGUI_PipeDlg::execute (ObjectList& objects) //================================================================================= void GenerationGUI_PipeDlg::addSubshapesToStudy() { - QMap objMap; - - objMap[GroupPoints->LineEdit2->text()] = myPath; - - addSubshapesToFather(objMap); + GEOMBase::PublishSubObject( myPath.get() ); + GEOMBase::PublishSubObject( myVec.get() ); } //================================================================================= @@ -508,5 +424,5 @@ void GenerationGUI_PipeDlg::addSubshapesToStudy() //================================================================================= bool GenerationGUI_PipeDlg::extractPrefix() const { - return myBaseObjects.length() > 1; + return myBaseObjects.count() > 1; }