ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

rnc: tiny modifications

Browse Source
This commit is contained in:
gdd 2011-11-09 17:24:21 +00:00
parent dfc97bd8a7
commit 9818567cc6
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
View File

@ -434,16 +434,12 @@ GEOM::GEOM_IOperations_ptr EntityGUI_FeatureDetectorDlg::createOperation()
//================================================================================= //=================================================================================
bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects ) bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
{ {
MESSAGE("EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )")
bool res = false; bool res = false;
SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow();
MESSAGE("myFaceEntry = "<< myFaceEntry.toStdString()); SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow();
std::map< std::string , std::vector<Handle(AIS_InteractiveObject)> >::iterator AISit; std::map< std::string , std::vector<Handle(AIS_InteractiveObject)> >::iterator AISit;
SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel()); SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel());
MESSAGE("repere1")
AISit = soccViewer->entry2aisobjects.find(myFaceEntry.toStdString()); AISit = soccViewer->entry2aisobjects.find(myFaceEntry.toStdString());
if (AISit == soccViewer->entry2aisobjects.end()) if (AISit == soccViewer->entry2aisobjects.end())
return res; return res;
@ -476,9 +472,9 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
QPoint bottomRight = QPoint(myEndPnt.X() - pictureLeft, pictureTop - myEndPnt.Y()); QPoint bottomRight = QPoint(myEndPnt.X() - pictureLeft, pictureTop - myEndPnt.Y());
QRect aRect = QRect(topLeft, bottomRight); QRect aRect = QRect(topLeft, bottomRight);
GEOM::GEOM_IBasicOperations_var aBasicOperations = myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); GEOM::GEOM_IBasicOperations_var aBasicOperations = myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
GEOM::GEOM_IShapesOperations_var aShapesOperations = GEOM::GEOM_IShapesOperations::_narrow( getOperation() ); GEOM::GEOM_IShapesOperations_var aShapesOperations = GEOM::GEOM_IShapesOperations::_narrow( getOperation() );
if (myConstructorId == CORNERS) if (myConstructorId == CORNERS)
{ {
if( !aRect.isEmpty() ) if( !aRect.isEmpty() )

2
src/GEOMGUI/GeometryGUI.cxx
View File

@ -915,8 +915,8 @@ void GeometryGUI::initialize( CAM_Application* app )
createMenu( separator(), newEntId, -1 ); createMenu( separator(), newEntId, -1 );
#ifdef WITH_OPENCV #ifdef WITH_OPENCV
createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 );
createMenu( GEOMOp::OpPictureImport, newEntId, -1 ); createMenu( GEOMOp::OpPictureImport, newEntId, -1 );
createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 );
#endif #endif
int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 ); int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 );