]> SALOME platform Git repositories - modules/hydro.git/log
Salome HOME
modules/hydro.git
9 years agoworkaround to improve: allow to read enbankement altitude given by a flat line BR_quadtree_20150925
Paul RASCLE [Mon, 21 Sep 2015 09:51:39 +0000 (11:51 +0200)]
workaround to improve: allow to read enbankement altitude given by a flat line

9 years agomerge BR_v14_rc
Paul RASCLE [Mon, 24 Aug 2015 13:48:59 +0000 (15:48 +0200)]
merge BR_v14_rc

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

9 years ago#refs 647
isn [Mon, 24 Aug 2015 10:41:27 +0000 (13:41 +0300)]
#refs 647

9 years agoMerge branch 'BR_v14_rc' into BR_quadtree
Paul RASCLE [Mon, 24 Aug 2015 08:17:56 +0000 (10:17 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree

9 years agorefs #640: correct width for non-georeferenced profile
asl [Fri, 21 Aug 2015 13:06:02 +0000 (16:06 +0300)]
refs #640: correct width for non-georeferenced profile

9 years agorefs #639: the button to regenerate colors
asl [Fri, 21 Aug 2015 12:23:29 +0000 (15:23 +0300)]
refs #639: the button to regenerate colors

9 years agosome housekeeping
Paul RASCLE [Thu, 13 Aug 2015 15:35:11 +0000 (17:35 +0200)]
some housekeeping

9 years agosome housekeeping on traces
Paul RASCLE [Wed, 12 Aug 2015 09:20:55 +0000 (11:20 +0200)]
some housekeeping on traces

9 years agoget altitude with GetDepthFromDistance function OK, housekeeping needed
Paul RASCLE [Wed, 12 Aug 2015 08:48:40 +0000 (10:48 +0200)]
get altitude with GetDepthFromDistance function OK, housekeeping needed

9 years agotentative utilisation ligne altitude, non disponible, probleme precision tracé ligne...
Paul RASCLE [Tue, 11 Aug 2015 12:49:18 +0000 (14:49 +0200)]
tentative utilisation ligne altitude, non disponible, probleme precision tracé ligne guide

9 years agoadd name to brep
Paul RASCLE [Mon, 10 Aug 2015 15:11:46 +0000 (17:11 +0200)]
add name to brep

9 years agopublish brep for channel debug
Paul RASCLE [Wed, 5 Aug 2015 14:38:02 +0000 (16:38 +0200)]
publish brep for channel debug

9 years agorefs #626: No warning appears during attempt splitting not intersected polylines
abk [Wed, 5 Aug 2015 14:21:08 +0000 (17:21 +0300)]
refs #626: No warning appears during attempt splitting not intersected polylines

Functionality to output the warning using the flag was created.

9 years agorefs #626: No warning appears during attempt splitting not intersected polylines
abk [Wed, 5 Aug 2015 13:32:49 +0000 (16:32 +0300)]
refs #626: No warning appears during attempt splitting not intersected polylines

The functionality to split a polyline by a tool was extended
to determine whether to display the warning about the intersection absence.
Now method 'HYDROGUI_SplitPolylinesOp::processApply' calculates corresponding flag 'isIntersected'.

9 years agochannel altitude interpolation
Paul RASCLE [Wed, 5 Aug 2015 11:30:41 +0000 (13:30 +0200)]
channel altitude interpolation

9 years agotraces bounding box
Paul RASCLE [Wed, 5 Aug 2015 08:05:40 +0000 (10:05 +0200)]
traces bounding box

9 years agomiddle z for 3D guideline
Paul RASCLE [Tue, 4 Aug 2015 16:57:35 +0000 (18:57 +0200)]
middle z for 3D guideline

9 years agochannel: projection point on guideline
Paul RASCLE [Tue, 4 Aug 2015 13:42:33 +0000 (15:42 +0200)]
channel: projection point on guideline

9 years agospecific altitude object for channel and embankment
Paul RASCLE [Mon, 3 Aug 2015 14:38:09 +0000 (16:38 +0200)]
specific altitude object for channel and embankment

9 years agoMerge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Mon, 3 Aug 2015 12:40:18 +0000 (15:40 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

9 years agoAdd polylines scenario.
mzn [Mon, 3 Aug 2015 12:39:38 +0000 (15:39 +0300)]
Add polylines scenario.

9 years agoMerge branch 'BR_v14_rc' into BR_quadtree
Paul RASCLE [Thu, 23 Jul 2015 08:57:03 +0000 (10:57 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree

9 years agomerge BR_v14_rc from origin
Paul RASCLE [Thu, 23 Jul 2015 08:54:41 +0000 (10:54 +0200)]
merge BR_v14_rc from origin

9 years agorefs #625: Fatal error as result of show split polyline
abk [Fri, 10 Jul 2015 17:35:04 +0000 (20:35 +0300)]
refs #625: Fatal error as result of show split polyline

The reasons of the error - the incorrect cuttings of a topological curve by parameters and a parameter - were corrected.

9 years agorefs #623: Fatal error as result of splitting polyline
abk [Fri, 10 Jul 2015 14:00:40 +0000 (17:00 +0300)]
refs #623: Fatal error as result of splitting polyline

The reason of the error - the incorrect cutting of a topological curve by parameters - was corrected.

9 years agorefs #628: Fatal error as result of splitting polyline without tool object
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.

9 years agoA functionality to control the conversion deflection was created.
abk [Thu, 9 Jul 2015 17:40:37 +0000 (20:40 +0300)]
A functionality to control the conversion deflection was created.

9 years agopatch for compilation on Linux
asl [Thu, 9 Jul 2015 13:29:08 +0000 (16:29 +0300)]
patch for compilation on Linux

9 years agoAlgorithms to convert 'TopoDS_Wire' object to a wire composed of B-spline edges were...
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'.

9 years agoMerge branch 'BR_v14_rc' into BR_quadtree
Paul RASCLE [Wed, 8 Jul 2015 21:37:16 +0000 (23:37 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree

9 years agocompilation gcc 4.8.4
Paul RASCLE [Wed, 8 Jul 2015 21:33:33 +0000 (23:33 +0200)]
compilation gcc 4.8.4

9 years agorefs #576: Artificial object that does not follow the polyline.
mzn [Tue, 7 Jul 2015 14:29:48 +0000 (17:29 +0300)]
refs #576: Artificial object that does not follow the polyline.

9 years agoAlgorithms to merge sections were created.
abk [Wed, 1 Jul 2015 18:21:56 +0000 (21:21 +0300)]
Algorithms to merge sections were created.

9 years agoMerge branch 'BR_v14_rc' into BR_quadtree
Paul RASCLE [Wed, 1 Jul 2015 15:01:46 +0000 (17:01 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree

9 years agoThe algorithm to split any curve by any point was fixed to rightly split the curve...
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.

9 years agoMerge branch 'BR_v14_rc' into BR_quadtree
Paul RASCLE [Tue, 30 Jun 2015 16:21:10 +0000 (18:21 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree

9 years agoThe algorithm to split any curve by any point was fixed to rightly split the curve... v1.4.2
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.

9 years agorefs #585: name is not necessary in GUI
asl [Tue, 30 Jun 2015 13:32:53 +0000 (16:32 +0300)]
refs #585: name is not necessary in GUI

9 years agoAlgorithms to cut and split each polyline section by all other polyline sections...
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.

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