parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Theophile Terraz committed 2024-09-24 16:04:22 +02:00
2 parents 9ae16ca6ec a95364db1d
commit a52e6b86f4
148 files changed
+5069 -2198
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/View/ui/BoundaryConditions.ui
+5 -5
View File
@@ -37,7 +37,7 @@
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab_liquid">
<attribute name="title">
@@ -61,7 +61,7 @@
</widget>
<widget class="QWidget" name="tab_suspenssion">
<attribute name="title">
<string>Suspenssion</string>
<string>Suspension</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -114,7 +114,7 @@
<string>Add</string>
</property>
<property name="toolTip">
<string>Add a new boundary condition or punctual contribution</string>
<string>Add a new boundary condition or point source</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -144,7 +144,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
<string>Edit boundary condition or punctual contribution</string>
<string>Edit boundary condition or point source</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
@@ -159,7 +159,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
<string>Sort boundary condition by name</string>
<string>Sort by names</string>
</property>
</action>
</widget>
src/View/ui/BoundaryConditionsDialogGenerator.ui
+98
View File
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>356</width>
<height>107</height>
</rect>
</property>
<property name="windowTitle">
<string>Options</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="locale">
<locale language="English" country="Europe"/>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Slope</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox">
<property name="decimals">
<number>6</number>
</property>
<property name="maximum">
<double>999999.998999999952503</double>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="EstimateButton">
<property name="text">
<string>Estimate</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/View/ui/ConfigureDialog.ui
+4 -4
View File
@@ -164,7 +164,7 @@
<item>
<widget class="QLabel" name="label_9">
<property name="text">
<string>Frequence</string>
<string>Frequency</string>
</property>
</widget>
</item>
@@ -349,7 +349,7 @@
</font>
</property>
<property name="text">
<string>This value must be used for reading or editing files in speficic case.</string>
<string>This value must be used for reading or editing files in speficic cases.</string>
</property>
</widget>
</item>
@@ -374,7 +374,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string> - The &quot;@file&quot; keyworkd is replace by the path of file to open.</string>
<string> - The &quot;@file&quot; keyword is replaced by the path of file to open.</string>
</property>
</widget>
</item>
@@ -382,7 +382,7 @@
</widget>
<widget class="QWidget" name="tab_language">
<attribute name="title">
<string>Language</string>
<string>Langue</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
src/View/ui/CustomPlotValuesSelectionDialog.ui
+17 -17
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>414</width>
<height>482</height>
<height>70</height>
</rect>
</property>
<property name="windowTitle">
@@ -57,22 +57,6 @@
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
@@ -89,5 +73,21 @@
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/View/ui/DebugRepl.ui
+1 -1
View File
@@ -23,7 +23,7 @@
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Eval</string>
<string>Evaluate</string>
</property>
<property name="icon">
<iconset>
src/View/ui/EditBoundaryConditions.ui
+32 -2
View File
@@ -73,6 +73,9 @@
<addaction name="action_add"/>
<addaction name="action_del"/>
<addaction name="action_sort"/>
<addaction name="action_generate_uniform"/>
<addaction name="action_generate_critical"/>
<addaction name="action_increasing"/>
</widget>
<action name="action_add">
<property name="checkable">
@@ -86,7 +89,7 @@
<string>Add</string>
</property>
<property name="toolTip">
<string>Add a new point in boundary condition or punctual contribution</string>
<string>Add a new point</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -116,7 +119,34 @@
<string>Sort</string>
</property>
<property name="toolTip">
<string>Sort boundary condition points</string>
<string>Sort points</string>
</property>
</action>
<action name="action_generate_uniform">
<property name="text">
<string>Generate uniform</string>
</property>
<property name="iconText">
<string>Generate uniform</string>
</property>
<property name="toolTip">
<string>Generate rating curve from Manning law</string>
</property>
</action>
<action name="action_generate_critical">
<property name="text">
<string>Generate critical</string>
</property>
<property name="toolTip">
<string>Generate rating curve as Q(z) = Sqrt(g*S(z)^3/L(z))</string>
</property>
</action>
<action name="action_increasing">
<property name="text">
<string>Make increasing</string>
</property>
<property name="toolTip">
<string>Remove points to make the curve increasing</string>
</property>
</action>
</widget>
src/View/ui/EditLateralContribution.ui
+2 -2
View File
@@ -79,7 +79,7 @@
<string>Add</string>
</property>
<property name="toolTip">
<string>Add a new point in boundary condition or lateral contribution</string>
<string>Add a new point in boundary condition or lateral source</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -109,7 +109,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
<string>Sort boundary condition point</string>
<string>Sort points</string>
</property>
</action>
</widget>
src/View/ui/Frictions.ui
+4 -1
View File
@@ -98,7 +98,10 @@
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property>
<property name="text">
<string>Edit stricklers</string>
<string>Edit Strickler coefficients</string>
</property>
<property name="toolTip">
<string>Edit Strickler coefficients</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
src/View/ui/GeometryCrossSection.ui
+5 -5
View File
@@ -67,10 +67,10 @@
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
<string>add</string>
<string>Add</string>
</property>
<property name="toolTip">
<string>Add a point on cross-section</string>
<string>Add a point to cross-section</string>
</property>
</action>
<action name="action_delete">
@@ -91,7 +91,7 @@
<normaloff>ressources/up.png</normaloff>ressources/up.png</iconset>
</property>
<property name="text">
<string>up</string>
<string>Up</string>
</property>
<property name="toolTip">
<string>Move up selected point(s)</string>
@@ -103,10 +103,10 @@
<normaloff>ressources/down.png</normaloff>ressources/down.png</iconset>
</property>
<property name="text">
<string>down</string>
<string>Down</string>
</property>
<property name="toolTip">
<string>Mode down selected point(s)</string>
<string>Move down selected point(s)</string>
</property>
</action>
<action name="action_sort_asc">
src/View/ui/GeometryReach.ui
+19 -53
View File
@@ -28,49 +28,6 @@
<item>
<widget class="QTableView" name="tableView"/>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QPushButton" name="pushButton_up">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSlider" name="verticalSlider">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>true</bool>
</property>
<property name="invertedControls">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="pushButton_down">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QSplitter" name="splitter_2">
@@ -133,8 +90,9 @@
<addaction name="action_down"/>
<addaction name="action_export"/>
<addaction name="action_meshing"/>
<addaction name="action_update_kp"/>
<addaction name="action_update_rk"/>
<addaction name="action_purge"/>
<addaction name="action_shift"/>
</widget>
<action name="action_import">
<property name="icon">
@@ -166,7 +124,7 @@
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
<string>add</string>
<string>Add</string>
</property>
<property name="toolTip">
<string>Add a cross-section</string>
@@ -190,7 +148,7 @@
<normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
</property>
<property name="text">
<string>edit</string>
<string>Edit</string>
</property>
<property name="toolTip">
<string>Edit selected cross section(s)</string>
@@ -205,7 +163,7 @@
<string>sort_asc</string>
</property>
<property name="toolTip">
<string>Sort cross-sections by ascending KP</string>
<string>Sort cross-sections by ascending position</string>
</property>
</action>
<action name="action_sort_des">
@@ -217,7 +175,7 @@
<string>sort_des</string>
</property>
<property name="toolTip">
<string>Sort cross-sections by descending KP</string>
<string>Sort cross-sections by descending position</string>
</property>
</action>
<action name="action_up">
@@ -226,7 +184,7 @@
<normaloff>ressources/up.png</normaloff>ressources/up.png</iconset>
</property>
<property name="text">
<string>up</string>
<string>Up</string>
</property>
<property name="toolTip">
<string>Move up selected cross-section(s)</string>
@@ -238,7 +196,7 @@
<normaloff>ressources/down.png</normaloff>ressources/down.png</iconset>
</property>
<property name="text">
<string>down</string>
<string>Down</string>
</property>
<property name="toolTip">
<string>Move down selected cross-section(s)</string>
@@ -253,12 +211,12 @@
<string>Meshing</string>
</property>
</action>
<action name="action_update_kp">
<action name="action_update_rk">
<property name="text">
<string>Update KP</string>
<string>Update RK</string>
</property>
<property name="toolTip">
<string>Recompute KP</string>
<string>Recompute RK</string>
</property>
</action>
<action name="action_purge">
@@ -269,6 +227,14 @@
<string>Purge cross-sections to keep a given number of points</string>
</property>
</action>
<action name="action_shift">
<property name="text">
<string>Shift</string>
</property>
<property name="toolTip">
<string>Shift selected sections coordinates</string>
</property>
</action>
</widget>
<resources/>
<connections/>
src/View/ui/GeometryReachShift.ui
+134
View File
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>381</width>
<height>144</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Y coordinate</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_1">
<property name="text">
<string>X coordinate</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_Y">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_X">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Z coordinate</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_Z">
<property name="decimals">
<number>4</number>
</property>
<property name="minimum">
<double>-99999999.000000000000000</double>
</property>
<property name="maximum">
<double>99999999.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/View/ui/InitialConditions.ui
+12 -5
View File
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1024</width>
<width>849</width>
<height>576</height>
</rect>
</property>
@@ -27,14 +27,21 @@
<item>
<widget class="QPushButton" name="pushButton_generate_1">
<property name="text">
<string>Generate from height</string>
<string>Generate depth</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_generate_2">
<property name="text">
<string>Generate from discharge</string>
<string>Generate discharge</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_generate_3">
<property name="text">
<string>Generate elevation</string>
</property>
</widget>
</item>
@@ -65,7 +72,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1024</width>
<width>849</width>
<height>22</height>
</rect>
</property>
@@ -119,7 +126,7 @@
<string>sort</string>
</property>
<property name="toolTip">
<string>Sort inital condition</string>
<string>Sort inital conditions</string>
</property>
</action>
<action name="action_import">
src/View/ui/InitialConditions_Dialog_Generator_Depth.ui
+95
View File
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>284</width>
<height>107</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="locale">
<locale language="English" country="Europe"/>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Depth (m)</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox">
<property name="maximum">
<double>1000000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Generate discharge</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
+16 -6
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>284</width>
<height>80</height>
<height>107</height>
</rect>
</property>
<property name="windowTitle">
@@ -17,6 +17,16 @@
<locale language="English" country="Europe"/>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
@@ -39,12 +49,12 @@
</layout>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Generate height</string>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
src/View/ui/InitialConditions_Dialog_Generator_Height.ui
+70 -5
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>284</width>
<height>80</height>
<width>396</width>
<height>182</height>
</rect>
</property>
<property name="windowTitle">
@@ -22,20 +22,74 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Height (m)</string>
<string>Upstream height (m)</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox">
<widget class="QDoubleSpinBox" name="doubleSpinBox_1">
<property name="minimum">
<double>-1000000.000000000000000</double>
</property>
<property name="maximum">
<double>999999.998999999952503</double>
<double>1000000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Discharge</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox_3">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimum">
<double>-1000000.000000000000000</double>
</property>
<property name="maximum">
<double>1000000.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Downstream height (m)</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox_2">
<property name="minimum">
<double>-1000000.000000000000000</double>
</property>
<property name="maximum">
<double>1000000.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -45,6 +99,17 @@
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Generate constant discharge</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
src/View/ui/LateralContributions.ui
+4 -4
View File
@@ -61,7 +61,7 @@
</widget>
<widget class="QWidget" name="tab_suspenssion">
<attribute name="title">
<string>Suspenssion</string>
<string>Suspension</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -114,7 +114,7 @@
<string>Add</string>
</property>
<property name="toolTip">
<string>Add a new boundary condition or lateral contribution</string>
<string>Add a new boundary condition or lateral source</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -144,7 +144,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
<string>Edit boundary condition or lateral contribution</string>
<string>Edit boundary condition or lateral source</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
@@ -159,7 +159,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
<string>Sort boundary condition by name</string>
<string>Sort by names</string>
</property>
</action>
</widget>
src/View/ui/MainWindow.ui
+14 -14
View File
@@ -117,7 +117,7 @@
<locale language="English" country="Europe"/>
</property>
<property name="title">
<string>&amp;River Network</string>
<string>&amp;River network</string>
</property>
<addaction name="action_menu_edit_network"/>
</widget>
@@ -422,7 +422,7 @@
</action>
<action name="action_menu_config">
<property name="text">
<string>Pamhyr configuration</string>
<string>Pamhyr2 configuration</string>
</property>
</action>
<action name="action_menu_quit">
@@ -460,10 +460,10 @@
</action>
<action name="action_menu_numerical_parameter">
<property name="text">
<string>Numerical parameter for solvers</string>
<string>Numerical parameters of solvers</string>
</property>
<property name="toolTip">
<string>Numerical parameter for solvers</string>
<string>Numerical parameters of solvers</string>
</property>
</action>
<action name="action_menu_boundary_conditions">
@@ -472,7 +472,7 @@
<normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset>
</property>
<property name="text">
<string>Boundary conditions and punctual contributions</string>
<string>Boundary conditions and point sources</string>
</property>
<property name="font">
<font/>
@@ -493,7 +493,7 @@
<normaloff>ressources/friction.png</normaloff>ressources/friction.png</iconset>
</property>
<property name="text">
<string>Edit friction</string>
<string>Edit frictions</string>
</property>
</action>
<action name="action_menu_edit_lateral_contribution">
@@ -502,7 +502,7 @@
<normaloff>ressources/lateral_contribution.png</normaloff>ressources/lateral_contribution.png</iconset>
</property>
<property name="text">
<string>Edit lateral contributions</string>
<string>Edit lateral sources</string>
</property>
</action>
<action name="action_menu_run_solver">
@@ -611,7 +611,7 @@
<string>Boundary conditions</string>
</property>
<property name="toolTip">
<string>Edit boundary conditions and punctual contributions</string>
<string>Edit boundary conditions and point sources</string>
</property>
<property name="font">
<font/>
@@ -623,10 +623,10 @@
<normaloff>ressources/lateral_contribution.png</normaloff>ressources/lateral_contribution.png</iconset>
</property>
<property name="text">
<string>Lateral contribution</string>
<string>Lateral sources</string>
</property>
<property name="toolTip">
<string>Edit lateral contribution</string>
<string>Edit lateral sources</string>
</property>
</action>
<action name="action_toolBar_frictions">
@@ -638,7 +638,7 @@
<string>Friction</string>
</property>
<property name="toolTip">
<string>Edit frictions</string>
<string>Edit friction</string>
</property>
</action>
<action name="action_menu_edit">
@@ -683,7 +683,7 @@
<string>Mage</string>
</property>
<property name="toolTip">
<string>Open mage documentation</string>
<string>Open Mage documentation</string>
</property>
</action>
<action name="action_menu_pamhyr_users_wiki">
@@ -731,12 +731,12 @@
<normaloff>ressources/boundary_condition.png</normaloff>ressources/boundary_condition.png</iconset>
</property>
<property name="text">
<string>Boundary conditions and punctual contributions</string>
<string>Boundary conditions and point sources</string>
</property>
</action>
<action name="action_menu_additional_file">
<property name="text">
<string>&amp;Additional file</string>
<string>&amp;Additional files</string>
</property>
</action>
<action name="action_menu_rep_additional_lines">
src/View/ui/MeshingOptions.ui
+8 -8
View File
@@ -33,7 +33,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Section space step (m)</string>
<string>Space step (m)</string>
</property>
</widget>
</item>
@@ -111,7 +111,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Distance computation</string>
<string>Guideline used for distance computation</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
@@ -120,7 +120,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Second guide-line</string>
<string>Second guideline</string>
</property>
</widget>
</item>
@@ -130,7 +130,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>First guide-line</string>
<string>First guideline</string>
</property>
</widget>
</item>
@@ -165,12 +165,12 @@
<bool>true</bool>
</property>
<property name="text">
<string>First cross section</string>
<string>First cross-section</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_begin_kp">
<widget class="QComboBox" name="comboBox_begin_rk">
<property name="enabled">
<bool>true</bool>
</property>
@@ -186,12 +186,12 @@
<bool>true</bool>
</property>
<property name="text">
<string>Last cross section</string>
<string>Last cross-section</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_end_kp">
<widget class="QComboBox" name="comboBox_end_rk">
<property name="enabled">
<bool>true</bool>
</property>
src/View/ui/NewStudy.ui
+1 -1
View File
@@ -127,7 +127,7 @@
<bool>false</bool>
</property>
<property name="text">
<string>Staring date</string>
<string>Starting date</string>
</property>
</widget>
</item>
src/View/ui/PurgeOptions.ui
+86
View File
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>194</width>
<height>114</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Number of points to keep</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QSpinBox" name="spinBox_np_purge">
<property name="minimum">
<number>3</number>
</property>
<property name="maximum">
<number>999999999</number>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/View/ui/REPLineDialog.ui
+1 -1
View File
@@ -54,7 +54,7 @@
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_line">
<property name="toolTip">
<string>Comment lines start with '*' char (let see the mage documentation for more details)</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Comment lines start with '*' char (let see Mage documentation for more details)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
src/View/ui/REPLineList.ui
+3 -3
View File
@@ -37,13 +37,13 @@
<action name="action_add">
<property name="icon">
<iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
<string>Add</string>
</property>
<property name="toolTip">
<string>Add new additional line</string>
<string>Add new line</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
@@ -52,7 +52,7 @@
<action name="action_delete">
<property name="icon">
<iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
<normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property>
<property name="text">
<string>Delete</string>
src/View/ui/ReachSedimentLayers.ui
+2 -2
View File
@@ -35,7 +35,7 @@
<item>
<widget class="QPushButton" name="pushButton_apply">
<property name="text">
<string>Apply sediment layers on all reach</string>
<string>Apply sediment layers to all reaches</string>
</property>
</widget>
</item>
@@ -80,7 +80,7 @@
<string>Edit profile</string>
</property>
<property name="toolTip">
<string>Edit profile sediment layer</string>
<string>Edit sediment layers of the profile</string>
</property>
</action>
</widget>
src/View/ui/Reservoir.ui
+2 -2
View File
@@ -99,7 +99,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
<string>Edit elevation/surface law</string>
<string>Edit stage-area relation</string>
</property>
</action>
<action name="action_sort">
@@ -111,7 +111,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
<string>Sort points by elevation</string>
<string>Sort points by elevations</string>
</property>
</action>
</widget>
src/View/ui/ReservoirList.ui
+3 -3
View File
@@ -75,7 +75,7 @@
<action name="action_add">
<property name="icon">
<iconset>
<normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
<normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
</property>
<property name="text">
<string>Add</string>
@@ -87,7 +87,7 @@
<action name="action_delete">
<property name="icon">
<iconset>
<normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
<normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
</property>
<property name="text">
<string>Delete</string>
@@ -105,7 +105,7 @@
<string>Edit</string>
</property>
<property name="toolTip">
<string>Edit reservoir law</string>
<string>Edit reservoir equations</string>
</property>
</action>
</widget>
src/View/ui/Results.ui
+6 -16
View File
@@ -39,19 +39,6 @@
<item>
<widget class="QTableView" name="tableView_profile"/>
</item>
<item>
<widget class="QSlider" name="verticalSlider_profile">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>true</bool>
</property>
<property name="invertedControls">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
@@ -147,6 +134,9 @@
<property name="currentIndex">
<number>1</number>
</property>
<property name="tabsClosable">
<bool>true</bool>
</property>
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>Raw data</string>
@@ -198,7 +188,7 @@
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Hydrograph</string>
<string>Discharge time series</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -251,7 +241,7 @@
<string>Add</string>
</property>
<property name="toolTip">
<string>Add custom visualization</string>
<string>Add customized visualization</string>
</property>
</action>
<action name="action_reload">
@@ -272,7 +262,7 @@
<string>Export</string>
</property>
<property name="toolTip">
<string>Export raw data</string>
<string>Export data as CSV</string>
</property>
<property name="shortcut">
<string>Ctrl+E</string>
src/View/ui/Stricklers.ui
+5 -5
View File
@@ -25,7 +25,7 @@
</property>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Study stricklers</string>
<string>Strickler coefficients of the study</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -35,7 +35,7 @@
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Application stricklers</string>
<string>Strickler coefficients of the application</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
@@ -70,7 +70,7 @@
<string>Add</string>
</property>
<property name="toolTip">
<string>Add new stricklers</string>
<string>Add new Strickler coefficients</string>
</property>
</action>
<action name="action_del">
@@ -82,7 +82,7 @@
<string>Delete</string>
</property>
<property name="toolTip">
<string>Delete selected stricklers</string>
<string>Delete selected Strickler coefficients</string>
</property>
</action>
<action name="action_sort">
@@ -94,7 +94,7 @@
<string>Sort</string>
</property>
<property name="toolTip">
<string>Sort stricklers</string>
<string>Sort Strickler coefficients</string>
</property>
</action>
</widget>
src/View/ui/UpdateKPOptions.ui → src/View/ui/UpdateRKOptions.ui
+89 -37
View File
@@ -6,37 +6,23 @@
<rect>
<x>0</x>
<y>0</y>
<width>340</width>
<height>204</height>
<width>381</width>
<height>302</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Distance computation</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_end_gl">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="enabled">
@@ -47,11 +33,17 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_begin_gl">
<property name="enabled">
<bool>true</bool>
<item row="5" column="1">
<widget class="QRadioButton" name="radioButton_1">
<property name="text">
<string>Upstream to downstream</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_orientation</string>
</attribute>
</widget>
</item>
<item row="2" column="0">
@@ -67,20 +59,6 @@
<item row="0" column="1">
<widget class="QComboBox" name="comboBox_origin"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Origin</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Origin value</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_origin">
<property name="decimals">
@@ -94,9 +72,80 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Origin</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBox_begin_gl">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Origin value</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QRadioButton" name="radioButton_2">
<property name="text">
<string>Downstream to upstream</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_orientation</string>
</attribute>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox_end_gl">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Orientation</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QRadioButton" name="radioButton_0">
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Keep current</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_orientation</string>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
@@ -134,4 +183,7 @@
</hints>
</connection>
</connections>
<buttongroups>
<buttongroup name="buttonGroup_orientation"/>
</buttongroups>
</ui>
src/View/ui/Widgets/MainWindowTabInfo.ui
+1 -1
View File
@@ -182,7 +182,7 @@
<item row="2" column="3">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Lateral contributions:</string>
<string>Lateral sources:</string>
</property>
</widget>
</item>
src/View/ui/Widgets/d50sigma.ui
+3 -3
View File
@@ -22,7 +22,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_d50">
@@ -37,13 +37,13 @@
<locale language="English" country="Europe"/>
</property>
<property name="decimals">
<number>4</number>
<number>8</number>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_sigma">
src/View/ui/ressources/icon.ico
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB