Salome HOME
modules/hydro.git
8 years agoImplement automatic coloring of land cover maps 1) by colors of Strickler types selec...
mkr [Fri, 13 Nov 2015 10:10:07 +0000 (13:10 +0300)]
Implement automatic coloring of land cover maps 1) by colors of Strickler types selected during land cover map creation, or 2) by colors from Strickler table active for scalar map mode. Add a possibility to change Z order for land cover maps.

8 years agorefs #664: redesign of calculation case dialog and operation.
mkr [Thu, 12 Nov 2015 17:10:47 +0000 (20:10 +0300)]
refs #664: redesign of calculation case dialog and operation.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Thu, 12 Nov 2015 09:04:26 +0000 (12:04 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #669, #671: implementation of change land cover type operation, set default...
mkr [Thu, 12 Nov 2015 09:03:53 +0000 (12:03 +0300)]
refs #669, #671: implementation of change land cover type operation, set default Strickler type from the first selected land cover for merge and change type operations.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://gitolite3@git.salome-platform.org/modules...
asl [Thu, 12 Nov 2015 08:02:47 +0000 (11:02 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://gitolite3@git.salome-platform.org/modules/hydro.git into BR_LAND_COVER_MAP

8 years agoporting on Linux
asl [Thu, 12 Nov 2015 08:02:37 +0000 (11:02 +0300)]
porting on Linux

8 years agodebug of land cover map operations
asl [Thu, 12 Nov 2015 04:58:17 +0000 (07:58 +0300)]
debug of land cover map operations

8 years agorefs #668, #669: finalize implementation of split and merge land cover(s) operations.
mkr [Wed, 11 Nov 2015 17:59:05 +0000 (20:59 +0300)]
refs #668, #669: finalize implementation of split and merge land cover(s) operations.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Tue, 10 Nov 2015 10:02:43 +0000 (13:02 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #668: get the complete boundary of the object face as the splitting polyline.
mkr [Tue, 10 Nov 2015 10:02:17 +0000 (13:02 +0300)]
refs #668: get the complete boundary of the object face as the splitting polyline.

8 years agodebug of the land cover maps
asl [Tue, 10 Nov 2015 09:28:25 +0000 (12:28 +0300)]
debug of the land cover maps

8 years agoMerge remote-tracking branch 'origin/BR_SHP_FORMAT2' into BR_LAND_COVER_MAP
asl [Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)]
Merge remote-tracking branch 'origin/BR_SHP_FORMAT2' into BR_LAND_COVER_MAP

8 years agoloopback test. BR_SHP_FORMAT2
isn [Mon, 9 Nov 2015 16:58:36 +0000 (19:58 +0300)]
loopback test.

8 years agoMerge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_SHP_FORMAT2
isn [Mon, 9 Nov 2015 13:44:45 +0000 (16:44 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_SHP_FORMAT2

8 years agoLCM // Import/Export of SHP p.8
isn [Mon, 9 Nov 2015 09:27:28 +0000 (12:27 +0300)]
LCM // Import/Export of SHP p.8

8 years agonew operation for change land cover type
asl [Mon, 9 Nov 2015 08:36:37 +0000 (11:36 +0300)]
new operation for change land cover type

8 years agorefs #659: support of attributes in the Strickler table
asl [Mon, 9 Nov 2015 06:00:48 +0000 (09:00 +0300)]
refs #659: support of attributes in the Strickler table

8 years agoLCM // Import/Export of SHP p.7
isn [Thu, 5 Nov 2015 11:31:22 +0000 (14:31 +0300)]
LCM // Import/Export of SHP p.7

8 years agoLCM // Import/Export of SHP p.6
isn [Thu, 5 Nov 2015 09:54:26 +0000 (12:54 +0300)]
LCM // Import/Export of SHP p.6

8 years agoLCM // Import/Export of SHP p.5
isn [Tue, 3 Nov 2015 12:41:34 +0000 (15:41 +0300)]
LCM // Import/Export of SHP p.5

8 years agoLCM // Import/Export of SHP p.4
isn [Mon, 2 Nov 2015 14:41:23 +0000 (17:41 +0300)]
LCM // Import/Export of SHP p.4

8 years agoLCM // Import/Export of SHP p.3
isn [Fri, 30 Oct 2015 18:46:40 +0000 (21:46 +0300)]
LCM // Import/Export of SHP p.3

8 years agoLCM // Import/Export of SHP p.2
isn [Fri, 30 Oct 2015 13:10:59 +0000 (16:10 +0300)]
LCM // Import/Export of SHP p.2

8 years agoLCM // Import/Export of SHP p.1
isn [Mon, 26 Oct 2015 17:02:08 +0000 (20:02 +0300)]
LCM // Import/Export of SHP p.1

8 years agocode revision
asl [Mon, 26 Oct 2015 11:52:01 +0000 (14:52 +0300)]
code revision

8 years agorefs #634: check type of split polyline
asl [Mon, 26 Oct 2015 11:51:51 +0000 (14:51 +0300)]
refs #634: check type of split polyline

8 years agoland cover map assignment to the calculation case
asl [Mon, 26 Oct 2015 11:10:48 +0000 (14:10 +0300)]
land cover map assignment to the calculation case

8 years agorefs #630: polylines merge
asl [Mon, 26 Oct 2015 11:04:26 +0000 (14:04 +0300)]
refs #630: polylines merge

8 years agodocumentation is updated
asl [Mon, 26 Oct 2015 10:12:49 +0000 (13:12 +0300)]
documentation is updated

8 years agorefs #651: dump python -- functionality and test
asl [Mon, 26 Oct 2015 10:12:40 +0000 (13:12 +0300)]
refs #651: dump python -- functionality and test

8 years agorefs #613: duplicated names
asl [Mon, 26 Oct 2015 08:20:14 +0000 (11:20 +0300)]
refs #613: duplicated names

8 years agocorrect conversion pointer to int on linux
asl [Fri, 23 Oct 2015 15:38:01 +0000 (18:38 +0300)]
correct conversion pointer to int on linux

8 years agomode normalization
asl [Fri, 23 Oct 2015 15:37:50 +0000 (18:37 +0300)]
mode normalization

8 years agocode revision
asl [Fri, 23 Oct 2015 15:34:14 +0000 (18:34 +0300)]
code revision

8 years agopatch for the correct history extraction
asl [Fri, 23 Oct 2015 15:30:09 +0000 (18:30 +0300)]
patch for the correct history extraction

8 years agonew test on problem in the land cover map's local partition
asl [Fri, 23 Oct 2015 14:52:21 +0000 (17:52 +0300)]
new test on problem in the land cover map's local partition

8 years agocopyrights are updated
asl [Fri, 23 Oct 2015 07:32:13 +0000 (10:32 +0300)]
copyrights are updated

8 years agorefs #665 - #669: remove, split and merge operations are added.
mkr [Fri, 23 Oct 2015 13:07:39 +0000 (16:07 +0300)]
refs #665 - #669: remove, split and merge operations are added.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Fri, 23 Oct 2015 08:22:19 +0000 (11:22 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #653, #665 - 669: start implementation of features.
mkr [Fri, 23 Oct 2015 08:21:13 +0000 (11:21 +0300)]
refs #653, #665 - 669: start implementation of features.

8 years agocompilation on Linux
asl [Fri, 23 Oct 2015 07:18:09 +0000 (10:18 +0300)]
compilation on Linux

8 years agotest on transparent land cover map presentation
asl [Fri, 23 Oct 2015 06:21:11 +0000 (09:21 +0300)]
test on transparent land cover map presentation

8 years ago#refs 651: draft version of the test on dump land cover map to Python
asl [Fri, 23 Oct 2015 06:04:31 +0000 (09:04 +0300)]
#refs 651: draft version of the test on dump land cover map to Python

8 years agocode revision
asl [Fri, 23 Oct 2015 06:03:48 +0000 (09:03 +0300)]
code revision

8 years agoautomatic test on custom polylines and interpolation of imported shapes
asl [Fri, 23 Oct 2015 06:03:29 +0000 (09:03 +0300)]
automatic test on custom polylines and interpolation of imported shapes

8 years agorefs #627: colors of split polylines
asl [Thu, 22 Oct 2015 13:13:03 +0000 (16:13 +0300)]
refs #627: colors of split polylines

8 years agopatch on crash in old study
asl [Thu, 22 Oct 2015 10:30:49 +0000 (13:30 +0300)]
patch on crash in old study

8 years agoSIP files revision
asl [Thu, 22 Oct 2015 09:29:31 +0000 (12:29 +0300)]
SIP files revision

8 years agorefs #651: wrapping land cover map by Python
asl [Thu, 22 Oct 2015 09:29:22 +0000 (12:29 +0300)]
refs #651: wrapping land cover map by Python

8 years agotests revision
asl [Thu, 22 Oct 2015 09:28:46 +0000 (12:28 +0300)]
tests revision

8 years ago#662: updated hilight/select presentations for land covers
asl [Thu, 22 Oct 2015 06:48:17 +0000 (09:48 +0300)]
#662: updated hilight/select presentations for land covers

8 years agotest for polyline presentation
asl [Wed, 21 Oct 2015 14:25:31 +0000 (17:25 +0300)]
test for polyline presentation

8 years ago#refs 611: test on polylines extraction from the channel
asl [Wed, 21 Oct 2015 13:25:31 +0000 (16:25 +0300)]
#refs 611: test on polylines extraction from the channel

8 years agorefs #611: test for polylines extraction on immersible zone
asl [Wed, 21 Oct 2015 13:20:00 +0000 (16:20 +0300)]
refs #611: test for polylines extraction on immersible zone

8 years agorefs #611: redesign of the polylines extraction
asl [Wed, 21 Oct 2015 13:19:45 +0000 (16:19 +0300)]
refs #611: redesign of the polylines extraction

8 years agotest for channel presentation
asl [Wed, 21 Oct 2015 12:35:59 +0000 (15:35 +0300)]
test for channel presentation

8 years agorefs #624: test for split polylines
asl [Wed, 21 Oct 2015 10:43:04 +0000 (13:43 +0300)]
refs #624: test for split polylines

8 years agocorrection of automatic tests
asl [Wed, 21 Oct 2015 08:55:18 +0000 (11:55 +0300)]
correction of automatic tests

8 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP
asl [Wed, 21 Oct 2015 08:25:14 +0000 (11:25 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP

Conflicts:
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.h
src/HYDRO_tests/TestViewer.cxx

8 years agoCorrect compilation errors after merge. BR_LAND_COVER_REMOVING
mkr [Wed, 21 Oct 2015 08:22:03 +0000 (11:22 +0300)]
Correct compilation errors after merge.

8 years agoMerge branch 'BR_LAND_COVER_REMOVING' of ssh://git.salome-platform.org/modules/hydro...
mkr [Wed, 21 Oct 2015 07:57:03 +0000 (10:57 +0300)]
Merge branch 'BR_LAND_COVER_REMOVING' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_REMOVING

8 years agoRemove references to land cover object from data model and GUI in order to have a...
mkr [Wed, 21 Oct 2015 07:56:03 +0000 (10:56 +0300)]
Remove references to land cover object from data model and GUI in order to have a compilable application. Add indexes for new operations.

8 years agoLC-Import GUI-Wizard #1
isn [Tue, 20 Oct 2015 12:40:51 +0000 (15:40 +0300)]
LC-Import GUI-Wizard #1

8 years agonew names
isn [Tue, 20 Oct 2015 10:32:22 +0000 (13:32 +0300)]
new names

8 years agocorrect selection mode activation
asl [Tue, 20 Oct 2015 10:30:31 +0000 (13:30 +0300)]
correct selection mode activation

8 years agostatic qvector of color
isn [Tue, 20 Oct 2015 10:24:25 +0000 (13:24 +0300)]
static qvector of color

8 years agonew pics for tests
isn [Tue, 20 Oct 2015 10:22:54 +0000 (13:22 +0300)]
new pics for tests

8 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_REMOVING
asl [Tue, 20 Oct 2015 10:12:22 +0000 (13:12 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_REMOVING

Conflicts:
src/HYDRO_tests/TestViewer.cxx
src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
src/HYDRO_tests/test_HYDROData_LandCoverMap.h

8 years agoanother way to get colors;
isn [Tue, 20 Oct 2015 09:25:45 +0000 (12:25 +0300)]
another way to get colors;
get rid of random.h

8 years agorefs #662: the tests for land cover presentations
asl [Tue, 20 Oct 2015 09:25:18 +0000 (12:25 +0300)]
refs #662: the tests for land cover presentations

8 years agotest corrections
isn [Tue, 20 Oct 2015 08:55:03 +0000 (11:55 +0300)]
test corrections

8 years agoLCM StoreLandCovers() changes
isn [Tue, 20 Oct 2015 08:48:30 +0000 (11:48 +0300)]
LCM StoreLandCovers() changes

8 years ago#662: custom mesh for presentation
asl [Tue, 20 Oct 2015 08:35:39 +0000 (11:35 +0300)]
#662: custom mesh for presentation

8 years ago#662: test for land cover map presentation
asl [Tue, 20 Oct 2015 07:25:29 +0000 (10:25 +0300)]
#662: test for land cover map presentation

8 years agotest for lcm dbf writer
isn [Mon, 19 Oct 2015 18:08:06 +0000 (21:08 +0300)]
test for lcm dbf writer

8 years agoimport & export from DBF
isn [Mon, 19 Oct 2015 15:01:04 +0000 (18:01 +0300)]
import & export from DBF

8 years agopatch for crash in tests
asl [Mon, 19 Oct 2015 12:23:00 +0000 (15:23 +0300)]
patch for crash in tests

8 years agoMerge branch 'BR_DBF_SUPPORT' into BR_LAND_COVER_MAP
isn [Mon, 19 Oct 2015 12:19:41 +0000 (15:19 +0300)]
Merge branch 'BR_DBF_SUPPORT' into BR_LAND_COVER_MAP

8 years agomethods to get index and change Strickler type via the iterator
asl [Mon, 19 Oct 2015 12:18:11 +0000 (15:18 +0300)]
methods to get index and change Strickler type via the iterator

8 years ago#662: new presentation for the land cover map
asl [Mon, 19 Oct 2015 09:17:41 +0000 (12:17 +0300)]
#662: new presentation for the land cover map

8 years agocorrection of the compilation
asl [Mon, 19 Oct 2015 08:10:40 +0000 (11:10 +0300)]
correction of the compilation

8 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_REMOVING
asl [Mon, 19 Oct 2015 08:08:41 +0000 (11:08 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_REMOVING

Conflicts:
src/HYDROData/HYDROData_CalculationCase.cxx
src/HYDROData/HYDROData_Iterator.cxx
src/HYDROData/HYDROData_LandCover.cxx
src/HYDROData/HYDROData_LandCover.h
src/HYDROData/HYDROData_Zone.cxx

8 years agocorrection of the test window size on Windows
asl [Mon, 19 Oct 2015 06:21:01 +0000 (09:21 +0300)]
correction of the test window size on Windows

8 years agocorrection of the test window size on Linux
asl [Mon, 19 Oct 2015 06:17:51 +0000 (09:17 +0300)]
correction of the test window size on Linux

8 years agotests correction
asl [Mon, 19 Oct 2015 06:11:23 +0000 (09:11 +0300)]
tests correction

8 years agopatch for the same size on Windows/Linux
asl [Mon, 19 Oct 2015 06:06:09 +0000 (09:06 +0300)]
patch for the same size on Windows/Linux

8 years agotests on Linux
asl [Mon, 19 Oct 2015 06:00:50 +0000 (09:00 +0300)]
tests on Linux

8 years agolinear congruent method is applied for random numbers
asl [Mon, 19 Oct 2015 05:28:22 +0000 (08:28 +0300)]
linear congruent method is applied for random numbers

8 years agoadditional tests BR_DBF_SUPPORT
isn [Fri, 16 Oct 2015 19:09:08 +0000 (22:09 +0300)]
additional tests

8 years agodbf writer #2
isn [Fri, 16 Oct 2015 17:25:48 +0000 (20:25 +0300)]
dbf writer #2

8 years agodbf writer #1
isn [Fri, 16 Oct 2015 16:27:09 +0000 (19:27 +0300)]
dbf writer #1

8 years agoalways store a field type of attribute even inside internal dbf-structure
isn [Fri, 16 Oct 2015 14:26:21 +0000 (17:26 +0300)]
always store a field type of attribute even inside internal dbf-structure

8 years agoMerge branch 'BR_LAND_COVER_MAP' into BR_DBF_SUPPORT
isn [Fri, 16 Oct 2015 13:08:13 +0000 (16:08 +0300)]
Merge branch 'BR_LAND_COVER_MAP' into BR_DBF_SUPPORT

8 years agotest data have been changed
isn [Fri, 16 Oct 2015 12:58:16 +0000 (15:58 +0300)]
test data have been changed

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
isn [Fri, 16 Oct 2015 12:41:57 +0000 (15:41 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agotest_merge_faces() // circles
isn [Fri, 16 Oct 2015 12:41:28 +0000 (15:41 +0300)]
test_merge_faces() // circles

8 years agocode revision for Linux
asl [Fri, 16 Oct 2015 12:29:01 +0000 (15:29 +0300)]
code revision for Linux

8 years agotest_merge_faces() // corrections
isn [Fri, 16 Oct 2015 12:24:12 +0000 (15:24 +0300)]
test_merge_faces() // corrections

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
isn [Fri, 16 Oct 2015 11:55:40 +0000 (14:55 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agotest_merge_faces() // boxes
isn [Fri, 16 Oct 2015 11:55:15 +0000 (14:55 +0300)]
test_merge_faces() // boxes