From 0008dcb5cc93da11434e7d8943d8a6fd734264c6 Mon Sep 17 00:00:00 2001 From: gdd Date: Tue, 13 Sep 2011 12:39:31 +0000 Subject: [PATCH] rnc : commit of previous work done before opening of the branch --- src/BasicGUI/Makefile.am | 7 +- src/EntityGUI/EntityGUI.cxx | 123 ++++++++++++++++++------ src/EntityGUI/EntityGUI.h | 3 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 11 ++- src/EntityGUI/Makefile.am | 17 +++- src/GEOMBase/GEOMBase_Helper.cxx | 21 +++- src/GEOMBase/Makefile.am | 8 +- src/GEOMGUI/GEOM_msg_en.ts | 81 ++++++++++++++-- src/GEOMGUI/GEOM_msg_fr.ts | 31 ++++++ src/GEOMGUI/GeometryGUI.cxx | 10 +- src/GEOMGUI/GeometryGUI_Operations.h | 1 + src/GEOMGUI/Makefile.am | 8 +- src/OperationGUI/Makefile.am | 8 +- 13 files changed, 271 insertions(+), 58 deletions(-) diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am index 08fde9c7d..05ba2d561 100644 --- a/src/BasicGUI/Makefile.am +++ b/src/BasicGUI/Makefile.am @@ -101,7 +101,9 @@ libBasicGUI_la_CPPFLAGS = \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMClient \ -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl + -I$(top_builddir)/idl \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include libBasicGUI_la_LDFLAGS = \ @@ -109,4 +111,5 @@ libBasicGUI_la_LDFLAGS = \ ../GEOMBase/libGEOMBase.la \ ../GEOMGUI/libGEOM.la \ $(CAS_LDFLAGS) -lTKGeomBase \ - $(GUI_LDFLAGS) -lsuit + $(GUI_LDFLAGS) -lsuit \ + -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index a6b0bdf23..33dee8d01 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -46,10 +46,12 @@ #include #include +#include -#include "EntityGUI_SketcherDlg.h" // Sketcher -#include "EntityGUI_3DSketcherDlg.h" // Sketcher -#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE +#include "EntityGUI_SketcherDlg.h" // Sketcher +#include "EntityGUI_3DSketcherDlg.h" // Sketcher +#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE +#include "EntityGUI_FeatureDetectorDlg.h" // Feature Detection //======================================================================= // function : EntityGUI() @@ -93,6 +95,9 @@ bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case GEOMOp::OpExplode: // EXPLODE aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent ); break; + case GEOMOp::OpFeatureDetect: // CORNER DETECTION + aDlg = new EntityGUI_FeatureDetectorDlg( getGeometryGUI(), parent ); + break; default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break; @@ -113,38 +118,96 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); // Create Point dialog, OCC viewer - if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_SketcherDlg" ) == 0 ) && + if ( aDlg && theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() && pe->modifiers() != Qt::ControlModifier ) { - MESSAGE("Premier if ok!") - EntityGUI_SketcherDlg* aPntDlg = (EntityGUI_SketcherDlg*) aDlg; - if ( aPntDlg->acceptMouseEvent() ) { - OCCViewer_Viewer* anOCCViewer = - ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer(); - Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext(); - - gp_Pnt aPnt; - - ic->InitSelected(); - if ( pe->modifiers() == Qt::ShiftModifier ) - ic->ShiftSelect(); // Append selection - else + + gp_Pnt aPnt; + + if ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_SketcherDlg" ) == 0 ) + { + EntityGUI_SketcherDlg* aSketcherDlg = (EntityGUI_SketcherDlg*) aDlg; + if ( aSketcherDlg->acceptMouseEvent() ) { + OCCViewer_Viewer* anOCCViewer = + ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer(); + Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext(); + + ic->InitSelected(); + if ( pe->modifiers() == Qt::ShiftModifier ) + ic->ShiftSelect(); // Append selection + else + ic->Select(); // New selection + + ic->InitSelected(); + if ( ic->MoreSelected() ) { + TopoDS_Shape aShape = ic->SelectedShape(); + if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) + aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); + } + else { + OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort(); + aPnt = ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); + } + + Qt::KeyboardModifiers modifiers = pe->modifiers(); + aSketcherDlg->OnPointSelected( modifiers, aPnt ); // "feed" the point to point construction dialog + } // acceptMouseEvent() + } + if ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) + { + EntityGUI_FeatureDetectorDlg* aCornerDlg = (EntityGUI_FeatureDetectorDlg*) aDlg; + if ( aCornerDlg->acceptMouseEvent() ) { + OCCViewer_Viewer* anOCCViewer = + ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer(); + Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext(); + + ic->InitSelected(); ic->Select(); // New selection - ic->InitSelected(); - if ( ic->MoreSelected() ) { - TopoDS_Shape aShape = ic->SelectedShape(); - if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) - aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); - } - else { - OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort(); - aPnt = ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); - } + ic->InitSelected(); + if ( ic->MoreSelected() ) { + TopoDS_Shape aShape = ic->SelectedShape(); + if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX ) + aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) ); + } + else { + OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort(); + aPnt = ConvertClickToPoint( pe->x(), pe->y(), vp->getView() ); + } + + aCornerDlg->OnPointSelected( aPnt ); // "feed" the point to corner detection dialog + + QPoint start = QPoint(pe->x(),pe->y()); + aCornerDlg->setStartPnt( start ); + } // acceptMouseEvent() + + } + } + return false; +} + +//================================================================================= +// function : 0nMouseMove() +// purpose : [static] manage mouse events +//================================================================================= +bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ) +{ +// MESSAGE("EntityGUI::OnMouseMove") + QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); + if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) && + theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() && + pe->modifiers() != Qt::ControlModifier ) { + + EntityGUI_FeatureDetectorDlg* aCornerDlg = (EntityGUI_FeatureDetectorDlg*) aDlg; + + gp_Pnt aPnt; - Qt::KeyboardModifiers modifiers = pe->modifiers(); - aPntDlg->OnPointSelected( modifiers, aPnt ); // "feed" the point to point construction dialog - } // acceptMouseEvent() + if ( QApplication::mouseButtons() == Qt::LeftButton && + aCornerDlg->acceptMouseEvent() ) + { + QPoint end = QPoint(pe->x(),pe->y()); + aCornerDlg->setEndPnt( end ); + } } return false; } diff --git a/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h index cfc0addef..d6a557ef6 100644 --- a/src/EntityGUI/EntityGUI.h +++ b/src/EntityGUI/EntityGUI.h @@ -49,8 +49,9 @@ public : bool OnGUIEvent( int, SUIT_Desktop* ); bool OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ); + bool OnMouseMove( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ); - gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView ); + static gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView ); void DisplaySimulationShape( const TopoDS_Shape&, const TopoDS_Shape& ); void EraseSimulationShape(); diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 711da593c..f3fa98bf2 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -28,6 +28,9 @@ #include "EntityGUI_Widgets.h" #include +#include +#include + #include #include #include @@ -1525,6 +1528,10 @@ void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, con { MESSAGE("EntityGUI_SketcherDlg::OnPointSelected") + SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); + OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort(); + QString theImgFileName = vp->backgroundImageFilename(); + double x, y; x = y = 0; @@ -1542,8 +1549,8 @@ void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, con gp_Pnt aTrsfPnt; GEOMBase::VertexToPoint( aShape, aTrsfPnt ); - autoApply = ( getPnt2ConstructorId() == 1 && false ); // If no additional argument needed after selection - // -> apply automatically --> disabled for now + autoApply = ( (getPnt2ConstructorId() == 1) && (!theImgFileName.isEmpty()) ); // If no additional argument needed after selection and there is a backgroundimage + // -> apply automatically if ( getPnt1ConstructorId() == 0 ){ // Relative selection mode x = aTrsfPnt.X() - myLastX1; diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am index e8331a454..694c1acaa 100644 --- a/src/EntityGUI/Makefile.am +++ b/src/EntityGUI/Makefile.am @@ -33,20 +33,23 @@ salomeinclude_HEADERS = \ EntityGUI_Widgets.h \ EntityGUI_SketcherDlg.h \ EntityGUI_3DSketcherDlg.h \ - EntityGUI_SubShapeDlg.h + EntityGUI_SubShapeDlg.h \ + EntityGUI_FeatureDetectorDlg.h dist_libEntityGUI_la_SOURCES = \ EntityGUI.cxx \ EntityGUI_Widgets.cxx \ EntityGUI_SketcherDlg.cxx \ EntityGUI_3DSketcherDlg.cxx \ - EntityGUI_SubShapeDlg.cxx + EntityGUI_SubShapeDlg.cxx \ + EntityGUI_FeatureDetectorDlg.cxx MOC_FILES = \ EntityGUI_Widgets_moc.cxx \ EntityGUI_SketcherDlg_moc.cxx \ EntityGUI_3DSketcherDlg_moc.cxx \ - EntityGUI_SubShapeDlg_moc.cxx + EntityGUI_SubShapeDlg_moc.cxx \ + EntityGUI_FeatureDetectorDlg_moc.cxx nodist_libEntityGUI_la_SOURCES = \ $(MOC_FILES) @@ -88,8 +91,11 @@ libEntityGUI_la_CPPFLAGS = \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../SKETCHER \ + -I$(srcdir)/../GEOM \ -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl + -I$(top_builddir)/idl \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include libEntityGUI_la_LDFLAGS = \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ @@ -97,5 +103,6 @@ libEntityGUI_la_LDFLAGS = \ ../SKETCHER/libGEOMSketcher.la \ ../GEOMGUI/libGEOM.la \ $(QT_MT_LIBS) \ - $(CAS_TKTopAlgo) -lTKernel + $(CAS_TKTopAlgo) -lTKernel \ + -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index d62615d87..313854e0d 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -359,7 +359,7 @@ void GEOMBase_Helper::displayPreview( const SALOME_Prs* prs, if ( myViewWindow == 0 ) return; - + // Display prs SUIT_ViewManager* aViewManager = myViewWindow->getViewManager(); if ( aViewManager->getType() == OCCViewer_Viewer::Type() || @@ -700,7 +700,10 @@ bool GEOMBase_Helper::openCommand() { bool res = false; if ( !getStudy() || hasCommand() ) + { + MESSAGE("Getting out from openCommand()") return res; + } GEOM::GEOM_IOperations_var anOp = GEOM::GEOM_IOperations::_narrow( getOperation() ); if ( !anOp->_is_nil() ) { @@ -708,6 +711,10 @@ bool GEOMBase_Helper::openCommand() myCommand->start(); res = true; } + else + { + MESSAGE("anOp->_is_nil() = true") + } return res; } @@ -750,6 +757,8 @@ bool GEOMBase_Helper::commitCommand( const char* ) //================================================================ bool GEOMBase_Helper::hasCommand() const { + bool res = (bool) myCommand; + MESSAGE("hasCommand = "<( SUIT_Session::session()->activeApplication()->activeStudy() ); - if ( !appStudy ) return false; + if ( !appStudy ) + { + MESSAGE("appStudy is empty") + return false; + } _PTR(Study) aStudy = appStudy->studyDS(); bool aLocked = (_PTR(AttributeStudyProperties) (aStudy->GetProperties()))->IsLocked(); @@ -819,7 +832,9 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction ) bool result = false; try { + MESSAGE("publish ="<activeApplication()->putInfo( "" ); ObjectList objects; @@ -889,10 +904,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction ) catch( const SALOME::SALOME_Exception& e ) { SalomeApp_Tools::QtCatchCorbaException( e ); abortCommand(); + MESSAGE("Exception catched") } updateViewer(); + MESSAGE("result ="< MEN_BUILD Build + + MEN_FEATURE_DETECTION + Feature detection + MEN_CHAMFER Chamfer @@ -3156,11 +3160,11 @@ Please, select face, shell or solid and try again STB_POP_UNPUBLISH_OBJ Unpublish object - + STB_POP_PUBLISH_OBJ Publish object - + STB_POP_HIDE_CHILDREN Hide child objects @@ -3704,7 +3708,7 @@ Please, select face, shell or solid and try again TOP_POP_PUBLISH_OBJ Publish object - + TOP_POP_HIDE_CHILDREN Hide Children @@ -4345,7 +4349,7 @@ Otherwise the dimensions will be kept without modifications. GEOM_CURVE_ANALITICAL Analytical - + BasicGUI_ParamCurveWidget @@ -4372,7 +4376,7 @@ Otherwise the dimensions will be kept without modifications. GEOM_PCURVE_MAX Max t - + GEOM_PCURVE_STEP Step @@ -4552,6 +4556,65 @@ Otherwise the dimensions will be kept without modifications. Number of sketch points too small + + EntityGUI_FeatureDetectorDlg + + GEOM_DETECT_TITLE + Feature Detection + + + GEOM_SCALING + Scaling + + + GEOM_PNT1 + Top left corner + + + GEOM_PNT2 + Top right corner + + + GEOM_CORNER + Detected_corners + + + GEOM_CORNERS + Corners + + + GEOM_CONTOURS + Contours + + + GEOM_FEATURES + Features + + + GEOM_DETECT_ZONE + Select a detection zone (default is whole picture) + + + GEOM_COLOR_FILTER + Select the color of the zone you want to find the frontier of + + + GEOM_VIEW + View + + + GEOM_FRONT + Front (Y-Z) + + + GEOM_TOP + Top (X-Y) + + + GEOM_LEFT + Left (X-Z) + + EntityGUI_SubShapeDlg @@ -4963,12 +5026,12 @@ Would you like to continue? Publish Objects - OBJECT_NAME - Name + OBJECT_NAME + Name - OBJECT_ENTRY - Entry + OBJECT_ENTRY + Entry UNSELECT_ALL diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 099e90fa3..5342658ac 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -2181,6 +2181,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_BUILD Construire + + MEN_CORNER_DETECTION + Détecter les angles (image ou plan) + MEN_CHAMFER Chanfrein @@ -4552,6 +4556,33 @@ le paramètre '%1' aux préférences du module Géométrie. + + EntityGUI_CornerDetectionDlg + + GEOM_DETECT_TITLE + Détecter les angles + + + GEOM_SCALING + Mise à l'échelle + + + GEOM_PNT1 + Coin supérieur gauche + + + GEOM_PNT2 + Coin supérieur droit + + + GEOM_CORNER + Angles_détectés + + + GEOM_CORNERS + Angles + + EntityGUI_SubShapeDlg diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 033704512..4881c4e10 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -282,7 +282,7 @@ void GeometryGUI::ActiveWorkingPlane() view3d->SetProj(DZ.X(), DZ.Y(), DZ.Z()); view3d->SetUp(DY.X(), DY.Y(), DY.Z()); - vw->onViewFitAll(); +// vw->onViewFitAll(); TEST (don't forget to remove comments) } } else if( ViewVTK ) { @@ -460,6 +460,7 @@ void GeometryGUI::OnGUIEvent( int id ) case GEOMOp::Op2dSketcher: // MENU ENTITY - SKETCHER case GEOMOp::Op3dSketcher: // MENU ENTITY - 3D SKETCHER case GEOMOp::OpExplode: // MENU ENTITY - EXPLODE + case GEOMOp::OpFeatureDetect: // MENU ENTITY - FEATURE DETECTION libName = "EntityGUI"; break; case GEOMOp::OpEdge: // MENU BUILD - EDGE @@ -707,6 +708,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::Op2dSketcher, "SKETCH" ); createGeomAction( GEOMOp::Op3dSketcher, "3DSKETCH" ); createGeomAction( GEOMOp::OpExplode, "EXPLODE" ); + createGeomAction( GEOMOp::OpFeatureDetect,"FEATURE_DETECTION" ); createGeomAction( GEOMOp::OpEdge, "EDGE" ); createGeomAction( GEOMOp::OpWire, "WIRE" ); @@ -900,6 +902,10 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpShell, buildId, -1 ); createMenu( GEOMOp::OpSolid, buildId, -1 ); createMenu( GEOMOp::OpCompound, buildId, -1 ); + + createMenu( separator(), newEntId, -1 ); + + createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 ); int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 ); @@ -1065,6 +1071,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( separator(), operTbId ); createTool( GEOMOp::OpExplode, operTbId ); createTool( separator(), operTbId ); + createTool( GEOMOp::OpFeatureDetect, operTbId ); + createTool( separator(), operTbId ); createTool( GEOMOp::OpPartition, operTbId ); createTool( GEOMOp::OpArchimede, operTbId ); createTool( GEOMOp::OpShapesOnShape, operTbId ); diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index 73b68f2f2..f891de5a7 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -92,6 +92,7 @@ namespace GEOMOp { Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER OpExplode = 3302, // MENU NEW ENTITY - EXPLODE + OpFeatureDetect = 3303, // MENU NEW ENTITY - FEATURE DETECTION // BuildGUI ------------------//-------------------------------- OpEdge = 3400, // MENU NEW ENTITY - BUILD - EDGE OpWire = 3401, // MENU NEW ENTITY - BUILD - WIRE diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am index d65f42496..5ca89f58f 100644 --- a/src/GEOMGUI/Makefile.am +++ b/src/GEOMGUI/Makefile.am @@ -76,7 +76,9 @@ libGEOM_la_CPPFLAGS = \ -I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMImpl \ -I$(top_builddir)/idl \ - -I$(top_builddir) + -I$(top_builddir) \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include libGEOM_la_LDFLAGS = \ $(PYTHON_LIBS) \ @@ -84,7 +86,9 @@ libGEOM_la_LDFLAGS = \ ../GEOMClient/libGEOMClient.la \ ../OBJECT/libGEOMObject.la \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \ - $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd + $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd \ + -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann + # -lSalomeApp # -lToolsGUI # $(CORBA_LIBS) \ diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am index 324616632..31a562122 100644 --- a/src/OperationGUI/Makefile.am +++ b/src/OperationGUI/Makefile.am @@ -81,11 +81,15 @@ libOperationGUI_la_CPPFLAGS = \ -I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMAlgo \ -I$(top_builddir)/src/DlgRef \ - -I$(top_builddir)/idl + -I$(top_builddir)/idl \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \ + -I/home/palmco/OpenCV/OpenCV-2.3.0/install/include + libOperationGUI_la_LDFLAGS = \ ../GEOMBase/libGEOMBase.la \ - $(CAS_LDPATH) -lTKFillet + $(CAS_LDPATH) -lTKFillet \ + -L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann ############################### # Obsolete files ? -- 2.39.2