Salome HOME
modules/hydro.git
8 years agorefs #688, #689: bugs fixes.
mkr [Tue, 17 Nov 2015 12:49:11 +0000 (15:49 +0300)]
refs #688, #689: bugs fixes.

8 years agorefs #687, #692 - #695: customize enable/disable state of LCM action on create/open...
mkr [Tue, 17 Nov 2015 07:30:43 +0000 (10:30 +0300)]
refs #687, #692 - #695: customize enable/disable state of LCM action on create/open a study.

8 years agopatch for correct immersible zone color in preview
asl [Tue, 17 Nov 2015 06:04:09 +0000 (09:04 +0300)]
patch for correct immersible zone color in preview

8 years agocorrection of the documentation generator on Linux
asl [Tue, 17 Nov 2015 05:32:30 +0000 (08:32 +0300)]
correction of the documentation generator on Linux

8 years agocompilation on Linux
asl [Tue, 17 Nov 2015 04:59:30 +0000 (07:59 +0300)]
compilation on Linux

8 years agoMerge branch 'BR_LCM_COMP' into HEAD
isn [Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)]
Merge branch 'BR_LCM_COMP' into HEAD

8 years agoUse discretization to write non-linear borders of LCM to SHP file // p.2 BR_LCM_COMP
isn [Mon, 16 Nov 2015 18:29:39 +0000 (21:29 +0300)]
Use discretization to write non-linear borders of LCM to SHP file // p.2

