diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index d9b8a9533..2dc1adf3f 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -434,16 +434,12 @@ GEOM::GEOM_IOperations_ptr EntityGUI_FeatureDetectorDlg::createOperation() //================================================================================= bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects ) { - MESSAGE("EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )") - bool res = false; - SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); - MESSAGE("myFaceEntry = "<< myFaceEntry.toStdString()); + SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); std::map< std::string , std::vector >::iterator AISit; SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel()); - MESSAGE("repere1") AISit = soccViewer->entry2aisobjects.find(myFaceEntry.toStdString()); if (AISit == soccViewer->entry2aisobjects.end()) return res; @@ -476,9 +472,9 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects ) QPoint bottomRight = QPoint(myEndPnt.X() - pictureLeft, pictureTop - myEndPnt.Y()); QRect aRect = QRect(topLeft, bottomRight); - GEOM::GEOM_IBasicOperations_var aBasicOperations = myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); GEOM::GEOM_IShapesOperations_var aShapesOperations = GEOM::GEOM_IShapesOperations::_narrow( getOperation() ); + if (myConstructorId == CORNERS) { if( !aRect.isEmpty() ) diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index d15bec532..5e1a99796 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -915,8 +915,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( separator(), newEntId, -1 ); #ifdef WITH_OPENCV - createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 ); createMenu( GEOMOp::OpPictureImport, newEntId, -1 ); + createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 ); #endif int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 );