Salome HOME
modules/hydro.git
9 years agorefs #567: add "POLYLINES" partition and modified icon for Land Cover object.
mzn [Mon, 22 Jun 2015 11:54:56 +0000 (14:54 +0300)]
refs #567: add "POLYLINES" partition and modified icon for Land Cover object.

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

9 years agorefs #567: HYDROData_LandCover::buildShape() method returns the error message now.
mzn [Mon, 22 Jun 2015 11:15:42 +0000 (14:15 +0300)]
refs #567: HYDROData_LandCover::buildShape() method returns the error message now.

9 years agorefs #575, #580: display the information about the chosen land cover objects in the...
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.

9 years agorefs #567: let the land covers to be recognized as reference objects of a cc zone
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

9 years agoupdate of the documentation
asl [Mon, 22 Jun 2015 07:02:35 +0000 (10:02 +0300)]
update of the documentation

9 years agopatch for correct calculation
asl [Mon, 22 Jun 2015 05:40:39 +0000 (08:40 +0300)]
patch for correct calculation

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
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

9 years agoMerge remote-tracking branch 'origin/BR_SINUSX_FORMAT' into BR_v14_rc
asl [Mon, 22 Jun 2015 05:08:36 +0000 (08:08 +0300)]
Merge remote-tracking branch 'origin/BR_SINUSX_FORMAT' into BR_v14_rc

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

9 years agorefs #575, #580: zones preview and combo-box to choose the land cover and, therefore...
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.

9 years agorefs #570: documentation update.
mzn [Fri, 19 Jun 2015 14:21:11 +0000 (17:21 +0300)]
refs #570: documentation update.

9 years agopatch for default zone colors on Linux
asl [Fri, 19 Jun 2015 13:25:38 +0000 (16:25 +0300)]
patch for default zone colors on Linux

9 years agorefs #570: fix priority queue.
mzn [Fri, 19 Jun 2015 12:41:46 +0000 (15:41 +0300)]
refs #570: fix priority queue.

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

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

9 years agorefs #570: Land Cover: the partition algorithm (further implementation)
mzn [Fri, 19 Jun 2015 09:53:16 +0000 (12:53 +0300)]
refs #570: Land Cover: the partition algorithm (further implementation)

9 years agosinusX p.10 // new resources BR_SINUSX_FORMAT
isn [Fri, 19 Jun 2015 09:05:38 +0000 (12:05 +0300)]
sinusX p.10 // new resources

9 years agoMerge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
isn [Fri, 19 Jun 2015 08:24:58 +0000 (11:24 +0300)]
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT

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

9 years agoObjListBox // small corrections
isn [Fri, 19 Jun 2015 08:16:52 +0000 (11:16 +0300)]
ObjListBox // small corrections

9 years agorefs #585: preview in split operation
asl [Fri, 19 Jun 2015 08:15:24 +0000 (11:15 +0300)]
refs #585: preview in split operation

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

9 years agorefs #585: gui for polyline operations
asl [Fri, 19 Jun 2015 06:24:44 +0000 (09:24 +0300)]
refs #585: gui for polyline operations

9 years agosinusX p.9 // Export of profile
isn [Thu, 18 Jun 2015 15:32:14 +0000 (18:32 +0300)]
sinusX p.9 // Export of profile

9 years agorefs #580: further GUI development.
mkr [Thu, 18 Jun 2015 14:43:09 +0000 (17:43 +0300)]
refs #580: further GUI development.

9 years agosinusX p.8 // Export of polyXY
isn [Thu, 18 Jun 2015 14:38:04 +0000 (17:38 +0300)]
sinusX p.8 // Export of polyXY

9 years agorefs #570: Land Cover: the partition algorithm (draft)
mzn [Thu, 18 Jun 2015 14:16:42 +0000 (17:16 +0300)]
refs #570: Land Cover: the partition algorithm (draft)

9 years agosinusX p.7 // Export of bathy
isn [Thu, 18 Jun 2015 13:54:58 +0000 (16:54 +0300)]
sinusX p.7 // Export of bathy

9 years agosinusX p.6 // Export // GUI Part // moving to new listbox
isn [Thu, 18 Jun 2015 12:21:07 +0000 (15:21 +0300)]
sinusX p.6 // Export // GUI Part // moving to new listbox

9 years agoMerge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
isn [Thu, 18 Jun 2015 11:38:25 +0000 (14:38 +0300)]
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT

9 years agoAllowing to add multiple object-types to ObjListBox
isn [Thu, 18 Jun 2015 11:35:23 +0000 (14:35 +0300)]
Allowing to add multiple object-types to ObjListBox

9 years agoMerge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
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

9 years agosinusX p.5 (Export / GUI Part)
isn [Thu, 18 Jun 2015 08:52:35 +0000 (11:52 +0300)]
sinusX p.5 (Export / GUI Part)