8 years agoUse discretization to write non-linear borders of LCM to SHP file // p.1
isn [Mon, 16 Nov 2015 18:13:45 +0000 (21:13 +0300)]
Use discretization to write non-linear borders of LCM to SHP file // p.1

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Mon, 16 Nov 2015 16:27:37 +0000 (19:27 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #687, #692 - #695: fix fatal errors.
mkr [Mon, 16 Nov 2015 16:27:20 +0000 (19:27 +0300)]
refs #687, #692 - #695: fix fatal errors.

8 years agopossible improvement // speed up import process (SHP to LCM)
isn [Mon, 16 Nov 2015 14:26:26 +0000 (17:26 +0300)]
possible improvement // speed up import process (SHP to LCM)

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

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
asl [Mon, 16 Nov 2015 12:55:44 +0000 (15:55 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agoautomatic tests are stabilized (test for dump python is commented)
asl [Mon, 16 Nov 2015 12:55:17 +0000 (15:55 +0300)]
automatic tests are stabilized (test for dump python is commented)

8 years agobug fixes/improvements (678, 681, 679, etc..)
isn [Mon, 16 Nov 2015 12:14:08 +0000 (15:14 +0300)]
bug fixes/improvements (678, 681, 679, etc..)

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Mon, 16 Nov 2015 12:50:32 +0000 (15:50 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #669, #677: selection of land covers in extended mode without pressing Shift...
mkr [Mon, 16 Nov 2015 12:50:03 +0000 (15:50 +0300)]
refs #669, #677: selection of land covers in extended mode without pressing Shift/Ctrl buttons, fix bug about label of land cover maps sub-tree in the Object Browser.

8 years agocorrection for the name of help file
asl [Mon, 16 Nov 2015 12:46:56 +0000 (15:46 +0300)]
correction for the name of help file

8 years agoversion is updated
asl [Mon, 16 Nov 2015 12:11:52 +0000 (15:11 +0300)]
version is updated

8 years agorefs #676: repairing of the documentation system and help
asl [Mon, 16 Nov 2015 12:11:39 +0000 (15:11 +0300)]
refs #676: repairing of the documentation system and help

8 years agopatch for bug with 0-tranparency on the non-LCM objects
isn [Mon, 16 Nov 2015 12:07:03 +0000 (15:07 +0300)]
patch for bug with 0-tranparency on the non-LCM objects

8 years agoconcretions after Merge op.
isn [Mon, 16 Nov 2015 09:12:36 +0000 (12:12 +0300)]
concretions after Merge op.

8 years agoMerge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP
isn [Mon, 16 Nov 2015 09:07:07 +0000 (12:07 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP

Conflicts:
src/HYDROData/HYDROData_LandCoverMap.h

8 years agonew functions for python wrapping
isn [Fri, 13 Nov 2015 17:56:59 +0000 (20:56 +0300)]
new functions for python wrapping
(not tested yet)

8 years ago#651: dump to Python of land cover map
asl [Mon, 16 Nov 2015 08:44:35 +0000 (11:44 +0300)]
#651: dump to Python of land cover map

8 years agopatch for export telemac wrapping for Python
asl [Mon, 16 Nov 2015 07:07:55 +0000 (10:07 +0300)]
patch for export telemac wrapping for Python

8 years agopatch for bug with transparency in the neutral point
asl [Mon, 16 Nov 2015 06:43:18 +0000 (09:43 +0300)]
patch for bug with transparency in the neutral point

8 years agoMerge remote-tracking branch 'origin/BR_LCM_COMP' into BR_LAND_COVER_MAP
asl [Mon, 16 Nov 2015 04:37:06 +0000 (07:37 +0300)]
Merge remote-tracking branch 'origin/BR_LCM_COMP' into BR_LAND_COVER_MAP

8 years agoMerge branch 'BR_LCM_COMP' into BR_LAND_COVER_MAP
asl [Mon, 16 Nov 2015 04:36:48 +0000 (07:36 +0300)]
Merge branch 'BR_LCM_COMP' into BR_LAND_COVER_MAP

8 years agocorrection for reference dump test
asl [Mon, 16 Nov 2015 04:36:04 +0000 (07:36 +0300)]
correction for reference dump test

8 years agoMerge commit '9dd90968eb8ad86e7e6ae67f48bb6110bd4ffbdc' into BR_LCM_COMP
isn [Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)]
Merge commit '9dd90968eb8ad86e7e6ae67f48bb6110bd4ffbdc' into BR_LCM_COMP

8 years agoadditional checks
isn [Fri, 13 Nov 2015 14:43:33 +0000 (17:43 +0300)]
additional checks

8 years agoAvoid compilation error.
mkr [Fri, 13 Nov 2015 15:47:39 +0000 (18:47 +0300)]
Avoid compilation error.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Fri, 13 Nov 2015 15:11:09 +0000 (18:11 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #661: implement a transparency feature for land cover maps.
mkr [Fri, 13 Nov 2015 15:10:45 +0000 (18:10 +0300)]
refs #661: implement a transparency feature for land cover maps.

8 years agorefs #673: Strickler coefficient should be written for Telemac instead of Strickler...
asl [Fri, 13 Nov 2015 14:36:02 +0000 (17:36 +0300)]
refs #673: Strickler coefficient should be written for Telemac instead of Strickler type

8 years agoSHP export // small correction
isn [Fri, 13 Nov 2015 14:13:58 +0000 (17:13 +0300)]
SHP export // small correction

8 years agorefs #651: wrapping for Python
asl [Fri, 13 Nov 2015 13:42:59 +0000 (16:42 +0300)]
refs #651: wrapping for Python

8 years agocorrections after merge
isn [Fri, 13 Nov 2015 12:38:34 +0000 (15:38 +0300)]
corrections after merge

8 years agoMerge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP
isn [Fri, 13 Nov 2015 12:35:35 +0000 (15:35 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LCM_COMP

8 years agonew iteration process in TestViewer;
isn [Fri, 13 Nov 2015 12:30:38 +0000 (15:30 +0300)]
new iteration process in TestViewer;
new pics etc.

8 years agorefs #651: draft version of the dump python
asl [Fri, 13 Nov 2015 11:55:23 +0000 (14:55 +0300)]
refs #651: draft version of the dump python

8 years agocorrections
isn [Fri, 13 Nov 2015 11:36:04 +0000 (14:36 +0300)]
corrections

8 years agoupdate of the reference data for tests
asl [Fri, 13 Nov 2015 11:44:13 +0000 (14:44 +0300)]
update of the reference data for tests

8 years agorefs #673: test for export to Telemac
asl [Fri, 13 Nov 2015 10:58:07 +0000 (13:58 +0300)]
refs #673: test for export to Telemac

8 years agorefs #673: test for export to Telemac
asl [Fri, 13 Nov 2015 10:57:46 +0000 (13:57 +0300)]
refs #673: test for export to Telemac

8 years agoMerge branch 'BR_LAND_COVER_MAP' into HEAD
isn [Fri, 13 Nov 2015 10:55:20 +0000 (13:55 +0300)]
Merge branch 'BR_LAND_COVER_MAP' into HEAD

8 years agoDebug of land cover map creation.
mkr [Fri, 13 Nov 2015 10:45:12 +0000 (13:45 +0300)]
Debug of land cover map creation.

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

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 agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
isn [Fri, 13 Nov 2015 09:52:33 +0000 (12:52 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into HEAD

Conflicts:
src/HYDROData/HYDROData_LandCoverMap.cxx
src/HYDROData/HYDROData_LandCoverMap.h

8 years agodeny to write internal/non-closed wires to the shp-file
isn [Fri, 13 Nov 2015 09:49:03 +0000 (12:49 +0300)]
deny to write internal/non-closed wires to the shp-file

8 years agorefs #661: support of transparency in LCM
asl [Fri, 13 Nov 2015 09:23:30 +0000 (12:23 +0300)]
refs #661: support of transparency in LCM

8 years agoTShell cannot be disconnected; use TCompound of shells/faces instead
isn [Fri, 13 Nov 2015 08:48:13 +0000 (11:48 +0300)]
TShell cannot be disconnected; use TCompound of shells/faces instead

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...
isn [Thu, 12 Nov 2015 14:46:12 +0000 (17:46 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into HEAD

8 years agoRemove internal edges
isn [Thu, 12 Nov 2015 14:41:25 +0000 (17:41 +0300)]
Remove internal edges

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