From: asl <asl@opencascade.com>
Date: Tue, 7 Nov 2017 12:29:06 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_1323_0' into BR_2017
X-Git-Tag: v2.1~58
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=07c29bb9bda552734178a94c59e6c3cd6881b754;p=modules%2Fhydro.git

Merge remote-tracking branch 'origin/BR_1323_0' into BR_2017

# Conflicts:
#	src/HYDROGUI/CMakeLists.txt
#	src/HYDROGUI/HYDROGUI_Operations.cxx
#	src/HYDROGUI/HYDROGUI_Operations.h
---

07c29bb9bda552734178a94c59e6c3cd6881b754
diff --cc src/HYDROGUI/CMakeLists.txt
index 3d0a3607,130135bd..e0909451
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@@ -147,8 -148,8 +148,10 @@@ set(PROJECT_HEADER
      HYDROGUI_SetTransparencyOp.h
      HYDROGUI_TransparencyDlg.h
      HYDROGUI_Overview.h
 +    HYDROGUI_PolylineStyleOp.h
 +    HYDROGUI_PolylineStyleDlg.h
+     HYDROGUI_ZoneTool.h
+ 	HYDROGUI_RegenerateRegionColorsOp.h
  )
  
  QT_WRAP_MOC(PROJECT_HEADERS_MOC ${PROJECT_HEADERS})
@@@ -298,8 -300,8 +302,10 @@@ set(PROJECT_SOURCE
      HYDROGUI_SetTransparencyOp.cxx
      HYDROGUI_TransparencyDlg.cxx
      HYDROGUI_Overview.cxx
 +    HYDROGUI_PolylineStyleOp.cxx
 +    HYDROGUI_PolylineStyleDlg.cxx
+     HYDROGUI_ZoneTool.cxx
+ 	HYDROGUI_RegenerateRegionColorsOp.cxx
  )
  
  add_definitions(
diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
index 8909b875,2a817f47..259ac301
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@@ -72,7 -73,7 +73,8 @@@
  #include "HYDROGUI_ImportLandCoverMapOp.h"
  #include "HYDROGUI_BathymetrySelectionOp.h"
  #include "HYDROGUI_BathymetryOp.h"
 +#include "HYDROGUI_PolylineStyleOp.h"
+ #include "HYDROGUI_RegenerateRegionColorsOp.h"
  
  #include <HYDROData_Document.h>
  #include <HYDROData_Obstacle.h>
@@@ -243,7 -245,8 +246,9 @@@ void HYDROGUI_Module::createActions(
    createAction( LandCoverScalarMapModeOnId, "LC_SCALARMAP_COLORING_ON" );
    createAction( LandCoverScalarMapModeOffId, "LC_SCALARMAP_COLORING_OFF" );
  
 +  createAction( ShowHideArrows, "SHOW_HIDE_ARROWS" );
+   createAction( RegenerateRegionColorsId, "REGENERATE_REGION_COLORS" );
+ 
  }
  
  void HYDROGUI_Module::createMenus()
diff --cc src/HYDROGUI/HYDROGUI_Operations.h
index fdd3048d,50ec909e..88afbe3c
--- a/src/HYDROGUI/HYDROGUI_Operations.h
+++ b/src/HYDROGUI/HYDROGUI_Operations.h
@@@ -144,7 -145,7 +145,8 @@@ enum OperationI
    BathymetryRescaleUserId,
    BathymetryRescaleDefaultId,
  
 +  ShowHideArrows,
+   RegenerateRegionColorsId
  };
  
  #endif