mzn [Mon, 29 Jun 2015 12:09:01 +0000 (15:09 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Mon, 29 Jun 2015 12:08:38 +0000 (15:08 +0300)]
refs #548: Names of axes intersect each other.
isn [Mon, 29 Jun 2015 11:42:41 +0000 (14:42 +0300)]
Import of landcover: small bug fixes
isn [Mon, 29 Jun 2015 10:56:40 +0000 (13:56 +0300)]
#refs 608 ::remarks
isn [Mon, 29 Jun 2015 09:37:10 +0000 (12:37 +0300)]
Import/Export // API revision. p4
isn [Mon, 29 Jun 2015 09:11:59 +0000 (12:11 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
isn [Mon, 29 Jun 2015 09:11:39 +0000 (12:11 +0300)]
Import/Export // API revision. p3
isn [Mon, 29 Jun 2015 08:51:28 +0000 (11:51 +0300)]
Import/Export // API revision. p2
isn [Mon, 29 Jun 2015 08:03:45 +0000 (11:03 +0300)]
Import/Export // API revision. p1
asl [Fri, 26 Jun 2015 13:00:49 +0000 (16:00 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Fri, 26 Jun 2015 13:00:34 +0000 (16:00 +0300)]
refs #585: merge
mkr [Fri, 26 Jun 2015 12:28:05 +0000 (15:28 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Fri, 26 Jun 2015 12:23:51 +0000 (15:23 +0300)]
refs #585: split/merge implementation
mkr [Fri, 26 Jun 2015 12:18:44 +0000 (15:18 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Fri, 26 Jun 2015 12:18:02 +0000 (15:18 +0300)]
refs #593: Split polylines, Merge polylines icons.
mkr [Fri, 26 Jun 2015 12:16:43 +0000 (15:16 +0300)]
refs #596: improve polyline popup menu in Object Browser.
asl [Fri, 26 Jun 2015 09:43:26 +0000 (12:43 +0300)]
patch for compilation on Linux
asl [Fri, 26 Jun 2015 09:37:12 +0000 (12:37 +0300)]
code revision
asl [Fri, 26 Jun 2015 09:37:03 +0000 (12:37 +0300)]
patch for correct linkage to shapelib
isn [Fri, 26 Jun 2015 09:20:27 +0000 (12:20 +0300)]
++ shapefil
isn [Fri, 26 Jun 2015 09:18:11 +0000 (12:18 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
isn [Fri, 26 Jun 2015 09:17:37 +0000 (12:17 +0300)]
move shapelib to sep. lib (cmake errors)
asl [Fri, 26 Jun 2015 08:46:54 +0000 (11:46 +0300)]
patch for correct compilation after merge
asl [Fri, 26 Jun 2015 08:15:42 +0000 (11:15 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
stv [Fri, 26 Jun 2015 07:56:18 +0000 (10:56 +0300)]
#571 - Land Cover: calculation of Strickler coefficient
#572 - Extraction of polylines
#563 - Strickler table: dump to Python (bug fixing)
#599 - Incorrect behavior of 'eyes' in Object browser after reloading python script
asl [Fri, 26 Jun 2015 08:09:44 +0000 (11:09 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
Conflicts:
src/HYDROData/HYDROData_StricklerTable.cxx
src/HYDROData/HYDROData_StricklerTable.h
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_DataModel.cxx
src/HYDROGUI/HYDROGUI_DataModel.h
src/HYDROGUI/HYDROGUI_Module.h
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h
asl [Fri, 26 Jun 2015 08:01:48 +0000 (11:01 +0300)]
refs #585: flag in merge operations
stv [Fri, 26 Jun 2015 07:56:18 +0000 (10:56 +0300)]
#571 - Land Cover: calculation of Strickler coefficient
#572 - Extraction of polylines
#563 - Strickler table: dump to Python (bug fixing)
#599 - Incorrect behavior of 'eyes' in Object browser after reloading python script
asl [Fri, 26 Jun 2015 07:02:09 +0000 (10:02 +0300)]
minor code revision
isn [Thu, 25 Jun 2015 14:55:54 +0000 (17:55 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
isn [Thu, 25 Jun 2015 14:55:20 +0000 (17:55 +0300)]
Import/Export new resources
mkr [Thu, 25 Jun 2015 14:50:38 +0000 (17:50 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Thu, 25 Jun 2015 14:50:26 +0000 (17:50 +0300)]
refs #596, #597: redesign of HYDRO main menu: create new Image and Polyline items.
isn [Thu, 25 Jun 2015 14:46:54 +0000 (17:46 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
isn [Thu, 25 Jun 2015 14:45:28 +0000 (17:45 +0300)]
Import/Export new corrections
mkr [Thu, 25 Jun 2015 14:06:12 +0000 (17:06 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Thu, 25 Jun 2015 14:05:58 +0000 (17:05 +0300)]
refs #542: show warning, when order or priority rules are changed for geometry objects or land covers.
isn [Thu, 25 Jun 2015 13:46:48 +0000 (16:46 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
isn [Thu, 25 Jun 2015 13:45:46 +0000 (16:45 +0300)]
Import/Export >> some minor corrections
mzn [Thu, 25 Jun 2015 13:11:34 +0000 (16:11 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Thu, 25 Jun 2015 13:11:26 +0000 (16:11 +0300)]
refs #569: fix remarks.
asl [Thu, 25 Jun 2015 13:10:41 +0000 (16:10 +0300)]
patch for correct compilation on Linux
asl [Thu, 25 Jun 2015 12:36:22 +0000 (15:36 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Thu, 25 Jun 2015 12:36:07 +0000 (15:36 +0300)]
refs #585: polylines operations (split/merge)
isn [Thu, 25 Jun 2015 10:43:14 +0000 (13:43 +0300)]
export of landcovers to shp-polygons (draft)
asl [Thu, 25 Jun 2015 07:26:04 +0000 (10:26 +0300)]
Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc
Conflicts:
src/HYDROGUI/HYDROGUI_Operations.cxx
mzn [Thu, 25 Jun 2015 06:23:51 +0000 (09:23 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Thu, 25 Jun 2015 06:23:41 +0000 (09:23 +0300)]
refs #602: show the special error message when export case with no submersible regions.
asl [Thu, 25 Jun 2015 06:18:29 +0000 (09:18 +0300)]
#589: new interpolation algorithm for polylines
asl [Thu, 25 Jun 2015 04:24:23 +0000 (07:24 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Wed, 24 Jun 2015 15:48:22 +0000 (18:48 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Wed, 24 Jun 2015 15:48:12 +0000 (18:48 +0300)]
refs #509: Create stream - no synchronization between object browser and input panel
isn [Wed, 24 Jun 2015 15:40:02 +0000 (18:40 +0300)]
resources
isn [Wed, 24 Jun 2015 14:18:04 +0000 (17:18 +0300)]
new resources; bug fixes; etc
mkr [Wed, 24 Jun 2015 15:04:22 +0000 (18:04 +0300)]
refs #534: fix the case "3. If the only zone from the region has been selected." (It has no sense to create new zone region from region, consisting from only one zone.)
mkr [Wed, 24 Jun 2015 14:22:07 +0000 (17:22 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Wed, 24 Jun 2015 14:21:56 +0000 (17:21 +0300)]
refs #574: take into account the order of land covers in the "Included land covers" list while add default rules into the priority table.
mzn [Wed, 24 Jun 2015 13:50:12 +0000 (16:50 +0300)]
refs #569: enable scalar map coloring only if the active view contains Land Covers
isn [Wed, 24 Jun 2015 12:05:39 +0000 (15:05 +0300)]
many corrections
ShapeFix on landcover-faces disabled (temporary)
mzn [Wed, 24 Jun 2015 13:14:24 +0000 (16:14 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Wed, 24 Jun 2015 13:14:13 +0000 (16:14 +0300)]
refs #569: improve scalar map presentation of Land Covers.
mkr [Wed, 24 Jun 2015 12:54:21 +0000 (15:54 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Wed, 24 Jun 2015 12:54:09 +0000 (15:54 +0300)]
refs #573: fix regression of saving resolved conflicts on zones constructed on geometry objects, separate assignment modes for regions constructed on geometry objects and land covers, update corresponding *.sip file.
isn [Tue, 23 Jun 2015 12:17:54 +0000 (15:17 +0300)]
Import of SHP polygons (draft)
isn [Wed, 24 Jun 2015 07:36:10 +0000 (10:36 +0300)]
refs #603
mzn [Wed, 24 Jun 2015 07:05:00 +0000 (10:05 +0300)]
refs #569: Land Covers should not be colored manually in scalar map mode
mzn [Wed, 24 Jun 2015 06:49:02 +0000 (09:49 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Wed, 24 Jun 2015 06:48:37 +0000 (09:48 +0300)]
refs #569: scalar map coloring of Land Covers (scalar bar part)
mzn [Wed, 24 Jun 2015 06:33:15 +0000 (09:33 +0300)]
refs #601: avoid using working directory as a temp directory.
asl [Tue, 23 Jun 2015 14:38:25 +0000 (17:38 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Tue, 23 Jun 2015 14:38:17 +0000 (17:38 +0300)]
draft split/merge
mkr [Tue, 23 Jun 2015 13:01:21 +0000 (16:01 +0300)]
refs #578: hide geometry objects and land covers, when panels with constructed regions inside calculation case dialog are active, only generated zones are shown in the viewer in this case.
mkr [Tue, 23 Jun 2015 09:21:32 +0000 (12:21 +0300)]
refs #591: restore default Strickler coefficient value in preferences.
isn [Tue, 23 Jun 2015 08:36:17 +0000 (11:36 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT
Conflicts:
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
isn [Tue, 23 Jun 2015 07:36:25 +0000 (10:36 +0300)]
SHP poly 2
mkr [Tue, 23 Jun 2015 08:24:18 +0000 (11:24 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Tue, 23 Jun 2015 08:23:59 +0000 (11:23 +0300)]
refs #594: create preview for land covers.
isn [Tue, 23 Jun 2015 07:41:13 +0000 (10:41 +0300)]
refs #598
refs #595
asl [Mon, 22 Jun 2015 13:41:44 +0000 (16:41 +0300)]
patch for correct compilation on Linux
isn [Mon, 22 Jun 2015 12:32:59 +0000 (15:32 +0300)]
SHP Poly 1
asl [Mon, 22 Jun 2015 12:37:13 +0000 (15:37 +0300)]
refs #595: error in split/merge polylines GUI
asl [Mon, 22 Jun 2015 12:14:09 +0000 (15:14 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Mon, 22 Jun 2015 11:54:56 +0000 (14:54 +0300)]
refs #567: add "POLYLINES" partition and modified icon for Land Cover object.
mzn [Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Mon, 22 Jun 2015 11:15:42 +0000 (14:15 +0300)]
refs #567: HYDROData_LandCover::buildShape() method returns the error message now.
mkr [Mon, 22 Jun 2015 10:43:39 +0000 (13:43 +0300)]
refs #575, #580: display the information about the chosen land cover objects in the last column of data browser, resolve Strickler types conflicts for zones constructed on land covers, add static labels on two last pages of the dialog.
asl [Mon, 22 Jun 2015 08:59:06 +0000 (11:59 +0300)]
refs #588
asl [Mon, 22 Jun 2015 08:57:55 +0000 (11:57 +0300)]
refs #563: Strickler table kind is published in SIP
mzn [Mon, 22 Jun 2015 08:54:29 +0000 (11:54 +0300)]
refs #567: let the land covers to be recognized as reference objects of a cc zone
asl [Mon, 22 Jun 2015 07:02:35 +0000 (10:02 +0300)]
update of the documentation
asl [Mon, 22 Jun 2015 05:40:39 +0000 (08:40 +0300)]
patch for correct calculation
asl [Mon, 22 Jun 2015 05:16:15 +0000 (08:16 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
Conflicts:
src/HYDROGUI/HYDROGUI_CalculationOp.cxx
src/HYDROGUI/HYDROGUI_CalculationOp.h
asl [Mon, 22 Jun 2015 05:08:36 +0000 (08:08 +0300)]
Merge remote-tracking branch 'origin/BR_SINUSX_FORMAT' into BR_v14_rc
mkr [Fri, 19 Jun 2015 17:58:20 +0000 (20:58 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mkr [Fri, 19 Jun 2015 17:58:06 +0000 (20:58 +0300)]
refs #575, #580: zones preview and combo-box to choose the land cover and, therefore, the Strickler type defined for it.
mzn [Fri, 19 Jun 2015 14:21:11 +0000 (17:21 +0300)]
refs #570: documentation update.
asl [Fri, 19 Jun 2015 13:25:38 +0000 (16:25 +0300)]
patch for default zone colors on Linux
mzn [Fri, 19 Jun 2015 12:41:46 +0000 (15:41 +0300)]
refs #570: fix priority queue.
mkr [Fri, 19 Jun 2015 12:22:04 +0000 (15:22 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mkr [Fri, 19 Jun 2015 11:43:10 +0000 (14:43 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
