X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationDlg.cxx;h=a2d3c7dce3107ac9596f114f6775fd666a8f1022;hb=7f56fcbfed23a9fd09b7ab87edd7ec742e2725e6;hp=21773bc8b77b0dedb0daa536927977ca9d82e572;hpb=d4cd71fc291a732783caf61bebde87fe5b4bfc92;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx index 21773bc8..a2d3c7dc 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx @@ -71,9 +71,8 @@ HYDROGUI_CalculationDlg::HYDROGUI_CalculationDlg( HYDROGUI_Module* theModule, co { addPage( createObjectsPage() ); addPage( createGroupsPage() ); - addPage( createLandCoversPage() ); + addPage( createLandCoverMapPage() ); addPage( createZonesPage() ); - addPage( createLandCoverZonesPage() ); } HYDROGUI_CalculationDlg::~HYDROGUI_CalculationDlg() @@ -85,20 +84,16 @@ void HYDROGUI_CalculationDlg::reset() myObjectName->clear(); HYDROGUI_ListModel::Object2VisibleList anObject2VisibleList; myGeomObjects->setObjects(anObject2VisibleList); - myLandCovers->setObjects(anObject2VisibleList); myPolylineName->clear(); myStricklerTableName->clear(); myAvailableGeomObjects->clear(); - myAvailableLandCovers->clear(); // Activate the automatic mode setMode( HYDROData_CalculationCase::AUTOMATIC ); - setLandCoverMode( HYDROData_CalculationCase::AUTOMATIC ); // Reset the priority widget state QList anObjects; myPriorityWidget->setObjects( anObjects ); - myLandCoverPriorityWidget->setObjects( anObjects ); } QWizardPage* HYDROGUI_CalculationDlg::createObjectsPage() { @@ -245,6 +240,8 @@ QWizardPage* HYDROGUI_CalculationDlg::createObjectsPage() { connect( myGeomObjects, SIGNAL( orderChanged() ), SLOT( onOrderChanged() ) ); + connect( myPriorityWidget, SIGNAL( ruleChanged() ), SLOT( onRuleChanged() ) ); + return aPage; } @@ -311,16 +308,14 @@ QWizardPage* HYDROGUI_CalculationDlg::createGroupsPage() { return aPage; } -QWizardPage* HYDROGUI_CalculationDlg::createLandCoversPage() { +QWizardPage* HYDROGUI_CalculationDlg::createLandCoverMapPage() { QWizardPage* aPage = new QWizardPage( mainFrame() ); QFrame* aFrame = new QFrame( aPage ); - // Splitter - myLandCoverSplitter = new QSplitter(Qt::Vertical); - // Top of the page QWidget* aTopContainer = new QWidget; - + + // TODO: add combo-box to choose land cover map object // Combo-box to choose Strickler table name QLabel* aStricklerTableLabel = new QLabel( tr( "STRICKLER_TABLE" ), aPage ); myStricklerTableName = new QComboBox( aPage ); @@ -328,122 +323,26 @@ QWizardPage* HYDROGUI_CalculationDlg::createLandCoversPage() { connect( myStricklerTableName, SIGNAL( activated( const QString & ) ), SIGNAL( StricklerTableSelected( const QString & ) ) ); - // Mode selector (auto/manual) - QGroupBox* aModeGroup = new QGroupBox( tr( "MODE" ) ); - - QRadioButton* aManualRB = new QRadioButton( tr( "MANUAL" ), mainFrame() ); - QRadioButton* anAutoRB = new QRadioButton( tr( "AUTO" ), mainFrame() ); - - myLandCoverModeButtons = new QButtonGroup( mainFrame() ); - myLandCoverModeButtons->addButton( anAutoRB, HYDROData_CalculationCase::AUTOMATIC ); - myLandCoverModeButtons->addButton( aManualRB, HYDROData_CalculationCase::MANUAL ); - - QBoxLayout* aModeSelectorLayout = new QHBoxLayout; - aModeSelectorLayout->setMargin( 5 ); - aModeSelectorLayout->setSpacing( 5 ); - aModeSelectorLayout->addWidget( anAutoRB ); - aModeSelectorLayout->addWidget( aManualRB ); - aModeGroup->setLayout( aModeSelectorLayout ); - - // Available land covers - QLabel* aLandCoversLabel = new QLabel( tr( "CALCULATION_REFERENCE_LAND_COVERS" ) ); - myAvailableLandCovers = new QListWidget( aPage ); - myAvailableLandCovers->setSelectionMode( QListWidget::ExtendedSelection ); - myAvailableLandCovers->setEditTriggers( QListWidget::NoEditTriggers ); - myAvailableLandCovers->setViewMode( QListWidget::ListMode ); - myAvailableLandCovers->setSortingEnabled( true ); - - // Included land covers - QLabel* anIncludedLabel = new QLabel( tr( "INCLUDED_LAND_COVERS" ) ); - myLandCovers = new HYDROGUI_OrderedListWidget( aPage, 16 ); - myLandCovers->setHiddenObjectsShown(true); - myLandCovers->setVisibilityIconShown(false); - myLandCovers->setContentsMargins(QMargins()); - - // Include/Exclude buttons - QFrame* aBtnsFrame = new QFrame; - QVBoxLayout* aBtnsLayout = new QVBoxLayout( aBtnsFrame ); - aBtnsLayout->setMargin( 5 ); - aBtnsLayout->setSpacing( 5 ); - aBtnsFrame->setLayout( aBtnsLayout ); - QPushButton* anAddBtn = new QPushButton( tr("INCLUDE"), aBtnsFrame ); - QPushButton* aRemoveBtn = new QPushButton( tr("EXCLUDE"), aBtnsFrame ); - - // Fill the butons frame with two buttons - aBtnsLayout->addWidget( anAddBtn ); - aBtnsLayout->addWidget( aRemoveBtn ); - aBtnsLayout->addStretch( 1 ); - - // Land covers frame - QFrame* aLandCoversFrame = new QFrame( aPage ); - aLandCoversFrame->setFrameStyle( QFrame::Panel | QFrame::Raised ); - QGridLayout* aLandCoversLayout = new QGridLayout( aLandCoversFrame ); - aLandCoversLayout->setMargin( 5 ); - aLandCoversLayout->setSpacing( 5 ); - aLandCoversFrame->setLayout( aLandCoversLayout ); - - // Fill the land covers frame with two lists, two labels and with buttons frame - aLandCoversLayout->addWidget( aLandCoversLabel, 0, 0, Qt::AlignHCenter ); - aLandCoversLayout->addWidget( anIncludedLabel, 0, 2, Qt::AlignHCenter ); - aLandCoversLayout->addWidget( myAvailableLandCovers, 1, 0 ); - aLandCoversLayout->addWidget( aBtnsFrame, 1, 1, Qt::AlignHCenter ); - aLandCoversLayout->addWidget( myLandCovers, 1, 2 ); - // Fill the top layout of the page QGridLayout* aTopLayout = new QGridLayout; aTopLayout->setMargin( 5 ); aTopLayout->setSpacing( 5 ); aTopLayout->setVerticalSpacing( 10 ); + // TODO: add land cover map combo-box to the layout aTopLayout->addWidget( aStricklerTableLabel, 0, 0, Qt::AlignHCenter ); aTopLayout->addWidget( myStricklerTableName, 0, 1 ); - aTopLayout->addWidget( aModeGroup, 1, 0, 1, 2 ); - aTopLayout->addWidget( aLandCoversFrame, 2, 0, 1, 2 ); - + aTopContainer->setLayout( aTopLayout ); - // Add the top of the page to the splitter - myLandCoverSplitter->insertWidget(0, aTopContainer); - myLandCoverSplitter->setStretchFactor(0, 2); - - // Bottom of the page - myLandCoverPriorityWidget = new HYDROGUI_PriorityWidget( mainFrame() ); - HYDROGUI_PriorityTableModel* aModel = - dynamic_cast( myLandCoverPriorityWidget->getTable()->model() ); - if ( aModel ) - aModel->setColumnCount( 3 ); - - QGroupBox* aPriorityGroup = new QGroupBox( tr( "PRIORITY" ) ); - QBoxLayout* aPriorityLayout = new QHBoxLayout; - aPriorityLayout->setMargin( 5 ); - aPriorityLayout->setSpacing( 5 ); - aPriorityLayout->addWidget( myLandCoverPriorityWidget ); - aPriorityGroup->setLayout( aPriorityLayout ); - - // Add the bottom of the page to the splitter - myLandCoverSplitter->insertWidget(1, aPriorityGroup); - myLandCoverSplitter->setStretchFactor(1, 1); - // Page layout QVBoxLayout* aPageLayout = new QVBoxLayout; aPageLayout->setMargin( 5 ); aPageLayout->setSpacing( 5 ); - aPageLayout->addWidget( myLandCoverSplitter ); - + aPage->setLayout( aPageLayout ); - // Create selector - if ( module() ) { - HYDROGUI_ListSelector* aListSelector = - new HYDROGUI_ListSelector( myLandCovers, module()->getApp()->selectionMgr() ); - aListSelector->setAutoBlock( true ); - } - // Connections - connect( myLandCoverModeButtons, SIGNAL( buttonClicked( int ) ), SIGNAL( changeLandCoverMode( int ) ) ); - connect( anAddBtn, SIGNAL( clicked() ), SIGNAL( addLandCovers() ) ); - connect( aRemoveBtn, SIGNAL( clicked() ), SIGNAL( removeLandCovers() ) ); - - connect( myLandCovers, SIGNAL( orderLandCoverChanged() ), SLOT( onOrderLandCoverChanged() ) ); + // TODO return aPage; } @@ -453,13 +352,16 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() { QFrame* aFrame = new QFrame( aPage ); QGridLayout* aLayout = new QGridLayout( aPage ); + + QLabel* aResultsOnGeomObjectsLabel = new QLabel( tr( "RESULTS_ON_GEOMETRY_OBJECTS" ), aFrame ); myBrowser = new HYDROGUI_DataBrowser( module(), NULL, aPage ); myBrowser->setAutoOpenLevel( 3 ); aLayout->setMargin( 5 ); aLayout->setSpacing( 5 ); - aLayout->addWidget( myBrowser, 0, 0, 1, 2 ); + aLayout->addWidget( aResultsOnGeomObjectsLabel, 0, 0 ); + aLayout->addWidget( myBrowser, 1, 0, 1, 2 ); myBathymetryLabel = new QLabel( tr( "BATHYMETRY" ), aFrame ); myBathymetryChoice = new QComboBox( aFrame ); @@ -467,8 +369,11 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() { myBathymetryChoice->setVisible( false ); myBathymetryLabel->setVisible( false ); - aLayout->addWidget( myBathymetryLabel, 1, 0 ); - aLayout->addWidget( myBathymetryChoice, 1, 1 ); + aLayout->addWidget( myBathymetryLabel, 2, 0 ); + aLayout->addWidget( myBathymetryChoice, 2, 1 ); + + QPushButton* aRegenerateBtn = new QPushButton( tr( "REGENERATE_COLORS" ), this ); + aLayout->addWidget( aRegenerateBtn, 3, 0 ); aPage->setLayout( aLayout ); @@ -480,48 +385,10 @@ QWizardPage* HYDROGUI_CalculationDlg::createZonesPage() { SIGNAL( dropped( const QList&, SUIT_DataObject*, int, Qt::DropAction ) ), SLOT( onZonesDropped( const QList&, SUIT_DataObject*, int, Qt::DropAction ) ) ); connect( myBrowser, SIGNAL( newRegion() ), this, SLOT( OnNewRegion() ) ); - - return aPage; -} - -QWizardPage* HYDROGUI_CalculationDlg::createLandCoverZonesPage() { - QWizardPage* aPage = new QWizardPage( mainFrame() ); - QFrame* aFrame = new QFrame( aPage ); - - QGridLayout* aLayout = new QGridLayout( aPage ); - - myLandCoverBrowser = new HYDROGUI_DataBrowser( module(), NULL, aPage ); - myLandCoverBrowser->setAutoOpenLevel( 3 ); - aLayout->setMargin( 5 ); - aLayout->setSpacing( 5 ); - - aLayout->addWidget( myLandCoverBrowser, 0, 0, 1, 2 ); - - myStricklerTypeLabel = new QLabel( tr( "STRICKLER_TYPE" ), aFrame ); - myStricklerTypeChoice = new QComboBox( aFrame ); - - myStricklerTypeLabel->setVisible( false ); - myStricklerTypeChoice->setVisible( false ); - - aLayout->addWidget( myBathymetryLabel, 1, 0 ); - aLayout->addWidget( myBathymetryChoice, 1, 1 ); - - aPage->setLayout( aLayout ); - - // Connections - connect( myLandCoverBrowser, SIGNAL( dataChanged() ), SLOT( onDataLandCoverChanged() ) ); - connect( myLandCoverBrowser, SIGNAL( clicked( SUIT_DataObject* ) ), SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ) ); - connect( myLandCoverBrowser, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onLandCoverZoneSelected( SUIT_DataObject* ) ) ); - connect( myStricklerTypeChoice, SIGNAL( activated( int ) ), SLOT( onMergeStricklerTypeSelected( int ) ) ); - connect( myLandCoverBrowser, - SIGNAL( dropped( const QList&, SUIT_DataObject*, int, Qt::DropAction ) ), - SLOT( onLandCoverZonesDropped( const QList&, SUIT_DataObject*, int, Qt::DropAction ) ) ); - connect( myLandCoverBrowser, SIGNAL( newRegion() ), this, SLOT( OnNewLandCoverRegion() ) ); - + connect( aRegenerateBtn, SIGNAL( clicked() ), this, SIGNAL( regenerateColors() ) ); return aPage; } - bool HYDROGUI_CalculationDlg::acceptCurrent() const { QString anErrorMsg; @@ -585,7 +452,7 @@ void HYDROGUI_CalculationDlg::onZonesDropped( const QList& the HYDROGUI_Region* aRegion = dynamic_cast(theTargetParent); if ( aRegion ) { - emit moveZones( theTargetParent, aZonesList, false ); + emit moveZones( theTargetParent, aZonesList ); } } } @@ -596,11 +463,6 @@ void HYDROGUI_CalculationDlg::OnNewRegion() emit createRegion( myBrowser->getSelected() ); } -void HYDROGUI_CalculationDlg::OnNewLandCoverRegion() -{ - emit createLandCoverRegion( myLandCoverBrowser->getSelected() ); -} - void HYDROGUI_CalculationDlg::onMergeTypeSelected( int theIndex ) { int aType = myBathymetryChoice->itemData( theIndex ).toInt(); @@ -626,7 +488,7 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject ) myBathymetryChoice->addItem( tr("MERGE_UNKNOWN"), HYDROData_Zone::Merge_UNKNOWN ); myBathymetryChoice->addItem( tr("MERGE_ZMIN"), HYDROData_Zone::Merge_ZMIN ); myBathymetryChoice->addItem( tr("MERGE_ZMAX"), HYDROData_Zone::Merge_ZMAX ); - QStringList aList = aZone->getAltitudes(); + QStringList aList = aZone->getObjects(); for ( int i = 0; i < aList.length(); i++ ) { myBathymetryChoice->addItem( aList.at( i ), HYDROData_Zone::Merge_Object ); @@ -656,59 +518,6 @@ void HYDROGUI_CalculationDlg::onSelected( SUIT_DataObject* theObject ) myBathymetryLabel->setVisible( doShow ); } -void HYDROGUI_CalculationDlg::onLandCoverZoneSelected( SUIT_DataObject* theObject ) -{ - bool doShow = false; - HYDROGUI_Zone* aZone = dynamic_cast( theObject ); - if ( aZone ) - { - doShow = aZone->isMergingNeed(); - } - - if ( doShow ) - { - // Fill the merge type combo box - bool prevBlock = myStricklerTypeChoice->blockSignals( true ); - myCurrentZone = aZone; - myStricklerTypeChoice->clear(); - myStricklerTypeChoice->addItem( tr("MERGE_UNKNOWN"), HYDROData_Zone::Merge_UNKNOWN ); - /*QStringList aList = aZone->getStricklerTypes(); - for ( int i = 0; i < aList.length(); i++ ) - { - myStricklerTypeChoice->addItem( aList.at( i ), HYDROData_Zone::Merge_Object ); - } - // Select the current choice if any - int aCurIndex = 0; - switch ( aZone->getMergeType() ) - { - case HYDROData_Zone::Merge_Object: - aCurIndex = 1 + aList.indexOf( aZone->text( HYDROGUI_DataObject::AltitudeObjId ) ); - break; - default: - aCurIndex = 0; // Select unknown by default - } - myStricklerTypeChoice->setCurrentIndex( aCurIndex );*/ - myStricklerTypeChoice->blockSignals( prevBlock ); - } - - myStricklerTypeChoice->setVisible( doShow ); - myStricklerTypeChoice->setEnabled( getLandCoverMode() == HYDROData_CalculationCase::MANUAL ); - myStricklerTypeChoice->setVisible( doShow ); -} - -void HYDROGUI_CalculationDlg::onMergeStricklerTypeSelected( int theIndex ) -{ - int aType = myStricklerTypeChoice->itemData( theIndex ).toInt(); - QString aText = myStricklerTypeChoice->itemText( theIndex ); - emit setMergeStricklerType( aType, aText ); -} - -void HYDROGUI_CalculationDlg::onLandCoverZonesDropped( const QList& theList, - SUIT_DataObject* theTargetParent, int theTargetRow, Qt::DropAction theDropAction ) -{ - // TODO: implement this function -} - void HYDROGUI_CalculationDlg::setObjectName( const QString& theName ) { myObjectName->setText( theName ); @@ -818,20 +627,6 @@ void HYDROGUI_CalculationDlg::setAllGeomObjects( const QStringList& theObjects, } } -void HYDROGUI_CalculationDlg::setAllLandCovers( const QStringList& theObjects, const QStringList& theObjectsEntries ) -{ - myAvailableLandCovers->clear(); - - for ( int i = 0, n = theObjects.length(); i < n; ++i ) - { - QString anObjName = theObjects.at( i ); - - QListWidgetItem* aListItem = new QListWidgetItem( anObjName, myAvailableLandCovers ); - aListItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable ); - aListItem->setData( Qt::UserRole, theObjectsEntries.at( i ) ); - } -} - QStringList getSelected( QListWidget* theWidget ) { QStringList aResList; @@ -848,40 +643,23 @@ QStringList HYDROGUI_CalculationDlg::getSelectedGeomObjects() const return myGeomObjects->getSelectedNames(); } -QStringList HYDROGUI_CalculationDlg::getSelectedLandCovers() const -{ - return myLandCovers->getSelectedNames(); -} - QStringList HYDROGUI_CalculationDlg::getAllGeomObjects() const { return myGeomObjects->getAllNames(); } -QStringList HYDROGUI_CalculationDlg::getAllLandCovers() const -{ - return myLandCovers->getAllNames(); -} - QStringList HYDROGUI_CalculationDlg::getSelectedAvailableGeomObjects() const { return getSelected( myAvailableGeomObjects ); } -QStringList HYDROGUI_CalculationDlg::getSelectedAvailableLandCovers() const -{ - return getSelected( myAvailableLandCovers ); -} - void HYDROGUI_CalculationDlg::setEditedObject( const Handle(HYDROData_CalculationCase) theCase ) { myEditedObject = theCase; myValidator->setEditedObject( theCase ); // Build the calculation case subtree - module()->getDataModel()->buildCaseTree( myBrowser->root(), myEditedObject ); - // TODO: build subtree items corresponding to regions constructed on land covers - //... + module()->getDataModel()->buildCaseTree( myBrowser->root(), myEditedObject); myBrowser->updateTree(); myBrowser->openLevels(); @@ -889,11 +667,16 @@ void HYDROGUI_CalculationDlg::setEditedObject( const Handle(HYDROData_Calculatio myBrowser->setAutoUpdate( true ); myBrowser->setUpdateModified( true ); + /*TODO + // Build the calculation case subtree for Land Cover regions + module()->getDataModel()->buildCaseTree( myLandCoverBrowser->root(), myEditedObject, true ); + myLandCoverBrowser->updateTree(); myLandCoverBrowser->openLevels(); myLandCoverBrowser->adjustColumnsWidth(); myLandCoverBrowser->setAutoUpdate( true ); myLandCoverBrowser->setUpdateModified( true ); + */ } HYDROGUI_Zone* HYDROGUI_CalculationDlg::getCurrentZone() const @@ -972,34 +755,6 @@ void HYDROGUI_CalculationDlg::setMode( int theMode ) } } -/** - Get creation mode for land covers panel. - @param theMode the mode -*/ -int HYDROGUI_CalculationDlg::getLandCoverMode() const -{ - return myLandCoverModeButtons->checkedId(); -} - -/** - Set creation mode for land cover panel. - @param theMode the mode -*/ -void HYDROGUI_CalculationDlg::setLandCoverMode( int theMode ) -{ - bool isBlocked = myLandCoverModeButtons->blockSignals( true ); - myLandCoverModeButtons->button( theMode )->setChecked( true ); - myLandCoverModeButtons->blockSignals( isBlocked ); - - bool isAuto = ( theMode == HYDROData_CalculationCase::AUTOMATIC ); - - myLandCovers->setOrderingEnabled( isAuto ); - QWidget* aWidget = myLandCoverSplitter->widget( 1 ); - if ( aWidget ) { - aWidget->setVisible( isAuto ); - } -} - /** Enable/disable zones drag'n'drop and renaming. @param theIsEnabled if true - zones drag'n'drop and renaming will be enabled @@ -1009,15 +764,6 @@ void HYDROGUI_CalculationDlg::setEditZonesEnabled( const bool theIsEnabled ) myBrowser->setReadOnly( !theIsEnabled ); } -/** - Enable/disable land covers drag'n'drop and renaming. - @param theIsEnabled if true - land covers drag'n'drop and renaming will be enabled -*/ -void HYDROGUI_CalculationDlg::setEditLandCoverZonesEnabled( const bool theIsEnabled ) -{ - myLandCoverBrowser->setReadOnly( !theIsEnabled ); -} - /** Get included geometry objects. @return the list of geometry objects @@ -1040,11 +786,12 @@ QList HYDROGUI_CalculationDlg::getGeometryObjects() } /** - Get included land covers. - @return the list of land covers + Get chosen land cover map. + @return the land cover map object */ -QList HYDROGUI_CalculationDlg::getLandCovers() +Handle(HYDROData_LandCoverMap) HYDROGUI_CalculationDlg::getLandCoverMap() { + /* TODO QList anEntities = myLandCovers->getObjects(); QList aLandCovers; @@ -1058,6 +805,9 @@ QList HYDROGUI_CalculationDlg::getLandCovers() } return aLandCovers; + */ + Handle(HYDROData_LandCoverMap) aLandCoverMap = NULL; + return aLandCoverMap; } /** @@ -1078,24 +828,6 @@ void HYDROGUI_CalculationDlg::setRules( const HYDROData_ListOfRules& theRules ) myPriorityWidget->setRules( theRules ); } -/** - Get rules defined for land covers. - @return the list of rules - */ -HYDROData_ListOfRules HYDROGUI_CalculationDlg::getLandCoverRules() const -{ - return myLandCoverPriorityWidget->getRules(); -} - -/** - Set rules for land covers. - @param theRules the list of rules - */ -void HYDROGUI_CalculationDlg::setLandCoverRules( const HYDROData_ListOfRules& theRules ) const -{ - myLandCoverPriorityWidget->setRules( theRules ); -} - /** Slot called when objects order is changed. */ @@ -1109,6 +841,18 @@ void HYDROGUI_CalculationDlg::onOrderChanged() myGeomObjects->undoLastMove(); } +/** + Slot called when priority rule for geometry objects is changed. + */ +void HYDROGUI_CalculationDlg::onRuleChanged() +{ + bool isConfirmed = true; + emit ruleChanged( isConfirmed ); + if( !isConfirmed ) + myPriorityWidget->undoLastChange(); +} + +// TODO: setLandCoverMap(...) void HYDROGUI_CalculationDlg::setStricklerTable( const QString& theStricklerTableName, bool theBlockSignals ) { bool isBlocked; @@ -1122,76 +866,3 @@ void HYDROGUI_CalculationDlg::setStricklerTable( const QString& theStricklerTabl else emit StricklerTableSelected( theStricklerTableName ); } - -void HYDROGUI_CalculationDlg::includeLandCovers( const QStringList& theLandCovers, bool theReset ) -{ - if ( theReset ) - { - HYDROGUI_ListModel::Object2VisibleList anObject2VisibleList; - myLandCovers->setObjects(anObject2VisibleList); - } - - QList aFoundItems; - foreach ( const QString& anObjName, theLandCovers ) { - // Hide the land cover in the available land covers list - aFoundItems = myAvailableLandCovers->findItems( anObjName, Qt::MatchExactly ); - foreach ( QListWidgetItem* anItem, aFoundItems ) { - anItem->setHidden( true ); - } - - // Add the land cover to the list of included objects - Handle(HYDROData_Entity) anObject = - HYDROGUI_Tool::FindObjectByName( module(), anObjName ); - myLandCovers->addObject( HYDROGUI_ListModel::Object2Visible( anObject, true ) ); - } - - myLandCoverPriorityWidget->setObjects( getLandCovers() ); -} - -void HYDROGUI_CalculationDlg::excludeLandCovers( const QStringList& theLandCovers ) -{ - QList aFoundItems; - foreach ( const QString& anObjName, theLandCovers ) { - // Set visible the land cover in the available objects list - aFoundItems = myAvailableLandCovers->findItems( anObjName, Qt::MatchExactly ); - foreach ( QListWidgetItem* anItem, aFoundItems ) { - anItem->setHidden( false ); - } - - // Remove the land cover from the list of included objects - myLandCovers->removeObjectByName( anObjName ); - } - - myLandCoverPriorityWidget->setObjects( getLandCovers() ); -} - -void HYDROGUI_CalculationDlg::refreshLandCoverZonesBrowser() -{ - SUIT_DataObject* aRoot = myLandCoverBrowser->root(); - module()->getDataModel()->updateObjectTree( myEditedObject ); - module()->getDataModel()->buildCaseTree( aRoot, myEditedObject ); - myLandCoverBrowser->updateTree( aRoot ); -} - -/** - Slot called when zones created on land covers are changed. - */ -void HYDROGUI_CalculationDlg::onDataLandCoverChanged() -{ - SUIT_DataObject* aRoot = myLandCoverBrowser->root(); - module()->getDataModel()->buildCaseTree( aRoot, myEditedObject ); - myLandCoverBrowser->updateTree( aRoot ); -} - -/** - Slot called when land covers order is changed. - */ -void HYDROGUI_CalculationDlg::onOrderLandCoverChanged() -{ - bool isConfirmed = true; - emit orderLandCoverChanged( isConfirmed ); - if( isConfirmed ) - myLandCoverPriorityWidget->setObjects( getLandCovers() ); - else - myLandCovers->undoLastMove(); -}