]> SALOME platform Git repositories - modules/hydro.git/log
Salome HOME
modules/hydro.git
8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Mon, 23 Nov 2015 07:58:06 +0000 (10:58 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #741: set minimum section with for column headers.
mkr [Mon, 23 Nov 2015 07:57:50 +0000 (10:57 +0300)]
refs #741: set minimum section with for column headers.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
isn [Fri, 20 Nov 2015 09:27:36 +0000 (12:27 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #740 (p.1 + p.2)
isn [Fri, 20 Nov 2015 09:27:01 +0000 (12:27 +0300)]
refs #740 (p.1 + p.2)

8 years agorefs #610: correct processing of open new document, when create calculation case...
mkr [Fri, 20 Nov 2015 08:53:53 +0000 (11:53 +0300)]
refs #610: correct processing of open new document, when create calculation case operation is started.

8 years agorefs #728 + minor code revision
isn [Fri, 20 Nov 2015 08:50:38 +0000 (11:50 +0300)]
refs #728 + minor code revision

8 years agorefs #682, #684 - #686: create icons for land cover map operations.
mkr [Thu, 19 Nov 2015 16:32:08 +0000 (19:32 +0300)]
refs #682, #684 - #686: create icons for land cover map operations.

8 years agorefs #609: simplify removing rows from tables.
mkr [Thu, 19 Nov 2015 14:44:48 +0000 (17:44 +0300)]
refs #609: simplify removing rows from tables.

8 years agorefs #697 (p.1)
isn [Thu, 19 Nov 2015 13:07:42 +0000 (16:07 +0300)]
refs #697 (p.1)

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
mkr [Thu, 19 Nov 2015 14:02:08 +0000 (17:02 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #734: correct construction of name for the polyline created as a result of split...
mkr [Thu, 19 Nov 2015 14:01:47 +0000 (17:01 +0300)]
refs #734: correct construction of name for the polyline created as a result of split operation.

8 years agorefs #724
isn [Thu, 19 Nov 2015 12:24:29 +0000 (15:24 +0300)]
refs #724

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

8 years agorefs #725
isn [Thu, 19 Nov 2015 11:41:06 +0000 (14:41 +0300)]
refs #725

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agorefs #729, #730: fix for bugs.
mkr [Thu, 19 Nov 2015 11:32:53 +0000 (14:32 +0300)]
refs #729, #730: fix for bugs.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agorefs #728
isn [Thu, 19 Nov 2015 09:46:49 +0000 (12:46 +0300)]
refs #728

8 years agoEnable Apply, Apply and Close buttons, if create land cover map operation is started...
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.

8 years agorefs #701
isn [Thu, 19 Nov 2015 09:35:53 +0000 (12:35 +0300)]
refs #701

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agorefs #709, #710, #711: bugs fixes, synchronization between selection in Polyline...
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.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agospeed-up importing process of SHP + export process corrections
isn [Wed, 18 Nov 2015 10:49:56 +0000 (13:49 +0300)]
speed-up importing process of SHP + export process corrections

8 years agoglobal misprinting in the word "splitted" is replaced by "split"
asl [Wed, 18 Nov 2015 09:29:18 +0000 (12:29 +0300)]
global misprinting in the word "splitted" is replaced by "split"

8 years agorefs #718
isn [Wed, 18 Nov 2015 08:49:02 +0000 (11:49 +0300)]
refs #718

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agorefs #719
isn [Wed, 18 Nov 2015 08:30:15 +0000 (11:30 +0300)]
refs #719

8 years agorefs #716: blinking land cover map on show/hide other objects
asl [Wed, 18 Nov 2015 07:30:10 +0000 (10:30 +0300)]
refs #716: blinking land cover map on show/hide other objects

8 years agotools refactoring on two parts (OCCT/QT and other products dependencies)
asl [Wed, 18 Nov 2015 07:00:48 +0000 (10:00 +0300)]
tools refactoring on two parts (OCCT/QT and other products dependencies)

8 years agorefs #717: automatic test on crash after add Strickler coefficient in GUI
asl [Wed, 18 Nov 2015 06:05:16 +0000 (09:05 +0300)]
refs #717: automatic test on crash after add Strickler coefficient in GUI

8 years agorefs #717: crash after Strickler coefficient addition
asl [Wed, 18 Nov 2015 05:07:10 +0000 (08:07 +0300)]
refs #717: crash after Strickler coefficient addition

8 years agorefs #691: the automatic test covering the bug #691
asl [Tue, 17 Nov 2015 14:52:12 +0000 (17:52 +0300)]
refs #691: the automatic test covering the bug #691

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agoUse discretization to write non-linear borders of LCM to SHP file // p.4
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

8 years agorefs #712: show warning in GUI, if the number of land covers is not changed after...
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.

8 years agorefs #661: patch to enable transparency functionality for land cover map objects...
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.

8 years agorefs #690: draw land cover map edges with gray color.
mkr [Tue, 17 Nov 2015 15:49:19 +0000 (18:49 +0300)]
refs #690: draw land cover map edges with gray color.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
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

8 years agobug #702
isn [Tue, 17 Nov 2015 12:49:22 +0000 (15:49 +0300)]
bug #702

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 #707: correct filtering of objects for land cover
asl [Tue, 17 Nov 2015 12:43:10 +0000 (15:43 +0300)]
refs #707: correct filtering of objects for land cover

8 years agoMerge remote-tracking branch 'remotes/origin/BR_LAND_COVER_MAP' into BR_LAND_COVER_MAP
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

8 years agoUse discretization to write non-linear borders of LCM to SHP file // p.3
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

8 years agorefs #704: the land cover map can not be colored to the global filling color via...
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

8 years agorefs #670: test on copy land cover map
asl [Tue, 17 Nov 2015 09:19:39 +0000 (12:19 +0300)]
refs #670: test on copy land cover map

8 years agopatch on regression in selection mode activation
asl [Tue, 17 Nov 2015 08:50:34 +0000 (11:50 +0300)]
patch on regression in selection mode activation

8 years agopatch on regression in land cover map coloring and transparency
asl [Tue, 17 Nov 2015 08:26:34 +0000 (11:26 +0300)]
patch on regression in land cover map coloring and transparency

8 years agorefs #700: the version is corrected
asl [Tue, 17 Nov 2015 07:32:31 +0000 (10:32 +0300)]
refs #700: the version is corrected

8 years agopatch on the shape to support correctly the border color
asl [Tue, 17 Nov 2015 07:32:16 +0000 (10:32 +0300)]
patch on the shape to support correctly the border color

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