-// GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2015 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, or (at your option) any later version.
//
-// 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.
//
-// 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
//
-// 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
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//
-//
-// File : MeasureGUI_AngleDlg.cxx
-// Author : Julia DOROVSKIKH
-// Module : GEOM
-// $Header$
-
-#include "MeasureGUI_AngleDlg.h"
-#include "MeasureGUI_2Sel1LineEdit_QTD.h"
+// GEOM GEOMGUI : GUI for Geometry component
+// File : MeasureGUI_AngleDlg.cxx
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
-#include "GEOMBase.h"
-#include "GEOM_Displayer.h"
-#include "DlgRef_SpinBox.h"
-#include "GeometryGUI.h"
-
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_MessageBox.h"
-#include "SOCC_Prs.h"
-#include "SOCC_ViewModel.h"
-#include "SalomeApp_Tools.h"
-#include "SalomeApp_Application.h"
+#include "MeasureGUI_AngleDlg.h"
+#include "MeasureGUI_Widgets.h"
+
+#include <DlgRef.h>
+#include <GEOMBase.h>
+#include <GeometryGUI.h>
+
+#include <Basics_OCCTVersion.hxx>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SOCC_Prs.h>
+#include <SOCC_ViewModel.h>
+#include <SalomeApp_Tools.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
// OCCT Includes
#include <AIS_AngleDimension.hxx>
#include <Geom_Plane.hxx>
#include <gce_MakePln.hxx>
#include <Precision.hxx>
+#include <AIS.hxx>
+#include <Prs3d_LineAspect.hxx>
+#include <IntTools_EdgeEdge.hxx>
+#include <IntTools_SequenceOfCommonPrts.hxx>
+#include <IntTools_CommonPrt.hxx>
// QT Includes
#include <qlineedit.h>
// TRUE to construct a modal dialog.
//=================================================================================
MeasureGUI_AngleDlg::MeasureGUI_AngleDlg (GeometryGUI* GUI, QWidget* parent)
- : MeasureGUI_Skeleton(GUI, parent, "MeasureGUI_AngleDlg")
+ : MeasureGUI_Skeleton(GUI, parent)
{
- QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_ANGLE")));
- QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
+ SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+ QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_ANGLE")));
+ QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
- setCaption(tr("GEOM_MEASURE_ANGLE_TITLE"));
+ setWindowTitle(tr("GEOM_MEASURE_ANGLE_TITLE"));
- // Widgets
+ /***************************************************************/
+ mainFrame()->GroupConstructors->setTitle(tr("GEOM_MEASURE_ANGLE_ANGLE"));
+ mainFrame()->RadioButton1->setIcon(image0);
- GroupConstructors->setTitle(tr("GEOM_MEASURE_ANGLE_ANGLE"));
- RadioButton1->setPixmap(image0);
-
- myGrp = new MeasureGUI_2Sel1LineEdit_QTD(this, "myGrp");
+ myGrp = new MeasureGUI_2Sel1LineEdit(centralWidget());
myGrp->GroupBox1->setTitle(tr("GEOM_MEASURE_ANGLE_OBJ"));
myGrp->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1"));
myGrp->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
- myGrp->TextLabel3->setText(tr("GEOM_MEASURE_ANGLE_IS"));
- myGrp->LineEdit3->setReadOnly(TRUE);
- myGrp->PushButton1->setPixmap(image1);
- myGrp->PushButton2->setPixmap(image1);
+ myGrp->TextLabel3->setText(tr(aResMgr->stringValue ( "Geometry", "dimensions_angle_units", "deg" ) == "deg" ? "GEOM_MEASURE_ANGLE_DEG" : "GEOM_MEASURE_ANGLE_RAD"));
+ myGrp->LineEdit3->setReadOnly(true);
+ myGrp->PushButton1->setIcon(image1);
+ myGrp->PushButton2->setIcon(image1);
myGrp->LineEdit1->setReadOnly(true);
myGrp->LineEdit2->setReadOnly(true);
- Layout1->addWidget(myGrp, 1, 0);
+ QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+ layout->setMargin(0); layout->setSpacing(6);
+ layout->addWidget(myGrp);
+ /***************************************************************/
// Help page reference
- myHelpFileName = "using_measurement_tools_page.html#angle_anchor";
+ myHelpFileName = "angle_page.html";
// Initialisation
Init();
//=================================================================================
void MeasureGUI_AngleDlg::Init()
{
+ // init variables
+ myGrp->LineEdit1->setText("");
+ myGrp->LineEdit2->setText("");
+ myGrp->LineEdit1->setEnabled(true);
+ myGrp->LineEdit2->setEnabled(false);
+ myObj.nullify();
+ myObj2.nullify();
+
mySelBtn = myGrp->PushButton1;
mySelEdit = myGrp->LineEdit1;
mySelBtn2 = myGrp->PushButton2;
myEditCurrentArgument = mySelEdit;
+ // signals and slots connections
connect(mySelEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
- connect(mySelBtn2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+ connect(mySelBtn2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
- globalSelection(GEOM_LINE);
+ activateSelection();
MeasureGUI_Skeleton::Init();
}
-
//=================================================================================
// function : SelectionIntoArgument()
// purpose : Called when selection has changed
//=================================================================================
void MeasureGUI_AngleDlg::SelectionIntoArgument()
{
- Standard_Boolean testResult = Standard_False;
- GEOM::GEOM_Object_var aSelectedObject =
- GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult);
+ GEOM::GeomObjPtr aSelectedObject = getSelected( TopAbs_EDGE );
- if (!testResult)
- aSelectedObject = GEOM::GEOM_Object::_nil();
+ // clear selection
+ disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ myGeomGUI->getApp()->selectionMgr()->clearSelected();
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
- if (myEditCurrentArgument == mySelEdit)
+ if (myEditCurrentArgument == mySelEdit) {
myObj = aSelectedObject;
- else
+ if (myObj && !myObj2)
+ myGrp->PushButton2->click();
+ }
+ else {
myObj2 = aSelectedObject;
+ if (myObj2 && !myObj)
+ myGrp->PushButton1->click();
+ }
processObject();
}
//=================================================================================
void MeasureGUI_AngleDlg::processObject()
{
- myGrp->LineEdit1->setText(!myObj->_is_nil() ? GEOMBase::GetName(myObj ) : "");
- myGrp->LineEdit2->setText(!myObj2->_is_nil() ? GEOMBase::GetName(myObj2) : "");
+ myGrp->LineEdit1->setText(myObj ? GEOMBase::GetName(myObj.get()) : "");
+ myGrp->LineEdit2->setText(myObj2 ? GEOMBase::GetName(myObj2.get()) : "");
double anAngle = 0.;
- if (getParameters(anAngle))
- {
- myGrp->LineEdit3->setText(DlgRef_SpinBox::PrintDoubleValue(anAngle));
+ if (getParameters(anAngle)) {
+ // To avoid the using different angle values in viewer and dialog,
+ // the value from presentation is used in both cases (see buildPrs())
redisplayPreview();
}
- else
- {
+ else {
myGrp->LineEdit3->setText("");
erasePreview();
}
{
QString msg;
if (isValid(msg)) {
+ GEOM::GEOM_IMeasureOperations_var anOper = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() );
try {
- theAngle = GEOM::GEOM_IMeasureOperations::_narrow(getOperation())->GetAngle(myObj, myObj2);
+ theAngle = anOper->GetAngle(myObj.get(), myObj2.get());
}
catch(const SALOME::SALOME_Exception& e) {
SalomeApp_Tools::QtCatchCorbaException(e);
return false;
}
- bool isDone = getOperation()->IsDone();
+ bool isDone = anOper->IsDone();
if (!isDone) {
- CORBA::String_var aMsg = getOperation()->GetErrorCode();
- SUIT_MessageBox::warn1((QWidget*)myGeomGUI->getApp()->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr(aMsg.in()),
- QObject::tr("BUT_OK"));
+ CORBA::String_var aMsg = anOper->GetErrorCode();
+ SUIT_MessageBox::warning(this,
+ QObject::tr("WRN_WARNING"),
+ QObject::tr(aMsg.in()));
}
return isDone;
}
{
QPushButton* send = (QPushButton*)sender();
- if (send == mySelBtn) {
- mySelEdit->setFocus();
- myEditCurrentArgument = mySelEdit;
+ if (send == myGrp->PushButton1) {
+ myEditCurrentArgument = myGrp->LineEdit1;
+
+ myGrp->PushButton2->setDown(false);
+ myGrp->LineEdit2->setEnabled(false);
}
else {
- mySelEdit2->setFocus();
- myEditCurrentArgument = mySelEdit2;
+ myEditCurrentArgument = myGrp->LineEdit2;
+
+ myGrp->PushButton1->setDown(false);
+ myGrp->LineEdit1->setEnabled(false);
}
- globalSelection(GEOM_LINE);
- SelectionIntoArgument();
+ disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+ activateSelection();
+ connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+ this, SLOT(SelectionIntoArgument()));
+
+ // enable line edit
+ myEditCurrentArgument->setEnabled(true);
+ myEditCurrentArgument->setFocus();
+ // after setFocus(), because it will be setDown(false) when loses focus
+ send->setDown(true);
+
+ // seems we need it only to avoid preview disappearing, caused by selection mode change
+ redisplayPreview();
}
//=================================================================================
else
myEditCurrentArgument = mySelEdit2;
- if (GEOMBase::SelectionByNameInDialogs(this, mySelEdit->text(), selectedIO()))
+ LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+ SALOME_ListIO aSelList;
+ aSelMgr->selectedObjects(aSelList);
+
+ if (GEOMBase::SelectionByNameInDialogs(this, mySelEdit->text(), aSelList))
mySelEdit->setText(mySelEdit->text());
}
SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
{
double anAngle = 0.;
+ myGrp->LineEdit3->setText("");
SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
- if (myObj->_is_nil() || myObj2->_is_nil() || !getParameters(anAngle) ||
- vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
+ if (!myObj || !myObj2 || !getParameters(anAngle) ||
+ vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
return 0;
- if (anAngle > Precision::Angular())
- {
- try
- {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+ if (anAngle > Precision::Angular()) {
+ try {
OCC_CATCH_SIGNALS;
-#endif
TopoDS_Shape S1, S2;
- if (GEOMBase::GetShape(myObj , S1, TopAbs_EDGE) &&
- GEOMBase::GetShape(myObj2, S2, TopAbs_EDGE))
- {
+ if (GEOMBase::GetShape(myObj.get() , S1, TopAbs_EDGE) &&
+ GEOMBase::GetShape(myObj2.get(), S2, TopAbs_EDGE)) {
TopoDS_Edge anEdge1 = TopoDS::Edge(S1);
TopoDS_Edge anEdge2 = TopoDS::Edge(S2);
- // Build a plane for angle dimension presentation {P11, P12, P3}
- TopoDS_Vertex V11, V12, V21, V22;
- TopExp::Vertices(anEdge1, V11, V12);
- TopExp::Vertices(anEdge2, V21, V22);
-
- gp_Pnt aP11 = BRep_Tool::Pnt(TopExp::FirstVertex(anEdge1));
- gp_Pnt aP12 = BRep_Tool::Pnt(TopExp::LastVertex (anEdge1));
-
- gp_Pnt aP21 = BRep_Tool::Pnt(TopExp::FirstVertex(anEdge2));
- gp_Pnt aP22 = BRep_Tool::Pnt(TopExp::LastVertex (anEdge2));
-
- // *P3
- // \
- // \
- // *P22
- // /
- // /
- // P11 / P12
- // *-----/----------*
- // \ /
- // \ /
- // *P21
- gp_Pnt aP3 (aP22.XYZ() + aP11.XYZ() - aP21.XYZ());
-
- gce_MakePln gce_MP (aP11, aP12, aP3);
- Handle(Geom_Plane) aPlane = new Geom_Plane(gce_MP.Value());
-
- // Build the angle dimension presentation
- QString aLabel;
- aLabel.sprintf("%.1f", anAngle);
-
- Handle(AIS_AngleDimension) anIO = new AIS_AngleDimension
- (anEdge1, anEdge2, aPlane, anAngle * PI180,
- TCollection_ExtendedString((Standard_CString)aLabel.latin1()));
+ Handle(AIS_AngleDimension) anIO = new AIS_AngleDimension( anEdge1, anEdge2 );
+
+ Handle(Prs3d_DimensionAspect) aDimensionStyle = new Prs3d_DimensionAspect;
+
+ Handle(Geom_Line) geom_lin1,geom_lin2;
+ gp_Pnt ptat11,ptat12,ptat21,ptat22;
+ Standard_Boolean isInfinite1,isInfinite2;
+ Handle(Geom_Curve) extCurv;
+ Standard_Integer extShape;
+ Handle(Geom_Plane) aPlane;
+ if (AIS::ComputeGeometry(anEdge1,
+ anEdge2,
+ extShape,
+ geom_lin1,
+ geom_lin2,
+ ptat11,
+ ptat12,
+ ptat21,
+ ptat22,
+ extCurv,
+ isInfinite1,
+ isInfinite2,
+ aPlane)) {
+ Standard_Real arrSize1 = aDimensionStyle->ArrowAspect()->Length();
+ Standard_Real arrSize2 = aDimensionStyle->ArrowAspect()->Length();
+ if (!isInfinite1) arrSize1 = ptat11.Distance(ptat12)/10.;
+ if (!isInfinite2) arrSize2 = ptat21.Distance(ptat22)/10.;
+ aDimensionStyle->ArrowAspect()->SetLength( Max(arrSize1, arrSize2) );
+ }
+
+ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+ int w = resMgr->integerValue( "Geometry", "measures_line_width", 1 );
+ QString aUnitsAngle = resMgr->stringValue ( "Geometry", "dimensions_angle_units", "deg" );
+
+ aDimensionStyle->LineAspect()->SetWidth( w );
+ aDimensionStyle->SetTextHorizontalPosition( Prs3d_DTHP_Center );
+ aDimensionStyle->SetTextVerticalPosition( Prs3d_DTVP_Center );
+ aDimensionStyle->MakeText3d( Standard_False );
+ aDimensionStyle->MakeArrows3d( Standard_True );
+
+ anIO->SetDimensionAspect( aDimensionStyle );
+ anIO->SetDisplayUnits( aUnitsAngle.toLatin1().data() );
+ if (aUnitsAngle == "rad")
+ anIO->SetDisplaySpecialSymbol(AIS_DSS_No);
SOCC_Prs* aPrs =
dynamic_cast<SOCC_Prs*>(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
if (aPrs)
aPrs->AddObject(anIO);
+ // set angle value into dialog
+ double anAngle = anIO->GetValue();
+ QString anAngleLabel = "GEOM_MEASURE_ANGLE_RAD";
+ if (aUnitsAngle == "deg") {
+ // using degrees instead of radians
+ anAngle *= 180. / M_PI;
+ anAngleLabel = "GEOM_MEASURE_ANGLE_DEG";
+ }
+ myGrp->TextLabel3->setText(tr(anAngleLabel.toLatin1().data()));
+ int aPrecision = resMgr->integerValue( "Geometry", "angle_precision", 6 );
+ myGrp->LineEdit3->setText(DlgRef::PrintDoubleValue(anAngle, aPrecision));
+
return aPrs;
}
}
- catch(Standard_Failure)
- {
+ catch(Standard_Failure) {
}
}
// function : isValid()
// purpose :
//=================================================================================
-bool MeasureGUI_AngleDlg::isValid(QString& msg)
+bool MeasureGUI_AngleDlg::isValid (QString& msg)
+{
+ return MeasureGUI_Skeleton::isValid(msg) && myObj2;
+}
+
+//=================================================================================
+// function : activateSelection()
+// purpose :
+//=================================================================================
+void MeasureGUI_AngleDlg::activateSelection()
{
- return MeasureGUI_Skeleton::isValid(msg) && !myObj2->_is_nil();
+ globalSelection(GEOM_LINE);
+ localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
}
