From: ana Date: Fri, 23 Dec 2011 13:02:59 +0000 (+0000) Subject: Windows compatibility X-Git-Tag: V6_5_0a1~109 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1192c0b6c16d629fabf9ef1cf872b80d4520373a;p=modules%2Fgeom.git Windows compatibility --- diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index b56ee2599..5fa025aa7 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -159,6 +159,7 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi aSketcherDlg->OnPointSelected( modifiers, aPnt ); // "feed" the point to point construction dialog } // acceptMouseEvent() } +#ifdef WITH_OPENCV if ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) { EntityGUI_FeatureDetectorDlg* aCornerDlg = (EntityGUI_FeatureDetectorDlg*) aDlg; @@ -189,7 +190,9 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi } // acceptMouseEvent() } +#endif } + return false; } @@ -201,6 +204,7 @@ bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_View { MESSAGE("EntityGUI::OnMouseRelease") QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); +#ifdef WITH_OPENCV if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) && theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() && pe->modifiers() != Qt::ControlModifier ) @@ -217,9 +221,11 @@ bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_View aCornerDlg->setEndPnt( aPnt ); } } +#endif return false; } + //======================================================================= // function : ConvertClickToPoint() // purpose : Returns the point clicked in 3D view