Commit Graph

809 Commits (7ab6db184d8ff3aa2c733d6587a34f2ee3e35918)

Author SHA1 Message Date
Pierre-Antoine Rouby 6b232d2971 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-18 10:14:24 +01:00
Theophile Terraz 9c0ffa8356 add option to let Mage generate initial condition 2023-12-15 15:36:17 +01:00
Pierre-Antoine Rouby ffbd2e2413 Mage: Minor code style refactoring. 2023-12-13 16:44:44 +01:00
Pierre-Antoine Rouby 58300b8c1a Mage: Minor indent fixes. 2023-12-13 16:31:57 +01:00
Pierre-Antoine Rouby cd2fda8224 HS, Mage: Rewrite some code for coding style. 2023-12-13 16:30:18 +01:00
Pierre-Antoine Rouby 73ae571de1 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-13 16:01:23 +01:00
Pierre-Antoine Rouby 7aee4c64a3 Solver: Fix running pipeline. 2023-12-13 15:57:47 +01:00
Pierre-Antoine Rouby c3cae35de4 pep8: Fixes code style. 2023-12-13 14:53:58 +01:00
Pierre-Antoine Rouby 2736d2f399 SolverRun: Keep in configuration the last solver name used. 2023-12-13 14:48:01 +01:00
Pierre-Antoine Rouby 00afc6c06b SolverRun: Fix bin/gra reading before solver running. 2023-12-13 14:30:29 +01:00
Theophile Terraz 4eefa88490 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-13 11:45:01 +01:00
Theophile Terraz 92e54bf11e work on Mage export 2023-12-13 11:44:56 +01:00
Pierre-Antoine Rouby c11350d49a HS: Fix basic HS previous data delete at save. 2023-12-13 11:04:51 +01:00
Pierre-Antoine Rouby 8f5fb4cc3b Geometry: Profile: Some fixes. 2023-12-13 10:36:13 +01:00
Pierre-Antoine Rouby fc7a7bb7fd HS: Fix update relim in PlotAC and PlotKPC. 2023-12-13 10:07:46 +01:00
Pierre-Antoine Rouby 5a1c363e8a IC: Fix reach reference at loading in case of multiple reach. 2023-12-13 09:42:47 +01:00
Theophile Terraz 77a6da3024 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-12 16:35:24 +01:00
Theophile Terraz c4a66281f6 debug output SIN 2023-12-12 16:35:17 +01:00
Pierre-Antoine Rouby 7ffc2482fc HS: Minor fixes. 2023-12-12 16:21:47 +01:00
Pierre-Antoine Rouby f37da68a67 HS: Basic: Minor fixes. 2023-12-12 16:08:04 +01:00
Theophile Terraz f64ed131f9 work on BHS 2023-12-12 16:00:40 +01:00
Theophile Terraz 79b31e8d08 merge 2023-12-12 15:40:54 +01:00
Theophile Terraz d1c8e3e4f5 debug SIN output 2023-12-12 15:39:43 +01:00
Theophile Terraz c253ad832d ajout ouvrages mage 2023-12-12 14:57:23 +01:00
Pierre-Antoine Rouby 6081b09267 pep8: Fixes. 2023-12-12 14:53:00 +01:00
Pierre-Antoine Rouby 592c2c9a72 HS: Minor fix. 2023-12-12 14:44:58 +01:00
Pierre-Antoine Rouby ce45776a63 HS: Basic: Fix load sql request. 2023-12-12 14:30:04 +01:00
Pierre-Antoine Rouby 02bbdf9fda HS: Basic: Add parameters table and fix save/load sql methods. 2023-12-12 14:23:36 +01:00
Pierre-Antoine Rouby 6c9e90ceaf MainWindow: Add progress dialog for save as method. 2023-12-12 13:39:38 +01:00
Pierre-Antoine Rouby b99be5a280 MainWindow: Remove cancel button. 2023-12-12 13:35:13 +01:00
Pierre-Antoine Rouby 1acd582de9 MainWindow: Add progress dialog for save process. 2023-12-12 11:57:19 +01:00
Pierre-Antoine Rouby 8ce5a4d215 Network: Change selected reach color and minor change. 2023-12-12 10:51:25 +01:00
Pierre-Antoine Rouby ccb55ff4e1 HS: Fix pep8 and minor change. 2023-12-12 10:22:52 +01:00
Pierre-Antoine Rouby 3ef4b40558 HS: Basic: Add question for BHS type change. 2023-12-12 10:13:10 +01:00
Pierre-Antoine Rouby c667d94e84 HS: Basic: Fix delete undo command. 2023-12-12 09:43:54 +01:00
Pierre-Antoine Rouby 1b601460e6 HS: Basic: Make enabled undo command. 2023-12-12 09:32:05 +01:00
Theophile Terraz 7db65f127e work on hydraulic structures 2023-12-11 16:53:53 +01:00
Theophile Terraz f302e18d71 dirty work on BHS 2023-12-11 15:44:31 +01:00
Theophile Terraz 352c0beb27 add short dict and getter in HS 2023-12-11 15:29:02 +01:00
Theophile Terraz d6561ab44d merge 2023-12-11 15:27:53 +01:00
Pierre-Antoine Rouby 5d9b6f99c6 HS: Fix case with no profile kp. 2023-12-11 15:20:46 +01:00
Pierre-Antoine Rouby 163a842384 HS: Refacto update function and fix NA value at table data set. 2023-12-11 15:19:24 +01:00
Pierre-Antoine Rouby eea355a784 pep8: Change to respect pep8 code style. 2023-12-11 14:40:54 +01:00
Pierre-Antoine Rouby 1ab1cb37b0 HS: Create a enabled undo command. 2023-12-11 11:55:27 +01:00
Theophile Terraz be19a11387 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-11 11:20:51 +01:00
Theophile Terraz 062743d748 enable edit window 2023-12-11 11:20:47 +01:00
Pierre-Antoine Rouby ac2a2002b7 HS: Fix checkbox state at undo add command. 2023-12-11 11:12:57 +01:00
Pierre-Antoine Rouby 6951b82339 Friction: Delete useless prints. 2023-12-11 11:12:41 +01:00
Pierre-Antoine Rouby e41c23120a HS: Minor fix add method. 2023-12-11 11:00:14 +01:00
Theophile Terraz 4c5281ea30 Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-06 16:55:34 +01:00
Theophile Terraz 7b7ba2eb37 add hydraulic structures plots 2023-12-06 16:55:27 +01:00
Pierre-Antoine Rouby 4a43653d7f HydraulicStructure: Fix KP db type. 2023-12-06 14:49:50 +01:00
Pierre-Antoine Rouby 0307927fa9 PamhyrTable: Fix editable column. 2023-12-06 14:15:47 +01:00
Pierre-Antoine Rouby db11c9d968 Geometry: Resize window to respect 16:9 ratio. 2023-12-06 11:44:09 +01:00
Pierre-Antoine Rouby d85e5c4666 PamhyrDialog: Fix window list delete whene dialog is done. 2023-12-06 11:30:09 +01:00
Pierre-Antoine Rouby 45ee8a9662 Friction: Fix load method in case of multiple reaches. 2023-12-06 11:05:55 +01:00
Pierre-Antoine Rouby 5ab06dbe51 HydraulicStructure: Fix db export. 2023-12-06 09:20:18 +01:00
Theophile Terraz d73e901a96 work on hydraulic structures window 2023-12-05 16:46:50 +01:00
Theophile Terraz c17e39e3cf Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure 2023-12-05 15:14:19 +01:00
Pierre-Antoine Rouby af4cce96ef HydraulicStructure: Rename enable to enabled. 2023-12-05 14:02:10 +01:00
Pierre-Antoine Rouby 0a780e5f78 HydraulicStructure: Minor change and fixes. 2023-12-05 11:56:14 +01:00
Pierre-Antoine Rouby fb2b1f680f HydraulicStructures: Add Model files. 2023-12-05 11:13:52 +01:00
Theophile Terraz 6957986632 add hydraulic structures view files 2023-12-05 09:41:15 +01:00
Theophile Terraz 13d23502a9 Merge branch 'master' into hydraulics-structure 2023-12-04 17:41:39 +01:00
Theophile Terraz 5fa888768e add hydraulic structures ui 2023-12-04 17:41:06 +01:00
Theophile Terraz 07451899c4 export mage SIN file 2023-12-04 17:38:25 +01:00
Theophile Terraz 2aa693e4ae modif sections sliders 2023-12-04 09:35:02 +01:00
Theophile Terraz ff480fb593 add first and last button (visu) 2023-12-04 09:14:35 +01:00
Theophile Terraz d6753dc986 upgrade results slider 2023-12-01 18:37:36 +01:00
Theophile Terraz 2d2484d8fa change colors 2023-12-01 15:51:40 +01:00
Theophile Terraz bb97f1977b debug 2023-12-01 15:51:13 +01:00
Theophile Terraz eb26eba131 optim visu 2023-12-01 14:05:00 +01:00
Theophile Terraz 2d3e214514 debug 2023-12-01 14:04:46 +01:00
Theophile Terraz 894a7c8477 speed up View/Results/PlotXY 2023-11-30 15:06:39 +01:00
Theophile Terraz 21197ead23 work on vater limits for top view visualization 2023-11-30 15:06:00 +01:00
Theophile Terraz d79a0cc973 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 17:10:30 +01:00
Theophile Terraz a55669d181 modif INI format 2023-11-29 17:10:27 +01:00
Pierre-Antoine Rouby 2fd44fbfb4 IC: Fix data sorting at the end of generation. 2023-11-29 16:52:01 +01:00
Pierre-Antoine Rouby 962bfa945d Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 16:41:53 +01:00
Pierre-Antoine Rouby 65c1163a55 Reservoir: Allow to select only internal node. 2023-11-29 16:41:05 +01:00
Theophile Terraz 8d67442ca3 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 15:26:22 +01:00
Theophile Terraz f7d2ac8b86 traduction 2023-11-29 15:26:11 +01:00
Pierre-Antoine Rouby 4f91de4c97 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr. 2023-11-29 14:49:02 +01:00
Pierre-Antoine Rouby 37b04961f1 IC: Add Manning/Strickler equation for IC approximation. 2023-11-29 14:47:35 +01:00
Theophile Terraz 0a63f16f62 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-29 14:34:11 +01:00
Theophile Terraz 92eb729a39 add Reservoirs 2023-11-29 14:34:06 +01:00
Pierre-Antoine Rouby d891c9783d Model: Fix possible data removing durring save. 2023-11-27 16:58:46 +01:00
Pierre-Antoine Rouby 51858597cd Mage: ST export minor change. 2023-11-27 14:49:42 +01:00
Pierre-Antoine Rouby 8b3baf433f Solver run: Used merged channels to get stderr. 2023-11-27 14:31:04 +01:00
Pierre-Antoine Rouby 12e3d779c6 Mage: Fix BC export when node is not associate. 2023-11-27 11:40:59 +01:00
Pierre-Antoine Rouby c6274890a7 BC: Rename some BC types. 2023-11-27 11:29:39 +01:00
Pierre-Antoine Rouby b4ee76416e BC, LC: Disable time delegate (fix #23). 2023-11-27 09:37:23 +01:00
Pierre-Antoine Rouby a88b42a8ef BC: Fix get_assoc_to_node in case of no results. 2023-11-27 09:21:23 +01:00
Pierre-Antoine Rouby 08f01aee69 Network: Fix #22. 2023-11-27 09:12:31 +01:00
Pierre-Antoine Rouby c69cbdb34e BC: Make node association unique (#25). 2023-11-27 08:55:38 +01:00
Pierre-Antoine Rouby 01fd7dbec8 Pamhyr2: Fix some type compare. 2023-11-22 15:47:57 +01:00
Pierre-Antoine Rouby 2af9b0018c SQL: Minor change. 2023-11-22 15:39:21 +01:00
Pierre-Antoine Rouby 7f8e8d5a9f SQL: Minor change and add exception handler. 2023-11-22 14:58:03 +01:00
Pierre-Antoine Rouby c9887a97e7 Friction: Disable name column because the value is not in database. 2023-11-22 10:20:50 +01:00
Pierre-Antoine Rouby 1a708921e3 BC: Fix #13 paste undo command. 2023-11-22 10:02:25 +01:00
Pierre-Antoine Rouby 9fe1b35a59 IC: Fix profile side effect on IC generator. 2023-11-21 16:06:37 +01:00
Pierre-Antoine Rouby edf744eee1 Geometry: Fix profiles list sorting. 2023-11-21 14:24:31 +01:00
Pierre-Antoine Rouby e400980103 Frictions: Fix plot drawing crash. 2023-11-21 11:07:36 +01:00
Pierre-Antoine Rouby b12e935a5d Geometry: Fix some translate. 2023-11-21 10:45:00 +01:00
Pierre-Antoine Rouby 1d4422e9c5 MainWindow: Disable window maximized. 2023-11-21 10:38:35 +01:00
Pierre-Antoine Rouby 1a10da9c89 MainWindow: Fix translate and re organize UI. 2023-11-21 10:36:13 +01:00
Pierre-Antoine Rouby 470eae8b92 pamhyr: Fix #20 study reload whene study is not saved on a file. 2023-11-21 09:26:57 +01:00
Pierre-Antoine Rouby 9b53b4302b BC,IC: Enable to get time int from float string (fix #21). 2023-11-21 09:11:35 +01:00
Pierre-Antoine Rouby 461202219d Window: Fix paste delimiter. 2023-11-20 17:29:37 +01:00
Pierre-Antoine Rouby 3e531130fe Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-20 16:16:24 +01:00
Pierre-Antoine Rouby 595eb29c42 BC: Fix long type translate crash. 2023-11-20 16:15:43 +01:00
Pierre-Antoine Rouby ccbbc83502 IC: Fix sql_save as generator value type. 2023-11-20 16:10:10 +01:00
Pierre-Antoine Rouby fd0a8ddf51 BC: Fix paste command. 2023-11-20 15:55:57 +01:00
Pierre-Antoine Rouby ce5808e3ce Geometry: Fix delete profiles. 2023-11-20 15:38:52 +01:00
Pierre-Antoine Rouby 4dafa345b4 Geometry: Fix delete command crash. 2023-11-20 15:37:07 +01:00
Theophile Terraz 90776f0af9 Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr 2023-11-02 16:44:02 +01:00
Theophile Terraz 32777456b9 add scripts to use Mascaret 2023-11-02 16:43:57 +01:00
Pierre-Antoine Rouby dcaa7fafbd tools: Fix PEP8. 2023-10-30 09:30:16 +01:00
Pierre-Antoine Rouby 17eb3e8184 tools: parser: Minor change and tests fixes. 2023-10-27 17:21:09 +02:00
Pierre-Antoine Rouby 7bbca7cf54 unittests: Add parse tests for ' quote. 2023-10-27 15:10:16 +02:00
Pierre-Antoine Rouby 3c738ebcb9 Solver: Mage: Fix profile sediment export. 2023-10-27 14:32:51 +02:00
Pierre-Antoine Rouby 6522cea03f pamhyr: Set axis label color to 'black' instead 'green'. 2023-10-27 14:23:55 +02:00
Pierre-Antoine Rouby ea2dbfba3e pamhyr: Rename '_sql_*' function to '_db_*'. 2023-10-27 14:15:42 +02:00
Pierre-Antoine Rouby 8d92fbbdac pamhyr: Delete useless '__init__.py' file. 2023-10-27 14:13:01 +02:00
Pierre-Antoine Rouby 77f06aaa07 tools: Time the parser function. 2023-10-27 11:53:00 +02:00
Pierre-Antoine Rouby b79c5b30c0 tests: Add tests for flatten function. 2023-10-27 11:50:36 +02:00
Pierre-Antoine Rouby fdac834d48 Tests: Fix pep8. 2023-10-27 11:34:11 +02:00
Pierre-Antoine Rouby 4355be1a9c Solver: Mage: Split ST export function. 2023-10-27 11:31:20 +02:00
Pierre-Antoine Rouby 66f6d3505b Solver: CommandLine: Fix path replace. 2023-10-27 11:15:58 +02:00
Pierre-Antoine Rouby 65c261887c Tools: Command line parser: Add a test. 2023-10-27 11:14:10 +02:00
Pierre-Antoine Rouby 6c794d2eb4 Solver: Refactoring command line parser and add unittest. 2023-10-27 11:05:16 +02:00
Pierre-Antoine Rouby 51c912f3a8 Solver: Code refactoring. 2023-10-27 09:33:32 +02:00
Pierre-Antoine Rouby 76e90f417e Script: Fix pep8. 2023-10-24 15:26:55 +02:00
Pierre-Antoine Rouby e556bcff54 Script: Add script command list solver. 2023-10-24 15:13:35 +02:00
Pierre-Antoine Rouby 4833685e2e Script: Add run/export script. 2023-10-24 15:05:05 +02:00
Pierre-Antoine Rouby 862ec88191 tests: Add test script and fix pep8 in unittest. 2023-10-24 10:48:54 +02:00
Pierre-Antoine Rouby afafbb0c5e tests: Add unittest for Model and minor change. 2023-10-24 10:38:34 +02:00
Pierre-Antoine Rouby e3f01b575a Solver: Mage: Fix minor in ST file export. 2023-10-23 10:31:59 +02:00
Pierre-Antoine Rouby d6924998d9 Results: CustomPlot: Fix pep8. 2023-10-20 17:25:36 +02:00
Pierre-Antoine Rouby 0ae5c02ea0 Friction: Fix open stricker edit. 2023-10-20 17:20:03 +02:00
Pierre-Antoine Rouby e395f9f575 BC, LC: Fix sub window open. 2023-10-20 17:16:37 +02:00
Pierre-Antoine Rouby f074e1fdf2 Geometry: Fix profile sub window open. 2023-10-20 17:01:28 +02:00
Pierre-Antoine Rouby 4d1eb0fecc View: Fix results window open. 2023-10-20 16:57:32 +02:00
Pierre-Antoine Rouby f5fdde9a5d Merge branch 'results-custom-plot'. 2023-10-20 16:51:26 +02:00
Pierre-Antoine Rouby 32aa5bece5 Results: CustomPlot: Add legend and change axes label fontsize for each plot. 2023-10-20 16:48:21 +02:00
Pierre-Antoine Rouby cdfb867037 Results: CustomPlot: Add custom time axes. 2023-10-20 16:27:07 +02:00
Pierre-Antoine Rouby 021971816a Results: CustomPlot: Implement plot with time on y axes. 2023-10-20 15:09:24 +02:00
Pierre-Antoine Rouby e4386e20a3 Network: Fix item selection. 2023-10-20 11:45:28 +02:00
Pierre-Antoine Rouby 8760cd364d Pamhyr: Implement window duplication deny mechanism with hash (#7). 2023-10-20 10:48:07 +02:00
Pierre-Antoine Rouby 4c40f675b5 IC: Fix #14. 2023-10-20 09:25:19 +02:00