-// GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 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 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// File : MeasureGUI_DistanceDlg.cxx
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
//
-//
-// File : MeasureGUI_DistanceDlg.cxx
-// Author : Nicolas REJNERI
-// Module : GEOM
-// $Header$
#include "MeasureGUI_DistanceDlg.h"
-#include "MeasureGUI_2Sel1LineEdit_QTD.h"
-#include "GEOMBase.h"
-#include "GEOM_Displayer.h"
-#include "QAD_RightFrame.h"
-#include "QAD_Desktop.h"
-#include "OCCViewer_Viewer3d.h"
-#include "OCCViewer_Prs.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
+#include "MeasureGUI_Widgets.h"
+
+#include <GEOMBase.h>
+#include <DlgRef.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_ViewWindow.h>
+#include <SUIT_ViewManager.h>
+#include <SOCC_Prs.h>
+#include <SOCC_ViewModel.h>
+#include <SalomeApp_Tools.h>
#include <Geom_Plane.hxx>
-#include <TopoDS_Edge.hxx>
#include <AIS_LengthDimension.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#include <BRepBuilderAPI_MakeVertex.hxx>
-#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <gce_MakePln.hxx>
#include <Precision.hxx>
-#include "utilities.h"
-
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-
//=================================================================================
// class : MeasureGUI_DistanceDlg()
// purpose : Constructs a MeasureGUI_DistanceDlg which is a child of 'parent', with the
// name 'name' and widget flags set to 'f'.
// The dialog will by default be modeless, unless you set 'modal' to
-// TRUE to construct a modal dialog.
+// true to construct a modal dialog.
//=================================================================================
-MeasureGUI_DistanceDlg::MeasureGUI_DistanceDlg( QWidget* parent, SALOME_Selection* Sel )
-: MeasureGUI_Skeleton( parent, "MeasureGUI_DistanceDlg", Sel )
+MeasureGUI_DistanceDlg::MeasureGUI_DistanceDlg( GeometryGUI* GUI, QWidget* parent )
+ : MeasureGUI_Skeleton( GUI, parent )
{
- QPixmap image0( QAD_Desktop::getResourceManager()->loadPixmap(
- "GEOM",tr( "ICON_DLG_MINDIST" ) ) );
- QPixmap image1( QAD_Desktop::getResourceManager()->loadPixmap(
- "GEOM",tr( "ICON_SELECT" ) ) );
+ QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
+ "GEOM", tr( "ICON_DLG_MINDIST" ) ) );
+ QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
+ "GEOM", tr( "ICON_SELECT" ) ) );
- setCaption( tr( "GEOM_MINDIST_TITLE" ) );
+ setWindowTitle( tr( "GEOM_MINDIST_TITLE" ) );
/***************************************************************/
- GroupConstructors->setTitle( tr( "GEOM_DISTANCE" ) );
- RadioButton1->setPixmap( image0 );
+ mainFrame()->GroupConstructors->setTitle( tr( "GEOM_DISTANCE" ) );
+ mainFrame()->RadioButton1->setIcon( image0 );
- myGrp = new MeasureGUI_2Sel1LineEdit_QTD( this, "myGrp" );
+ myGrp = new MeasureGUI_2Sel4LineEdit( centralWidget() );
myGrp->GroupBox1->setTitle( tr( "GEOM_MINDIST_OBJ" ) );
myGrp->TextLabel1->setText( tr( "GEOM_OBJECT_I" ).arg( "1" ) );
myGrp->TextLabel2->setText( tr( "GEOM_OBJECT_I" ).arg( "2" ) );
myGrp->TextLabel3->setText( tr( "GEOM_LENGTH" ) );
- myGrp->LineEdit3->setReadOnly( TRUE );
- myGrp->PushButton1->setPixmap( image1 );
- myGrp->PushButton2->setPixmap( image1 );
+ myGrp->TextLabel4->setText( tr( "GEOM_DX" ) );
+ myGrp->TextLabel5->setText( tr( "GEOM_DY" ) );
+ myGrp->TextLabel6->setText( tr( "GEOM_DZ" ) );
+ myGrp->LineEdit3->setReadOnly( true );
+ myGrp->PushButton1->setIcon( image1 );
+ myGrp->PushButton2->setIcon( image1 );
myGrp->LineEdit1->setReadOnly( true );
myGrp->LineEdit2->setReadOnly( true );
+ myGrp->LineEdit4->setReadOnly( true );
+ myGrp->LineEdit5->setReadOnly( true );
+ myGrp->LineEdit6->setReadOnly( true );
- Layout1->addWidget( myGrp, 1, 0 );
+ QVBoxLayout* layout = new QVBoxLayout( centralWidget() );
+ layout->setMargin( 0 ); layout->setSpacing( 6 );
+ layout->addWidget( myGrp );
/***************************************************************/
+ myHelpFileName = "using_measurement_tools_page.html#min_distance_anchor";
+
/* Initialisation */
- Init( Sel );
+ Init();
}
// function : Init()
// purpose :
//=================================================================================
-void MeasureGUI_DistanceDlg::Init( SALOME_Selection* Sel )
+void MeasureGUI_DistanceDlg::Init()
{
mySelBtn = myGrp->PushButton1;
mySelEdit = myGrp->LineEdit1;
myEditCurrentArgument = mySelEdit;
connect( mySelEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
- connect( mySelBtn2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
-
- MeasureGUI_Skeleton::Init( Sel );
+ connect( mySelBtn2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
+ MeasureGUI_Skeleton::Init();
}
{
Standard_Boolean testResult = Standard_False;
GEOM::GEOM_Object_var aSelectedObject =
- GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), testResult );
+ GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult );
if ( !testResult )
aSelectedObject = GEOM::GEOM_Object::_nil();
if ( myEditCurrentArgument == mySelEdit )
- myObj = aSelectedObject;
- else
- myObj2 = aSelectedObject;
+ myObj = aSelectedObject;
+ else
+ myObj2 = aSelectedObject;
processObject();
}
//=================================================================================
// function : processObject()
-// purpose : Fill dialogs fileds in accordance with myObj and myObj2
+// purpose : Fill dialogs fields in accordance with myObj and myObj2
//=================================================================================
void MeasureGUI_DistanceDlg::processObject()
{
gp_Pnt aPnt1, aPnt2;
double aDist = 0.;
- if ( getParameters( aDist, aPnt1, aPnt2 ) )
- {
- myGrp->LineEdit3->setText( QString( "%1" ).arg( aDist ) );
+ if ( getParameters( aDist, aPnt1, aPnt2 ) ) {
+ myGrp->LineEdit3->setText( DlgRef::PrintDoubleValue( aDist ) );
+
+ gp_XYZ aVec = aPnt2.XYZ() - aPnt1.XYZ();
+ myGrp->LineEdit4->setText( DlgRef::PrintDoubleValue( aVec.X() ) );
+ myGrp->LineEdit5->setText( DlgRef::PrintDoubleValue( aVec.Y() ) );
+ myGrp->LineEdit6->setText( DlgRef::PrintDoubleValue( aVec.Z() ) );
+
redisplayPreview();
}
- else
- {
+ else {
myGrp->LineEdit3->setText( "" );
+ myGrp->LineEdit4->setText( "" );
+ myGrp->LineEdit5->setText( "" );
+ myGrp->LineEdit6->setText( "" );
erasePreview();
}
-
}
//=================================================================================
QString msg;
if ( !isValid( msg ) )
return false;
- else
- {
- try
- {
+ else {
+ try {
double x1, y1, z1, x2, y2, z2;
theDistance = GEOM::GEOM_IMeasureOperations::_narrow( getOperation() )->GetMinDistance(
myObj, myObj2, x1, y1, z1, x2, y2, z2 );
thePnt1.SetCoord( x1, y1, z1 );
thePnt2.SetCoord( x2, y2, z2 );
}
- catch( const SALOME::SALOME_Exception& e )
- {
- QtCatchCorbaException( e );
+ catch( const SALOME::SALOME_Exception& e ) {
+ SalomeApp_Tools::QtCatchCorbaException( e );
return false;
}
{
QPushButton* send = ( QPushButton* )sender();
- if( send == mySelBtn )
- {
+ if ( send == mySelBtn ) {
mySelEdit->setFocus();
myEditCurrentArgument = mySelEdit;
}
- else
- {
+ else {
mySelEdit2->setFocus();
myEditCurrentArgument = mySelEdit2;
}
{
QLineEdit* send = ( QLineEdit* )sender();
- if( send == mySelEdit )
+ if ( send == mySelEdit )
myEditCurrentArgument = mySelEdit;
else
myEditCurrentArgument = mySelEdit2;
- if ( GEOMBase::SelectionByNameInDialogs( this, mySelEdit->text(), mySelection ) )
+ if ( GEOMBase::SelectionByNameInDialogs( this, mySelEdit->text(), selectedIO() ) )
mySelEdit->setText( mySelEdit->text() );
}
double aDist = 0.;
gp_Pnt aPnt1( 0, 0, 0 ), aPnt2( 0, 0, 0 );
- if ( myObj->_is_nil() || myObj2->_is_nil() || !getParameters( aDist, aPnt1, aPnt2 ) ||
- QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() != VIEW_OCC )
+
+ SUIT_ViewWindow* vw = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
+
+ if ( myObj->_is_nil() || myObj2->_is_nil() ||
+ !getParameters( aDist, aPnt1, aPnt2 ) ||
+ vw->getViewManager()->getType() != OCCViewer_Viewer::Type() )
return 0;
try
{
- if( aDist <= 1.e-9 )
- {
+ if ( aDist <= 1.e-9 ) {
BRepBuilderAPI_MakeVertex aMaker( aPnt1 );
return getDisplayer()->BuildPrs( aMaker.Vertex() );
}
- else
- {
+ else {
BRepBuilderAPI_MakeEdge MakeEdge( aPnt1, aPnt2 );
TopoDS_Vertex aVert1 = BRepBuilderAPI_MakeVertex( aPnt1 );
TopoDS_Vertex aVert2 = BRepBuilderAPI_MakeVertex( aPnt2 );
( aPnt1.Y() + aPnt2.Y() ) / 2,
( aPnt1.Z() + aPnt2.Z() ) / 2 + 100 );
-
gp_Vec va( aPnt3, aPnt1 );
gp_Vec vb( aPnt3, aPnt2 );
- if ( va.IsParallel( vb, Precision::Angular() ) )
- {
+ if ( va.IsParallel( vb, Precision::Angular() ) ) {
aPnt3.SetY( ( aPnt1.Y() + aPnt2.Y() ) / 2 + 100 );
aPnt3.SetZ( ( aPnt1.Z() + aPnt2.Z() ) / 2 );
}
Handle( Geom_Plane ) P = new Geom_Plane( gce_MP.Value() );
Handle( AIS_LengthDimension ) anIO = new AIS_LengthDimension(
- aVert1, aVert2, P, aDist, TCollection_ExtendedString( (Standard_CString)aLabel.latin1() ) );
+ aVert1, aVert2, P, aDist, TCollection_ExtendedString( (Standard_CString)aLabel.toLatin1().constData() ) );
+ anIO->SetArrowSize( aDist/20 );
- QAD_ViewFrame* vf = GEOM_Displayer::GetActiveView();
- OCCViewer_Prs* aPrs = dynamic_cast<OCCViewer_Prs*>( vf->CreatePrs( 0 ) );
+ SOCC_Prs* aPrs = dynamic_cast<SOCC_Prs*>( ((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs( 0 ) );
if ( aPrs )
aPrs->AddObject( anIO );
return aPrs;
}
}
- catch( Standard_Failure )
- {
+ catch( Standard_Failure ) {
return 0;
}
}
{
return MeasureGUI_Skeleton::isValid( msg ) && !myObj2->_is_nil();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
