X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPrimitiveGUI%2FPrimitiveGUI_BoxDlg.cxx;h=8435e9a3804bf5f7f0d26664e2beb6422df7d464;hb=2dbe613765884256942925d8a95293e3c473caec;hp=33be3b87097afc192fe173487176422c58b3aa56;hpb=4e7b28499d7e5528357aa0bbae4fdf49cdd464b6;p=modules%2Fgeom.git

diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index 33be3b870..8435e9a38 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -25,7 +25,7 @@
 
 #include "PrimitiveGUI_BoxDlg.h"
 
-#include <GEOM_DlgRef.h>
+#include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
@@ -34,7 +34,14 @@
 #include <SalomeApp_Application.h>
 #include <LightApp_SelectionMgr.h>
 
+#include <TopoDS_Shape.hxx>
+#include <TopoDS.hxx>
+#include <TopExp.hxx>
+#include <TColStd_IndexedMapOfInteger.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+
 #include <GEOMImpl_Types.hxx>
+#include <ostream.h>
 
 //=================================================================================
 // class    : PrimitiveGUI_BoxDlg()
@@ -79,7 +86,7 @@ PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg( GeometryGUI* theGeometryGUI, QWidget*
   layout->addWidget( GroupDimensions );
   /***************************************************************/
 
-  setHelpFileName( "box.htm" );
+  setHelpFileName( "create_box_page.html" );
   
   Init();
 }
@@ -113,9 +120,9 @@ void PrimitiveGUI_BoxDlg::Init()
   double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100 );
   
   /* min, max, step and decimals for spin boxes */
-  initSpinBox( GroupDimensions->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 );
-  initSpinBox( GroupDimensions->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 );
-  initSpinBox( GroupDimensions->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3 );
+  initSpinBox( GroupDimensions->SpinBox_DX, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupDimensions->SpinBox_DY, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
+  initSpinBox( GroupDimensions->SpinBox_DZ, COORD_MIN, COORD_MAX, step, 3 ); // VSR: TODO: DBL_DIGITS_DISPLAY
 
   double initValue = 200.0;
   GroupDimensions->SpinBox_DX->setValue( initValue );
@@ -138,13 +145,9 @@ void PrimitiveGUI_BoxDlg::Init()
   connect( GroupDimensions->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
   connect( GroupDimensions->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) );
   
-  // VSR: TODO ->>
-  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), GroupDimensions->SpinBox_DX, SLOT( SetStep( double ) ) );
-  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), GroupDimensions->SpinBox_DY, SLOT( SetStep( double ) ) );
-  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), GroupDimensions->SpinBox_DZ, SLOT( SetStep( double ) ) );
-  // <<-
+  connect( myGeomGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
 
-  connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+  connect( myGeomGUI->getApp()->selectionMgr(), 
 	   SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
 
   initName( tr( "GEOM_BOX" ) );
@@ -152,6 +155,17 @@ void PrimitiveGUI_BoxDlg::Init()
   ConstructorsClicked( 0 );
 }
 
+//=================================================================================
+// function : SetDoubleSpinBoxStep()
+// purpose  : Double spin box management
+//=================================================================================
+void PrimitiveGUI_BoxDlg::SetDoubleSpinBoxStep( double step )
+{
+  GroupDimensions->SpinBox_DX->setSingleStep(step);
+  GroupDimensions->SpinBox_DY->setSingleStep(step);
+  GroupDimensions->SpinBox_DZ->setSingleStep(step);
+}
+
 
 //=================================================================================
 // function : ConstructorsClicked()
@@ -159,12 +173,14 @@ void PrimitiveGUI_BoxDlg::Init()
 //=================================================================================
 void PrimitiveGUI_BoxDlg::ConstructorsClicked( int constructorId )
 {
-  disconnect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication( ) ) )->selectionMgr(), 0, this, 0 );
+  disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 );
   
   switch (  constructorId ) {
   case 0:
     {
-      globalSelection( GEOM_POINT );
+      //globalSelection( GEOM_POINT );
+      globalSelection(); // close local contexts, if any
+      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
       
       GroupDimensions->hide();
       GroupPoints->show();
@@ -174,7 +190,7 @@ void PrimitiveGUI_BoxDlg::ConstructorsClicked( int constructorId )
       GroupPoints->LineEdit2->setText( "" );
       myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
       
-      connect( ( (SalomeApp_Application*)( SUIT_Session::session()->activeApplication() ) )->selectionMgr(), 
+      connect( myGeomGUI->getApp()->selectionMgr(),
 	       SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
       break;
     }
@@ -182,6 +198,7 @@ void PrimitiveGUI_BoxDlg::ConstructorsClicked( int constructorId )
     {
       GroupPoints->hide();
       GroupDimensions->show();
+      globalSelection(); // close local contexts, if any
       break;
     }
   }
@@ -246,13 +263,43 @@ void PrimitiveGUI_BoxDlg::SelectionIntoArgument()
   if ( !testResult || CORBA::is_nil( aSelectedObject ) )
     return;
   
+  TopoDS_Shape aShape;
+  QString aName = GEOMBase::GetName( aSelectedObject );
+  if (GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) {
+    LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
+    TColStd_IndexedMapOfInteger aMap;
+    aSelMgr->GetIndexes( firstIObject(), 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 = 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() != TopAbs_VERTEX ) {
+        aSelectedObject = GEOM::GEOM_Object::_nil();
+        aName = "";
+      }
+    }
+  }
+
+  myEditCurrentArgument->setText( aName );
+
   if ( myEditCurrentArgument == GroupPoints->LineEdit1 )
     myPoint1 = aSelectedObject;
   else if ( myEditCurrentArgument == GroupPoints->LineEdit2 )
     myPoint2 = aSelectedObject;
   
-  myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
-  
   displayPreview();
 }
 
@@ -270,7 +317,9 @@ void PrimitiveGUI_BoxDlg::SetEditCurrentArgument()
   else if ( send == GroupPoints->PushButton2 )
     myEditCurrentArgument = GroupPoints->LineEdit2;
   
-  globalSelection( GEOM_POINT );
+  //  globalSelection( GEOM_POINT );
+  globalSelection(); // close local contexts, if any
+  localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
   
   myEditCurrentArgument->setFocus();
   SelectionIntoArgument();
@@ -298,8 +347,8 @@ void PrimitiveGUI_BoxDlg::LineEditReturnPressed()
 void PrimitiveGUI_BoxDlg::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() ) );
   
   ConstructorsClicked( getConstructorId() );
 }
@@ -385,10 +434,15 @@ bool PrimitiveGUI_BoxDlg::execute( ObjectList& objects )
 }
 
 //=================================================================================
-// function : closeEvent
-// purpose  :
+// function : addSubshapeToStudy
+// purpose  : virtual method to add new SubObjects if local selection
 //=================================================================================
-void PrimitiveGUI_BoxDlg::closeEvent( QCloseEvent* e )
+void PrimitiveGUI_BoxDlg::addSubshapesToStudy()
 {
-  GEOMBase_Skeleton::closeEvent( e );
+  QMap<QString, GEOM::GEOM_Object_var> objMap;
+  if ( getConstructorId() == 0 ) {
+    objMap[GroupPoints->LineEdit1->text()] = myPoint1;
+    objMap[GroupPoints->LineEdit2->text()] = myPoint2;
+    addSubshapesToFather( objMap );
+  }
 }