From: mkr Date: Wed, 24 Jun 2015 14:21:56 +0000 (+0300) Subject: refs #574: take into account the order of land covers in the "Included land covers... X-Git-Tag: v1.4.2~37^2~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3a924665a9e71e81ebf760014601b457376fe996;p=modules%2Fhydro.git refs #574: take into account the order of land covers in the "Included land covers" list while add default rules into the priority table. --- diff --git a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx index 889d2b61..3103fe4a 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationDlg.cxx @@ -443,7 +443,7 @@ QWizardPage* HYDROGUI_CalculationDlg::createLandCoversPage() { connect( anAddBtn, SIGNAL( clicked() ), SIGNAL( addLandCovers() ) ); connect( aRemoveBtn, SIGNAL( clicked() ), SIGNAL( removeLandCovers() ) ); - connect( myLandCovers, SIGNAL( orderLandCoverChanged() ), SLOT( onOrderLandCoverChanged() ) ); + connect( myLandCovers, SIGNAL( orderChanged() ), SLOT( onOrderLandCoverChanged() ) ); return aPage; } diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx index ef991cab..6c6aa8e8 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx @@ -1106,7 +1106,6 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex ) if ( anIsToUpdate ) { myShowZones = true; - //myEditedObject->Update(); myEditedObject->SetToUpdate( false ); AssignDefaultZonesColors( true );