X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=134c3bd0b2996beb4d13914db545b34c115e382b;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=1987887cfab9eb3b9a9a85fc21a90914ef18260a;hpb=a72bc1fe339d74df864cfcbc765e2b62c2543d25;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx index 1987887c..134c3bd0 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx @@ -21,7 +21,7 @@ #include "HYDROGUI_DataModel.h" #include "HYDROGUI_CalculationDlg.h" #include "HYDROGUI_Module.h" -#include "HYDROGUI_Tool.h" +#include "HYDROGUI_Tool2.h" #include "HYDROGUI_UpdateFlags.h" #include "HYDROGUI_Zone.h" #include "HYDROGUI_Region.h" @@ -98,6 +98,13 @@ void HYDROGUI_CalculationOp::startOperation() QStringList anEntryList; HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetGeometryObjects( module() ); getNamesAndEntries( aSeq, aList, anEntryList ); + + QStringList List1; + QStringList EList1; + + //add intersection polylines + AddInterPolylinesToList(aList, anEntryList); + aPanel->setAllGeomObjects( aList, anEntryList ); // Get all polylines @@ -110,18 +117,18 @@ void HYDROGUI_CalculationOp::startOperation() { aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() ); - if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed() ) + if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed(false) ) { - // Check the polyline shape - TopoDS_Shape aPolylineShape = aPolylineObj->GetShape(); - if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) { +// // Check the polyline shape +// TopoDS_Shape aPolylineShape = aPolylineObj->GetShape(); +// if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) { aPolylineName = aPolylineObj->GetName(); if ( !aPolylineName.isEmpty() ) { aList.append( aPolylineName ); anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) ); } - } +// } } } aPanel->setPolylineNames( aList, anEntryList ); @@ -147,7 +154,10 @@ void HYDROGUI_CalculationOp::startOperation() aPanel->setBoundary( aPolylineName ); } - aSeq = myEditedObject->GetGeometryObjects(); + aSeq = myEditedObject->GetGeometryObjects(); + HYDROData_SequenceOfObjects anInterPolyList = myEditedObject->GetInterPolyObjects(); + aSeq.Append(anInterPolyList); + getNamesAndEntries( aSeq, aList, anEntryList ); aPanel->includeGeomObjects( aList ); @@ -166,9 +176,31 @@ void HYDROGUI_CalculationOp::startOperation() aPanel->setObjectName( anObjectName ); aPanel->setEditedObject( myEditedObject ); + setGeomObjectsVisible( true ); + createPreview( false ); } +void HYDROGUI_CalculationOp::AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList) +{ + HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY ); + Handle(HYDROData_PolylineXY) aPolylineObj; + QString aPolylineName; + for ( ; anIter.More(); anIter.Next() ) + { + aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() ); + if ( !aPolylineObj.IsNull()) + { + aPolylineName = aPolylineObj->GetName(); + if ( !aPolylineName.isEmpty() && !theList.contains(aPolylineName) ) + { + theList.append( aPolylineName ); + theEntryList.append(HYDROGUI_DataObject::dataObjectEntry( aPolylineObj )); + } + } + } +} + void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, QStringList& theNames, QStringList& theEntries ) const { @@ -223,18 +255,16 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones( const int ) ) ); //connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) ); connect( aPanel, SIGNAL( setMergeType( int, QString& ) ), SLOT( onSetMergeType( int, QString& ) ) ); - connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList&, bool ) ), - SLOT( onMoveZones( SUIT_DataObject*, const QList&, bool ) ) ); + connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList& ) ), + SLOT( onMoveZones( SUIT_DataObject*, const QList& ) ) ); connect( aPanel, SIGNAL( createRegion( const QList& ) ), SLOT( onCreateRegion( const QList& ) ) ); connect( aPanel, SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ), SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) ); connect( aPanel, SIGNAL( objectsSelected() ), SLOT( onObjectsSelected() ) ); - connect( aPanel, SIGNAL( landCoversSelected() ), - SLOT( onLandCoversSelected() ) ); - connect( aPanel, SIGNAL( createLandCoverRegion( const QList& ) ), - SLOT( onCreateLandCoverRegion( const QList& ) ) ); + connect( aPanel, SIGNAL( landCoverMapSelected( const QString & ) ), + SLOT( onLandCoverMapSelected( const QString & ) ) ); connect( aPanel, SIGNAL( boundarySelected( const QString & ) ), SLOT( onBoundarySelected( const QString & ) ) ); connect( aPanel, SIGNAL( StricklerTableSelected( const QString & ) ), @@ -289,26 +319,12 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa { bool anIsToUpdateViewer = false; - /* TODO - // Remove old presentations of land covers from the operation viewer - Handle(HYDROData_Entity) anEntity; - Handle(HYDROData_LandCover) aLandCover; - HYDROData_SequenceOfObjects aLandCovers; - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers(); - HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); - for ( ; anIter.More(); anIter.Next() ) + // Remove old presentation of land cover map from the operation viewer + Handle(HYDROData_LandCoverMap) aLandCoverMap = myEditedObject->GetLandCoverMap(); + if ( !aLandCoverMap.IsNull() ) { - anEntity = anIter.Value(); - if ( !anEntity.IsNull() ) - { - aLandCover = Handle(HYDROData_LandCover)::DownCast( anEntity ); - if ( !aLandCover.IsNull() ) - { - aLandCovers.Append( aLandCover ); - setObjectVisibility( aLandCover, false ); - anIsToUpdateViewer = true; - } - } + setObjectVisibility( aLandCoverMap, false ); + anIsToUpdateViewer = true; } // Set the selected Strickler table to the calculation case @@ -326,19 +342,10 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if ( !aCtx.IsNull() ) { - HYDROData_SequenceOfObjects::Iterator anIter( aLandCovers ); - for ( ; anIter.More(); anIter.Next() ) + if ( !aLandCoverMap.IsNull() ) { - anEntity = anIter.Value(); - if ( !anEntity.IsNull() ) - { - aLandCover = Handle(HYDROData_LandCover)::DownCast( anEntity ); - if ( !aLandCover.IsNull() ) - { - setObjectVisibility( aLandCover, true ); - anIsToUpdateViewer = true; - } - } + setObjectVisibility( aLandCoverMap, true ); + anIsToUpdateViewer = true; } } } @@ -347,7 +354,6 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa module()->update( UF_OCCViewer ); } } - */ } void HYDROGUI_CalculationOp::onObjectsSelected() @@ -391,53 +397,27 @@ void HYDROGUI_CalculationOp::onObjectsSelected() aLastShape->update( true, false ); } -void HYDROGUI_CalculationOp::onLandCoverMapSelected() +void HYDROGUI_CalculationOp::onLandCoverMapSelected( const QString & theObjName ) { - HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); - - /* TODO: highlight the selected land cover map in the 3d viewer (synchronize slection in the dialog with a preview in the viewer) - QStringList aSelectedObjs = aPanel->getSelectedLandCovers(); - QMap aSelectedObjsMap; - foreach( QString aName, aSelectedObjs ) - aSelectedObjsMap[aName] = true; - */ - - - // Select the appropriate land cover shape in the viewer - selectionMgr()->clearSelected(); - - // Unhighlight all land covers except selected - HYDROGUI_Shape* aShape = 0, *aLastShape = 0; - Handle(HYDROData_Entity) anEntity; - /* TODO: highlight the selected land cover map in the 3d viewer (synchronize slection in the dialog with a preview in the viewer) - HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers(); - HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); - bool isSelected; - QString aName; - for ( ; anIter.More(); anIter.Next() ) + bool anIsToUpdateViewer = false; + + // Remove old presentation of land cover map from the operation viewer + Handle(HYDROData_LandCoverMap) aPrevLandCoverMap = myEditedObject->GetLandCoverMap(); + if ( !aPrevLandCoverMap.IsNull() ) { - anEntity = anIter.Value(); - if ( !anEntity.IsNull() ) - { - aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anEntity ); - if ( aShape ) - { - aName = anEntity->GetName(); - isSelected = aSelectedObjsMap.contains( aName ); - aShape->highlight( isSelected, false ); - aShape->update( false, false ); - aLastShape = aShape; - } - } + setObjectVisibility( aPrevLandCoverMap, false ); + anIsToUpdateViewer = true; } - */ - // TODO - //createPreview( true ); + // Select the appropriate land cover map shape in the viewer + selectionMgr()->clearSelected(); - if( aLastShape ) - aLastShape->update( true, false ); + // Set the selected land cover map to the calculation case + Handle(HYDROData_LandCoverMap) aNewLandCoverMap = Handle(HYDROData_LandCoverMap)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_LAND_COVER_MAP ) ); + myEditedObject->SetLandCoverMap( aNewLandCoverMap ); + + createPreview( true ); } void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem ) @@ -560,6 +540,17 @@ void HYDROGUI_CalculationOp::onAddObjects() anAddedList.append( anObject->GetName() ); } + for (int i = 0; i < aSelectedList.length(); i++) + { + Handle(HYDROData_PolylineXY) aPoly = Handle(HYDROData_PolylineXY)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) ); + if ( aPoly.IsNull() ) + continue; + + if ( myEditedObject->AddInterPoly( aPoly ) ) + anAddedList.append( aPoly->GetName() ); + } + if ( !anAddedList.isEmpty() ) { aPanel->includeGeomObjects( anAddedList ); @@ -590,6 +581,17 @@ void HYDROGUI_CalculationOp::onRemoveObjects() myEditedObject->RemoveGeometryObject( anObject ); } + for (int i = 0; i < aSelectedList.length(); i++) + { + Handle(HYDROData_PolylineXY) aPoly = Handle(HYDROData_PolylineXY)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) ); + if ( aPoly.IsNull() ) + continue; + + setObjectVisibility( aPoly, false ); + myEditedObject->RemoveInterPolyObject ( aPoly ); + } + module()->update( UF_OCCViewer ); aPanel->excludeGeomObjects( aSelectedList ); } @@ -825,16 +827,47 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) QStringList aList; QStringList anEntryList; - HYDROData_SequenceOfObjects aSeq; - /* TODO: get all land cover map objects to fill in combo-box + // Get all land cover map objects to fill in combo-box + Handle(HYDROData_LandCoverMap) aLandCoverMapObj; + QString aLandCoverMapName; + + aList.clear(); + anEntryList.clear(); + HYDROData_Iterator anIter( doc(), KIND_LAND_COVER_MAP ); + for ( ; anIter.More(); anIter.Next() ) + { + aLandCoverMapObj = Handle(HYDROData_LandCoverMap)::DownCast( anIter.Current() ); + + if ( !aLandCoverMapObj.IsNull() ) + { + aLandCoverMapName = aLandCoverMapObj->GetName(); + if ( !aLandCoverMapName.isEmpty() ) + { + aList.append( aLandCoverMapName ); + anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aLandCoverMapObj ) ); + } + } + } + aPanel->setLandCoverMapsNames( aList, anEntryList ); + aLandCoverMapObj = myEditedObject->GetLandCoverMap(); + if ( !aList.isEmpty() ) + { + if ( aLandCoverMapObj.IsNull() ) + aPanel->setLandCoverMap( aList.at( 0 ), false ); + else if ( myIsEdit ) + aPanel->setLandCoverMap( aList.at( 0 ), true ); + else + aPanel->setLandCoverMap( aList.at( aList.indexOf( aLandCoverMapObj->GetName() ) ), true ); + } + + // Get all Strickler table objects to fill in combo-box Handle(HYDROData_StricklerTable) aStricklerTableObj; QString aStricklerTableName; - // Get all Strickler table objects to fill in combo-box aList.clear(); anEntryList.clear(); - HYDROData_Iterator anIter( doc(), KIND_STRICKLER_TABLE ); + anIter = HYDROData_Iterator( doc(), KIND_STRICKLER_TABLE ); for ( ; anIter.More(); anIter.Next() ) { aStricklerTableObj = Handle(HYDROData_StricklerTable)::DownCast( anIter.Current() ); @@ -870,9 +903,19 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) aStricklerTableName = aStricklerTableObj->GetName(); aPanel->setStricklerTable( aStricklerTableName ); } + + // Select the certain land cover map object in combo-box + if ( aLandCoverMapObj.IsNull() ) + { + aPanel->setLandCoverMap( QString() ); + } + else + { + aLandCoverMapName = aLandCoverMapObj->GetName(); + aPanel->setLandCoverMap( aLandCoverMapName ); + } } } - */ closePreview( false ); createPreview( true ); @@ -1165,7 +1208,9 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap ) else if ( !theLandCoverMap && myShowGeomObjects ) { HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects(); + HYDROData_SequenceOfObjects aSeqP = myEditedObject->GetInterPolyObjects(); aSeq.Append( aSeqGO ); + aSeq.Append( aSeqP ); } Handle(HYDROData_Entity) anEntity; @@ -1193,7 +1238,8 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap ) } // Get a boundary polyline if any - aSeq.Append( myEditedObject->GetBoundaryPolyline() ); + if (Handle(HYDROData_PolylineXY) aBPoly = myEditedObject->GetBoundaryPolyline()) + aSeq.Append( aBPoly ); module()->removeViewShapes( HYDROGUI_Module::VMR_PreviewCaseZones ); @@ -1230,16 +1276,19 @@ void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap ) HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); for ( ; anIter.More(); anIter.Next() ) { - setObjectVisibility( anIter.Value(), true ); + const Handle(HYDROData_Entity)& ent = anIter.Value(); + if (!ent.IsNull()) + setObjectVisibility( ent, true ); } //Process the draw events for viewer QApplication::processEvents( QEventLoop::ExcludeUserInputEvents ); - if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() ) - vw->onTopView(); } module()->update( UF_OCCViewer | UF_FitAll ); + + if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() ) + vw->onTopView(); } } @@ -1322,11 +1371,11 @@ void HYDROGUI_CalculationOp::setAvailableGroups() HYDROData_SequenceOfObjects anObjs = myEditedObject->GetGeometryObjects(); for( int anIndex = 1, aLength = anObjs.Length(); anIndex <= aLength; anIndex++ ) { - Handle_HYDROData_Object anObj = Handle_HYDROData_Object::DownCast( anObjs.Value( anIndex ) ); + Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( anObjs.Value( anIndex ) ); HYDROData_SequenceOfObjects aGroups = anObj->GetGroups(); for( int aGIndex = 1, aGLength = aGroups.Length(); aGIndex <= aGLength; aGIndex++ ) { - Handle_HYDROData_ShapesGroup aGroup = Handle_HYDROData_ShapesGroup::DownCast( aGroups.Value( aGIndex ) ); + Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( aGIndex ) ); aGroupsNames.append( aGroup->GetName() ); } }