]> SALOME platform Git repositories - modules/hydro.git/log
Salome HOME
modules/hydro.git
7 years agorefs #1341: debug of automatic tests
asl [Wed, 15 Nov 2017 12:51:23 +0000 (15:51 +0300)]
refs #1341: debug of automatic tests

7 years agorefs #1341: debug of tests on Linux
asl [Wed, 15 Nov 2017 08:08:40 +0000 (11:08 +0300)]
refs #1341: debug of tests on Linux

7 years agoMerge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017
asl [Wed, 15 Nov 2017 07:36:13 +0000 (10:36 +0300)]
Merge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017

7 years agorefs #1341: debug of tests on Linux
asl [Wed, 15 Nov 2017 07:36:06 +0000 (10:36 +0300)]
refs #1341: debug of tests on Linux

7 years agorefs #1341: debug of difference image
asl [Wed, 15 Nov 2017 07:33:56 +0000 (10:33 +0300)]
refs #1341: debug of difference image

7 years agodebug of tests on Linux
asl [Wed, 15 Nov 2017 06:20:10 +0000 (09:20 +0300)]
debug of tests on Linux

7 years agominor code review
asl [Wed, 15 Nov 2017 05:24:23 +0000 (08:24 +0300)]
minor code review

7 years agomove ref test data to win32/linux folders
isn [Tue, 14 Nov 2017 18:27:59 +0000 (21:27 +0300)]
move ref test data to win32/linux folders

7 years agoMerge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017
asl [Tue, 14 Nov 2017 13:56:36 +0000 (16:56 +0300)]
Merge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017

7 years agodebug of profileOp
isn [Tue, 14 Nov 2017 13:55:04 +0000 (16:55 +0300)]
debug of profileOp

7 years agoMerge branch 'BR_2017' of https://git.salome-platform.org/gitpub/modules/hydro into...
asl [Tue, 14 Nov 2017 13:52:44 +0000 (16:52 +0300)]
Merge branch 'BR_2017' of https://git.salome-platform.org/gitpub/modules/hydro into BR_2017

7 years agorefs #1341: adaptation of automatic tests for Linux
asl [Tue, 14 Nov 2017 13:51:55 +0000 (16:51 +0300)]
refs #1341: adaptation of automatic tests for Linux

7 years agorefs #1329
isn [Tue, 14 Nov 2017 13:24:20 +0000 (16:24 +0300)]
refs #1329

7 years agorefs #1395: clear selection on bathymetry selection switch
asl [Mon, 13 Nov 2017 13:54:15 +0000 (16:54 +0300)]
refs #1395: clear selection on bathymetry selection switch

7 years agorefs #1405: patch for fit selection on polylines
asl [Mon, 13 Nov 2017 13:18:46 +0000 (16:18 +0300)]
refs #1405: patch for fit selection on polylines

7 years agorefs #1324: chained panning of OCC viewer created in other module
asl [Mon, 13 Nov 2017 08:08:27 +0000 (11:08 +0300)]
refs #1324: chained panning of OCC viewer created in other module

7 years agoupdate of tests
isn [Fri, 10 Nov 2017 17:24:09 +0000 (20:24 +0300)]
update of tests

