-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// 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.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// File : BasicGUI_LineDlg.cxx
-// Author : Lucien PIGNOLONI
-// Module : GEOM
-// $Header$
+// GEOM GEOMGUI : GUI for Geometry component
+// File : BasicGUI_LineDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
+//
#include "BasicGUI_LineDlg.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
#include <TopoDS_Shape.hxx>
#include <TopoDS.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
//=================================================================================
// class : BasicGUI_LineDlg()
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-BasicGUI_LineDlg::BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
- const char* name, bool modal, WFlags fl)
- :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
- WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+BasicGUI_LineDlg::BasicGUI_LineDlg( GeometryGUI* theGeometryGUI, QWidget* parent,
+ bool modal, Qt::WindowFlags fl )
+ : GEOMBase_Skeleton( theGeometryGUI, parent, modal, fl )
{
- QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P")));
- QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_SELECT")));
- QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2F")));
-
- setCaption(tr("GEOM_LINE_TITLE"));
-
- QGroupBox* aFrame = new QGroupBox( 1, Qt::Horizontal, this );
- aFrame->setInsideMargin( 0 );
- aFrame->setFrameStyle( QFrame::NoFrame );
+ QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_LINE_2P" ) ) );
+ QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+ QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_LINE_2F" ) ) );
+ setWindowTitle( tr( "GEOM_LINE_TITLE" ) );
+
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_LINE"));
- RadioButton1->setPixmap(image0);
- RadioButton2->setPixmap(image2);
- RadioButton3->close(TRUE);
-
- GroupPoints = new DlgRef_2Sel_QTD( aFrame, "GroupPoints");
- GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
- GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
- GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
- GroupPoints->PushButton1->setPixmap(image1);
- GroupPoints->PushButton2->setPixmap(image1);
+ mainFrame()->GroupConstructors->setTitle( tr( "GEOM_LINE" ) );
+ mainFrame()->RadioButton1->setIcon( image0 );
+ mainFrame()->RadioButton2->setIcon( image2 );
+ mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+ mainFrame()->RadioButton3->close();
+
+ GroupPoints = new DlgRef_2Sel( centralWidget() );
+
+ GroupPoints->GroupBox1->setTitle( tr( "GEOM_POINTS" ) );
+ GroupPoints->TextLabel1->setText( tr( "GEOM_POINT_I" ).arg( 1 ) );
+ GroupPoints->TextLabel2->setText( tr( "GEOM_POINT_I" ).arg( 2 ) );
+ GroupPoints->PushButton1->setIcon( image1 );
+ GroupPoints->PushButton2->setIcon( image1 );
GroupPoints->LineEdit1->setReadOnly( true );
GroupPoints->LineEdit2->setReadOnly( true );
-
- GroupFaces = new DlgRef_2Sel_QTD( aFrame, "GroupFaces");
- GroupFaces->GroupBox1->setTitle(tr("GEOM_FACES"));
- GroupFaces->TextLabel1->setText(tr("GEOM_FACE_I").arg("1"));
- GroupFaces->TextLabel2->setText(tr("GEOM_FACE_I").arg("2"));
- GroupFaces->PushButton1->setPixmap(image1);
- GroupFaces->PushButton2->setPixmap(image1);
+ GroupPoints->LineEdit1->setEnabled( true );
+ GroupPoints->LineEdit2->setEnabled( false );
+
+ GroupFaces = new DlgRef_2Sel( centralWidget() );
+ GroupFaces->GroupBox1->setTitle( tr( "GEOM_FACES" ) );
+ GroupFaces->TextLabel1->setText( tr( "GEOM_FACE_I" ).arg( "1" ) );
+ GroupFaces->TextLabel2->setText( tr( "GEOM_FACE_I" ).arg( "2" ) );
+ GroupFaces->PushButton1->setIcon( image1 );
+ GroupFaces->PushButton2->setIcon( image1 );
GroupFaces->LineEdit1->setReadOnly( true );
GroupFaces->LineEdit2->setReadOnly( true );
+ GroupFaces->LineEdit1->setEnabled( true );
+ GroupFaces->LineEdit2->setEnabled( false );
+
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( GroupPoints );
+ layout->addWidget( GroupFaces );
- Layout1->addWidget(aFrame, 2, 0);
/***************************************************************/
- setHelpFileName("create_line_page.html");
+ setHelpFileName( "create_line_page.html" );
Init();
}
+
//=================================================================================
// function : ~BasicGUI_LineDlg()
// purpose : Destroys the object and frees any allocated resources
{
}
+
//=================================================================================
// function : Init()
// purpose :
void BasicGUI_LineDlg::Init()
{
/* init variables */
- //myEditCurrentArgument = GroupPoints->LineEdit1;
- //myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
- //globalSelection(); // close local contexts, if any
- //localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-
+ myEditCurrentArgument = GroupPoints->LineEdit1;
+ myPoint1.nullify();
+ myPoint2.nullify();
+ myFace1.nullify();
+ myFace2.nullify();
+
+ GroupPoints->PushButton1->setDown(true);
+
/* signals and slots connections */
- connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
- connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
- connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
- connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
-
- connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-
- connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(GroupFaces->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(GroupFaces->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
- connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(GroupFaces->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(GroupFaces->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
- connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
- this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+ connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) );
+
+ connect( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
+
+ connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+ connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+ connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( GroupPoints->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( GroupFaces->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( GroupFaces->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
- ConstructorsClicked(0);
- initName( tr("GEOM_LINE") );
+ initName( tr( "GEOM_LINE" ) );
+
+ ConstructorsClicked( 0 );
}
+
//=================================================================================
// function : ClickOnOk()
// purpose :
//=================================================================================
void BasicGUI_LineDlg::ClickOnOk()
{
+ setIsApplyAndClose( true );
if ( ClickOnApply() )
ClickOnCancel();
}
-//=================================================================================
-// function : ClickOnCancel()
-// purpose :
-//=================================================================================
-void BasicGUI_LineDlg::ClickOnCancel()
-{
- GEOMBase_Skeleton::ClickOnCancel();
-}
-
//=================================================================================
// function : ClickOnApply()
// purpose :
//=================================================================================
bool BasicGUI_LineDlg::ClickOnApply()
{
-
if ( !onAccept() )
return false;
-
+
initName();
- myEditCurrentArgument->setText("");
- ConstructorsClicked(getConstructorId());
+
+ myEditCurrentArgument->setText( "" );
+ ConstructorsClicked( getConstructorId() );
+
return true;
}
// function : ConstructorsClicked()
// purpose : Radio button management
//=================================================================================
-void BasicGUI_LineDlg::ConstructorsClicked(int constructorId)
+void BasicGUI_LineDlg::ConstructorsClicked( int constructorId )
{
- switch ( constructorId )
- {
+ switch ( constructorId ) {
case 0:
{
- globalSelection(); // close local contexts, if any
- localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-
myEditCurrentArgument = GroupPoints->LineEdit1;
- myEditCurrentArgument->setText("");
- myPoint1 = GEOM::GEOM_Object::_nil();
- myPoint2 = GEOM::GEOM_Object::_nil();
+ myEditCurrentArgument->setText( "" );
+ GroupPoints->LineEdit2->setText( "" );
+ myPoint1.nullify();
+ myPoint2.nullify();
+ GroupPoints->PushButton1->setDown(true);
+ GroupPoints->PushButton2->setDown(false);
+ GroupPoints->LineEdit1->setEnabled(true);
+ GroupPoints->LineEdit2->setEnabled(false);
GroupPoints->show();
GroupFaces->hide();
break;
}
case 1:
{
- globalSelection(); // close local contexts, if any
- localSelection( GEOM::GEOM_Object::_nil(), TopAbs_FACE );
-
myEditCurrentArgument = GroupFaces->LineEdit1;
myEditCurrentArgument->setText("");
- myFace1 = GEOM::GEOM_Object::_nil();
- myFace2 = GEOM::GEOM_Object::_nil();
+ myFace1.nullify();
+ myFace2.nullify();
+ GroupFaces->PushButton1->setDown(true);
+ GroupFaces->PushButton2->setDown(false);
+ GroupFaces->LineEdit1->setEnabled(true);
+ GroupFaces->LineEdit2->setEnabled(false);
GroupPoints->hide();
GroupFaces->show();
break;
}
}
+ TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupFaces->LineEdit1 ||
+ myEditCurrentArgument == GroupFaces->LineEdit2 ) ?
+ TopAbs_FACE : TopAbs_VERTEX;
+ globalSelection(); // close local selection to clear it
+ localSelection( aNeedType );
+
+ qApp->processEvents();
updateGeometry();
- resize(minimumSize());
+ resize( minimumSizeHint() );
SelectionIntoArgument();
}
//=================================================================================
void BasicGUI_LineDlg::SelectionIntoArgument()
{
- myEditCurrentArgument->setText("");
-
- if (IObjectCount() != 1)
- {
- if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = GEOM::GEOM_Object::_nil();
- else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = GEOM::GEOM_Object::_nil();
- else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) myFace1 = GEOM::GEOM_Object::_nil();
- else if ( myEditCurrentArgument == GroupFaces->LineEdit2 ) myFace2 = GEOM::GEOM_Object::_nil();
+ myEditCurrentArgument->setText( "" );
+
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ if (aSelList.Extent() != 1) {
+ if (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint1.nullify();
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2) myPoint2.nullify();
+ else if (myEditCurrentArgument == GroupFaces->LineEdit1) myFace1.nullify();
+ else if (myEditCurrentArgument == GroupFaces->LineEdit2) myFace2.nullify();
+ displayPreview(true);
return;
}
- // nbSel == 1
- Standard_Boolean aRes = Standard_False;
- GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), aRes);
- if (!CORBA::is_nil(aSelectedObject) && aRes)
- {
- QString aName = GEOMBase::GetName(aSelectedObject);
-
- TopoDS_Shape aShape;
- if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
- {
- TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
- if (myEditCurrentArgument == GroupFaces->LineEdit1 ||
- myEditCurrentArgument == GroupFaces->LineEdit2)
- aNeedType = TopAbs_FACE;
-
- LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
- TColStd_IndexedMapOfInteger aMap;
- aSelMgr->GetIndexes(firstIObject(), aMap);
- if (aMap.Extent() == 1) // Local Selection
- {
- int anIndex = aMap( 1 );
- if (aNeedType == TopAbs_FACE)
- aName += QString(":face_%1").arg(anIndex);
- else
- aName += QString(":vertex_%1").arg(anIndex);
-
- //Find SubShape Object in Father
- GEOM::GEOM_Object_var aFindedObject = GEOMBase_Helper::findObjectInFather(aSelectedObject, aName);
-
- if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
- GEOM::GEOM_IShapesOperations_var aShapesOp = getGeomEngine()->GetIShapesOperations(getStudyId());
- aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
- }
- else
- aSelectedObject = aFindedObject; // get Object from study
- }
- else // Global Selection
- {
- if (aShape.ShapeType() != aNeedType) {
- aSelectedObject = GEOM::GEOM_Object::_nil();
- aName = "";
- }
- }
+ TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupFaces->LineEdit1 ||
+ myEditCurrentArgument == GroupFaces->LineEdit2 ) ?
+ TopAbs_FACE : TopAbs_VERTEX;
+ GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType );
+ TopoDS_Shape aShape;
+ if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
+ QString aName = GEOMBase::GetName( aSelectedObject.get() );
+ myEditCurrentArgument->setText( aName );
+ if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+ myPoint1 = aSelectedObject;
+ if ( myPoint1 && !myPoint2 )
+ GroupPoints->PushButton2->click();
+ }
+ else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+ myPoint2 = aSelectedObject;
+ if ( myPoint2 && !myPoint1 )
+ GroupPoints->PushButton1->click();
+ }
+ else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) {
+ myFace1 = aSelectedObject;
+ if ( myFace1 && !myFace2 )
+ GroupFaces->PushButton2->click();
+ }
+ else if ( myEditCurrentArgument == GroupFaces->LineEdit2 ) {
+ myFace2 = aSelectedObject;
+ if ( myFace2 && !myFace1 )
+ GroupFaces->PushButton1->click();
}
-
- myEditCurrentArgument->setText(aName);
-
- if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint1 = aSelectedObject;
- else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myPoint2 = aSelectedObject;
- else if ( myEditCurrentArgument == GroupFaces->LineEdit1 ) myFace1 = aSelectedObject;
- else if ( myEditCurrentArgument == GroupFaces->LineEdit2 ) myFace2 = aSelectedObject;
}
- displayPreview();
+ displayPreview(true);
}
//=================================================================================
void BasicGUI_LineDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
- if ( send == GroupPoints->PushButton1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
- else if ( send == GroupPoints->PushButton2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
- else if ( send == GroupFaces->PushButton1 ) myEditCurrentArgument = GroupFaces->LineEdit1;
- else if ( send == GroupFaces->PushButton2 ) myEditCurrentArgument = GroupFaces->LineEdit2;
- myEditCurrentArgument->setFocus();
- SelectionIntoArgument();
-}
+ if ( send == GroupPoints->PushButton1 ) {
+ myEditCurrentArgument = GroupPoints->LineEdit1;
+ GroupPoints->PushButton2->setDown(false);
+ GroupPoints->LineEdit1->setEnabled(true);
+ GroupPoints->LineEdit2->setEnabled(false);
+ }
+ else if ( send == GroupPoints->PushButton2 ) {
+ myEditCurrentArgument = GroupPoints->LineEdit2;
+ GroupPoints->PushButton1->setDown(false);
+ GroupPoints->LineEdit1->setEnabled(false);
+ GroupPoints->LineEdit2->setEnabled(true);
+ }
+ else if ( send == GroupFaces->PushButton1 ) {
+ myEditCurrentArgument = GroupFaces->LineEdit1;
+ GroupFaces->PushButton2->setDown(false);
+ GroupFaces->LineEdit1->setEnabled(true);
+ GroupFaces->LineEdit2->setEnabled(false);
+ }
+ else if ( send == GroupFaces->PushButton2 ) {
+ myEditCurrentArgument = GroupFaces->LineEdit2;
+ GroupFaces->PushButton1->setDown(false);
+ GroupFaces->LineEdit1->setEnabled(false);
+ GroupFaces->LineEdit2->setEnabled(true);
+ }
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose :
-//=================================================================================
-void BasicGUI_LineDlg::LineEditReturnPressed()
-{
- QLineEdit* send = (QLineEdit*)sender();
- if ( send == GroupPoints->LineEdit1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
- else if ( send == GroupPoints->LineEdit2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
- else if ( send == GroupFaces->LineEdit1 ) myEditCurrentArgument = GroupFaces->LineEdit1;
- else if ( send == GroupFaces->LineEdit2 ) myEditCurrentArgument = GroupFaces->LineEdit2;
- else return;
- GEOMBase_Skeleton::LineEditReturnPressed();
+ TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupFaces->LineEdit1 ||
+ myEditCurrentArgument == GroupFaces->LineEdit2 ) ?
+ TopAbs_FACE : TopAbs_VERTEX;
+ globalSelection(); // close local selection to clear it
+ localSelection( aNeedType );
+
+ myEditCurrentArgument->setFocus();
+ // SelectionIntoArgument();
+ send->setDown(true);
+ displayPreview(true);
}
//=================================================================================
void BasicGUI_LineDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
- this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
- ConstructorsClicked(getConstructorId());
+ ConstructorsClicked( getConstructorId() );
}
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
-void BasicGUI_LineDlg::enterEvent(QEvent* e)
+void BasicGUI_LineDlg::enterEvent( QEvent* )
{
- if ( !GroupConstructors->isEnabled() )
+ if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
//=================================================================================
bool BasicGUI_LineDlg::isValid( QString& msg )
{
- const int id = getConstructorId();
- if ( id == 0 )
- return !myPoint1->_is_nil() && !myPoint2->_is_nil();
- else if ( id == 1 )
- return !myFace1->_is_nil() && !myFace2->_is_nil();
- return false;
+ bool ok = false;
+ switch ( getConstructorId() ) {
+ case 0 :
+ ok = myPoint1 && myPoint2;
+ break;
+ case 1:
+ ok = myFace1 && myFace2;
+ break;
+ default:
+ break;
+ }
+ return ok;
}
//=================================================================================
{
bool res = false;
GEOM::GEOM_Object_var anObj;
- switch ( getConstructorId() )
- {
- case 0 :
- {
- anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoPnt( myPoint1, myPoint2 );
- res = true;
- break;
- }
- case 1 :
- {
- anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakeLineTwoFaces( myFace1, myFace2 );
- res = true;
- break;
- }
- }
+ GEOM::GEOM_IBasicOperations_var anOper = GEOM::GEOM_IBasicOperations::_narrow( getOperation() );
+ switch ( getConstructorId() ) {
+ case 0 :
+ anObj = anOper->MakeLineTwoPnt( myPoint1.get(), myPoint2.get() );
+ res = true;
+ break;
+ case 1 :
+ anObj = anOper->MakeLineTwoFaces( myFace1.get(), myFace2.get() );
+ res = true;
+ break;
+ }
+
if ( !anObj->_is_nil() )
objects.push_back( anObj._retn() );
}
//=================================================================================
-// function : closeEvent
-// purpose :
+// function : addSubshapeToStudy
+// purpose : virtual method to add new SubObjects if local selection
//=================================================================================
-void BasicGUI_LineDlg::closeEvent( QCloseEvent* e )
+void BasicGUI_LineDlg::addSubshapesToStudy()
{
- GEOMBase_Skeleton::closeEvent( e );
+ switch ( getConstructorId() ) {
+ case 0 :
+ GEOMBase::PublishSubObject( myPoint1.get() );
+ GEOMBase::PublishSubObject( myPoint2.get() );
+ break;
+ case 1 :
+ GEOMBase::PublishSubObject( myFace1.get() );
+ GEOMBase::PublishSubObject( myFace2.get() );
+ break;
+ default:
+ break;
+ }
}
//=================================================================================
-// function : addSubshapeToStudy
-// purpose : virtual method to add new SubObjects if local selection
+// function : getSourceObjects
+// purpose : virtual method to get source objects
//=================================================================================
-void BasicGUI_LineDlg::addSubshapesToStudy()
+QList<GEOM::GeomObjPtr> BasicGUI_LineDlg::getSourceObjects()
{
- QMap<QString, GEOM::GEOM_Object_var> objMap;
- switch ( getConstructorId() )
- {
- case 0 :
- objMap[GroupPoints->LineEdit1->text()] = myPoint1;
- objMap[GroupPoints->LineEdit2->text()] = myPoint2;
- break;
- case 1 :
- objMap[GroupFaces->LineEdit1->text()] = myFace1;
- objMap[GroupFaces->LineEdit2->text()] = myFace2;
- break;
- }
- addSubshapesToFather( objMap );
+ QList<GEOM::GeomObjPtr> res;
+ res << myPoint1 << myPoint2 << myFace1 << myFace2;
+ return res;
}
