Join modifications from branch OCC_debug_for_3_2_0b1

[modules/geom.git] / src / OperationGUI / OperationGUI_MaterialDlg.cxx

diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.cxx b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
index b3055d38d48a017da19b3fd662e38135e84b716f..b92dd5efbcf79cf14a4148ae3d549b48f774379b 100644 (file)
--- a/src/OperationGUI/OperationGUI_MaterialDlg.cxx
+++ b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
@@ -47,15 +47,16 @@ using namespace std;
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-OperationGUI_MaterialDlg::OperationGUI_MaterialDlg (QWidget* parent, const char* name,
-                                                   GEOM::ListOfGO ListShapes,
+OperationGUI_MaterialDlg::OperationGUI_MaterialDlg (GeometryGUI* theGeometryGUI, QWidget* parent,
+                                                    const char* name, GEOM::ListOfGO ListShapes,
                                                     bool modal, WFlags fl)
-  :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
+                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
   myListShapes = ListShapes;
   myParentDlg = parent;
 
-  QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION")));
+  QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION")));
 
   setCaption(tr("GEOM_MATERIAL_TITLE"));
 
@@ -77,11 +78,12 @@ OperationGUI_MaterialDlg::OperationGUI_MaterialDlg (QWidget* parent, const char*
 
   Layout1->addWidget(GroupPoints, 1, 0);
   /***************************************************************/
- 
+
+  setHelpFileName("none.htm"); 
+
   Init();
 }
 
-
 //=================================================================================
 // function : ~OperationGUI_MaterialDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -91,7 +93,6 @@ OperationGUI_MaterialDlg::~OperationGUI_MaterialDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
@@ -128,20 +129,8 @@ void OperationGUI_MaterialDlg::Init()
 
   connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetMaterial()));
 
-//  connect(GroupPoints->ListView1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-//  connect(GroupPoints->SpinBox1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
   connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
          SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
-
-  /* displays Dialog */
-  MESSAGE("GroupPoints->show() ...");
-  GroupPoints->show();
-  MESSAGE("this->show() ...");
-  this->show();
-  MESSAGE("return");
-
-  return;
 }
 
 
@@ -182,17 +171,17 @@ void OperationGUI_MaterialDlg::ClickOnOk()
 //=================================================================================
 void OperationGUI_MaterialDlg::SelectionIntoArgument()
 {
-  QString aString = ""; /* name of selection */
+  /*QString aString = ""; // name of selection
 
-  int nbSel = myGeomBase->GetNameOfSelectedIObjects(selectedIO(), aString);
-  if(nbSel < 1) {
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aString);
+  if (nbSel < 1) {
     return;
   }
 
   //myGeomBase->ConvertListOfIOInListOfIOR(selectedIO(), myListShapes);
 
-  /* no simulation */
-  return;
+  // no simulation
+  return;*/
 }
 
 
@@ -233,6 +222,6 @@ void OperationGUI_MaterialDlg::ActivateThisDialog()
 //=================================================================================
 void OperationGUI_MaterialDlg::enterEvent(QEvent* e)
 {
-  if(!GroupConstructors->isEnabled())
+  if (!GroupConstructors->isEnabled())
     this->ActivateThisDialog();
 }