Join modifications from branch OCC_debug_for_3_2_0b1

[modules/geom.git] / src / BasicGUI / BasicGUI_WorkingPlaneDlg.cxx

diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
index 168c8bc7b818e1a6a3de65fd0be7366a84d1edd4..064ea93a70b64c654a09b95853f1abda05f9758b 100644 (file)
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
@@ -61,8 +61,10 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(GeometryGUI* theGeometryGUI , QWidget* parent, const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI)
+BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(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(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_FACE")));
@@ -103,6 +105,8 @@ BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(GeometryGUI* theGeometryGUI ,
   Layout1->addWidget(Group3, 1, 0);
   /***************************************************************/
 
+  setHelpFileName("working_plane.htm");
+
   Init();
 }
 
@@ -122,9 +126,9 @@ void BasicGUI_WorkingPlaneDlg::Init()
 {
   /* init variables */
   myEditCurrentArgument = Group1->LineEdit1;
-  myWPlane = myGeometryGUI->GetWorkingPlane();
+  myWPlane = myGeomGUI->GetWorkingPlane();
 
-  // myGeometryGUI->SetState( 0 );
+  // myGeomGUI->SetState( 0 );
 
   myFace = GEOM::GEOM_Object::_nil();
   myVectX = GEOM::GEOM_Object::_nil();
@@ -137,8 +141,8 @@ void BasicGUI_WorkingPlaneDlg::Init()
 
    /* signals and slots connections */
   connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
-  connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
-  connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
+  connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
+  connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
   connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int)));
 
   connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
@@ -168,7 +172,7 @@ void BasicGUI_WorkingPlaneDlg::Init()
 void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId)
 {
   disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0);
-  // myGeometryGUI->SetState( 0 );
+  // myGeomGUI->SetState( 0 );
 
   switch (constructorId)
     {
@@ -249,7 +253,7 @@ void BasicGUI_WorkingPlaneDlg::ClickOnOk()
 bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
 {
   buttonApply->setFocus();
-  myGeometryGUI->application()->putInfo(tr(""));
+  myGeomGUI->application()->putInfo(tr(""));
   const int id = getConstructorId();
 
   if (id == 0) {
@@ -262,8 +266,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
           gp_Pln aPln = aGPlane->Pln();
 
           myWPlane = aPln.Position();
-          myGeometryGUI->SetWorkingPlane(myWPlane);
-          myGeometryGUI->ActiveWorkingPlane();
+          myGeomGUI->SetWorkingPlane(myWPlane);
+          myGeomGUI->ActiveWorkingPlane();
           return true;
         }
       }
@@ -305,8 +309,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
 
       myWPlane = gp_Ax3(BRep_Tool::Pnt(V1), aDirZ, aDirX);
 
-      myGeometryGUI->SetWorkingPlane(myWPlane);
-      myGeometryGUI->ActiveWorkingPlane();
+      myGeomGUI->SetWorkingPlane(myWPlane);
+      myGeomGUI->ActiveWorkingPlane();
       return true;
     }
   } else if (id == 2) {
@@ -328,8 +332,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply()
 
     myWPlane = gp_Ax3(P1, aDirZ, aDirX);
 
-    myGeometryGUI->SetWorkingPlane(myWPlane);
-    myGeometryGUI->ActiveWorkingPlane();
+    myGeomGUI->SetWorkingPlane(myWPlane);
+    myGeomGUI->ActiveWorkingPlane();
     return true;
   }
   return false;
@@ -434,7 +438,7 @@ void BasicGUI_WorkingPlaneDlg::ActivateThisDialog( )
 //=================================================================================
 void BasicGUI_WorkingPlaneDlg::DeactivateActiveDialog()
 {
-  // myGeometryGUI->SetState( -1 );
+  // myGeomGUI->SetState( -1 );
   GEOMBase_Skeleton::DeactivateActiveDialog();
 }
 
@@ -463,6 +467,5 @@ void BasicGUI_WorkingPlaneDlg::enterEvent(QEvent* e)
 //=================================================================================
 void BasicGUI_WorkingPlaneDlg::closeEvent( QCloseEvent* e )
 {
-  // myGeometryGUI->SetState( -1 );
   GEOMBase_Skeleton::closeEvent( e );
 }