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

rnc: fixed some compilation issues realted to the new ShapeRecognition package

Browse Source
This commit is contained in:
gdd 2011-11-08 10:37:52 +00:00
parent 57735b96e9
commit c4cd1a87aa
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -337,6 +337,7 @@ echo testing Opencv
echo --------------------------------------------- echo ---------------------------------------------
echo echo
CHECK_OPENCV CHECK_OPENCV
AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
echo echo
echo --------------------------------------------- echo ---------------------------------------------

8
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
View File

@ -28,8 +28,6 @@
#include <OCCViewer_ViewPort3d.h> #include <OCCViewer_ViewPort3d.h>
#include <OCCViewer_ViewWindow.h> #include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewSketcher.h>
#include <OCCViewer_FeatureDetector.h>
#include <OCCViewer_ViewManager.h> #include <OCCViewer_ViewManager.h>
#include <SOCC_ViewModel.h> #include <SOCC_ViewModel.h>
@ -39,6 +37,7 @@
#include <EntityGUI.h> #include <EntityGUI.h>
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GEOM_Object.hxx> #include <GEOM_Object.hxx>
#include <ShapeRec_FeatureDetector.hxx>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
@ -504,15 +503,18 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
return res; return res;
// Build an instance of detection used to perform image processing operations // Build an instance of detection used to perform image processing operations
OCCViewer_FeatureDetector* aDetector = new OCCViewer_FeatureDetector( theImgFileName ); ShapeRec_FeatureDetector* aDetector = new ShapeRec_FeatureDetector( theImgFileName );
int height = aDetector->GetImgHeight(); int height = aDetector->GetImgHeight();
int width = aDetector->GetImgWidth(); int width = aDetector->GetImgWidth();
// NOTE: OLD
int winHeight = vp->height(); int winHeight = vp->height();
int winWidth = vp->width(); int winWidth = vp->width();
double x_offset, y_offset; double x_offset, y_offset;
int i; int i;
// NOTE: OLD
// Recompute of the values computed in OCC OpenGl_view.c // Recompute of the values computed in OCC OpenGl_view.c
// while waiting for a function to retrieve parameters of the displayed backgroun image // while waiting for a function to retrieve parameters of the displayed backgroun image
double hratio = winHeight * 1.0 / height; double hratio = winHeight * 1.0 / height;

4
src/EntityGUI/EntityGUI_PictureImportDlg.cxx
View File

@ -40,7 +40,7 @@
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
#include <OCCViewer_FeatureDetector.h> #include <ShapeRec_FeatureDetector.hxx>
#include <QFileDialog> #include <QFileDialog>
@ -182,7 +182,7 @@ bool EntityGUI_PictureImportDlg::execute( ObjectList& objects )
if ( theImgFileName.isEmpty() ) if ( theImgFileName.isEmpty() )
return res; return res;
OCCViewer_FeatureDetector* aDetector = new OCCViewer_FeatureDetector( theImgFileName ); ShapeRec_FeatureDetector* aDetector = new ShapeRec_FeatureDetector( theImgFileName );
int height = aDetector->GetImgHeight(); int height = aDetector->GetImgHeight();
int width = aDetector->GetImgWidth(); int width = aDetector->GetImgWidth();

2
src/EntityGUI/Makefile.am
View File

@ -106,6 +106,7 @@ libEntityGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMFiltersSelection \
-I$(srcdir)/../SKETCHER \ -I$(srcdir)/../SKETCHER \
-I$(srcdir)/../ShapeRecognition \
-I$(srcdir)/../GEOM \ -I$(srcdir)/../GEOM \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl -I$(top_builddir)/idl
@ -115,6 +116,7 @@ libEntityGUI_la_LDFLAGS = \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../SKETCHER/libGEOMSketcher.la \ ../SKETCHER/libGEOMSketcher.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
../ShapeRecognition/libGEOMShapeRec.la \
$(QT_MT_LIBS) \ $(QT_MT_LIBS) \
$(CAS_TKTopAlgo) -lTKernel \ $(CAS_TKTopAlgo) -lTKernel \
$(Opencv_libs) $(Opencv_libs)

8
src/Makefile.am
View File

@ -27,6 +27,10 @@ SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER OCC2VTK GEOM \
STEPImport STLExport VTKExport ShHealOper GEOMImpl GEOM_I \ STEPImport STLExport VTKExport ShHealOper GEOMImpl GEOM_I \
GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY GEOMClient GEOM_I_Superv GEOM_SWIG GEOM_PY
if WITH_OPENCV
SUBDIRS += ShapeRecognition
endif
if GEOM_ENABLE_GUI if GEOM_ENABLE_GUI
SUBDIRS += OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI \ SUBDIRS += OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI \
DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI \ DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI \
@ -34,10 +38,6 @@ if GEOM_ENABLE_GUI
GroupGUI BlocksGUI AdvancedGUI GEOM_SWIG_WITHIHM GroupGUI BlocksGUI AdvancedGUI GEOM_SWIG_WITHIHM
endif endif
if WITH_OPENCV
SUBDIRS += ShapeRecognition
endif
DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER OCC2VTK GEOM BREPExport\ DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER OCC2VTK GEOM BREPExport\
BREPImport IGESExport IGESImport STEPExport STEPImport STLExport \ BREPImport IGESExport IGESImport STEPExport STEPImport STLExport \
VTKExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv \ VTKExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv \