// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
#include "GenerationGUI_RevolDlg.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_Session.h"
+#include "SalomeApp_Application.h"
+#include "LightApp_SelectionMgr.h"
+
#include <gp_Lin.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <BRepPrimAPI_MakeRevol.hxx>
-#include "QAD_Config.h"
#include <TopExp_Explorer.hxx>
#include <Standard_ErrorHandler.hxx>
+#include "GEOMImpl_Types.hxx"
-#include "utilities.h"
+#include <qlabel.h>
+#include <qcheckbox.h>
-using namespace std;
+#include "utilities.h"
//=================================================================================
// class : GenerationGUI_RevolDlg()
// The dialog will by default be modeless, unless you set 'modal' to
// TRUE to construct a modal dialog.
//=================================================================================
-GenerationGUI_RevolDlg::GenerationGUI_RevolDlg(QWidget* parent, const char* name, GenerationGUI* theGenerationGUI, SALOME_Selection* Sel, bool modal, WFlags fl)
- :GEOMBase_Skeleton(parent, name, Sel, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+GenerationGUI_RevolDlg::GenerationGUI_RevolDlg(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)
{
- QPixmap image0(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_DLG_REVOL")));
- QPixmap image1(QAD_Desktop::getResourceManager()->loadPixmap("GEOM",tr("ICON_SELECT")));
+ QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REVOL")));
+ QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
setCaption(tr("GEOM_REVOLUTION_TITLE"));
RadioButton2->close(TRUE);
RadioButton3->close(TRUE);
- GroupPoints = new DlgRef_2Sel1Spin1Check(this, "GroupPoints");
+ GroupPoints = new DlgRef_2Sel1Spin2Check(this, "GroupPoints");
+ GroupPoints->CheckButton1->hide();
GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
GroupPoints->TextLabel1->setText(tr("GEOM_OBJECT"));
GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
GroupPoints->TextLabel3->setText(tr("GEOM_ANGLE"));
- GroupPoints->CheckButton1->setText(tr("GEOM_REVERSE"));
GroupPoints->PushButton1->setPixmap(image1);
GroupPoints->PushButton2->setPixmap(image1);
+ GroupPoints->LineEdit1->setReadOnly( true );
+ GroupPoints->LineEdit2->setReadOnly( true );
+ GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
- Layout1->addWidget(GroupPoints, 1, 0);
+ Layout1->addWidget(GroupPoints, 2, 0);
/***************************************************************/
+ setHelpFileName("revolution.htm");
+
/* Initialisations */
- myGenerationGUI = theGenerationGUI;
Init();
}
{
/* init variables */
myEditCurrentArgument = GroupPoints->LineEdit1;
+ GroupPoints->LineEdit1->setReadOnly( true );
+ GroupPoints->LineEdit2->setReadOnly( true );
- myAngle = 45.0;
myOkBase = myOkAxis = false;
- myEdgeFilter = new GEOM_ShapeTypeFilter(TopAbs_EDGE, myGeom);
-
double SpecificStep = 5;
/* min, max, step and decimals for spin boxes & initial values */
- GroupPoints->SpinBox_DX->RangeStepAndValidator(-999.999, 999.999, SpecificStep, 3);
- GroupPoints->SpinBox_DX->SetValue(myAngle);
+ GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, SpecificStep, 3);
+ GroupPoints->SpinBox_DX->SetValue(45.0);
/* signals and slots connections */
connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double)));
+ connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+ connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
+
connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double)));
- connect(GroupPoints->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(ReverseAngle(int)));
-
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
+ connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(),
+ SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
- /* displays Dialog */
- GroupPoints->show();
- this->show();
+ initName(tr("GEOM_REVOLUTION"));
- return;
+ globalSelection( GEOM_ALLSHAPES );
}
//=================================================================================
void GenerationGUI_RevolDlg::ClickOnOk()
{
- this->ClickOnApply();
- ClickOnCancel();
- return;
+ if ( ClickOnApply() )
+ ClickOnCancel();
}
// function : ClickOnApply()
// purpose :
//=================================================================================
-void GenerationGUI_RevolDlg::ClickOnApply()
+bool GenerationGUI_RevolDlg::ClickOnApply()
{
- buttonApply->setFocus();
- QAD_Application::getDesktop()->putInfo(tr(""));
- if (mySimulationTopoDs.IsNull())
- return;
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
+ if ( !onAccept() )
+ return false;
- if(myOkBase && myOkAxis)
- myGenerationGUI->MakeRevolutionAndDisplay(myGeomShape, myLoc, myDir, myAngle*PI180);
- return;
+ initName();
+ return true;
}
//=======================================================================
//=================================================================================
void GenerationGUI_RevolDlg::SelectionIntoArgument()
{
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
+ erasePreview();
myEditCurrentArgument->setText("");
- QString aString = ""; /* name of selection */
- int nbSel = myGeomBase->GetNameOfSelectedIObjects(mySelection, aString);
- if(nbSel != 1) {
+ if(IObjectCount() != 1) {
if(myEditCurrentArgument == GroupPoints->LineEdit1)
- myOkBase = false;
+ myOkBase = false;
else if(myEditCurrentArgument == GroupPoints->LineEdit2)
myOkAxis = false;
return;
}
// nbSel == 1
- TopoDS_Shape S;
- Standard_Boolean testResult;
- Handle(SALOME_InteractiveObject) IO = mySelection->firstIObject();
- if(!myGeomBase->GetTopoFromSelection(mySelection, S))
+ Standard_Boolean testResult = Standard_False;
+ GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
+
+ if (!testResult)
return;
-
+
if(myEditCurrentArgument == GroupPoints->LineEdit1) {
- myGeomShape = myGeomBase->ConvertIOinGEOMShape(IO, testResult);
- if(!testResult)
- return;
- if( !isAcceptableBase( S ))
+ TopoDS_Shape S;
+ myOkBase = false;
+
+ if ( !GEOMBase::GetShape(aSelectedObject, S) || !isAcceptableBase( S ) )
return;
- myEditCurrentArgument->setText(aString);
+
+ myBase = aSelectedObject;
myOkBase = true;
- myBase = S;
}
else if(myEditCurrentArgument == GroupPoints->LineEdit2) {
- BRepAdaptor_Curve curv(TopoDS::Edge(S));
- myDir = curv.Line().Direction();
- myLoc = curv.Line().Location();
- myEditCurrentArgument->setText(aString);
+ myAxis = aSelectedObject;
myOkAxis = true;
}
+ myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
- if(myOkBase && myOkAxis)
- this->MakeRevolutionSimulationAndDisplay();
- return;
+ displayPreview();
}
void GenerationGUI_RevolDlg::SetEditCurrentArgument()
{
QPushButton* send = (QPushButton*)sender();
- mySelection->ClearFilters();
+ globalSelection( GEOM_ALLSHAPES );
if(send == GroupPoints->PushButton1) {
GroupPoints->LineEdit1->setFocus();
else if(send == GroupPoints->PushButton2) {
GroupPoints->LineEdit2->setFocus();
myEditCurrentArgument = GroupPoints->LineEdit2;
- mySelection->AddFilter(myEdgeFilter);
+ globalSelection( GEOM_LINE );
}
- this->SelectionIntoArgument();
-
- return;
+ SelectionIntoArgument();
}
void GenerationGUI_RevolDlg::LineEditReturnPressed()
{
QLineEdit* send = (QLineEdit*)sender();
- if(send == GroupPoints->LineEdit1)
- myEditCurrentArgument = GroupPoints->LineEdit1;
- else if (send == GroupPoints->LineEdit2)
- myEditCurrentArgument = GroupPoints->LineEdit2;
- else
- return;
-
- GEOMBase_Skeleton::LineEditReturnPressed();
- return;
+ if(send == GroupPoints->LineEdit1 ||
+ send == GroupPoints->LineEdit2)
+ {
+ myEditCurrentArgument = send;
+ GEOMBase_Skeleton::LineEditReturnPressed();
+ }
}
void GenerationGUI_RevolDlg::ActivateThisDialog()
{
GEOMBase_Skeleton::ActivateThisDialog();
- connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+ globalSelection( GEOM_ALLSHAPES );
+ connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
GroupPoints->LineEdit1->setFocus();
myEditCurrentArgument = GroupPoints->LineEdit1;
- if(!mySimulationTopoDs.IsNull())
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
- return;
+ displayPreview();
}
//=================================================================================
void GenerationGUI_RevolDlg::enterEvent(QEvent* e)
{
- if (GroupConstructors->isEnabled())
- return;
- this->ActivateThisDialog();
- return;
+ if ( !GroupConstructors->isEnabled() )
+ ActivateThisDialog();
}
// function : ValueChangedInSpinBox()
// purpose :
//=================================================================================
-void GenerationGUI_RevolDlg::ValueChangedInSpinBox(double newValue)
-{
- myAngle = newValue;
- if(myOkBase && myOkAxis)
- this->MakeRevolutionSimulationAndDisplay();
- return;
+void GenerationGUI_RevolDlg::ValueChangedInSpinBox()
+{
+ displayPreview();
}
//=================================================================================
-// function : ReverseAngle()
-// purpose : 'state' not used here
+// function : getAngle()
+// purpose :
//=================================================================================
-void GenerationGUI_RevolDlg::ReverseAngle(int state)
+double GenerationGUI_RevolDlg::getAngle() const
{
- myAngle = -myAngle;
- GroupPoints->SpinBox_DX->SetValue(myAngle);
- if(myOkBase && myOkAxis)
- this->MakeRevolutionSimulationAndDisplay();
- return;
+ return GroupPoints->SpinBox_DX->GetValue();
}
+//=================================================================================
+// function : createOperation
+// purpose :
+//=================================================================================
+GEOM::GEOM_IOperations_ptr GenerationGUI_RevolDlg::createOperation()
+{
+ return getGeomEngine()->GetI3DPrimOperations( getStudyId() );
+}
//=================================================================================
-// function : MakeRevolutionSimulationAndDisplay()
+// function : isValid
// purpose :
//=================================================================================
-void GenerationGUI_RevolDlg::MakeRevolutionSimulationAndDisplay()
+bool GenerationGUI_RevolDlg::isValid( QString& )
{
- myGeomBase->EraseSimulationShape();
- mySimulationTopoDs.Nullify();
+ return myOkBase && myOkAxis;
+}
- if (!isAcceptableBase( myBase ))
- return;
+//=================================================================================
+// function : execute
+// purpose :
+//=================================================================================
+bool GenerationGUI_RevolDlg::execute( ObjectList& objects )
+{
+ GEOM::GEOM_Object_var anObj;
- try {
- gp_Ax1 AX(myLoc, myDir);
- mySimulationTopoDs = BRepPrimAPI_MakeRevol(myBase, AX, myAngle*PI180);
- myGeomBase->DisplaySimulationShape(mySimulationTopoDs);
- }
- catch(Standard_Failure) {
- MESSAGE("Exception catched in MakeRevolutionSimulationAndDisplay");
- return;
- }
- return;
+ anObj = GEOM::GEOM_I3DPrimOperations::_narrow(
+ getOperation() )->MakeRevolutionAxisAngle( myBase, myAxis, getAngle() * PI180 );
+
+ if ( !anObj->_is_nil() )
+ objects.push_back( anObj._retn() );
+
+ return true;
+}
+
+
+//=================================================================================
+// function : onReverse()
+// purpose :
+//=================================================================================
+void GenerationGUI_RevolDlg::onReverse()
+{
+ double anOldValue = GroupPoints->SpinBox_DX->GetValue();
+ GroupPoints->SpinBox_DX->SetValue( -anOldValue );
}
