Paul RASCLE [Wed, 24 Jun 2015 08:30:22 +0000 (10:30 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree
isn [Wed, 24 Jun 2015 07:36:10 +0000 (10:36 +0300)]
refs #603
mzn [Wed, 24 Jun 2015 07:05:00 +0000 (10:05 +0300)]
refs #569: Land Covers should not be colored manually in scalar map mode
mzn [Wed, 24 Jun 2015 06:49:02 +0000 (09:49 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Wed, 24 Jun 2015 06:48:37 +0000 (09:48 +0300)]
refs #569: scalar map coloring of Land Covers (scalar bar part)
mzn [Wed, 24 Jun 2015 06:33:15 +0000 (09:33 +0300)]
refs #601: avoid using working directory as a temp directory.
mkr [Tue, 23 Jun 2015 13:01:21 +0000 (16:01 +0300)]
refs #578: hide geometry objects and land covers, when panels with constructed regions inside calculation case dialog are active, only generated zones are shown in the viewer in this case.
mkr [Tue, 23 Jun 2015 09:21:32 +0000 (12:21 +0300)]
refs #591: restore default Strickler coefficient value in preferences.
mkr [Tue, 23 Jun 2015 08:24:18 +0000 (11:24 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mkr [Tue, 23 Jun 2015 08:23:59 +0000 (11:23 +0300)]
refs #594: create preview for land covers.
isn [Tue, 23 Jun 2015 07:41:13 +0000 (10:41 +0300)]
refs #598
refs #595
asl [Mon, 22 Jun 2015 13:41:44 +0000 (16:41 +0300)]
patch for correct compilation on Linux
asl [Mon, 22 Jun 2015 12:37:13 +0000 (15:37 +0300)]
refs #595: error in split/merge polylines GUI
asl [Mon, 22 Jun 2015 12:14:09 +0000 (15:14 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Mon, 22 Jun 2015 11:54:56 +0000 (14:54 +0300)]
refs #567: add "POLYLINES" partition and modified icon for Land Cover object.
mzn [Mon, 22 Jun 2015 11:15:49 +0000 (14:15 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
mzn [Mon, 22 Jun 2015 11:15:42 +0000 (14:15 +0300)]
refs #567: HYDROData_LandCover::buildShape() method returns the error message now.
mkr [Mon, 22 Jun 2015 10:43:39 +0000 (13:43 +0300)]
refs #575, #580: display the information about the chosen land cover objects in the last column of data browser, resolve Strickler types conflicts for zones constructed on land covers, add static labels on two last pages of the dialog.
asl [Mon, 22 Jun 2015 08:59:06 +0000 (11:59 +0300)]
refs #588
asl [Mon, 22 Jun 2015 08:57:55 +0000 (11:57 +0300)]
refs #563: Strickler table kind is published in SIP
mzn [Mon, 22 Jun 2015 08:54:29 +0000 (11:54 +0300)]
refs #567: let the land covers to be recognized as reference objects of a cc zone
asl [Mon, 22 Jun 2015 07:02:35 +0000 (10:02 +0300)]
update of the documentation
asl [Mon, 22 Jun 2015 05:40:39 +0000 (08:40 +0300)]
patch for correct calculation
asl [Mon, 22 Jun 2015 05:16:15 +0000 (08:16 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
Conflicts:
src/HYDROGUI/HYDROGUI_CalculationOp.cxx
src/HYDROGUI/HYDROGUI_CalculationOp.h
asl [Mon, 22 Jun 2015 05:08:36 +0000 (08:08 +0300)]
Merge remote-tracking branch 'origin/BR_SINUSX_FORMAT' into BR_v14_rc
mkr [Fri, 19 Jun 2015 17:58:20 +0000 (20:58 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mkr [Fri, 19 Jun 2015 17:58:06 +0000 (20:58 +0300)]
refs #575, #580: zones preview and combo-box to choose the land cover and, therefore, the Strickler type defined for it.
mzn [Fri, 19 Jun 2015 14:21:11 +0000 (17:21 +0300)]
refs #570: documentation update.
asl [Fri, 19 Jun 2015 13:25:38 +0000 (16:25 +0300)]
patch for default zone colors on Linux
mzn [Fri, 19 Jun 2015 12:41:46 +0000 (15:41 +0300)]
refs #570: fix priority queue.
mkr [Fri, 19 Jun 2015 12:22:04 +0000 (15:22 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mkr [Fri, 19 Jun 2015 11:43:10 +0000 (14:43 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mzn [Fri, 19 Jun 2015 09:53:16 +0000 (12:53 +0300)]
refs #570: Land Cover: the partition algorithm (further implementation)
isn [Fri, 19 Jun 2015 09:05:38 +0000 (12:05 +0300)]
sinusX p.10 // new resources
isn [Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)]
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
isn [Fri, 19 Jun 2015 08:19:43 +0000 (11:19 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
Conflicts:
src/HYDROGUI/HYDROGUI_ObjListBox.cxx
isn [Fri, 19 Jun 2015 08:16:52 +0000 (11:16 +0300)]
ObjListBox // small corrections
asl [Fri, 19 Jun 2015 08:15:24 +0000 (11:15 +0300)]
refs #585: preview in split operation
asl [Fri, 19 Jun 2015 06:24:52 +0000 (09:24 +0300)]
Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
asl [Fri, 19 Jun 2015 06:24:44 +0000 (09:24 +0300)]
refs #585: gui for polyline operations
isn [Thu, 18 Jun 2015 15:32:14 +0000 (18:32 +0300)]
sinusX p.9 // Export of profile
mkr [Thu, 18 Jun 2015 14:43:09 +0000 (17:43 +0300)]
refs #580: further GUI development.
isn [Thu, 18 Jun 2015 14:38:04 +0000 (17:38 +0300)]
sinusX p.8 // Export of polyXY
mzn [Thu, 18 Jun 2015 14:16:42 +0000 (17:16 +0300)]
refs #570: Land Cover: the partition algorithm (draft)
isn [Thu, 18 Jun 2015 13:54:58 +0000 (16:54 +0300)]
sinusX p.7 // Export of bathy
isn [Thu, 18 Jun 2015 12:21:07 +0000 (15:21 +0300)]
sinusX p.6 // Export // GUI Part // moving to new listbox
isn [Thu, 18 Jun 2015 11:38:25 +0000 (14:38 +0300)]
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
isn [Thu, 18 Jun 2015 11:35:23 +0000 (14:35 +0300)]
Allowing to add multiple object-types to ObjListBox
isn [Thu, 18 Jun 2015 11:13:41 +0000 (14:13 +0300)]
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
Conflicts:
src/HYDROGUI/HYDROGUI_Operations.cxx
isn [Thu, 18 Jun 2015 08:52:35 +0000 (11:52 +0300)]
sinusX p.5 (Export / GUI Part)
asl [Thu, 18 Jun 2015 10:45:33 +0000 (13:45 +0300)]
#refs 585: polylines operations GUI
mkr [Thu, 18 Jun 2015 09:32:38 +0000 (12:32 +0300)]
refs #580: modifications in data model and GUI to work with land cover regions and zones.
asl [Thu, 18 Jun 2015 06:03:43 +0000 (09:03 +0300)]
refs #585: draft version of GUI for polylines operations
isn [Wed, 17 Jun 2015 12:52:07 +0000 (15:52 +0300)]
compilation errors
isn [Wed, 17 Jun 2015 12:43:42 +0000 (15:43 +0300)]
Merge branch 'BR_SINUSX_FORMAT' of ssh://git.salome-platform.org/modules/hydro into BR_SINUSX_FORMAT
Conflicts:
src/HYDROData/HYDROData_SinusX.cxx
isn [Wed, 17 Jun 2015 11:19:48 +0000 (14:19 +0300)]
small corrections
isn [Wed, 17 Jun 2015 11:19:48 +0000 (14:19 +0300)]
sinusX p.4
isn [Wed, 17 Jun 2015 08:48:48 +0000 (11:48 +0300)]
sinusX p.3
isn [Tue, 16 Jun 2015 16:55:33 +0000 (19:55 +0300)]
sinusX p.2
isn [Tue, 16 Jun 2015 11:57:10 +0000 (14:57 +0300)]
sinusX p.1
mzn [Tue, 16 Jun 2015 11:15:42 +0000 (14:15 +0300)]
refs #524: create data owner in a right way.
Paul RASCLE [Tue, 16 Jun 2015 09:19:37 +0000 (11:19 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree
asl [Tue, 16 Jun 2015 09:04:34 +0000 (12:04 +0300)]
patch for correct installation of XML files
Paul RASCLE [Mon, 15 Jun 2015 15:36:52 +0000 (17:36 +0200)]
Merge branch 'BR_v14_rc' into BR_quadtree
asl [Mon, 15 Jun 2015 14:24:57 +0000 (17:24 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
asl [Mon, 15 Jun 2015 14:24:10 +0000 (17:24 +0300)]
update of the documentation
mkr [Mon, 15 Jun 2015 14:10:17 +0000 (17:10 +0300)]
refs #568: correct margin and spacing.
asl [Mon, 15 Jun 2015 12:23:28 +0000 (15:23 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
mkr [Mon, 15 Jun 2015 12:18:31 +0000 (15:18 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mkr [Mon, 15 Jun 2015 12:18:07 +0000 (15:18 +0300)]
refs #568: use ordered list view with selection synchronized with object browser to define a set of polylines for constructed land cover.
asl [Mon, 15 Jun 2015 12:02:23 +0000 (15:02 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
asl [Mon, 15 Jun 2015 09:47:54 +0000 (12:47 +0300)]
correction of compilation on Windows
mzn [Mon, 15 Jun 2015 09:19:32 +0000 (12:19 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mzn [Mon, 15 Jun 2015 09:19:05 +0000 (12:19 +0300)]
refs #567: change buildShape() method.
asl [Mon, 15 Jun 2015 09:14:15 +0000 (12:14 +0300)]
porting on Linux
mkr [Mon, 15 Jun 2015 08:59:41 +0000 (11:59 +0300)]
refs #568: fill in Strickler table combo-box with with names of all different Strickler types defined in the model.
mkr [Mon, 15 Jun 2015 07:59:09 +0000 (10:59 +0300)]
refs #560: correct dialog title for export Strickler table operation.
asl [Mon, 15 Jun 2015 07:57:19 +0000 (10:57 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
Conflicts:
src/HYDROData/HYDROData_CalculationCase.cxx
asl [Mon, 15 Jun 2015 07:56:41 +0000 (10:56 +0300)]
Merge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc
mkr [Thu, 11 Jun 2015 14:56:38 +0000 (17:56 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
mkr [Thu, 11 Jun 2015 14:56:06 +0000 (17:56 +0300)]
refs #573, #574: implementation of ordered list widget and a table to define priorities for land covers.
mzn [Thu, 11 Jun 2015 13:19:50 +0000 (16:19 +0300)]
refs #567, 569: build face, coloring.
isn [Thu, 11 Jun 2015 08:29:33 +0000 (11:29 +0300)]
refs #579
asl [Thu, 11 Jun 2015 05:48:28 +0000 (08:48 +0300)]
correct documentation installation
asl [Thu, 11 Jun 2015 05:45:05 +0000 (08:45 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
asl [Thu, 11 Jun 2015 05:44:45 +0000 (08:44 +0300)]
draft documentation
mzn [Wed, 10 Jun 2015 13:33:49 +0000 (16:33 +0300)]
refs #567: further implementation of the data object.
stv [Wed, 10 Jun 2015 11:09:30 +0000 (14:09 +0300)]
refs #560: Strickler table: import/export
mkr [Tue, 9 Jun 2015 16:29:17 +0000 (19:29 +0300)]
refs #573, #574: fill in ordered list widget on Land Cover panel with land covers data model objects, include/exclude land covers and change its order.
mkr [Tue, 9 Jun 2015 13:31:45 +0000 (16:31 +0300)]
refs #573, #574: drafts of Land Cover and Land Covers Partition panels; Strickler table definition (select, save and restore) for the calculation case; definition of Auto or Manual mode to set a priority for included land covers.
mzn [Tue, 9 Jun 2015 11:59:53 +0000 (14:59 +0300)]
refs #559: Zones in Object Browser have not 'eyes' to show/hide them.
mzn [Tue, 9 Jun 2015 08:25:15 +0000 (11:25 +0300)]
refs #524: fix selection issues.
isn [Mon, 8 Jun 2015 12:01:25 +0000 (15:01 +0300)]
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
isn [Tue, 2 Jun 2015 14:15:02 +0000 (17:15 +0300)]
import/export of shp-files (draft)
mzn [Mon, 8 Jun 2015 09:33:41 +0000 (12:33 +0300)]
refs #578: hide included objects on the last step of the wizard.
mkr [Mon, 8 Jun 2015 09:13:47 +0000 (12:13 +0300)]
refs #568: Land Cover: a draft of data model and implementation of dialog box and operation (GUI).
mzn [Mon, 8 Jun 2015 07:19:20 +0000 (10:19 +0300)]
refs #524: fix bugs
mkr [Thu, 4 Jun 2015 12:23:09 +0000 (15:23 +0300)]
refs #562: add default Strickler coefficient into HYDRO module preferencies, implement duplicate operation for Strickler table objects.
Paul RASCLE [Thu, 4 Jun 2015 10:02:26 +0000 (12:02 +0200)]
merge master 2015/06/04
mkr [Thu, 4 Jun 2015 09:18:17 +0000 (12:18 +0300)]
refs #562: GUI to import/modify Strickler table objects.
