]> SALOME platform Git repositories - modules/hydro.git/log
Salome HOME
modules/hydro.git
8 years agocompilation calibre
Paul RASCLE [Thu, 3 Dec 2015 16:10:04 +0000 (17:10 +0100)]
compilation calibre

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

8 years agorefs #762
isn [Fri, 27 Nov 2015 12:34:35 +0000 (15:34 +0300)]
refs #762

8 years agorefs #673: patch for export to telemac
asl [Fri, 27 Nov 2015 12:01:50 +0000 (15:01 +0300)]
refs #673: patch for export to telemac

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

8 years agorefs #761
isn [Fri, 27 Nov 2015 09:34:16 +0000 (12:34 +0300)]
refs #761

8 years agorefs #673: export to telemac on export of calculation case
asl [Fri, 27 Nov 2015 09:05:22 +0000 (12:05 +0300)]
refs #673: export to telemac on export of calculation case

8 years agomake importing process from shp more robust
isn [Thu, 26 Nov 2015 14:48:40 +0000 (17:48 +0300)]
make importing process from shp more robust

8 years agorefs #745
isn [Thu, 26 Nov 2015 11:54:21 +0000 (14:54 +0300)]
refs #745

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
isn [Wed, 25 Nov 2015 15:41:42 +0000 (18:41 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

Conflicts:
src/HYDROData/HYDROData_LandCoverMap.cxx

8 years agorefs #744 [another fix]
isn [Wed, 25 Nov 2015 14:17:05 +0000 (17:17 +0300)]
refs #744 [another fix]

8 years agorefs #658: display warning message "Note that in current settings the attributes...
mkr [Wed, 25 Nov 2015 14:18:35 +0000 (17:18 +0300)]
refs #658: display warning message "Note that in current settings the attributes will NOT be written", if "Write Strickler type as attribute" check box is unchecked or no attribute (empty) is chosen.

8 years agorefs #759: forbid input text into Color column during Land cover map import.
mkr [Wed, 25 Nov 2015 12:54:08 +0000 (15:54 +0300)]
refs #759: forbid input text into Color column during Land cover map import.

8 years agorefs #760: correct grammatic mistake in warning.
mkr [Wed, 25 Nov 2015 12:21:05 +0000 (15:21 +0300)]
refs #760: correct grammatic mistake in warning.

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

8 years agorefs #756: hide 'QGIS' attribute name' field in Import and Export Strickler table...
mkr [Tue, 24 Nov 2015 16:42:20 +0000 (19:42 +0300)]
refs #756: hide 'QGIS' attribute name' field in Import and Export Strickler table dialogs.

8 years agoMerge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into...
isn [Tue, 24 Nov 2015 14:54:25 +0000 (17:54 +0300)]
Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP

8 years agorefs #744 (draft)
isn [Tue, 24 Nov 2015 14:29:31 +0000 (17:29 +0300)]
refs #744 (draft)

8 years agorefs #741: increase minimum section size.
mkr [Tue, 24 Nov 2015 14:11:01 +0000 (17:11 +0300)]
refs #741: increase minimum section size.

8 years agorefs #748: fix error, when included objects are not shown during calculation case...
mkr [Tue, 24 Nov 2015 10:03:58 +0000 (13:03 +0300)]
refs #748: fix error, when included objects are not shown during calculation case creation.

8 years agoUpdate label about selected land covers after clicking on Apply button for remove...
mkr [Tue, 24 Nov 2015 09:19:00 +0000 (12:19 +0300)]
Update label about selected land covers after clicking on Apply button for remove, merge and change type operations.

8 years agorefs #732: create preview of split point.
mkr [Mon, 23 Nov 2015 17:56:02 +0000 (20:56 +0300)]
refs #732: create preview of split point.

8 years agorefs #727, #736: fix for the first bug and for the second part (Bug2) of the last...
mkr [Mon, 23 Nov 2015 14:19:27 +0000 (17:19 +0300)]
refs #727, #736: fix for the first bug and for the second part (Bug2) of the last bug.

8 years agorefs #735: fix the situation, when edited polyline requires updating without reason...
mkr [Mon, 23 Nov 2015 09:21:49 +0000 (12:21 +0300)]
refs #735: fix the situation, when edited polyline requires updating without reason for it.

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