9 years ago#refs 585: polylines operations GUI
asl [Thu, 18 Jun 2015 10:45:33 +0000 (13:45 +0300)]
#refs 585: polylines operations GUI

9 years agorefs #580: modifications in data model and GUI to work with land cover regions and...
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.

9 years agorefs #585: draft version of GUI for polylines operations
asl [Thu, 18 Jun 2015 06:03:43 +0000 (09:03 +0300)]
refs #585: draft version of GUI for polylines operations

9 years agocompilation errors
isn [Wed, 17 Jun 2015 12:52:07 +0000 (15:52 +0300)]
compilation errors

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

9 years agosmall corrections
isn [Wed, 17 Jun 2015 11:19:48 +0000 (14:19 +0300)]
small corrections

9 years agosinusX p.4
isn [Wed, 17 Jun 2015 11:19:48 +0000 (14:19 +0300)]
sinusX p.4

9 years agosinusX p.3
isn [Wed, 17 Jun 2015 08:48:48 +0000 (11:48 +0300)]
sinusX p.3

9 years agosinusX p.2
isn [Tue, 16 Jun 2015 16:55:33 +0000 (19:55 +0300)]
sinusX p.2

9 years agosinusX p.1
isn [Tue, 16 Jun 2015 11:57:10 +0000 (14:57 +0300)]
sinusX p.1

9 years agorefs #524: create data owner in a right way.
mzn [Tue, 16 Jun 2015 11:15:42 +0000 (14:15 +0300)]
refs #524: create data owner in a right way.

