-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003 OPEN CASCADE
-//
-// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// 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.
//
+// 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
+//
+// GEOM GEOMGUI : GUI for Geometry component
+// File : BasicGUI_EllipseDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
//
-// File : BasicGUI_EllipseDlg.cxx
-// Author : Nicolas REJNERI
-// Module : GEOM
-// $Header$
-
#include "BasicGUI_EllipseDlg.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include <DlgRef.h>
-#include <qlabel.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
-#include "GEOMImpl_Types.hxx"
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
-#include "utilities.h"
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
-using namespace std;
+#include <GEOMImpl_Types.hxx>
//=================================================================================
// class : BasicGUI_EllipseDlg()
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-BasicGUI_EllipseDlg::BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl)
- :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
+BasicGUI_EllipseDlg::BasicGUI_EllipseDlg( 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_ELLIPSE_PV")));
- QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_ELLIPSE_PV" ) ) );
+ QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
+
+ setWindowTitle( tr( "GEOM_ELLIPSE_TITLE" ) );
- setCaption(tr("GEOM_ELLIPSE_TITLE"));
-
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_ELLIPSE"));
- RadioButton1->setPixmap(image0);
- RadioButton2->close(TRUE);
- RadioButton3->close(TRUE);
-
- GroupPoints = new DlgRef_2Sel2Spin(this, "GroupPoints");
- GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
- GroupPoints->TextLabel1->setText(tr("GEOM_CENTER"));
- GroupPoints->TextLabel2->setText(tr("GEOM_VECTOR"));
- GroupPoints->TextLabel3->setText(tr("GEOM_RADIUS_MAJOR"));
- GroupPoints->TextLabel4->setText(tr("GEOM_RADIUS_MINOR"));
- GroupPoints->PushButton1->setPixmap(image1);
- GroupPoints->PushButton2->setPixmap(image1);
+ mainFrame()->GroupConstructors->setTitle( tr( "GEOM_ELLIPSE" ) );
+ mainFrame()->RadioButton1->setIcon( image0 );
+ mainFrame()->RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+ mainFrame()->RadioButton2->close();
+ mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+ mainFrame()->RadioButton3->close();
+
+ GroupPoints = new DlgRef_3Sel2Spin( centralWidget() );
+ GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) );
+ GroupPoints->TextLabel1->setText( tr( "%1 (%2)" ).arg( tr( "GEOM_CENTER" ), tr( "ORIGIN_DEFAULT" ) ) );
+ GroupPoints->TextLabel2->setText( tr( "%1 (%2)" ).arg( tr( "GEOM_VECTOR" ), tr( "Z_AXIS_DEFAULT" ) ) );
+ GroupPoints->TextLabel3->setText( tr( "%1 (%2)" ).arg( tr( "GEOM_VECTOR_MAJOR" ), tr( "X_AXIS_DEFAULT" ) ) );
+ GroupPoints->TextLabel4->setText( tr( "GEOM_RADIUS_MAJOR" ) );
+ GroupPoints->TextLabel5->setText( tr( "GEOM_RADIUS_MINOR" ) );
+ GroupPoints->PushButton1->setIcon( image1 );
+ GroupPoints->PushButton2->setIcon( image1 );
+ GroupPoints->PushButton3->setIcon( image1 );
GroupPoints->LineEdit1->setReadOnly( true );
GroupPoints->LineEdit2->setReadOnly( true );
-
- Layout1->addWidget(GroupPoints, 2, 0);
+ GroupPoints->LineEdit3->setReadOnly( true );
+ GroupPoints->LineEdit1->setEnabled( true );
+ GroupPoints->LineEdit2->setEnabled( false );
+ GroupPoints->LineEdit3->setEnabled( false );
+
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( GroupPoints );
/***************************************************************/
+ setHelpFileName( "create_ellipse_page.html" );
+
Init();
}
{
/* init variables */
myEditCurrentArgument = GroupPoints->LineEdit1;
- globalSelection( GEOM_POINT );
-
- myPoint = myDir = GEOM::GEOM_Object::_nil();
+ globalSelection(); // close local contexts, if any
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+ GroupPoints->PushButton1->setDown(true);
- // myGeometryGUI->SetState( 0 );
+ myPoint = myDir = myMajor = GEOM::GEOM_Object::_nil();
/* Get setting of step value from file configuration */
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
- double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100);
+ double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
double aMajorR( 200. ), aMinorR( 100. );
/* min, max, step and decimals for spin boxes & initial values */
- GroupPoints->SpinBox_DX->RangeStepAndValidator( 0.001, 999.999, step, 3 );
- GroupPoints->SpinBox_DY->RangeStepAndValidator( 0.001, 999.999, step, 3 );
- GroupPoints->SpinBox_DX->SetValue( aMajorR );
- GroupPoints->SpinBox_DY->SetValue( aMinorR );
+ initSpinBox( GroupPoints->SpinBox_DX, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( GroupPoints->SpinBox_DY, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ GroupPoints->SpinBox_DX->setValue( aMajorR );
+ GroupPoints->SpinBox_DY->setValue( aMinorR );
/* signals and slots connections */
- connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
- connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
- connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
+ connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
+ connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) );
- connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+ 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( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ 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->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+ connect( GroupPoints->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
+ connect( GroupPoints->LineEdit3, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
- connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
- connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+ connect( GroupPoints->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
+ connect( GroupPoints->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
- connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
- connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double)));
+ connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+ connect( myGeomGUI->getApp()->selectionMgr(),
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
initName( tr( "GEOM_ELLIPSE" ) );
+
+ resize(100,100);
+ displayPreview();
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose : Double spin box management
+//=================================================================================
+void BasicGUI_EllipseDlg::SetDoubleSpinBoxStep( double step )
+{
+ GroupPoints->SpinBox_DX->setSingleStep(step);
+ GroupPoints->SpinBox_DY->setSingleStep(step);
}
initName();
// reset
- myPoint = myDir = GEOM::GEOM_Object::_nil();
+ myPoint = myDir = myMajor = GEOM::GEOM_Object::_nil();
GroupPoints->LineEdit1->setText( "" );
GroupPoints->LineEdit2->setText( "" );
+ GroupPoints->LineEdit3->setText( "" );
+ GroupPoints->PushButton1->setDown(true);
+ GroupPoints->PushButton2->setDown(false);
+ GroupPoints->PushButton3->setDown(false);
+ GroupPoints->LineEdit1->setEnabled( true );
+ GroupPoints->LineEdit2->setEnabled( false );
+ GroupPoints->LineEdit3->setEnabled( false );
myEditCurrentArgument = GroupPoints->LineEdit1;
- globalSelection( GEOM_POINT );
+
+ globalSelection(); // close local contexts, if any
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+ displayPreview();
return true;
}
-//=======================================================================
-// function : ClickOnCancel()
-// purpose :
-//=======================================================================
-void BasicGUI_EllipseDlg::ClickOnCancel()
-{
- GEOMBase_Skeleton::ClickOnCancel();
-}
-
//=================================================================================
// function : SelectionIntoArgument()
// purpose : Called when selection as changed or other case
//=================================================================================
void BasicGUI_EllipseDlg::SelectionIntoArgument()
{
- myEditCurrentArgument->setText("");
+ myEditCurrentArgument->setText( "" );
- if ( IObjectCount() != 1 )
- {
- if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint = GEOM::GEOM_Object::_nil();
- else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myDir = GEOM::GEOM_Object::_nil();
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ if (aSelList.Extent() != 1) {
+ if (myEditCurrentArgument == GroupPoints->LineEdit1) myPoint = GEOM::GEOM_Object::_nil();
+ else if (myEditCurrentArgument == GroupPoints->LineEdit2) myDir = GEOM::GEOM_Object::_nil();
+ else if (myEditCurrentArgument == GroupPoints->LineEdit3) myMajor = GEOM::GEOM_Object::_nil();
return;
}
Standard_Boolean aRes = Standard_False;
- GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), aRes );
- if ( !CORBA::is_nil( aSelectedObject ) && aRes )
- {
- myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
- if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) myPoint = aSelectedObject;
- else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) myDir = aSelectedObject;
+ Handle(SALOME_InteractiveObject) anIO = aSelList.First();
+ GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(anIO, aRes);
+ if (!CORBA::is_nil(aSelectedObject) && aRes) {
+ QString aName = GEOMBase::GetName(aSelectedObject);
+
+ // Get Selected object if selected subshape
+ TopoDS_Shape aShape;
+
+ TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+ if ( myEditCurrentArgument == GroupPoints->LineEdit2 || myEditCurrentArgument == GroupPoints->LineEdit3 )
+ aNeedType = TopAbs_EDGE;
+
+ if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
+ TColStd_IndexedMapOfInteger aMap;
+ aSelMgr->GetIndexes(anIO, aMap);
+ if (aMap.Extent() == 1) {
+ int anIndex = aMap(1);
+ if (aNeedType == TopAbs_EDGE)
+ aName += QString(":edge_%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 = "";
+ }
+ }
+ }
+
+ myEditCurrentArgument->setText( aName );
+
+ if (!aSelectedObject->_is_nil()) { // clear selection if something selected
+ globalSelection();
+ localSelection( GEOM::GEOM_Object::_nil(), aNeedType );
+ }
+
+ if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+ myPoint = aSelectedObject;
+ if ( !myPoint->_is_nil() && myDir->_is_nil() )
+ GroupPoints->PushButton2->click();
+ }
+ else if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+ myDir = aSelectedObject;
+ if ( !myDir->_is_nil() && myMajor->_is_nil() )
+ GroupPoints->PushButton3->click();
+ }
+ else if ( myEditCurrentArgument == GroupPoints->LineEdit3 ) {
+ myMajor = aSelectedObject;
+ if ( !myMajor->_is_nil() && myPoint->_is_nil() )
+ GroupPoints->PushButton1->click();
+ }
}
displayPreview();
{
QPushButton* send = (QPushButton*)sender();
- if ( send == GroupPoints->PushButton1 ) myEditCurrentArgument = GroupPoints->LineEdit1;
- else if ( send == GroupPoints->PushButton2 ) myEditCurrentArgument = GroupPoints->LineEdit2;
+ if ( send == GroupPoints->PushButton1 ) {
+ myEditCurrentArgument = GroupPoints->LineEdit1;
+ GroupPoints->PushButton2->setDown(false);
+ GroupPoints->PushButton3->setDown(false);
+ GroupPoints->LineEdit1->setEnabled( true );
+ GroupPoints->LineEdit2->setEnabled( false );
+ GroupPoints->LineEdit3->setEnabled( false );
+ }
+ else if ( send == GroupPoints->PushButton2 ) {
+ myEditCurrentArgument = GroupPoints->LineEdit2;
+ GroupPoints->PushButton1->setDown(false);
+ GroupPoints->PushButton3->setDown(false);
+ GroupPoints->LineEdit1->setEnabled( false );
+ GroupPoints->LineEdit2->setEnabled( true );
+ GroupPoints->LineEdit3->setEnabled( false );
+ }
+ else if ( send == GroupPoints->PushButton3 ) {
+ myEditCurrentArgument = GroupPoints->LineEdit3;
+ GroupPoints->PushButton1->setDown(false);
+ GroupPoints->PushButton2->setDown(false);
+ GroupPoints->LineEdit1->setEnabled( false );
+ GroupPoints->LineEdit2->setEnabled( false );
+ GroupPoints->LineEdit3->setEnabled( true );
+ }
+
+ globalSelection(); // close local contexts, if any
+ TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
+ if ( myEditCurrentArgument == GroupPoints->LineEdit2 || myEditCurrentArgument == GroupPoints->LineEdit3 )
+ aNeedType = TopAbs_EDGE;
+ localSelection( GEOM::GEOM_Object::_nil(), aNeedType );
myEditCurrentArgument->setFocus();
- if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
- globalSelection( GEOM_LINE );
- else
- globalSelection( GEOM_POINT );
- SelectionIntoArgument();
+ //SelectionIntoArgument();
+ send->setDown(true);
+ displayPreview();
}
//=================================================================================
{
QLineEdit* send = (QLineEdit*)sender();
if ( send == GroupPoints->LineEdit1 ||
- send == GroupPoints->LineEdit2 )
- {
+ send == GroupPoints->LineEdit2 ||
+ send == GroupPoints->LineEdit3 ) {
myEditCurrentArgument = send;
GEOMBase_Skeleton::LineEditReturnPressed();
}
void BasicGUI_EllipseDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
GroupPoints->LineEdit1->setFocus();
myEditCurrentArgument = GroupPoints->LineEdit1;
GroupPoints->LineEdit1->setText( "" );
GroupPoints->LineEdit2->setText( "" );
+ GroupPoints->LineEdit3->setText( "" );
myPoint = myDir = GEOM::GEOM_Object::_nil();
- globalSelection( GEOM_POINT );
+ //globalSelection( GEOM_POINT );
+ globalSelection(); // close local contexts, if any
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
}
//=================================================================================
//=================================================================================
void BasicGUI_EllipseDlg::DeactivateActiveDialog()
{
- // myGeometryGUI->SetState( -1 );
+ // myGeomGUI->SetState( -1 );
GEOMBase_Skeleton::DeactivateActiveDialog();
}
// function : enterEvent()
// purpose :
//=================================================================================
-void BasicGUI_EllipseDlg::enterEvent(QEvent* e)
+void BasicGUI_EllipseDlg::enterEvent( QEvent* )
{
- if ( !GroupConstructors->isEnabled() )
+ if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void BasicGUI_EllipseDlg::ValueChangedInSpinBox(double newValue)
+void BasicGUI_EllipseDlg::ValueChangedInSpinBox( double newValue )
{
displayPreview();
}
//=================================================================================
GEOM::GEOM_IOperations_ptr BasicGUI_EllipseDlg::createOperation()
{
- return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
+ return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() );
}
//=================================================================================
//=================================================================================
bool BasicGUI_EllipseDlg::isValid( QString& msg )
{
- double aMajorR = GroupPoints->SpinBox_DX->GetValue();
- double aMinorR = GroupPoints->SpinBox_DY->GetValue();
- if ( aMajorR < aMinorR )
- {
- msg = tr( "GEOM_ELLIPSE_ERROR_1" );
- return false;
+ double aMajorR = GroupPoints->SpinBox_DX->value();
+ double aMinorR = GroupPoints->SpinBox_DY->value();
+ if ( aMajorR < aMinorR ) {
+ msg = tr( "GEOM_ELLIPSE_ERROR_1" );
+ return false;
}
- return !myPoint->_is_nil() && !myDir->_is_nil();
+ //return !myPoint->_is_nil() && !myDir->_is_nil();
+ //nil point means origin of global CS
+ //nil vector means Z axis
+ bool ok = true;
+ ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+ ok = GroupPoints->SpinBox_DY->isValid( msg, !IsPreview() ) && ok;
+ return ok;
}
//=================================================================================
//=================================================================================
bool BasicGUI_EllipseDlg::execute( ObjectList& objects )
{
- double aMajorR = GroupPoints->SpinBox_DX->GetValue();
- double aMinorR = GroupPoints->SpinBox_DY->GetValue();
- GEOM::GEOM_Object_var anObj = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() )->MakeEllipse( myPoint, myDir, aMajorR, aMinorR );
+ double aMajorR = GroupPoints->SpinBox_DX->value();
+ double aMinorR = GroupPoints->SpinBox_DY->value();
- if ( !anObj->_is_nil() )
+ QStringList aParameters;
+ aParameters<<GroupPoints->SpinBox_DX->text();
+ aParameters<<GroupPoints->SpinBox_DY->text();
+
+ GEOM::GEOM_ICurvesOperations_var anOper = GEOM::GEOM_ICurvesOperations::_narrow( getOperation() );
+ GEOM::GEOM_Object_var anObj = myMajor->_is_nil() ?
+ anOper->MakeEllipse ( myPoint, myDir, aMajorR, aMinorR ) :
+ anOper->MakeEllipseVec( myPoint, myDir, aMajorR, aMinorR, myMajor );
+ if ( !anObj->_is_nil() ) {
+ if ( !IsPreview() )
+ anObj->SetParameters(aParameters.join(":").toLatin1().constData());
objects.push_back( anObj._retn() );
-
+ }
return true;
}
//=================================================================================
-// function : closeEvent
-// purpose :
+// function : addSubshapeToStudy
+// purpose : virtual method to add new SubObjects if local selection
//=================================================================================
-void BasicGUI_EllipseDlg::closeEvent( QCloseEvent* e )
+void BasicGUI_EllipseDlg::addSubshapesToStudy()
{
- // myGeometryGUI->SetState( -1 );
- GEOMBase_Skeleton::closeEvent( e );
-}
+ QMap<QString, GEOM::GEOM_Object_var> objMap;
+ if (!CORBA::is_nil(myPoint))
+ objMap[GroupPoints->LineEdit1->text()] = myPoint;
+ if (!CORBA::is_nil(myDir))
+ objMap[GroupPoints->LineEdit2->text()] = myDir;
+ if (!CORBA::is_nil(myMajor))
+ objMap[GroupPoints->LineEdit3->text()] = myMajor;
+
+ addSubshapesToFather( objMap );
+}
