Join modifications from branch OCC_debug_for_3_2_0b1

[modules/geom.git] / src / RepairGUI / RepairGUI_SuppressFacesDlg.cxx

diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index 4d996d2a143a170a6ba26c750749d1460ed8c53d..945f0714bb1659481edf45f21e2f14ac95fc1a76 100644 (file)
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -48,8 +48,10 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg(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_DLG_SUPRESS_FACE")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
@@ -70,6 +72,8 @@ RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg(QWidget* parent, const ch
 
   Layout1->addWidget(GroupPoints, 2, 0);
   /***************************************************************/
+  
+  setHelpFileName("suppress_faces.htm");
 
   Init();
 }
@@ -100,10 +104,6 @@ void RepairGUI_SuppressFacesDlg::Init()
   initSelection();
          
   /* signals and slots connections */
-  connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
-  connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
-  connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
-
   connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
   connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
 
@@ -127,8 +127,6 @@ void RepairGUI_SuppressFacesDlg::ClickOnOk()
     ClickOnCancel();
 }
 
-
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
@@ -150,16 +148,6 @@ bool RepairGUI_SuppressFacesDlg::ClickOnApply()
 }
 
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void RepairGUI_SuppressFacesDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
@@ -181,14 +169,14 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
     if ( !CORBA::is_nil( aSelectedObject ) && aRes )
     {
       TopoDS_Shape aShape;
-      if ( myGeomBase->GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) )
+      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) )
       {
        if ( aShape.ShapeType() <= TopAbs_FACE ) // FACE, SHELL, SOLID, COMPOUND
        {
          GEOM::short_array anIndexes;
 
          TColStd_IndexedMapOfInteger aMap;
-         ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap );
+         myGeomGUI->getApp()->selectionMgr()->GetIndexes( anIO, aMap );
          
          if ( !aMap.IsEmpty() )
          {
@@ -247,17 +235,6 @@ void RepairGUI_SuppressFacesDlg::LineEditReturnPressed()
 }
 
 
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose  :
-//=================================================================================
-void RepairGUI_SuppressFacesDlg::DeactivateActiveDialog()
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::DeactivateActiveDialog();
-}
-
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :