X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_RecognizeContoursOp.cxx;h=9af735e48880f823afa5ab68a16f6f1c4cd22ce5;hb=HEAD;hp=1ed528f676eb70ba5fc65791fe93986d7ab46588;hpb=7de2b9cfd8501129720f9338fcdf1766007511b9;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx index 1ed528f6..9af735e4 100644 --- a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx +++ b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx @@ -127,12 +127,11 @@ void HYDROGUI_RecognizeContoursOp::startOperation() // Export the selected image to GEOM module if ( aStudy && aViewMgr ) { - SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy->studyDS() ); GEOM::GEOM_Gen_var aGeomEngine = GeometryGUI::GetGeomGen(); QString aGeomPictureEntry; - HYDROData_GeomTool::createFaceInGEOM( aGeomEngine, aDSStudy, aQImage.width(), aQImage.height(), + HYDROData_GeomTool::createFaceInGEOM( aGeomEngine, aQImage.width(), aQImage.height(), anImageName, aGeomPictureEntry ); if ( !aGeomPictureEntry.isEmpty() ) { @@ -228,7 +227,7 @@ bool HYDROGUI_RecognizeContoursOp::processApply( int& theUpdateFlags, if( !aPolylineObj.IsNull() ) { aPolylineObj->SetName( aName ); - aPolylineObj->ImportShape( aShape, false ); + aPolylineObj->ImportShape( aShape, false, NULL ); aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() ); aPolylineObj->Update(); @@ -379,7 +378,7 @@ void HYDROGUI_RecognizeContoursOp::updateRecognizedPolylines() TopoDS_Shape aSubShape = aSubShapes.Value( i ); // Transform the sub-shape - aPolylineObj->ImportShape( aSubShape, false ); + aPolylineObj->ImportShape( aSubShape, false, NULL ); aPolylineObj->Transform( aTrsf ); /* @@ -443,7 +442,7 @@ void HYDROGUI_RecognizeContoursOp::onSelectionChanged( const QStringList& theSel if ( !aCtx.IsNull() ) { foreach ( QString aName, myPolylineShapes.keys() ) { Handle(AIS_InteractiveObject) anObject = - myPolylineShapes.value(aName)->getAISObject(); + myPolylineShapes.value(aName)->getAISObjects()[0]; bool isSelected = theSelectedNames.contains( aName ); if ( ( isSelected && !aCtx->IsSelected( anObject) ) || @@ -481,7 +480,7 @@ void HYDROGUI_RecognizeContoursOp::onViewerSelectionChanged() QStringList aSelectedNames; foreach ( QString aName, myPolylineShapes.keys() ) { - bool isSelected = aCtx->IsSelected( myPolylineShapes.value(aName)->getAISObject() ); + bool isSelected = aCtx->IsSelected( myPolylineShapes.value(aName)->getAISObjects()[0] ); if ( isSelected ) { aSelectedNames << aName; }