Fix for bug PAL12858(EDF210 GEOM Preferences menu of GEOM: color of the wireframe?)

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

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 145daa37bd78459cdff47d0749d3fe4a1db96ac1..648ae2fe961c58d970b1e7fd485947eede9f2871 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -17,7 +17,7 @@
 //  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
 //
 //
 //
@@ -29,7 +29,7 @@
 #include "RepairGUI_DivideEdgeDlg.h"
 
 #include "SalomeApp_Application.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SUIT_Session.h"
 #include "SALOME_ListIteratorOfListIO.hxx"
 
@@ -50,11 +50,9 @@ using namespace std;
 //=================================================================================
 RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
                                                   const char* name, bool modal, WFlags fl)
-  : GEOMBase_Skeleton(parent, name, modal, WStyle_Customize |
+  : GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
                       WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
-  myGeomGUI = theGeometryGUI;
-
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_DIVIDE_EDGE")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
@@ -92,10 +90,11 @@ RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, Q
   GroupPoints->getGroupBoxLayout()->addLayout( aLay, 2, 0 );
   /***************************************************************/
 
+  setHelpFileName("add_point_on_edge.htm");
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~RepairGUI_DivideEdgeDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -104,7 +103,6 @@ RepairGUI_DivideEdgeDlg::~RepairGUI_DivideEdgeDlg()
 {
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -121,10 +119,6 @@ void RepairGUI_DivideEdgeDlg::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()));
 
@@ -170,16 +164,6 @@ bool RepairGUI_DivideEdgeDlg::ClickOnApply()
 }
 
 
-//=================================================================================
-// function : ClickOnCancel()
-// purpose  :
-//=================================================================================
-void RepairGUI_DivideEdgeDlg::ClickOnCancel()
-{
-  GEOMBase_Skeleton::ClickOnCancel();
-}
-
-
 //=================================================================================
 // function : SelectionIntoArgument()
 // purpose  : Called when selection as changed or other case
@@ -200,7 +184,7 @@ void RepairGUI_DivideEdgeDlg::SelectionIntoArgument()
     if ( !CORBA::is_nil( aSelectedObj ) && aRes )
     {
       TopoDS_Shape aShape;
-      if ( myGeomBase->GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) )
+      if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) )
       {
         const int aType = aShape.ShapeType();
         if ( aType <= TopAbs_EDGE ) // edge, wire, face, shell, solid, compound
@@ -264,16 +248,6 @@ void RepairGUI_DivideEdgeDlg::LineEditReturnPressed()
 }
 
 
-//=================================================================================
-// function : DeactivateActiveDialog()
-// purpose  :
-//=================================================================================
-void RepairGUI_DivideEdgeDlg::DeactivateActiveDialog()
-{
-  //myGeomGUI->SetState( -1 );
-  GEOMBase_Skeleton::DeactivateActiveDialog();
-}
-
 //=================================================================================
 // function : ActivateThisDialog()
 // purpose  :