]>
SALOME platform Git repositories - modules/hydro.git/log
abk [Fri, 10 Jul 2015 11:00:28 +0000 (14:00 +0300)]
refs #628: Fatal error as result of splitting polyline without tool object
The split algorithms were changed to do not perform the splitting if:
- the polyline is absent during the split by a point;
- one of the polylines is absent during the split of a polyline by a tool;
- less than two polylines are present during the split of polylines by each other.
abk [Thu, 9 Jul 2015 17:40:37 +0000 (20:40 +0300)]
A functionality to control the conversion deflection was created.
asl [Thu, 9 Jul 2015 13:29:08 +0000 (16:29 +0300)]
patch for compilation on Linux
abk [Tue, 7 Jul 2015 12:17:54 +0000 (15:17 +0300)]
Algorithms to convert 'TopoDS_Wire' object to a wire composed of B-spline edges were created.
An automatic conversion of each complex polyline to polyline composed of spline section was created based on these algorithms.
The deflection of the conversion is uncontrolled now.
The data structures and the algorithms to work with the topological curves were formed as class 'HYDROData_TopoCurve'.
mzn [Tue, 7 Jul 2015 14:29:48 +0000 (17:29 +0300)]
refs #576: Artificial object that does not follow the polyline.
abk [Wed, 1 Jul 2015 18:21:56 +0000 (21:21 +0300)]
Algorithms to merge sections were created.
abk [Tue, 30 Jun 2015 17:16:09 +0000 (20:16 +0300)]
The algorithm to split any curve by any point was fixed to rightly split the curve if the curve is closed and the point is a vertex of the curve.
abk [Tue, 30 Jun 2015 14:47:08 +0000 (17:47 +0300)]
The algorithm to split any curve by any point was fixed to rightly split the curve in non vertex point if the curve is closed.
asl [Tue, 30 Jun 2015 13:32:53 +0000 (16:32 +0300)]
refs #585: name is not necessary in GUI
abk [Tue, 30 Jun 2015 10:28:19 +0000 (13:28 +0300)]
Algorithms to cut and split each polyline section by all other polyline sections were written.
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
isn [Tue, 30 Jun 2015 11:55:53 +0000 (14:55 +0300)]
Deny to create landcovers on the self-intersection wires/polyline
stv [Tue, 30 Jun 2015 11:31:27 +0000 (14:31 +0300)]
#612 - The order of extracted polylines in object browser is unexpected
isn [Tue, 30 Jun 2015 10:46:46 +0000 (13:46 +0300)]
refs #619
isn [Tue, 30 Jun 2015 10:34:13 +0000 (13:34 +0300)]
refs #618
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
isn [Tue, 30 Jun 2015 09:15:35 +0000 (12:15 +0300)]
Import of shapefile - small improvements
asl [Tue, 30 Jun 2015 09:13:02 +0000 (12:13 +0300)]
patch for crash
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
isn [Tue, 30 Jun 2015 08:50:46 +0000 (11:50 +0300)]
Import of shapefile - bug fixes; #refs 614
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
mzn [Tue, 30 Jun 2015 07:24:28 +0000 (10:24 +0300)]
refs #504: color of boundary polyline.
asl [Tue, 30 Jun 2015 06:44:25 +0000 (09:44 +0300)]
#refs 585: the method IsCustom()
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
isn [Mon, 29 Jun 2015 15:30:35 +0000 (18:30 +0300)]
Import of landcover -- use fclass2d to determine outer wires and holes
mzn [Mon, 29 Jun 2015 15:31:58 +0000 (18:31 +0300)]
refs #569: add warning if the user try to delete all tables
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
asl [Mon, 29 Jun 2015 13:29:00 +0000 (16:29 +0300)]
refs #585: correct tool polyline filling
abk [Mon, 29 Jun 2015 13:18:57 +0000 (16:18 +0300)]
Algorithms to cut any closed section at any point were written.
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
abk [Fri, 26 Jun 2015 12:26:49 +0000 (15:26 +0300)]
Algorithms to split open section by a point were written.
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
asl [Mon, 29 Jun 2015 12:12:56 +0000 (15:12 +0300)]
#585: patch for names for result
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
isn [Mon, 29 Jun 2015 12:10:17 +0000 (15:10 +0300)]
Import of landcover: small bug fixes #2
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