ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-15 17:13:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

Remove GEOMBase dependence.

Browse Source
This commit is contained in:
akl 2013-09-20 14:21:44 +00:00
parent 4a99ec5202
commit 1f621bfae7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CurveCreator/CurveCreator_Widget.cxx
View File

@ -7,9 +7,9 @@
#include "CurveCreator_NewSectionDlg.h" #include "CurveCreator_NewSectionDlg.h"
#include <GEOMUtils.hxx> #include <GEOMUtils.hxx>
#include <GEOMBase_Helper.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_ViewManager.h> #include <SUIT_ViewManager.h>
@ -304,10 +304,13 @@ void CurveCreator_Widget::onNewPoint()
myNewPointEditor->setSectionName(aSectName); myNewPointEditor->setSectionName(aSectName);
myNewPointEditor->setDimension(myCurve->getDimension()); myNewPointEditor->setDimension(myCurve->getDimension());
SUIT_ViewWindow* aViewWindow = GEOMBase_Helper::getActiveView(); SUIT_ViewWindow* aViewWindow = 0;
SUIT_ViewManager* aViewManager = aViewWindow->getViewManager(); SUIT_Study* activeStudy = SUIT_Session::session()->activeApplication()->activeStudy();
if ( activeStudy )
aViewWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow();
if ( aViewWindow == 0 ) if ( aViewWindow == 0 )
return; return;
SUIT_ViewManager* aViewManager = aViewWindow->getViewManager();
if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) { if ( aViewManager->getType() == OCCViewer_Viewer::Type() ) {
connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) ); this, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );

4
src/CurveCreator/Makefile.am
View File

@ -90,7 +90,6 @@ libCurveCreator_la_CPPFLAGS = \
$(CORBA_INCLUDES) \ $(CORBA_INCLUDES) \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../GEOMUtils \ -I$(srcdir)/../GEOMUtils \
-I$(srcdir)/../GEOMBase \
-I$(top_builddir)/idl -I$(top_builddir)/idl
@ -102,5 +101,4 @@ libCurveCreator_la_LDFLAGS = \
$(KERNEL_LDFLAGS) \ $(KERNEL_LDFLAGS) \
$(GUI_LDFLAGS) -lqtx -lsuit \ $(GUI_LDFLAGS) -lqtx -lsuit \
../GEOMUtils/libGEOM.la \ ../GEOMUtils/libGEOM.la \
../GEOMUtils/libGEOMUtils.la \ ../GEOMUtils/libGEOMUtils.la
../GEOMUtils/libGEOMBase.la