7 years agodebug of test
isn [Fri, 10 Nov 2017 17:15:11 +0000 (20:15 +0300)]
debug of test

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
isn [Fri, 10 Nov 2017 13:27:02 +0000 (16:27 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

7 years agorefs# #1339 debug
isn [Fri, 10 Nov 2017 13:25:40 +0000 (16:25 +0300)]
refs# #1339 debug

7 years agopatch for crash
asl [Fri, 10 Nov 2017 10:48:13 +0000 (13:48 +0300)]
patch for crash

7 years agorefs #1396: bathymetry text without transaction
asl [Fri, 10 Nov 2017 10:48:04 +0000 (13:48 +0300)]
refs #1396: bathymetry text without transaction

7 years agorefs #1340 regression
isn [Fri, 10 Nov 2017 11:58:57 +0000 (14:58 +0300)]
refs #1340 regression

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
isn [Fri, 10 Nov 2017 10:31:44 +0000 (13:31 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

7 years agorefs #1400 + refs# 1399
isn [Fri, 10 Nov 2017 10:31:20 +0000 (13:31 +0300)]
refs #1400 + refs# 1399

7 years agorefs #1393: patch for crash
asl [Fri, 10 Nov 2017 10:01:30 +0000 (13:01 +0300)]
refs #1393: patch for crash

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
isn [Thu, 9 Nov 2017 18:57:31 +0000 (21:57 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

7 years agodebug of tests
isn [Thu, 9 Nov 2017 18:55:02 +0000 (21:55 +0300)]
debug of tests

7 years agodebug of automatic tests for DTM
asl [Thu, 9 Nov 2017 16:54:12 +0000 (19:54 +0300)]
debug of automatic tests for DTM

7 years agorefs #1377: patch for crash
asl [Thu, 9 Nov 2017 15:46:55 +0000 (18:46 +0300)]
refs #1377: patch for crash

7 years agodebug of automatic tests
asl [Thu, 9 Nov 2017 15:17:34 +0000 (18:17 +0300)]
debug of automatic tests

7 years agolost translation
isn [Thu, 9 Nov 2017 14:39:03 +0000 (17:39 +0300)]
lost translation

7 years agodebug BR_1334_3
isn [Thu, 9 Nov 2017 14:34:15 +0000 (17:34 +0300)]
debug

7 years agolost icon for dummy3d
isn [Thu, 9 Nov 2017 14:24:18 +0000 (17:24 +0300)]
lost icon for dummy3d

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into BR_1334_3
isn [Thu, 9 Nov 2017 14:23:51 +0000 (17:23 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into BR_1334_3

7 years agorefs #1334 debug BR_1334_MPROF
isn [Thu, 9 Nov 2017 14:04:14 +0000 (17:04 +0300)]
refs #1334 debug

7 years agoMerge remote-tracking branch 'origin/BR_1334_MPROF' into BR_2017
asl [Thu, 9 Nov 2017 10:01:47 +0000 (13:01 +0300)]
Merge remote-tracking branch 'origin/BR_1334_MPROF' into BR_2017

7 years agodebug
isn [Thu, 9 Nov 2017 09:59:12 +0000 (12:59 +0300)]
debug

7 years agoMerge remote-tracking branch 'origin/BR_1334_MPROF' into BR_2017
asl [Thu, 9 Nov 2017 09:58:08 +0000 (12:58 +0300)]
Merge remote-tracking branch 'origin/BR_1334_MPROF' into BR_2017

7 years agodebug
isn [Thu, 9 Nov 2017 09:56:04 +0000 (12:56 +0300)]
debug

7 years agorefs #1389: fit on selected polyline with arrow
asl [Thu, 9 Nov 2017 09:33:11 +0000 (12:33 +0300)]
refs #1389: fit on selected polyline with arrow

7 years agorefs #1334 (draft, non-compiled)
isn [Mon, 23 Oct 2017 16:21:34 +0000 (19:21 +0300)]
refs #1334 (draft, non-compiled)

7 years agorefs #1385 ::icons
isn [Wed, 8 Nov 2017 18:08:22 +0000 (21:08 +0300)]
refs #1385 ::icons

7 years agorefs #1340 part.2
isn [Wed, 8 Nov 2017 16:46:24 +0000 (19:46 +0300)]
refs #1340 part.2

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
isn [Wed, 8 Nov 2017 15:38:18 +0000 (18:38 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

7 years agorefs #1340
isn [Wed, 8 Nov 2017 15:36:54 +0000 (18:36 +0300)]
refs #1340

7 years agorefs #1380: update of overview on show/hide objects
asl [Wed, 8 Nov 2017 15:35:53 +0000 (18:35 +0300)]
refs #1380: update of overview on show/hide objects

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
isn [Wed, 8 Nov 2017 15:31:35 +0000 (18:31 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

7 years agorefs #1340
isn [Mon, 30 Oct 2017 14:38:37 +0000 (17:38 +0300)]
refs #1340

Conflicts:
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h

7 years agorefs #1379: style of overview band
asl [Wed, 8 Nov 2017 15:18:56 +0000 (18:18 +0300)]
refs #1379: style of overview band

7 years agopatch for error in garonne
asl [Wed, 8 Nov 2017 15:06:07 +0000 (18:06 +0300)]
patch for error in garonne

7 years agorefs #1388: correct conversion of image format
asl [Wed, 8 Nov 2017 14:13:02 +0000 (17:13 +0300)]
refs #1388: correct conversion of image format

7 years agorefs #1382: when user clicks the current position becomes center
asl [Wed, 8 Nov 2017 13:46:56 +0000 (16:46 +0300)]
refs #1382: when user clicks the current position becomes center

7 years agoMerge remote-tracking branch 'remotes/origin/BR_2017' into HEAD
isn [Wed, 8 Nov 2017 13:46:34 +0000 (16:46 +0300)]
Merge remote-tracking branch 'remotes/origin/BR_2017' into HEAD

7 years agorefs #1384
isn [Wed, 8 Nov 2017 13:45:57 +0000 (16:45 +0300)]
refs #1384

7 years agorefs #1383: default values for polylines
asl [Wed, 8 Nov 2017 13:40:55 +0000 (16:40 +0300)]
refs #1383: default values for polylines

7 years agorefs #1370
isn [Wed, 8 Nov 2017 12:08:06 +0000 (15:08 +0300)]
refs #1370

7 years agorefs #1329 preference only
isn [Wed, 8 Nov 2017 10:21:47 +0000 (13:21 +0300)]
refs #1329 preference only

7 years agocorrection after merge
asl [Tue, 7 Nov 2017 13:27:45 +0000 (16:27 +0300)]
correction after merge

7 years agoMerge remote-tracking branch 'origin/BR_1323_0' into BR_2017
asl [Tue, 7 Nov 2017 12:29:06 +0000 (15:29 +0300)]
Merge remote-tracking branch 'origin/BR_1323_0' into BR_2017

# Conflicts:
# src/HYDROGUI/CMakeLists.txt
# src/HYDROGUI/HYDROGUI_Operations.cxx
# src/HYDROGUI/HYDROGUI_Operations.h

7 years agorefs #1376: now in the popup menu Show/Hide arrows are available always
asl [Tue, 7 Nov 2017 12:17:31 +0000 (15:17 +0300)]
refs #1376: now in the popup menu Show/Hide arrows are available always

7 years agorefs #1369: default position for overview
asl [Tue, 7 Nov 2017 12:14:28 +0000 (15:14 +0300)]
refs #1369: default position for overview

7 years agorefs #1323 BR_1323_0
isn [Fri, 3 Nov 2017 13:42:36 +0000 (16:42 +0300)]
refs #1323

7 years agorefs #1328: additional test for overview actions
asl [Fri, 3 Nov 2017 14:15:15 +0000 (17:15 +0300)]
refs #1328: additional test for overview actions

7 years agocorrections of tests for overview
asl [Fri, 3 Nov 2017 13:24:15 +0000 (16:24 +0300)]
corrections of tests for overview

7 years agocorrection for Windows
asl [Fri, 3 Nov 2017 08:54:37 +0000 (11:54 +0300)]
correction for Windows

7 years agotests configuration for Linux and YAMM
asl [Fri, 3 Nov 2017 08:26:45 +0000 (11:26 +0300)]
tests configuration for Linux and YAMM

7 years agoMerge remote-tracking branch 'origin/BR_1339' into BR_2017
asl [Fri, 3 Nov 2017 06:45:00 +0000 (09:45 +0300)]
Merge remote-tracking branch 'origin/BR_1339' into BR_2017

7 years agoMerge remote-tracking branch 'origin/BR_1338' into BR_2017
asl [Fri, 3 Nov 2017 06:44:48 +0000 (09:44 +0300)]
Merge remote-tracking branch 'origin/BR_1338' into BR_2017

7 years agoMerge remote-tracking branch 'origin/BR_DEMO' into BR_2017
asl [Fri, 3 Nov 2017 06:44:23 +0000 (09:44 +0300)]
Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017

# Conflicts:
# src/HYDROGUI/HYDROGUI_DataModel.cxx

7 years agorefs #1341: now the tests application does not link with LightApp since this package... BR_DEMO
asl [Fri, 3 Nov 2017 06:43:02 +0000 (09:43 +0300)]
refs #1341: now the tests application does not link with LightApp since this package is linked with CORBA

7 years agorefs #1330: global option show/hide arrows
asl [Thu, 2 Nov 2017 06:27:41 +0000 (09:27 +0300)]
refs #1330: global option show/hide arrows

7 years agorefs #1330: individual shape and size for polylines
asl [Wed, 1 Nov 2017 14:57:24 +0000 (17:57 +0300)]
refs #1330: individual shape and size for polylines

7 years agocorrection of HYDRO for YAMM
asl [Wed, 1 Nov 2017 12:01:49 +0000 (15:01 +0300)]
correction of HYDRO for YAMM

7 years agorefs #1323, icons of imm. zones (only) are changing while switching between sumb...
isn [Wed, 25 Oct 2017 16:31:01 +0000 (19:31 +0300)]
refs #1323, icons of imm. zones (only) are changing while switching between sumb/non-submers

7 years agorefs #1340 BR_1340_0
isn [Mon, 30 Oct 2017 14:38:37 +0000 (17:38 +0300)]
refs #1340

7 years agobathymetry points are drawn with larger image (4x4)
asl [Mon, 30 Oct 2017 07:05:27 +0000 (10:05 +0300)]
bathymetry points are drawn with larger image (4x4)

7 years agoreference data path is moved to main
asl [Mon, 30 Oct 2017 07:05:07 +0000 (10:05 +0300)]
reference data path is moved to main

7 years agosize of image is limited by 7000 pixels
asl [Mon, 30 Oct 2017 07:04:49 +0000 (10:04 +0300)]
size of image is limited by 7000 pixels

7 years agorefs #1340: first implementation of new zone colors algo
asl [Fri, 22 Sep 2017 11:55:39 +0000 (14:55 +0300)]
refs #1340: first implementation of new zone colors algo

Conflicts:
src/HYDROGUI/CMakeLists.txt
src/HYDRO_tests/ExternalFiles.cmake
src/HYDRO_tests/reference_data/CMakeLists.txt

7 years agorefs #1339 BR_1339
isn [Thu, 26 Oct 2017 09:15:13 +0000 (12:15 +0300)]
refs #1339

7 years agorefs #1338 BR_1338
isn [Tue, 17 Oct 2017 12:07:33 +0000 (15:07 +0300)]
refs #1338

7 years agoMerge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO
asl [Fri, 13 Oct 2017 04:27:43 +0000 (07:27 +0300)]
Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

7 years agorefs #1326: debug of cursor and buttons states
asl [Thu, 12 Oct 2017 16:14:23 +0000 (19:14 +0300)]
refs #1326: debug of cursor and buttons states

7 years agorefs #1326: waiting cursor is applied for bathymetry operations
asl [Thu, 12 Oct 2017 16:08:51 +0000 (19:08 +0300)]
refs #1326: waiting cursor is applied for bathymetry operations

7 years agorefs #1328: background for overview is updated
asl [Thu, 12 Oct 2017 16:03:32 +0000 (19:03 +0300)]
refs #1328: background for overview is updated

7 years agorefs #1328: debug of the overview on rotated plane
asl [Thu, 12 Oct 2017 15:57:08 +0000 (18:57 +0300)]
refs #1328: debug of the overview on rotated plane

7 years agoeliminate of warning BR_1321_ECW
isn [Thu, 12 Oct 2017 14:58:08 +0000 (17:58 +0300)]
eliminate of warning

7 years agoloadImage() for py scripts
isn [Thu, 12 Oct 2017 13:19:24 +0000 (16:19 +0300)]
loadImage() for py scripts

7 years agoquick optimization patch (bytearray for images)
isn [Thu, 12 Oct 2017 12:33:30 +0000 (15:33 +0300)]
quick optimization patch (bytearray for images)

7 years agoMerge branch 'BR_DEMO' of ssh://git.salome-platform.org/modules/hydro into BR_DEMO
isn [Thu, 12 Oct 2017 11:38:30 +0000 (14:38 +0300)]
Merge branch 'BR_DEMO' of ssh://git.salome-platform.org/modules/hydro into BR_DEMO

7 years agoicons refs #1326 #1327
isn [Thu, 12 Oct 2017 11:37:28 +0000 (14:37 +0300)]
icons refs #1326 #1327

7 years agorefs #1326: unchecking the button on operation finish
asl [Wed, 11 Oct 2017 11:34:21 +0000 (14:34 +0300)]
refs #1326: unchecking the button on operation finish

7 years agocorrection after merge
asl [Wed, 11 Oct 2017 09:32:35 +0000 (12:32 +0300)]
correction after merge

7 years agoMerge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO
asl [Wed, 11 Oct 2017 09:12:15 +0000 (12:12 +0300)]
Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

# Conflicts:
# doc/CMakeLists.txt
# src/HYDROData/HYDROData_IProfilesInterpolator.h
# src/HYDROGUI/HYDROGUI_BathymetryPrs.cxx
# src/HYDROGUI/HYDROGUI_BathymetryPrs.h
# src/HYDRO_tests/CMakeLists.txt
# src/HYDRO_tests/reference_data/Extraction_Channel.png
# src/HYDRO_tests/reference_data/Extraction_ImmZone.png
# src/HYDRO_tests/reference_data/Merge_Polylines.png
# src/HYDRO_tests/reference_data/Polyline_Presentation.png
# src/HYDRO_tests/reference_data/Split_Polylines_Colors.png
# src/HYDRO_tests/reference_data/Split_Straight.png

7 years agorefs #1330: debug of bathymetry showing with patch for polylines
asl [Wed, 11 Oct 2017 07:29:35 +0000 (10:29 +0300)]
refs #1330: debug of bathymetry showing with patch for polylines

7 years agorefs #1328: debug of overview on show objects
asl [Wed, 11 Oct 2017 07:29:00 +0000 (10:29 +0300)]
refs #1328: debug of overview on show objects

7 years agoporting on Linux
asl [Wed, 11 Oct 2017 07:30:15 +0000 (10:30 +0300)]
porting on Linux

7 years agocorrection of the compilation after merge
asl [Wed, 11 Oct 2017 05:35:25 +0000 (08:35 +0300)]
correction of the compilation after merge

7 years agoMerge branch 'BR_1331' into BR_DEMO
asl [Wed, 11 Oct 2017 05:23:46 +0000 (08:23 +0300)]
Merge branch 'BR_1331' into BR_DEMO

# Conflicts:
# src/HYDRO_tests/CMakeLists.txt
# src/HYDRO_tests/ExternalFiles.cmake
# src/HYDRO_tests/reference_data/CMakeLists.txt