#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"
#include <HYDROData_Object.h>
#include <HYDROData_Tool.h>
#include <HYDROData_StricklerTable.h>
+#include <HYDROData_BCPolygon.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <QApplication>
#include <QKeySequence>
#include <QShortcut>
+#include <QPushButton>
+#include <BRep_Builder.hxx>
+#include <TopoDS.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopExp.hxx>
+#include <TopoDS.hxx>
-HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool theIsEdit )
+#include <HYDROData_CompleteCalcCase.h>
+
+
+HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool theIsEdit, bool IsComplete )
: HYDROGUI_Operation( theModule ),
myIsEdit( theIsEdit ),
myActiveViewManager( NULL ),
myPreviewViewManager( NULL ),
myShowGeomObjects( true ),
- myShowLandCovers( false ),
+ myShowLandCoverMap( false ),
myShowZones( false ),
- myUpdateLandCoverZonesPrs( false )
+ myIsComplete (IsComplete)
{
- setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) );
+ QString aDlgName;
+ if (myIsComplete)
+ aDlgName = tr( "COMPLETE_CALCULATION" );
+ else
+ aDlgName = myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" );
+ setName( aDlgName );
}
HYDROGUI_CalculationOp::~HYDROGUI_CalculationOp()
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
{
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 );
QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_CALCULATION_CASE_NAME" ) );
myEditedObject.Nullify();
+
if ( myIsEdit )
{
myEditedObject = Handle(HYDROData_CalculationCase)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
aPanel->setBoundary( aPolylineName );
}
- aSeq = myEditedObject->GetGeometryObjects();
+ aSeq = myEditedObject->GetGeometryObjects();
+ HYDROData_SequenceOfObjects anInterPolyList = myEditedObject->GetInterPolyObjects();
+ aSeq.Append(anInterPolyList);
+
getNamesAndEntries( aSeq, aList, anEntryList );
- aPanel->includeGeomObjects( aList );
+ if (!myIsComplete)
+ aPanel->includeGeomObjects( aList );
+ else
+ {
+ //aPanel->includeGeomObjects( aList );
+ aPanel->setAlreadyAddedGeomObjects( aList );
+ //myIncObjAtStart = aSeq;
+ aPanel->hideAvailableGeomObjects( aList );
+ aPanel->setGeomOrderingEnabled(true);
+ }
// set rules
setRules( HYDROData_CalculationCase::DataTag_CustomRules );
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
{
HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
{
- HYDROGUI_CalculationDlg* aPanel = new HYDROGUI_CalculationDlg( module(), getName() );
+ HYDROGUI_CalculationDlg* aPanel = new HYDROGUI_CalculationDlg( module(), getName(), myIsComplete );
// Connect signals and slots
connect( aPanel, SIGNAL( changeMode( int ) ), SLOT( onChangeMode( int ) ) );
connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) );
connect( aPanel, SIGNAL( removeGroups() ), SLOT( onRemoveGroups() ) );
- connect( aPanel, SIGNAL( changeLandCoverMode( int ) ), SLOT( onChangeLandCoverMode( int ) ) );
- connect( aPanel, SIGNAL( addLandCovers() ), SLOT( onAddLandCovers() ) );
- connect( aPanel, SIGNAL( removeLandCovers() ), SLOT( onRemoveLandCovers() ) );
-
+ connect( aPanel, SIGNAL( addBoundaryPolygons() ), SLOT( onAddBoundaryPolygons() ) );
+ connect( aPanel, SIGNAL( removeBoundaryPolygons() ), SLOT( onRemoveBoundaryPolygons() ) );
+
connect( aPanel, SIGNAL( orderChanged( bool& ) ), SLOT( onOrderChanged( bool& ) ) );
- connect( aPanel, SIGNAL( orderLandCoverChanged( bool& ) ), SLOT( onOrderLandCoverChanged( bool& ) ) );
connect( aPanel, SIGNAL( ruleChanged( bool& ) ), SLOT( onRuleChanged( bool& ) ) );
- connect( aPanel, SIGNAL( ruleLandCoverChanged( bool& ) ), SLOT( onRuleLandCoverChanged( bool& ) ) );
connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onNext( const int ) ) );
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( setMergeStricklerType( int, QString& ) ), SLOT( onSetMergeStricklerType( int, QString& ) ) );
- connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>&, bool ) ),
- SLOT( onMoveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>&, bool ) ) );
+ connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ),
+ SLOT( onMoveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ) );
connect( aPanel, SIGNAL( createRegion( const QList<SUIT_DataObject*>& ) ),
SLOT( onCreateRegion( const QList<SUIT_DataObject*>& ) ) );
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<SUIT_DataObject*>& ) ),
- SLOT( onCreateLandCoverRegion( const QList<SUIT_DataObject*>& ) ) );
+ 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 & ) ),
{
bool anIsToUpdateViewer = false;
- // 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
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;
}
}
}
aLastShape->update( true, false );
}
-void HYDROGUI_CalculationOp::onLandCoversSelected()
+void HYDROGUI_CalculationOp::onLandCoverMapSelected( const QString & theObjName )
{
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-
- QStringList aSelectedObjs = aPanel->getSelectedLandCovers();
- QMap<QString, bool> aSelectedObjsMap;
- foreach( QString aName, aSelectedObjs )
- aSelectedObjsMap[aName] = true;
-
+ bool anIsToUpdateViewer = false;
+
+ // Remove old presentation of land cover map from the operation viewer
+ Handle(HYDROData_LandCoverMap) aPrevLandCoverMap = myEditedObject->GetLandCoverMap();
+ if ( !aPrevLandCoverMap.IsNull() )
+ {
+ setObjectVisibility( aPrevLandCoverMap, false );
+ anIsToUpdateViewer = true;
+ }
- // Select the appropriate land cover shape in the viewer
+ // Select the appropriate land cover map shape in the viewer
selectionMgr()->clearSelected();
- // Unhighlight all land covers except selected
- HYDROGUI_Shape* aShape = 0, *aLastShape = 0;
- Handle(HYDROData_Entity) anEntity;
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers();
- HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
- bool isSelected;
- QString aName;
- for ( ; anIter.More(); anIter.Next() )
- {
- 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;
- }
- }
- }
- 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 )
}
void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem,
- const QList<SUIT_DataObject*>& theZonesList,
- bool theLandCover )
+ const QList<SUIT_DataObject*>& theZonesList )
{
HYDROGUI_Region* aRegion = dynamic_cast<HYDROGUI_Region*>(theRegionItem);
if ( aRegion )
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
if ( aPanel )
- {
- theLandCover ? aPanel->refreshLandCoverZonesBrowser(): aPanel->refreshZonesBrowser();
- }
- createPreview( theLandCover );
+ aPanel->refreshZonesBrowser();
+ createPreview( false, false, false );
}
}
}
void HYDROGUI_CalculationOp::onCreateRegion( const QList<SUIT_DataObject*>& theZonesList )
{
- if ( createRegion( theZonesList, false ) )
+ if ( createRegion( theZonesList ) )
{
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
{
aPanel->refreshZonesBrowser();
}
- createPreview( false );
- }
-}
-
-void HYDROGUI_CalculationOp::onCreateLandCoverRegion( const QList<SUIT_DataObject*>& theZonesList )
-{
- if ( createRegion( theZonesList, true ) )
- {
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( aPanel )
- {
- aPanel->refreshLandCoverZonesBrowser();
- }
- createPreview( true );
+ createPreview( false, false, false );
}
}
}
}
-void HYDROGUI_CalculationOp::onSetMergeStricklerType( int theMergeType, QString& theStricklerTypeName )
-{
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( aPanel )
- {
- HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
- if ( aZone )
- {
- aZone->setMergeType( theMergeType, theStricklerTypeName );
- HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
- if ( aShape )
- {
- aShape->update( true, false );
- }
- }
- aPanel->refreshLandCoverZonesBrowser();
- }
-}
-
void HYDROGUI_CalculationOp::onAddObjects()
{
HYDROGUI_CalculationDlg* aPanel =
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 );
return;
QStringList aSelectedList = aPanel->getSelectedGeomObjects();
+
+ if (myIsComplete)
+ {
+ QSet<QString> selMap = aSelectedList.toSet();
+ }
+
+
if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
return;
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 );
}
bool HYDROGUI_CalculationOp::confirmRegionsChange() const
{
+
// Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
+ bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
+
if ( !isConfirmed )
{
+
+ if (myIsComplete)
+ {
+ //SUIT_MessageBox::information(module()->getApp()->desktop(),
+ // tr( "REGIONS_CHANGED" ),
+ // tr( "COMPLETE_OP_WILL_BE_PERFORMED" ));
+ return true;
+ }
+
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
bool HYDROGUI_CalculationOp::confirmOrderChange() const
{
// Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
+ bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
if ( !isConfirmed )
{
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
bool HYDROGUI_CalculationOp::confirmRuleChange() const
{
// Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
+ bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
if ( !isConfirmed )
{
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
bool HYDROGUI_CalculationOp::confirmModeChange() const
{
// Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
+ bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
if ( !isConfirmed )
{
// If not modified check if the case has already defined regions with zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( false );
+ HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
if ( aSeq.Length() > 0 )
{
// If there are already defined zones then ask a user to confirm zones recalculation
return ( anAnswer == QMessageBox::Yes );
}
-bool HYDROGUI_CalculationOp::confirmLandCoverRegionsChange() const
-{
- // Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
- if ( !isConfirmed )
- {
- // If not modified check if the case has already defined regions with land cover zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true );
- if ( aSeq.Length() > 0 )
- {
- // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation
- isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
- tr( "REGIONS_CHANGED" ),
- tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No ) == QMessageBox::Yes );
- }
- else
- {
- isConfirmed = true; // No regions - no land cover zones - nothing to recalculate
- }
- }
- return isConfirmed;
-}
-
-bool HYDROGUI_CalculationOp::confirmLandCoverModeChange() const
-{
- // Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
- if ( !isConfirmed )
- {
- // If not modified check if the case has already defined regions with land cover zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true );
- if ( aSeq.Length() > 0 )
- {
- // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation
- isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
- tr( "MODE_CHANGED" ),
- tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_MODE" ),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No ) == QMessageBox::Yes );
- }
- else
- {
- isConfirmed = true; // No regions - no land cover zones - nothing to recalculate
- }
- }
- return isConfirmed;
-}
-
-bool HYDROGUI_CalculationOp::confirmLandCoverOrderChange() const
-{
- // Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
- if ( !isConfirmed )
- {
- // If not modified check if the case has already defined regions with land cover zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true );
- if ( aSeq.Length() > 0 )
- {
- // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation
- isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
- tr( "ORDER_CHANGED" ),
- tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No ) == QMessageBox::Yes );
- }
- else
- {
- isConfirmed = true; // No regions - no land cover zones - nothing to recalculate
- }
- }
- return isConfirmed;
-}
-
-bool HYDROGUI_CalculationOp::confirmLandCoverRuleChange() const
-{
- // Check if the case is already modified or not
- bool isConfirmed = myEditedObject->IsMustBeUpdated();
- if ( !isConfirmed )
- {
- // If not modified check if the case has already defined regions with land cover zones
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions( true );
- if ( aSeq.Length() > 0 )
- {
- // If there are already defined land cover zones then ask a user to confirm land cover zones recalculation
- isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
- tr( "RULE_CHANGED" ),
- tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ),
- QMessageBox::Yes | QMessageBox::No,
- QMessageBox::No ) == QMessageBox::Yes );
- }
- else
- {
- isConfirmed = true; // No regions - no land cover zones - nothing to recalculate
- }
- }
- return isConfirmed;
-}
-
bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags,
QString& theErrorMsg,
QStringList& theBrowseObjectsEntries )
if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) {
myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, false );
}
- if ( aPanel->getLandCoverMode() == HYDROData_CalculationCase::MANUAL ) {
- myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, false );
- }
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
aMsg );
}
}
-
+#include <HYDROData_CompleteCalcCase.h>
void HYDROGUI_CalculationOp::onNext( const int theIndex )
{
- if( theIndex==1 )
+ if( theIndex==1 && !myIsComplete)
{
setAvailableGroups();
}
- else if( theIndex==2 )
+ else if( theIndex==2 && !myIsComplete)
+ {
+ setAvailableBoundaryPolygons();
+ }
+ else if( theIndex==3 && !myIsComplete)
{
- // Land covers panel
+ // Land cover map panel
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
if ( !aPanel )
return;
- setLandCoversVisible( true );
+ setLandCoverMapVisible( true );
QStringList aList;
QStringList anEntryList;
- HYDROData_SequenceOfObjects aSeq;
+ // 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() );
}
}
aPanel->setStricklerTableNames( aList, anEntryList );
- bool anUpdateState = myEditedObject->IsMustBeUpdated();
+ //@ASL: bool anUpdateState = myEditedObject->IsMustBeUpdated();
if ( !aList.isEmpty() )
aPanel->setStricklerTable( aList.at( 0 ), false );
- myEditedObject->SetToUpdate( anUpdateState );
-
- // Fill in list widget with all available land covers
- aSeq = HYDROGUI_Tool::GetLandCovers( module() );
- getNamesAndEntries( aSeq, aList, anEntryList );
- aPanel->setAllLandCovers( aList, anEntryList );
+ //@ASL: myEditedObject->SetToUpdate( anUpdateState );
- // Set list of included land covers
- aSeq = myEditedObject->GetLandCovers();
- getNamesAndEntries( aSeq, aList, anEntryList );
- aPanel->includeLandCovers( aList, true );
-
if ( !myEditedObject.IsNull() )
{
if ( myIsEdit )
aPanel->setStricklerTable( aStricklerTableName );
}
- // Set mode (Auto or Manual) to defined priority of land covers
- aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
-
- // Set rules defined on land covers
- setRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules );
- }
- else
- {
- myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getLandCoverMode() );
+ // 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 );
}
- else if( theIndex==3 )
+ else if( theIndex==4 || myIsComplete)
{
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
QApplication::setOverrideCursor( Qt::WaitCursor );
setGeomObjectsVisible( false );
- setLandCoversVisible( false );
+ setLandCoverMapVisible( false );
QString aNewCaseName = aPanel->getObjectName();
QString anOldCaseName = myEditedObject->GetName();
if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
{
// Set objects in the specified order
- if( myEditedObject->IsMustBeUpdated() )
+ if( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) )
{
myEditedObject->RemoveGeometryObjects();
- foreach ( const QString& aName, aPanel->getAllGeomObjects() )
+ QStringList aGeomObjNames;
+ if (myIsComplete) //erase objects ?
+ aGeomObjNames << aPanel->getAlreadyAddedGeomObjects();
+ aGeomObjNames << aPanel->getAllGeomObjects();
+ foreach ( const QString& aName, aGeomObjNames )
{
Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast(
HYDROGUI_Tool::FindObjectByName( module(), aName ) );
myEditedObject->AddGeometryObject( anObject );
}
- // Clear priority rules
- //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
+ if (!myIsComplete)
+ {
+ // Clear priority rules
+ //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, true );
- //@ASL }
- // Set priority rules
- foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
- myEditedObject->AddRule( aRule.Object1, aRule.Priority,
- aRule.Object2, aRule.MergeType,
- HYDROData_CalculationCase::DataTag_CustomRules );
+ //@ASL }
+ // Set priority rules
+ foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
+ myEditedObject->AddRule( aRule.Object1, aRule.Priority,
+ aRule.Object2, aRule.MergeType,
+ HYDROData_CalculationCase::DataTag_CustomRules );
+ }
}
}
}
aPanel->setEditZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
- // Land cover zones: set parameters for automatic mode
- aMode = aPanel->getLandCoverMode();
- if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
+ if (myIsComplete)
+ aPanel->BackButton()->setEnabled(false); //force disable; to prevent moving to the first page
+
+ if ( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
{
- // Set objects in the specified order
- if( myEditedObject->IsMustBeUpdated() )
+ myShowZones = true;
+
+ if (myIsComplete)
{
- myEditedObject->RemoveLandCovers();
- foreach ( const QString& aName, aPanel->getAllLandCovers() )
+ //abortDocOperation();
+ //module()->getApp()->updateObjectBrowser();
+ QList<Handle(HYDROData_Entity)> newGeomObj = aPanel->getGeometryObjects(false);
+ //QSet<Handle(HYDROData_Entity)> includedObjAtStartSet = myIncObjAtStart.toSet();
+ NCollection_Sequence<Handle(HYDROData_Entity)> theNewObjects;
+ foreach (Handle(HYDROData_Entity) obj, newGeomObj)
+ theNewObjects.Append(obj);
+
+
+ bool is_int = false;
+ bool UseOrigNamingOfNewRegions = true;
+ NCollection_Sequence<Handle(HYDROData_Region)> theNewRegions;
+ QSet<QString> newRegionEntries;
+ HYDROData_CompleteCalcCase::AddObjects(doc(), myEditedObject, theNewObjects, UseOrigNamingOfNewRegions, is_int, theNewRegions);
+ if (is_int)
+ SUIT_MessageBox::information(module()->getApp()->desktop(),
+ tr( "COMPLETE_CASE" ),
+ tr( "There is an intersection(s) between new objects. result will be depend on order" ));
+
+ myEditedObject->ClearChanged();
+ for (int k=1;k<=theNewRegions.Size();k++)
{
- Handle(HYDROData_LandCover) aLandCover = Handle(HYDROData_LandCover)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), aName ) );
- if ( aLandCover.IsNull() )
- {
- continue;
- }
- myEditedObject->AddLandCover( aLandCover );
- }
-
- // Clear priority rules
- myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, true );
- // Set priority rules
- foreach ( const HYDROData_CustomRule& aRule, aPanel->getLandCoverRules() ) {
- myEditedObject->AddRule( aRule.Object1, aRule.Priority,
- aRule.Object2, HYDROData_Zone::Merge_Object,
- HYDROData_CalculationCase::DataTag_CustomLandCoverRules );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( theNewRegions(k) );
+ newRegionEntries.insert(anEntry);
}
+ AssignDefaultZonesColors(&newRegionEntries);
+ }
+ else
+ {
+ myEditedObject->Update();
+ AssignDefaultZonesColors(NULL);
}
- }
- aPanel->setEditLandCoverZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
-
- if ( myEditedObject->IsMustBeUpdated() )
- {
- myShowZones = true;
- myEditedObject->Update();
- AssignDefaultZonesColors( false );
//aPanel->setEditedObject( myEditedObject );
aPanel->refreshZonesBrowser();
createPreview( false );
anIsToUpdateOb = true;
-
- myUpdateLandCoverZonesPrs = true;
}
else
{
// Show zones
- setZonesVisible( true, false );
+ setZonesVisible( true );
if ( isNameChanged ) {
module()->getDataModel()->updateObjectTree( myEditedObject );
}
QApplication::restoreOverrideCursor();
- }
- else if( theIndex==4 )
- {
- // Partition of Land covers panel
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( !aPanel )
- return;
-
- QApplication::setOverrideCursor( Qt::WaitCursor );
-
- bool anIsToUpdateOb = false;
- if ( myUpdateLandCoverZonesPrs )
- {
- myShowZones = true;
-
- AssignDefaultZonesColors( true );
-
- aPanel->refreshLandCoverZonesBrowser();
-
- anIsToUpdateOb = true;
- }
-
- closePreview( false );
- createPreview( true );
-
- if ( myUpdateLandCoverZonesPrs )
- myUpdateLandCoverZonesPrs = false;
- else
- {
- // Hide zones
- setZonesVisible( false, false );
- // Show land cover zones
- setZonesVisible( true, true );
- }
-
- if ( anIsToUpdateOb ) {
- SUIT_DataBrowser* anObjBrowser = ((LightApp_Application*)module()->application())->objectBrowser();
- if ( anObjBrowser ) {
- anObjBrowser->updateTree( module()->getDataModel()->getDataObject( myEditedObject ), false );
- }
- }
-
- QApplication::restoreOverrideCursor();
- }
+ }
}
void HYDROGUI_CalculationOp::onHideZones( const int theIndex )
{
- if( theIndex==1 )
- {
- setGeomObjectsVisible( true );
-
- closePreview( false );
- createPreview( false );
+ if (myIsComplete)
+ {
+ //theIndex == 0
+ // setGeomObjectsVisible( true );
+ // // HYDROGUI_CalculationDlg* aPanel = ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ // // QList<Handle(HYDROData_Entity)> geomObjList = aPanel->getGeometryObjects(false);
+ // // foreach ( Handle(HYDROData_Entity) geomObj, geomObjList)
+ // // setObjectVisibility( geomObj, true );
+ //
+ // setZonesVisible( false );
+ // closePreview( false );
+ // createPreview( false );
}
- if( theIndex==2 )
+ else
{
- setLandCoversVisible( true );
+ if( theIndex==1 )
+ {
+ setGeomObjectsVisible( true );
- closePreview( false );
- createPreview( true );
+ closePreview( false );
+ createPreview( false );
+ }
+ if( theIndex==3 )
+ {
+ setLandCoverMapVisible( true );
- // Hide zones
- setZonesVisible( false, false );
- // Hide land covers
- setZonesVisible( false, true );
- }
- else if( theIndex==3 )
- {
- AssignDefaultZonesColors( false );
+ closePreview( false );
+ createPreview( true );
- closePreview( false );
- createPreview( false );
+ // Hide zones
+ setZonesVisible( false );
+ }
+ else if( theIndex==4 )
+ {
+ AssignDefaultZonesColors();
- // Hide land cover zones
- setZonesVisible( false, true );
- // Show zones
- setZonesVisible( true, false );
+ closePreview( false );
+ createPreview( false );
+
+ // Show zones
+ setZonesVisible( true );
+ }
}
}
-void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible, const bool theLandCover )
+void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
{
myShowZones = theIsVisible;
- HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
+ HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
HYDROData_SequenceOfObjects aZones;
Handle(HYDROData_Region) aRegion;
}
}
-void HYDROGUI_CalculationOp::setLandCoversVisible( bool theIsVisible )
+void HYDROGUI_CalculationOp::setLandCoverMapVisible( bool theIsVisible )
{
- myShowLandCovers = theIsVisible;
-
- HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers();
-
- HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
- for ( ; anIter.More(); anIter.Next() ) {
- setObjectVisibility( anIter.Value(), theIsVisible );
- }
+ myShowLandCoverMap = theIsVisible;
+ setObjectVisibility( myEditedObject->GetLandCoverMap(), theIsVisible );
}
-void HYDROGUI_CalculationOp::AssignDefaultZonesColors( const bool theLandCover )
+void HYDROGUI_CalculationOp::AssignDefaultZonesColors(const QSet<QString>* theRegionsEntriesToColored)
{
- HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
+ HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
HYDROData_SequenceOfObjects aZones;
Handle(HYDROData_Region) aRegion;
{
Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
if ( !aCtx.IsNull() )
- {
- int aCounter = 0;
+ {
for ( ; aRegionsIter.More(); aRegionsIter.Next() )
{
aRegion = Handle(HYDROData_Region)::DownCast( aRegionsIter.Value() );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aRegion );
+
+ if (theRegionsEntriesToColored && !theRegionsEntriesToColored->contains(anEntry))
+ continue;
+
if ( !aRegion.IsNull() )
{
aZones = aRegion->GetZones();
Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
if ( !aZone.IsNull() )
{
- QColor aFillingColor = GenerateDefaultZonesColor(++aCounter);
+ QColor aFillingColor = HYDROData_Tool::GenerateRandColor();
while (aFillingColor == Qt::red)
- aFillingColor = GenerateDefaultZonesColor(++aCounter);
+ aFillingColor = HYDROData_Tool::GenerateRandColor();
aZone->SetColor(aFillingColor);
}
}
}
-QColor HYDROGUI_CalculationOp::GenerateDefaultZonesColor( int theIndex,
- float theSaturation/* = 0.5*/,
- float theValue/* = 0.95*/ ) const
-{
- float aHue = ( rand()%1000 ) * 0.001f;
-
- QColor aColor;
- aColor.setHsl( (int)(aHue*255.), 128, 128 );
- int r = aColor.red();
- int g = aColor.green();
- int b = aColor.blue();
- return ( aColor.isValid() ? aColor : HYDROData_ImmersibleZone::DefaultFillingColor() );
-}
-
void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDataTag )
{
HYDROGUI_CalculationDlg* aPanel =
}
if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomRules )
- aPanel->setRules( aRules );
- else if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomLandCoverRules )
- aPanel->setLandCoverRules( aRules );
+ aPanel->setRules( aRules );
}
-bool HYDROGUI_CalculationOp::createRegion( const QList<SUIT_DataObject*>& theZonesList,
- const bool theLandCover )
+bool HYDROGUI_CalculationOp::createRegion( const QList<SUIT_DataObject*>& theZonesList )
{
bool aRetValue = false;
}
if ( aZonesList.length() > 0 )
{
- module()->getDataModel()->createNewRegion( myEditedObject, aZonesList, theLandCover );
+ module()->getDataModel()->createNewRegion( myEditedObject, aZonesList );
aRetValue = true;
}
return aRetValue;
}
-void HYDROGUI_CalculationOp::createPreview( const bool theLandCover )
+void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap, bool fitAllFlag, bool onTopViewAndFit )
{
LightApp_Application* anApp = module()->getApp();
HYDROData_SequenceOfObjects aSeq;
- if ( theLandCover && myShowLandCovers )
+ if ( theLandCoverMap && myShowLandCoverMap )
{
- HYDROData_SequenceOfObjects aSeqLC = myEditedObject->GetLandCovers();
- aSeq.Append( aSeqLC );
+ aSeq.Append( myEditedObject->GetLandCoverMap() );
}
- else if ( !theLandCover && myShowGeomObjects )
+ else if ( !theLandCoverMap && myShowGeomObjects )
{
HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects();
+ HYDROData_SequenceOfObjects aSeqP = myEditedObject->GetInterPolyObjects();
aSeq.Append( aSeqGO );
+ aSeq.Append( aSeqP );
}
Handle(HYDROData_Entity) anEntity;
if ( myShowZones )
{
// Gather zones for displaying
- HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions( theLandCover );
+ HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
HYDROData_SequenceOfObjects aZones;
Handle(HYDROData_Region) aRegion;
}
// 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 );
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 );
+ int UpdateFlags = UF_OCCViewer;
+ if (fitAllFlag)
+ UpdateFlags |= UF_FitAll;
+ module()->update( UpdateFlags );
+
+ OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView();
+ if ( onTopViewAndFit && vw )
+ vw->onTopView();
}
}
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() );
}
}
- if( myEditedObject->IsMustBeUpdated() ) {
+ if( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) ) {
for( int anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) {
Handle(HYDROData_ShapesGroup) aGeomGroup =
Handle(HYDROData_ShapesGroup)::DownCast( aSeq.Value( anIndex ) );
aPanel->setAvailableGroups( aGroupsNames );
aPanel->includeGroups( aList );
- bool isUpdated = myEditedObject->IsMustBeUpdated();
+ //@ASL: bool isUpdated = myEditedObject->IsMustBeUpdated();
}
void HYDROGUI_CalculationOp::onAddGroups()
aPanel->excludeGroups( aSelectedList );
}
-void HYDROGUI_CalculationOp::onChangeLandCoverMode( int theMode )
+
+void HYDROGUI_CalculationOp::setAvailableBoundaryPolygons()
{
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( !aPanel )
- return;
+ HYDROGUI_CalculationDlg* aPanel = ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( !confirmLandCoverModeChange() ) {
- aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
- return;
+ HYDROData_Iterator anIter( doc(), KIND_BC_POLYGON );
+ Handle(HYDROData_BCPolygon) aBCP;
+ QStringList aNames;
+ QVector<int> aTypes;
+ for (;anIter.More(); anIter.Next())
+ {
+ aBCP = Handle(HYDROData_BCPolygon)::DownCast( anIter.Current() );
+ aNames.append(aBCP->GetName());
+ aTypes.append(aBCP->GetBoundaryType());
+ }
+ HYDROData_SequenceOfObjects aBCPSeq = myEditedObject->GetBoundaryPolygons();
+
+ QStringList aListCut, aListIS;
+ for (int i=1; i<=aBCPSeq.Size();i++)
+ {
+ int type = Handle(HYDROData_BCPolygon)::DownCast(aBCPSeq(i))->GetBoundaryType();
+ if (type == 1)
+ aListCut << aBCPSeq(i)->GetName();
+ else if (type == 2 || type == 3)
+ aListIS << aBCPSeq(i)->GetName();
}
- myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
- aPanel->setLandCoverMode( theMode );
+ aPanel->setAvailableBoundaryPolygons( aNames, aTypes );
+ aPanel->includeBoundaryPolygons( aListCut );
+ aPanel->includeISBoundaryPolygons( aListIS );
}
-void HYDROGUI_CalculationOp::onAddLandCovers()
+void HYDROGUI_CalculationOp::onRemoveBoundaryPolygons()
{
HYDROGUI_CalculationDlg* aPanel =
::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
if ( !aPanel )
return;
- // Add land covers selected in the module browser to the calculation case
- QStringList aSelectedList = aPanel->getSelectedAvailableLandCovers();
- if ( aSelectedList.isEmpty() || !confirmLandCoverRegionsChange() )
+ QStringList aSelectedListCut = aPanel->getSelectedBoundaryPolygons();
+ QStringList aSelectedListIS = aPanel->getSelectedISBoundaryPolygons();
+
+ if ( aSelectedListCut.isEmpty() && aSelectedListIS.isEmpty() )
return;
- QStringList anAddedList;
- for (int i = 0; i < aSelectedList.length(); i++)
+ for (int i = 0; i < aSelectedListCut.length(); i++)
{
- Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
- if ( anObject.IsNull() )
+ Handle(HYDROData_BCPolygon) aBCPoly = Handle(HYDROData_BCPolygon)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aSelectedListCut.at(i) ) );
+ if ( aBCPoly.IsNull() )
continue;
-
- if ( myEditedObject->AddLandCover( anObject ) )
- anAddedList.append( anObject->GetName() );
+ myEditedObject->RemoveBoundaryPolygon( aBCPoly );
}
- if ( !anAddedList.isEmpty() )
+ for (int i = 0; i < aSelectedListIS.length(); i++)
{
- aPanel->includeLandCovers( anAddedList, false );
- createPreview( true );
+ Handle(HYDROData_BCPolygon) aBCPoly = Handle(HYDROData_BCPolygon)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aSelectedListIS.at(i) ) );
+ if ( aBCPoly.IsNull() )
+ continue;
+ myEditedObject->RemoveBoundaryPolygon( aBCPoly );
}
+
+ aPanel->excludeBoundaryPolygons( aSelectedListCut );
+ aPanel->excludeISBoundaryPolygons( aSelectedListIS );
}
-void HYDROGUI_CalculationOp::onRemoveLandCovers()
+
+void HYDROGUI_CalculationOp::onAddBoundaryPolygons()
{
- // Remove selected objects from the calculation case
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+ HYDROGUI_CalculationDlg* aPanel = ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
if ( !aPanel )
return;
- QStringList aSelectedList = aPanel->getSelectedLandCovers();
- if ( aSelectedList.isEmpty() || !confirmLandCoverRegionsChange() )
+ QStringList aSelectedList = aPanel->getSelectedAvailableBoundaryPolygons();
+ if ( aSelectedList.isEmpty())
return;
+ QStringList anAddedListCut, anAddedListIS;
for (int i = 0; i < aSelectedList.length(); i++)
{
- Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast(
- HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
- if ( anObject.IsNull() )
+ Handle(HYDROData_BCPolygon) aBCPoly = Handle(HYDROData_BCPolygon)::DownCast(
+ HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+ if ( aBCPoly.IsNull() )
continue;
-
- setObjectVisibility( anObject, false );
- myEditedObject->RemoveLandCover( anObject );
- }
-
- module()->update( UF_OCCViewer );
- aPanel->excludeLandCovers( aSelectedList );
+
+ if ( myEditedObject->AddBoundaryPolygon( aBCPoly ) )
+ {
+ QString aName = aBCPoly->GetName();
+ int type = aBCPoly->GetBoundaryType();
+ if (type == 1)
+ anAddedListCut.append(aName);
+ else if (type == 2 || type == 3)
+ anAddedListIS.append(aName);
+ }
+
+ }
+
+ if ( !anAddedListCut.isEmpty() )
+ aPanel->includeBoundaryPolygons(anAddedListCut);
+ if ( !anAddedListIS.isEmpty() )
+ aPanel->includeISBoundaryPolygons(anAddedListIS);
}
void HYDROGUI_CalculationOp::onChangeMode( int theMode )
isConfirmed = confirmOrderChange();
if( isConfirmed )
- myEditedObject->SetToUpdate( true );
-}
-
-void HYDROGUI_CalculationOp::onOrderLandCoverChanged( bool& isConfirmed )
-{
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( !aPanel )
- return;
-
- isConfirmed = confirmLandCoverOrderChange();
- if( isConfirmed )
- myEditedObject->SetToUpdate( true );
+ myEditedObject->Changed( HYDROData_Entity::Geom_2d );
}
void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed )
isConfirmed = confirmRuleChange();
if( isConfirmed )
- myEditedObject->SetToUpdate( true );
-}
-
-void HYDROGUI_CalculationOp::onRuleLandCoverChanged( bool& isConfirmed )
-{
- HYDROGUI_CalculationDlg* aPanel =
- ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
- if ( !aPanel )
- return;
-
- isConfirmed = confirmLandCoverRuleChange();
- if( isConfirmed )
- myEditedObject->SetToUpdate( true );
+ myEditedObject->Changed( HYDROData_Entity::Geom_2d );
}
void HYDROGUI_CalculationOp::onRegenerateColors()
{
// For geometry zones
- AssignDefaultZonesColors( false );
- setZonesVisible( false, false );
- setZonesVisible( true, false );
+ AssignDefaultZonesColors();
+ setZonesVisible( false );
+ setZonesVisible( true );
}