]> SALOME platform Git repositories - modules/hydro.git/log
Salome HOME
modules/hydro.git
9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD
isn [Tue, 30 Jun 2015 11:56:39 +0000 (14:56 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD

9 years agoDeny to create landcovers on the self-intersection wires/polyline
isn [Tue, 30 Jun 2015 11:55:53 +0000 (14:55 +0300)]
Deny to create landcovers on the self-intersection wires/polyline

9 years ago#612 - The order of extracted polylines in object browser is unexpected
stv [Tue, 30 Jun 2015 11:31:27 +0000 (14:31 +0300)]
#612 - The order of extracted polylines in object browser is unexpected

9 years agorefs #619
isn [Tue, 30 Jun 2015 10:46:46 +0000 (13:46 +0300)]
refs #619

9 years agorefs #618
isn [Tue, 30 Jun 2015 10:34:13 +0000 (13:34 +0300)]
refs #618

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD
isn [Tue, 30 Jun 2015 09:16:05 +0000 (12:16 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD

9 years agoImport of shapefile - small improvements
isn [Tue, 30 Jun 2015 09:15:35 +0000 (12:15 +0300)]
Import of shapefile - small improvements

9 years agopatch for crash
asl [Tue, 30 Jun 2015 09:13:02 +0000 (12:13 +0300)]
patch for crash

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD
isn [Tue, 30 Jun 2015 08:51:41 +0000 (11:51 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD

9 years agoImport of shapefile - bug fixes; #refs 614
isn [Tue, 30 Jun 2015 08:50:46 +0000 (11:50 +0300)]
Import of shapefile - bug fixes; #refs 614

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Tue, 30 Jun 2015 07:24:43 +0000 (10:24 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

9 years agorefs #504: color of boundary polyline.
mzn [Tue, 30 Jun 2015 07:24:28 +0000 (10:24 +0300)]
refs #504: color of boundary polyline.

9 years ago#refs 585: the method IsCustom()
asl [Tue, 30 Jun 2015 06:44:25 +0000 (09:44 +0300)]
#refs 585: the method IsCustom()

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD
isn [Mon, 29 Jun 2015 16:10:08 +0000 (19:10 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into HEAD

9 years agoImport of landcover -- use fclass2d to determine outer wires and holes
isn [Mon, 29 Jun 2015 15:30:35 +0000 (18:30 +0300)]
Import of landcover -- use fclass2d to determine outer wires and holes

9 years agorefs #569: add warning if the user try to delete all tables
mzn [Mon, 29 Jun 2015 15:31:58 +0000 (18:31 +0300)]
refs #569: add warning if the user try to delete all tables

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Mon, 29 Jun 2015 13:29:17 +0000 (16:29 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

9 years agorefs #585: correct tool polyline filling
asl [Mon, 29 Jun 2015 13:29:00 +0000 (16:29 +0300)]
refs #585: correct tool polyline filling

9 years agoAlgorithms to cut any closed section at any point were written.
abk [Mon, 29 Jun 2015 13:18:57 +0000 (16:18 +0300)]
Algorithms to cut any closed section at any point were written.

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Mon, 29 Jun 2015 12:31:21 +0000 (15:31 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

9 years agoAlgorithms to split open section by a point were written.
abk [Fri, 26 Jun 2015 12:26:49 +0000 (15:26 +0300)]
Algorithms to split open section by a point were written.

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Mon, 29 Jun 2015 12:13:05 +0000 (15:13 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

9 years ago#585: patch for names for result
asl [Mon, 29 Jun 2015 12:12:56 +0000 (15:12 +0300)]
#585: patch for names for result

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
isn [Mon, 29 Jun 2015 12:10:34 +0000 (15:10 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

9 years agoImport of landcover: small bug fixes #2
isn [Mon, 29 Jun 2015 12:10:17 +0000 (15:10 +0300)]
Import of landcover: small bug fixes #2

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #548: Names of axes intersect each other.
mzn [Mon, 29 Jun 2015 12:08:38 +0000 (15:08 +0300)]
refs #548: Names of axes intersect each other.

9 years agoImport of landcover: small bug fixes
isn [Mon, 29 Jun 2015 11:42:41 +0000 (14:42 +0300)]
Import of landcover: small bug fixes

9 years ago#refs 608 ::remarks
isn [Mon, 29 Jun 2015 10:56:40 +0000 (13:56 +0300)]
#refs 608 ::remarks

9 years agoImport/Export // API revision. p4
isn [Mon, 29 Jun 2015 09:37:10 +0000 (12:37 +0300)]
Import/Export // API revision. p4

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agoImport/Export // API revision. p3
isn [Mon, 29 Jun 2015 09:11:39 +0000 (12:11 +0300)]
Import/Export // API revision. p3

9 years agoImport/Export // API revision. p2
isn [Mon, 29 Jun 2015 08:51:28 +0000 (11:51 +0300)]
Import/Export // API revision. p2

9 years agoImport/Export // API revision. p1
isn [Mon, 29 Jun 2015 08:03:45 +0000 (11:03 +0300)]
Import/Export // API revision. p1

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #585: merge
asl [Fri, 26 Jun 2015 13:00:34 +0000 (16:00 +0300)]
refs #585: merge

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #585: split/merge implementation
asl [Fri, 26 Jun 2015 12:23:51 +0000 (15:23 +0300)]
refs #585: split/merge implementation

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #593: Split polylines, Merge polylines icons.
mkr [Fri, 26 Jun 2015 12:18:02 +0000 (15:18 +0300)]
refs #593: Split polylines, Merge polylines icons.

9 years agorefs #596: improve polyline popup menu in Object Browser.
mkr [Fri, 26 Jun 2015 12:16:43 +0000 (15:16 +0300)]
refs #596: improve polyline popup menu in Object Browser.

9 years agopatch for compilation on Linux
asl [Fri, 26 Jun 2015 09:43:26 +0000 (12:43 +0300)]
patch for compilation on Linux

9 years agocode revision
asl [Fri, 26 Jun 2015 09:37:12 +0000 (12:37 +0300)]
code revision

9 years agopatch for correct linkage to shapelib
asl [Fri, 26 Jun 2015 09:37:03 +0000 (12:37 +0300)]
patch for correct linkage to shapelib

9 years ago++ shapefil
isn [Fri, 26 Jun 2015 09:20:27 +0000 (12:20 +0300)]
++ shapefil

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agomove shapelib to sep. lib (cmake errors)
isn [Fri, 26 Jun 2015 09:17:37 +0000 (12:17 +0300)]
move shapelib to sep. lib (cmake errors)

9 years agopatch for correct compilation after merge
asl [Fri, 26 Jun 2015 08:46:54 +0000 (11:46 +0300)]
patch for correct compilation after merge

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
asl [Fri, 26 Jun 2015 08:15:42 +0000 (11:15 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

9 years ago#571 - Land Cover: calculation of Strickler coefficient BR_LAND_COVER
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

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
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

9 years agorefs #585: flag in merge operations
asl [Fri, 26 Jun 2015 08:01:48 +0000 (11:01 +0300)]
refs #585: flag in merge operations

9 years ago#571 - Land Cover: calculation of Strickler coefficient
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

9 years agominor code revision
asl [Fri, 26 Jun 2015 07:02:09 +0000 (10:02 +0300)]
minor code revision

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agoImport/Export new resources
isn [Thu, 25 Jun 2015 14:55:20 +0000 (17:55 +0300)]
Import/Export new resources

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #596, #597: redesign of HYDRO main menu: create new Image and Polyline items.
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.

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agoImport/Export new corrections
isn [Thu, 25 Jun 2015 14:45:28 +0000 (17:45 +0300)]
Import/Export new corrections

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #542: show warning, when order or priority rules are changed for geometry object...
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.

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agoImport/Export >> some minor corrections
isn [Thu, 25 Jun 2015 13:45:46 +0000 (16:45 +0300)]
Import/Export >> some minor corrections

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #569: fix remarks.
mzn [Thu, 25 Jun 2015 13:11:26 +0000 (16:11 +0300)]
refs #569: fix remarks.

9 years agopatch for correct compilation on Linux
asl [Thu, 25 Jun 2015 13:10:41 +0000 (16:10 +0300)]
patch for correct compilation on Linux

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #585: polylines operations (split/merge)
asl [Thu, 25 Jun 2015 12:36:07 +0000 (15:36 +0300)]
refs #585: polylines operations (split/merge)

9 years agoexport of landcovers to shp-polygons (draft)
isn [Thu, 25 Jun 2015 10:43:14 +0000 (13:43 +0300)]
export of landcovers to shp-polygons (draft)

9 years agoMerge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc
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

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #602: show the special error message when export case with no submersible regions.
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.

9 years ago#589: new interpolation algorithm for polylines
asl [Thu, 25 Jun 2015 06:18:29 +0000 (09:18 +0300)]
#589: new interpolation algorithm for polylines

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agoMerge 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

9 years agorefs #509: Create stream - no synchronization between object browser and input panel
mzn [Wed, 24 Jun 2015 15:48:12 +0000 (18:48 +0300)]
refs #509: Create stream - no synchronization between object browser and input panel

9 years agoresources BR_SHP_FORMAT
isn [Wed, 24 Jun 2015 15:40:02 +0000 (18:40 +0300)]
resources

9 years agonew resources; bug fixes; etc
isn [Wed, 24 Jun 2015 14:18:04 +0000 (17:18 +0300)]
new resources; bug fixes; etc

9 years agorefs #534: fix the case "3. If the only zone from the region has been selected."...
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.)

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #574: take into account the order of land covers in the "Included land covers...
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.

9 years agorefs #569: enable scalar map coloring only if the active view contains Land Covers
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

9 years agomany corrections
isn [Wed, 24 Jun 2015 12:05:39 +0000 (15:05 +0300)]
many corrections
ShapeFix on landcover-faces disabled (temporary)

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #569: improve scalar map presentation of Land Covers.
mzn [Wed, 24 Jun 2015 13:14:13 +0000 (16:14 +0300)]
refs #569: improve scalar map presentation of Land Covers.

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #573: fix regression of saving resolved conflicts on zones constructed on geomet...
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.

9 years agoImport of SHP polygons (draft)
isn [Tue, 23 Jun 2015 12:17:54 +0000 (15:17 +0300)]
Import of SHP polygons (draft)

9 years agorefs #603
isn [Wed, 24 Jun 2015 07:36:10 +0000 (10:36 +0300)]
refs #603

9 years agorefs #569: Land Covers should not be colored manually in scalar map mode
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

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agorefs #569: scalar map coloring of Land Covers (scalar bar part)
mzn [Wed, 24 Jun 2015 06:48:37 +0000 (09:48 +0300)]
refs #569: scalar map coloring of Land Covers (scalar bar part)

9 years agorefs #601: avoid using working directory as a temp directory.
mzn [Wed, 24 Jun 2015 06:33:15 +0000 (09:33 +0300)]
refs #601: avoid using working directory as a temp directory.

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
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

9 years agodraft split/merge
asl [Tue, 23 Jun 2015 14:38:17 +0000 (17:38 +0300)]
draft split/merge

9 years agorefs #578: hide geometry objects and land covers, when panels with constructed region...
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.

9 years agorefs #591: restore default Strickler coefficient value in preferences.
mkr [Tue, 23 Jun 2015 09:21:32 +0000 (12:21 +0300)]
refs #591: restore default Strickler coefficient value in preferences.

9 years agoMerge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT
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

9 years agoSHP poly 2
isn [Tue, 23 Jun 2015 07:36:25 +0000 (10:36 +0300)]
SHP poly 2