Join modifications from branch OCC_development_for_3_2_0a2

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_CreateHypothesesDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx b/src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx
index 5e3e4b090218e6eae58a8fbf50876f3f7b547271..4f97f992dcb83346a72cb67ecddc47f49a2cb101 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreateHypothesesDlg.cxx
@@ -160,9 +160,6 @@ void SMESHGUI_CreateHypothesesDlg::Init()
   connect(ListAlgoDefinition, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
   connect(ListAlgoDefinition, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(onDoubleClicked(QListViewItem*)));
 
-  int x, y;
-  mySMESHGUI->DefineDlgPosition(this, x, y);
-  this->move(x, y);
   this->show();
 }
 
@@ -205,8 +202,13 @@ void SMESHGUI_CreateHypothesesDlg::ClickOnApply()
     SMESHGUI_GenericHypothesisCreator* aCreator =
       SMESH::GetHypothesisCreator(sHypType);
 
-    // Create hypothesis/algorithm
-    aCreator->CreateHypothesis(myIsAlgo, this);
+    if( aCreator )
+      // Create hypothesis/algorithm
+      aCreator->create( myIsAlgo, this );
+    else
+    {
+      // report about error
+    }
   }
 
 //  buttonApply->setEnabled(FALSE);
@@ -287,7 +289,7 @@ void SMESHGUI_CreateHypothesesDlg::InitAlgoDefinition()
       parentItem = new QListViewItem(ListAlgoDefinition, aHypData->PluginName);
     parentItem->setOpen(true);
     QListViewItem* aItem = new QListViewItem(parentItem, aHypData->Label, HypList[i]);
-    QPixmap aPixMap (SMESHGUI::resourceMgr()->loadPixmap("SMESH", tr(aHypData->IconId)));
+    QPixmap aPixMap (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr(aHypData->IconId)));
     if (!aPixMap.isNull())
       aItem->setPixmap(0, aPixMap);
   }