mkr [Thu, 19 Nov 2015 11:33:07 +0000 (14:33 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
mkr [Thu, 19 Nov 2015 11:32:53 +0000 (14:32 +0300)]
refs #729, #730: fix for bugs.
isn [Thu, 19 Nov 2015 09:56:48 +0000 (12:56 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
isn [Thu, 19 Nov 2015 09:46:49 +0000 (12:46 +0300)]
refs #728
mkr [Thu, 19 Nov 2015 09:55:28 +0000 (12:55 +0300)]
Enable Apply, Apply and Close buttons, if create land cover map operation is started, when any of available polyline/face is already selected in the Object Browser/3d Viewer.
isn [Thu, 19 Nov 2015 09:35:53 +0000 (12:35 +0300)]
refs #701
mkr [Wed, 18 Nov 2015 14:49:19 +0000 (17:49 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
mkr [Wed, 18 Nov 2015 14:49:03 +0000 (17:49 +0300)]
refs #709, #710, #711: bugs fixes, synchronization between selection in Polyline/Face combo-box and Object Browser, preview for Polyline/Face selected in the combo-box within Add and Split land cover operations.
isn [Wed, 18 Nov 2015 13:18:40 +0000 (16:18 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
isn [Wed, 18 Nov 2015 10:49:56 +0000 (13:49 +0300)]
speed-up importing process of SHP + export process corrections
asl [Wed, 18 Nov 2015 09:29:18 +0000 (12:29 +0300)]
global misprinting in the word "splitted" is replaced by "split"
isn [Wed, 18 Nov 2015 08:49:02 +0000 (11:49 +0300)]
refs #718
isn [Wed, 18 Nov 2015 08:30:34 +0000 (11:30 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
isn [Wed, 18 Nov 2015 08:30:15 +0000 (11:30 +0300)]
refs #719
asl [Wed, 18 Nov 2015 07:30:10 +0000 (10:30 +0300)]
refs #716: blinking land cover map on show/hide other objects
asl [Wed, 18 Nov 2015 07:00:48 +0000 (10:00 +0300)]
tools refactoring on two parts (OCCT/QT and other products dependencies)
asl [Wed, 18 Nov 2015 06:05:16 +0000 (09:05 +0300)]
refs #717: automatic test on crash after add Strickler coefficient in GUI
asl [Wed, 18 Nov 2015 05:07:10 +0000 (08:07 +0300)]
refs #717: crash after Strickler coefficient addition
asl [Tue, 17 Nov 2015 14:52:12 +0000 (17:52 +0300)]
refs #691: the automatic test covering the bug #691
isn [Tue, 17 Nov 2015 19:13:58 +0000 (22:13 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
isn [Tue, 17 Nov 2015 13:17:20 +0000 (16:17 +0300)]
Use discretization to write non-linear borders of LCM to SHP file // p.4
mkr [Tue, 17 Nov 2015 16:36:57 +0000 (19:36 +0300)]
refs #712: show warning in GUI, if the number of land covers is not changed after split operation.
mkr [Tue, 17 Nov 2015 16:22:13 +0000 (19:22 +0300)]
refs #661: patch to enable transparency functionality for land cover map objects, set transparency precision to 2.
mkr [Tue, 17 Nov 2015 15:49:19 +0000 (18:49 +0300)]
refs #690: draw land cover map edges with gray color.
mkr [Tue, 17 Nov 2015 13:02:44 +0000 (16:02 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
isn [Tue, 17 Nov 2015 12:49:22 +0000 (15:49 +0300)]
bug #702
mkr [Tue, 17 Nov 2015 12:49:11 +0000 (15:49 +0300)]
refs #688, #689: bugs fixes.
asl [Tue, 17 Nov 2015 12:43:10 +0000 (15:43 +0300)]
refs #707: correct filtering of objects for land cover
isn [Tue, 17 Nov 2015 09:49:08 +0000 (12:49 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_MAP
isn [Tue, 17 Nov 2015 09:07:06 +0000 (12:07 +0300)]
Use discretization to write non-linear borders of LCM to SHP file // p.3
asl [Tue, 17 Nov 2015 09:24:32 +0000 (12:24 +0300)]
refs #704: the land cover map can not be colored to the global filling color via GUI command
asl [Tue, 17 Nov 2015 09:19:39 +0000 (12:19 +0300)]
refs #670: test on copy land cover map
asl [Tue, 17 Nov 2015 08:50:34 +0000 (11:50 +0300)]
patch on regression in selection mode activation
asl [Tue, 17 Nov 2015 08:26:34 +0000 (11:26 +0300)]
patch on regression in land cover map coloring and transparency
asl [Tue, 17 Nov 2015 07:32:31 +0000 (10:32 +0300)]
refs #700: the version is corrected
asl [Tue, 17 Nov 2015 07:32:16 +0000 (10:32 +0300)]
patch on the shape to support correctly the border color
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.
asl [Tue, 17 Nov 2015 06:04:09 +0000 (09:04 +0300)]
patch for correct immersible zone color in preview
asl [Tue, 17 Nov 2015 05:32:30 +0000 (08:32 +0300)]
correction of the documentation generator on Linux
asl [Tue, 17 Nov 2015 04:59:30 +0000 (07:59 +0300)]
compilation on Linux
isn [Mon, 16 Nov 2015 19:22:20 +0000 (22:22 +0300)]
Merge branch 'BR_LCM_COMP' into HEAD
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
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
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
mkr [Mon, 16 Nov 2015 16:27:20 +0000 (19:27 +0300)]
refs #687, #692 - #695: fix fatal errors.
isn [Mon, 16 Nov 2015 14:26:26 +0000 (17:26 +0300)]
possible improvement // speed up import process (SHP to LCM)
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
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
asl [Mon, 16 Nov 2015 12:55:17 +0000 (15:55 +0300)]
automatic tests are stabilized (test for dump python is commented)
isn [Mon, 16 Nov 2015 12:14:08 +0000 (15:14 +0300)]
bug fixes/improvements (678, 681, 679, etc..)
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
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.
asl [Mon, 16 Nov 2015 12:46:56 +0000 (15:46 +0300)]
correction for the name of help file
asl [Mon, 16 Nov 2015 12:11:52 +0000 (15:11 +0300)]
version is updated
asl [Mon, 16 Nov 2015 12:11:39 +0000 (15:11 +0300)]
refs #676: repairing of the documentation system and help
isn [Mon, 16 Nov 2015 12:07:03 +0000 (15:07 +0300)]
patch for bug with 0-tranparency on the non-LCM objects
isn [Mon, 16 Nov 2015 09:12:36 +0000 (12:12 +0300)]
concretions after Merge op.
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
isn [Fri, 13 Nov 2015 17:56:59 +0000 (20:56 +0300)]
new functions for python wrapping
(not tested yet)
asl [Mon, 16 Nov 2015 08:44:35 +0000 (11:44 +0300)]
#651: dump to Python of land cover map
asl [Mon, 16 Nov 2015 07:07:55 +0000 (10:07 +0300)]
patch for export telemac wrapping for Python
asl [Mon, 16 Nov 2015 06:43:18 +0000 (09:43 +0300)]
patch for bug with transparency in the neutral point
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
asl [Mon, 16 Nov 2015 04:36:48 +0000 (07:36 +0300)]
Merge branch 'BR_LCM_COMP' into BR_LAND_COVER_MAP
asl [Mon, 16 Nov 2015 04:36:04 +0000 (07:36 +0300)]
correction for reference dump test
isn [Fri, 13 Nov 2015 17:08:41 +0000 (20:08 +0300)]
isn [Fri, 13 Nov 2015 14:43:33 +0000 (17:43 +0300)]
additional checks
mkr [Fri, 13 Nov 2015 15:47:39 +0000 (18:47 +0300)]
Avoid compilation error.
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
mkr [Fri, 13 Nov 2015 15:10:45 +0000 (18:10 +0300)]
refs #661: implement a transparency feature for land cover maps.
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
isn [Fri, 13 Nov 2015 14:13:58 +0000 (17:13 +0300)]
SHP export // small correction
asl [Fri, 13 Nov 2015 13:42:59 +0000 (16:42 +0300)]
refs #651: wrapping for Python
isn [Fri, 13 Nov 2015 12:38:34 +0000 (15:38 +0300)]
corrections after merge
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
isn [Fri, 13 Nov 2015 12:30:38 +0000 (15:30 +0300)]
new iteration process in TestViewer;
new pics etc.
asl [Fri, 13 Nov 2015 11:55:23 +0000 (14:55 +0300)]
refs #651: draft version of the dump python
isn [Fri, 13 Nov 2015 11:36:04 +0000 (14:36 +0300)]
corrections
asl [Fri, 13 Nov 2015 11:44:13 +0000 (14:44 +0300)]
update of the reference data for tests
asl [Fri, 13 Nov 2015 10:58:07 +0000 (13:58 +0300)]
refs #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
isn [Fri, 13 Nov 2015 10:55:20 +0000 (13:55 +0300)]
Merge branch 'BR_LAND_COVER_MAP' into HEAD
mkr [Fri, 13 Nov 2015 10:45:12 +0000 (13:45 +0300)]
Debug of land cover map creation.
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
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.
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
isn [Fri, 13 Nov 2015 09:49:03 +0000 (12:49 +0300)]
deny to write internal/non-closed wires to the shp-file
asl [Fri, 13 Nov 2015 09:23:30 +0000 (12:23 +0300)]
refs #661: support of transparency in LCM
isn [Fri, 13 Nov 2015 08:48:13 +0000 (11:48 +0300)]
TShell cannot be disconnected; use TCompound of shells/faces instead
mkr [Thu, 12 Nov 2015 17:10:47 +0000 (20:10 +0300)]
refs #664: redesign of calculation case dialog and operation.
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
isn [Thu, 12 Nov 2015 14:41:25 +0000 (17:41 +0300)]
Remove internal edges
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
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.
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
asl [Thu, 12 Nov 2015 08:02:37 +0000 (11:02 +0300)]
porting on Linux
asl [Thu, 12 Nov 2015 04:58:17 +0000 (07:58 +0300)]
debug of land cover map 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.
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
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.