9 years agopatch for correct installation of XML files
asl [Tue, 16 Jun 2015 09:04:34 +0000 (12:04 +0300)]
patch for correct installation of XML files

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc v1.4.1
asl [Mon, 15 Jun 2015 14:24:57 +0000 (17:24 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

9 years agoupdate of the documentation
asl [Mon, 15 Jun 2015 14:24:10 +0000 (17:24 +0300)]
update of the documentation

9 years agorefs #568: correct margin and spacing.
mkr [Mon, 15 Jun 2015 14:10:17 +0000 (17:10 +0300)]
refs #568: correct margin and spacing.

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
asl [Mon, 15 Jun 2015 12:23:28 +0000 (15:23 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

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

9 years agorefs #568: use ordered list view with selection synchronized with object browser...
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.

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
asl [Mon, 15 Jun 2015 12:02:23 +0000 (15:02 +0300)]
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

9 years agocorrection of compilation on Windows
asl [Mon, 15 Jun 2015 09:47:54 +0000 (12:47 +0300)]
correction of compilation on Windows

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

9 years agorefs #567: change buildShape() method.
mzn [Mon, 15 Jun 2015 09:19:05 +0000 (12:19 +0300)]
refs #567: change buildShape() method.

9 years agoporting on Linux
asl [Mon, 15 Jun 2015 09:14:15 +0000 (12:14 +0300)]
porting on Linux

9 years agorefs #568: fill in Strickler table combo-box with with names of all different Strickl...
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.

9 years agorefs #560: correct dialog title for export Strickler table operation.
mkr [Mon, 15 Jun 2015 07:59:09 +0000 (10:59 +0300)]
refs #560: correct dialog title for export Strickler table operation.

9 years agoMerge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
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

9 years agoMerge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc
asl [Mon, 15 Jun 2015 07:56:41 +0000 (10:56 +0300)]
Merge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc

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

9 years agorefs #573, #574: implementation of ordered list widget and a table to define prioriti...
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.

9 years agorefs #567, 569: build face, coloring.
mzn [Thu, 11 Jun 2015 13:19:50 +0000 (16:19 +0300)]
refs #567, 569: build face, coloring.

9 years agorefs #579
isn [Thu, 11 Jun 2015 08:29:33 +0000 (11:29 +0300)]
refs #579

9 years agocorrect documentation installation
asl [Thu, 11 Jun 2015 05:48:28 +0000 (08:48 +0300)]
correct documentation installation

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

9 years agodraft documentation
asl [Thu, 11 Jun 2015 05:44:45 +0000 (08:44 +0300)]
draft documentation

9 years agorefs #567: further implementation of the data object.
mzn [Wed, 10 Jun 2015 13:33:49 +0000 (16:33 +0300)]
refs #567: further implementation of the data object.

9 years agorefs #560: Strickler table: import/export
stv [Wed, 10 Jun 2015 11:09:30 +0000 (14:09 +0300)]
refs #560: Strickler table: import/export

9 years agorefs #573, #574: fill in ordered list widget on Land Cover panel with land covers...
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.

9 years agorefs #573, #574: drafts of Land Cover and Land Covers Partition panels; Strickler...
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.

9 years agorefs #559: Zones in Object Browser have not 'eyes' to show/hide them.
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.

9 years agorefs #524: fix selection issues. BR_SHAPE_RECOGNITION
mzn [Tue, 9 Jun 2015 08:25:15 +0000 (11:25 +0300)]
refs #524: fix selection issues.

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

9 years agoimport/export of shp-files (draft)
isn [Tue, 2 Jun 2015 14:15:02 +0000 (17:15 +0300)]
import/export of shp-files (draft)

9 years agorefs #578: hide included objects on the last step of the wizard.
mzn [Mon, 8 Jun 2015 09:33:41 +0000 (12:33 +0300)]
refs #578: hide included objects on the last step of the wizard.

9 years agorefs #568: Land Cover: a draft of data model and implementation of dialog box and...
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).

9 years agorefs #524: fix bugs
mzn [Mon, 8 Jun 2015 07:19:20 +0000 (10:19 +0300)]
refs #524: fix bugs

9 years agorefs #562: add default Strickler coefficient into HYDRO module preferencies, implemen...
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.

9 years agorefs #562: GUI to import/modify Strickler table objects.
mkr [Thu, 4 Jun 2015 09:18:17 +0000 (12:18 +0300)]
refs #562: GUI to import/modify Strickler table objects.

9 years agorefs #562: basic logic for Strickler table operation and dialog.
mkr [Wed, 3 Jun 2015 10:04:45 +0000 (13:04 +0300)]
refs #562: basic logic for Strickler table operation and dialog.

9 years agorefs #562: automatically create default Strickler table object, add operation and...
mkr [Tue, 2 Jun 2015 15:35:53 +0000 (18:35 +0300)]
refs #562: automatically create default Strickler table object, add operation and dialog classes for import/modify functionality, add resources.

9 years agoMerge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION
mzn [Tue, 2 Jun 2015 08:07:14 +0000 (11:07 +0300)]
Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION

Conflicts:
src/HYDROGUI/HYDROGUI_Shape.cxx

9 years agorefs #558, #552: take into account last changes in the list of predefined Z layers...
mzn [Tue, 2 Jun 2015 07:48:19 +0000 (10:48 +0300)]
refs #558, #552: take into account last changes in the list of predefined Z layers (namely top and bottom ids)

9 years agorefs #561: the draft data model for Strickler table
asl [Mon, 1 Jun 2015 12:31:36 +0000 (15:31 +0300)]
refs #561: the draft data model for Strickler table

9 years agorefs #524: fix preview selection problem
mzn [Mon, 1 Jun 2015 06:23:20 +0000 (09:23 +0300)]
refs #524: fix preview selection problem

9 years agorefs #524: apply transformation to TopoDS_Shape, not to polyline object
mzn [Thu, 28 May 2015 07:31:03 +0000 (10:31 +0300)]
refs #524: apply transformation to TopoDS_Shape, not to polyline object

9 years agorefs #556: warning when image file is not chosen
asl [Wed, 27 May 2015 13:47:40 +0000 (16:47 +0300)]
refs #556: warning when image file is not chosen

9 years agorefs #534: not to show "New region" item on the empty or not-zone selection
asl [Wed, 27 May 2015 13:39:17 +0000 (16:39 +0300)]
refs #534: not to show "New region" item on the empty or not-zone selection

9 years agorefs #557: patch for crash if null object is passed to HYDROGUI shape
asl [Wed, 27 May 2015 06:33:47 +0000 (09:33 +0300)]
refs #557: patch for crash if null object is passed to HYDROGUI shape

9 years agorefs #555: now the error message appears if the guide line or profile are not selected
asl [Wed, 27 May 2015 06:28:04 +0000 (09:28 +0300)]
refs #555: now the error message appears if the guide line or profile are not selected

9 years agorefs #553: correct default right point of not-georeferenced profile
asl [Wed, 27 May 2015 06:19:15 +0000 (09:19 +0300)]
refs #553: correct default right point of not-georeferenced profile

9 years agorefs #514: custom cursor in profile and georef operations
asl [Wed, 27 May 2015 05:40:54 +0000 (08:40 +0300)]
refs #514: custom cursor in profile and georef operations

9 years agorefs #551: incorrect visible status
asl [Tue, 26 May 2015 07:38:28 +0000 (10:38 +0300)]
refs #551: incorrect visible status

9 years agorefs #524: add polyline transformation; reaction on Apply button.
mzn [Mon, 25 May 2015 15:09:50 +0000 (18:09 +0300)]
refs #524: add polyline transformation; reaction on Apply button.

9 years agorefs #550: fix crash when myObject is NULL
mzn [Mon, 25 May 2015 13:50:28 +0000 (16:50 +0300)]
refs #550: fix crash when myObject is NULL

9 years agoMerge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION
mzn [Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)]
Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION

9 years agopatch for regression in popup menu construction
asl [Mon, 25 May 2015 11:57:25 +0000 (14:57 +0300)]
patch for regression in popup menu construction

9 years agopatch for correct compilation on Linux
asl [Mon, 25 May 2015 11:55:36 +0000 (14:55 +0300)]
patch for correct compilation on Linux