-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2008 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.
//
+// 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 : PrimitiveGUI_SphereDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
//
-// File : PrimitiveGUI_SphereDlg.cxx
-// Author : Lucien PIGNOLONI
-// Module : GEOM
-// $Header$
-
#include "PrimitiveGUI_SphereDlg.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 : PrimitiveGUI_SphereDlg()
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-PrimitiveGUI_SphereDlg::PrimitiveGUI_SphereDlg(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)
+PrimitiveGUI_SphereDlg::PrimitiveGUI_SphereDlg( 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_SPHERE_P")));
- QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SPHERE_DXYZ")));
- QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SPHERE_P" ) ) );
+ QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_SPHERE_DXYZ" ) ) );
+ QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) );
- setCaption(tr("GEOM_SPHERE_TITLE"));
+ setWindowTitle( tr( "GEOM_SPHERE_TITLE" ) );
/***************************************************************/
- GroupConstructors->setTitle(tr("GEOM_SPHERE"));
- RadioButton1->setPixmap(image0);
- RadioButton2->setPixmap(image1);
- RadioButton3->close(TRUE);
-
- GroupPoints = new DlgRef_1Sel1Spin(this, "GroupPoints");
- GroupPoints->GroupBox1->setTitle(tr("GEOM_SPHERE_CR"));
- GroupPoints->TextLabel1->setText(tr("GEOM_CENTER"));
- GroupPoints->TextLabel2->setText(tr("GEOM_RADIUS"));
- GroupPoints->PushButton1->setPixmap(image2);
-
- GroupDimensions = new DlgRef_1Spin(this, "GroupDimensions");
- GroupDimensions->GroupBox1->setTitle(tr("GEOM_SPHERE_RO"));
- GroupDimensions->TextLabel1->setText(tr("GEOM_RADIUS"));
-
- Layout1->addWidget(GroupPoints, 2, 0);
- Layout1->addWidget(GroupDimensions, 2, 0);
+ mainFrame()->GroupConstructors->setTitle( tr( "GEOM_SPHERE" ) );
+ mainFrame()->RadioButton1->setIcon( image0 );
+ mainFrame()->RadioButton2->setIcon( image1 );
+ mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+ mainFrame()->RadioButton3->close();
+
+ GroupPoints = new DlgRef_1Sel1Spin( centralWidget() );
+ GroupPoints->GroupBox1->setTitle( tr( "GEOM_SPHERE_CR" ) );
+ GroupPoints->TextLabel1->setText( tr( "GEOM_CENTER" ) );
+ GroupPoints->TextLabel2->setText( tr( "GEOM_RADIUS" ) );
+ GroupPoints->PushButton1->setIcon( image2 );
+
+ GroupDimensions = new DlgRef_1Spin( centralWidget() );
+ GroupDimensions->GroupBox1->setTitle( tr( "GEOM_SPHERE_RO" ) );
+ GroupDimensions->TextLabel1->setText( tr( "GEOM_RADIUS" ) );
+
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( GroupPoints );
+ layout->addWidget( GroupDimensions );
/***************************************************************/
- setHelpFileName("create_sphere_page.html");
+ setHelpFileName( "create_sphere_page.html" );
Init();
}
+
//=================================================================================
// function : ~PrimitiveGUI_SphereDlg()
// purpose : Destroys the object and frees any allocated resources
/* no need to delete child widgets, Qt does it all for us */
}
+
//=================================================================================
// function : Init()
// purpose :
/* 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 );
/* min, max, step and decimals for spin boxes */
- GroupPoints->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
- GroupDimensions->SpinBox_DX->RangeStepAndValidator(0.001, COORD_MAX, step, DBL_DIGITS_DISPLAY);
- GroupPoints->SpinBox_DX->SetValue(100.0);
- GroupDimensions->SpinBox_DX->SetValue(100.0);
+ initSpinBox( GroupPoints->SpinBox_DX, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ initSpinBox( GroupDimensions->SpinBox_DX, 0.000001, COORD_MAX, step, 6 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+ GroupPoints->SpinBox_DX->setValue( 100.0 );
+ GroupDimensions->SpinBox_DX->setValue( 100.0 );
/* signals and slots connections */
- connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
- connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
- connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
+ connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) );
+ connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
+
+ connect( this, SIGNAL( constructorsClicked( int ) ), this, SLOT( ConstructorsClicked( int ) ) );
- connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
+ connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ connect( GroupPoints->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
- connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
- connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect( GroupDimensions->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
+ connect( GroupPoints->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
- connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
- GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
- connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)),
- GroupDimensions->SpinBox_DX, SLOT(SetStep(double)));
+ connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
- connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
- this, SLOT(SelectionIntoArgument()));
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
- initName(tr("GEOM_SPHERE"));
- ConstructorsClicked(0);
+ initName( tr( "GEOM_SPHERE" ) );
+
+ setConstructorId( 1 ); // simplest constructor
+ ConstructorsClicked( 1 );
+}
+
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose : Double spin box management
+//=================================================================================
+void PrimitiveGUI_SphereDlg::SetDoubleSpinBoxStep( double step )
+{
+ GroupPoints->SpinBox_DX->setSingleStep(step);
+ GroupDimensions->SpinBox_DX->setSingleStep(step);
}
//=================================================================================
// function : ConstructorsClicked()
// purpose : Radio button management
//=================================================================================
-void PrimitiveGUI_SphereDlg::ConstructorsClicked (int constructorId)
+void PrimitiveGUI_SphereDlg::ConstructorsClicked( int constructorId )
{
- disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
-
- switch (constructorId)
+ disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
+
+ switch ( constructorId ) {
+ case 0:
{
- case 0:
- {
- globalSelection(); // close local contexts, if any
- localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
- GroupDimensions->hide();
- resize(0, 0);
- GroupPoints->show();
-
- myEditCurrentArgument = GroupPoints->LineEdit1;
- GroupPoints->LineEdit1->setText("");
- myPoint = GEOM::GEOM_Object::_nil();
-
- connect(myGeomGUI->getApp()->selectionMgr(),
- SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- break;
- }
- case 1:
- {
- GroupPoints->hide();
- globalSelection(); // close local contexts, if any
- resize(0, 0);
- GroupDimensions->show();
-
- break;
- }
+ globalSelection(); // close local contexts, if any
+ localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+
+ GroupDimensions->hide();
+ GroupPoints->show();
+
+ myEditCurrentArgument = GroupPoints->LineEdit1;
+ GroupPoints->LineEdit1->setText( "" );
+ myPoint = GEOM::GEOM_Object::_nil();
+
+ connect( myGeomGUI->getApp()->selectionMgr(),
+ SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
+ break;
+ }
+ case 1:
+ {
+ globalSelection(); // close local contexts, if any
+
+ GroupPoints->hide();
+ GroupDimensions->show();
+
+ break;
}
+ }
+
+ qApp->processEvents();
+ updateGeometry();
+ resize( minimumSizeHint() );
+
displayPreview();
}
+
//=================================================================================
// function : ClickOnOk()
// purpose :
ClickOnCancel();
}
+
//=================================================================================
// function : ClickOnApply()
// purpose :
return true;
}
-//=================================================================================
-// function : ClickOnCancel()
-// purpose :
-//=================================================================================
-void PrimitiveGUI_SphereDlg::ClickOnCancel()
-{
- GEOMBase_Skeleton::ClickOnCancel();
-}
//=================================================================================
// function : SelectionIntoArgument()
//=================================================================================
void PrimitiveGUI_SphereDlg::SelectionIntoArgument()
{
- if (getConstructorId() != 0)
+ if ( getConstructorId() != 0 )
return;
- myEditCurrentArgument->setText("");
+ myEditCurrentArgument->setText( "" );
+
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
- if (IObjectCount() != 1)
- {
+ if (aSelList.Extent() != 1) {
myPoint = GEOM::GEOM_Object::_nil();
return;
}
/* nbSel == 1 ! */
Standard_Boolean testResult = Standard_False;
- GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+ GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject(aSelList.First(), testResult);
- if (!testResult || CORBA::is_nil(aSelectedObject))
+ if ( !testResult || CORBA::is_nil( aSelectedObject ) )
return;
-
- QString aName = GEOMBase::GetName(aSelectedObject);
+
+ QString aName = GEOMBase::GetName( aSelectedObject );
TopoDS_Shape aShape;
- if (GEOMBase::GetShape(aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull())
- {
- LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE) && !aShape.IsNull() ) {
TColStd_IndexedMapOfInteger aMap;
- aSelMgr->GetIndexes(firstIObject(), aMap);
- if (aMap.Extent() == 1) // Local Selection
- {
+ aSelMgr->GetIndexes(aSelList.First(), aMap);
+ if ( aMap.Extent() == 1 ) { // Local Selection
int anIndex = aMap( 1 );
aName.append( ":vertex_" + QString::number( anIndex ) );
//Find SubShape Object in Father
- GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
+ GEOM::GEOM_Object_var aFindedObject = 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);
+ aSelectedObject = aShapesOp->GetSubShape( aSelectedObject, anIndex );
}
- else
+ else {
aSelectedObject = aFindedObject; // get Object from study
+ }
}
- else // Global Selection
- {
+ else { // Global Selection
if (aShape.ShapeType() != TopAbs_VERTEX) {
aSelectedObject = GEOM::GEOM_Object::_nil();
aName = "";
}
}
- myEditCurrentArgument->setText(aName);
+ myEditCurrentArgument->setText( aName );
myPoint = aSelectedObject;
displayPreview();
void PrimitiveGUI_SphereDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
- if(send == GroupPoints->LineEdit1)
- {
- myEditCurrentArgument = send;
- GEOMBase_Skeleton::LineEditReturnPressed();
- }
+ if ( send == GroupPoints->LineEdit1 ) {
+ myEditCurrentArgument = send;
+ GEOMBase_Skeleton::LineEditReturnPressed();
+ }
}
+
//=================================================================================
// function : SetEditCurrentArgument()
// purpose :
{
QPushButton* send = (QPushButton*)sender();
- if (send == GroupPoints->PushButton1) {
+ if ( send == GroupPoints->PushButton1 ) {
GroupPoints->LineEdit1->setFocus();
myEditCurrentArgument = GroupPoints->LineEdit1;
globalSelection(); // close local contexts, if any
}
}
+
//=================================================================================
// function : ActivateThisDialog()
// purpose :
void PrimitiveGUI_SphereDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
- this, SLOT(SelectionIntoArgument()));
-
- ConstructorsClicked(getConstructorId());
+ connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+ this, SLOT( SelectionIntoArgument() ) );
+
+ ConstructorsClicked( getConstructorId() );
}
+
//=================================================================================
// function : DeactivateActiveDialog()
// purpose : public slot to deactivate if active
GEOMBase_Skeleton::DeactivateActiveDialog();
}
+
//=================================================================================
// function : enterEvent()
// purpose :
//=================================================================================
-void PrimitiveGUI_SphereDlg::enterEvent(QEvent* e)
+void PrimitiveGUI_SphereDlg::enterEvent( QEvent* )
{
- if ( !GroupConstructors->isEnabled() )
+ if ( !mainFrame()->GroupConstructors->isEnabled() )
ActivateThisDialog();
}
+
//=================================================================================
// function : ValueChangedInSpinBox()
// purpose :
displayPreview();
}
+
//=================================================================================
// function : createOperation
// purpose :
return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
}
+
//=================================================================================
// function : isValid
// purpose :
//=================================================================================
bool PrimitiveGUI_SphereDlg::isValid( QString& msg )
{
- return getConstructorId() == 0 ? !myPoint->_is_nil() : true;
+ bool ok = true;
+ if( getConstructorId() == 0 )
+ ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+ else if( getConstructorId() == 1 )
+ ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && ok;
+ return getConstructorId() == 0 ? !myPoint->_is_nil() && ok : ok;
}
//=================================================================================
// function : execute
// purpose :
//=================================================================================
-bool PrimitiveGUI_SphereDlg::execute (ObjectList& objects)
+bool PrimitiveGUI_SphereDlg::execute( ObjectList& objects )
{
bool res = false;
-
+
GEOM::GEOM_Object_var anObj;
- switch (getConstructorId())
- {
- case 0:
+ switch ( getConstructorId() ) {
+ case 0 :
{
- if (!CORBA::is_nil(myPoint)) {
- anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
- MakeSpherePntR(myPoint, getRadius());
+ if ( !CORBA::is_nil( myPoint ) ) {
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeSpherePntR( myPoint, getRadius() );
+ if (!anObj->_is_nil() && !IsPreview())
+ {
+ QStringList aParameters;
+ aParameters << GroupPoints->SpinBox_DX->text();
+ anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+ }
res = true;
}
break;
}
- case 1:
+ case 1 :
{
- anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->
- MakeSphereR(getRadius());
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow( getOperation() )->MakeSphereR( getRadius() );
+ if (!anObj->_is_nil() && !IsPreview())
+ {
+ QStringList aParameters;
+ aParameters << GroupDimensions->SpinBox_DX->text();
+ anObj->SetParameters(GeometryGUI::JoinObjectParameters(aParameters));
+ }
res = true;
break;
}
}
-
- if (!anObj->_is_nil())
- objects.push_back(anObj._retn());
-
+
+ if ( !anObj->_is_nil() )
+ objects.push_back( anObj._retn() );
+
return res;
}
-//=================================================================================
-// function : closeEvent
-// purpose :
-//=================================================================================
-void PrimitiveGUI_SphereDlg::closeEvent( QCloseEvent* e )
-{
- GEOMBase_Skeleton::closeEvent( e );
-}
//=================================================================================
// function : getRadius()
double PrimitiveGUI_SphereDlg::getRadius() const
{
int aConstructorId = getConstructorId();
- if (aConstructorId == 0)
- return GroupPoints->SpinBox_DX->GetValue();
- else if (aConstructorId == 1)
- return GroupDimensions->SpinBox_DX->GetValue();
+ if ( aConstructorId == 0 )
+ return GroupPoints->SpinBox_DX->value();
+ else if ( aConstructorId == 1 )
+ return GroupDimensions->SpinBox_DX->value();
return 0;
}
{
QMap<QString, GEOM::GEOM_Object_var> objMap;
-switch (getConstructorId())
- {
+ switch ( getConstructorId() ) {
case 0:
objMap[GroupPoints->LineEdit1->text()] = myPoint;
break;
case 1:
return;
}
- addSubshapesToFather( objMap );
+ addSubshapesToFather( objMap );
}
