From: akl <akl@opencascade.com>
Date: Fri, 20 Sep 2013 14:21:44 +0000 (+0000)
Subject: Remove GEOMBase dependence.
X-Git-Tag: BR_hydro_v_0_1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1f621bfae77805d7727799995d7ae723dd93b95d;p=modules%2Fgeom.git

Remove GEOMBase dependence.
---

diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx
index c94ab8f4c..132857ca0 100644
--- a/src/CurveCreator/CurveCreator_Widget.cxx
+++ b/src/CurveCreator/CurveCreator_Widget.cxx
@@ -7,9 +7,9 @@
 #include "CurveCreator_NewSectionDlg.h"
 
 #include <GEOMUtils.hxx>
-#include <GEOMBase_Helper.h>
 
 #include <SUIT_Session.h>
+#include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_ViewManager.h>
 
@@ -304,10 +304,13 @@ void CurveCreator_Widget::onNewPoint()
   myNewPointEditor->setSectionName(aSectName);
   myNewPointEditor->setDimension(myCurve->getDimension());
 
-  SUIT_ViewWindow* aViewWindow = GEOMBase_Helper::getActiveView();
-  SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
+  SUIT_ViewWindow* aViewWindow = 0;
+  SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
+  if ( activeStudy )
+    aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
   if ( aViewWindow == 0 )
     return;
+  SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
   if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) {
     connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
              this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
diff --git a/src/CurveCreator/Makefile.am b/src/CurveCreator/Makefile.am
index d92dd4f5c..89faab32a 100644
--- a/src/CurveCreator/Makefile.am
+++ b/src/CurveCreator/Makefile.am
@@ -90,7 +90,6 @@ libCurveCreator_la_CPPFLAGS =		\
 	$(CORBA_INCLUDES)		\
 	-I$(srcdir)/../GEOMGUI		\
 	-I$(srcdir)/../GEOMUtils	\
-	-I$(srcdir)/../GEOMBase		\
 	-I$(top_builddir)/idl
 
 
@@ -102,5 +101,4 @@ libCurveCreator_la_LDFLAGS  =		\
 	$(KERNEL_LDFLAGS) 		\
 	$(GUI_LDFLAGS) -lqtx -lsuit	\
 	../GEOMUtils/libGEOM.la		\
-	../GEOMUtils/libGEOMUtils.la	\
-	../GEOMUtils/libGEOMBase.la	
+	../GEOMUtils/libGEOMUtils.la