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

diff --cc src/HYDROGUI/CMakeLists.txt
index 3d0a360755466200f527c572a0aeb3ed9b01f19d,130135bdbbc2280a83d6226843681c1e33d5358c..e090945181dfcf802fc75b6f68e52c49d99570e4
--- 1/src/HYDROGUI/CMakeLists.txt
--- 2/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_DataObject.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_Module.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
index 8909b8759b28724c4019358963bd045f63506d2e,2a817f47b0f4e0abe1ec86256f371b4a16b67937..259ac301301ba35c5e44a68a781a1906cee16030
--- 1/src/HYDROGUI/HYDROGUI_Operations.cxx
--- 2/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 fdd3048da307485937a438391a83bd97564c8288,50ec909ea09929c373de6089019be3bdfe2d180e..88afbe3cd3e11cb9b3f160987739651e0605afd2
--- 1/src/HYDROGUI/HYDROGUI_Operations.h
--- 2/src/HYDROGUI/HYDROGUI_Operations.h
+++ b/src/HYDROGUI/HYDROGUI_Operations.h
@@@ -144,7 -145,7 +145,8 @@@ enum OperationI
    BathymetryRescaleUserId,
    BathymetryRescaleDefaultId,
  
 +  ShowHideArrows,
+   RegenerateRegionColorsId
  };
  
  #endif

diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge

diff --cc src/HYDRO_tests/ExternalFiles.cmake
Simple merge

diff --cc src/HYDRO_tests/reference_data/CMakeLists.txt
Simple merge