connect( myGeomObjects, SIGNAL( orderChanged() ), SLOT( onOrderChanged() ) );
+ connect( myPriorityWidget, SIGNAL( ruleChanged() ), SLOT( onRuleChanged() ) );
+
return aPage;
}
connect( anAddBtn, SIGNAL( clicked() ), SIGNAL( addLandCovers() ) );
connect( aRemoveBtn, SIGNAL( clicked() ), SIGNAL( removeLandCovers() ) );
- connect( myLandCovers, SIGNAL( orderLandCoverChanged() ), SLOT( onOrderLandCoverChanged() ) );
+ connect( myLandCovers, SIGNAL( orderChanged() ), SLOT( onOrderLandCoverChanged() ) );
+
+ connect( myLandCoverPriorityWidget, SIGNAL( ruleChanged() ), SLOT( onLandCoverRuleChanged() ) );
return aPage;
}
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 );
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 );
SIGNAL( dropped( const QList<SUIT_DataObject*>&, SUIT_DataObject*, int, Qt::DropAction ) ),
SLOT( onZonesDropped( const QList<SUIT_DataObject*>&, SUIT_DataObject*, int, Qt::DropAction ) ) );
connect( myBrowser, SIGNAL( newRegion() ), this, SLOT( OnNewRegion() ) );
-
+ connect( aRegenerateBtn, SIGNAL( clicked() ), this, SIGNAL( regenerateColors() ) );
return aPage;
}
QGridLayout* aLayout = new QGridLayout( aPage );
+ QLabel* aResultsOnLandCoversLabel = new QLabel( tr( "RESULTS_ON_LAND_COVERS" ), aFrame );
+
myLandCoverBrowser = new HYDROGUI_DataBrowser( module(), NULL, aPage, true );
myLandCoverBrowser->setAutoOpenLevel( 3 );
aLayout->setMargin( 5 );
aLayout->setSpacing( 5 );
- aLayout->addWidget( myLandCoverBrowser, 0, 0, 1, 2 );
+ aLayout->addWidget( aResultsOnLandCoversLabel, 0, 0 );
+ aLayout->addWidget( myLandCoverBrowser, 1, 0, 1, 2 );
myStricklerTypeLabel = new QLabel( tr( "STRICKLER_TYPE" ), aFrame );
myStricklerTypeChoice = new QComboBox( aFrame );
myStricklerTypeLabel->setVisible( false );
myStricklerTypeChoice->setVisible( false );
- aLayout->addWidget( myStricklerTypeLabel, 1, 0 );
- aLayout->addWidget( myStricklerTypeChoice, 1, 1 );
+ aLayout->addWidget( myStricklerTypeLabel, 2, 0 );
+ aLayout->addWidget( myStricklerTypeChoice, 2, 1 );
aPage->setLayout( aLayout );
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();
+}
+
void HYDROGUI_CalculationDlg::setStricklerTable( const QString& theStricklerTableName, bool theBlockSignals )
{
bool isBlocked;
else
myLandCovers->undoLastMove();
}
+
+/**
+ Slot called when priority rule for land covers is changed.
+ */
+void HYDROGUI_CalculationDlg::onLandCoverRuleChanged()
+{
+ bool isConfirmed = true;
+ emit ruleLandCoverChanged( isConfirmed );
+ if( !isConfirmed )
+ myLandCoverPriorityWidget->undoLastChange();
+}