From 1fdeab9685ba1b153dc9d92d6a973d429421fb74 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 15 Apr 2024 15:40:46 +0200
Subject: [PATCH] Geometry: Meshing: Minor change.
---
src/View/ui/MeshingOptions.ui | 401 ++++++++++++++++++----------------
src/lang/fr.ts | 53 +++--
2 files changed, 247 insertions(+), 207 deletions(-)
diff --git a/src/View/ui/MeshingOptions.ui b/src/View/ui/MeshingOptions.ui
index dde78e51..c6f6108d 100644
--- a/src/View/ui/MeshingOptions.ui
+++ b/src/View/ui/MeshingOptions.ui
@@ -6,202 +6,231 @@
<rect>
<x>0</x>
<y>0</y>
- <width>416</width>
- <height>234</height>
+ <width>512</width>
+ <height>288</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>First cross section</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox_begin_kp">
- <property name="enabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Last cross section</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox_end_kp">
- <property name="enabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Limits</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>First cross section</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox_begin_kp">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Last cross section</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox_end_kp">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>First guide line</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox_begin_gl">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Last guide line</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="comboBox_end_gl">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</item>
<item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
- <item>
- <widget class="QLabel" name="label_5">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>First guide line</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox_begin_gl">
- <property name="enabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_8">
- <item>
- <widget class="QLabel" name="label_6">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Last guide line</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox_end_gl">
- <property name="enabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Options</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Section space step (m)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QDoubleSpinBox" name="doubleSpinBox_space_step">
+ <property name="value">
+ <double>50.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QLabel" name="label_4">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Distance computation guild line</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QComboBox" name="comboBox_lm">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Type of interpolation:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QRadioButton" name="radioButton_spline">
+ <property name="text">
+ <string>Spline</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioButton_linear">
+ <property name="text">
+ <string>Linear</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</item>
<item row="2" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Section space step</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="doubleSpinBox_space_step"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="3" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
- <item>
- <widget class="QLabel" name="label_4">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Distance computation guild line</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox_lm">
- <property name="enabled">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="4" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <item>
- <widget class="QRadioButton" name="radioButton_spline">
- <property name="text">
- <string>Spline</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioButton_linear">
- <property name="text">
- <string>Linear</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="5" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index 40cbd439..9aa127e3 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="fr_FR" sourcelanguage="en_150">
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR" sourcelanguage="en_150">
<context>
<name>About</name>
<message>
@@ -624,42 +625,42 @@
<translation>Débit</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="27"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="33"/>
<source>First cross section</source>
<translation>Première section en travers</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="48"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="54"/>
<source>Last cross section</source>
<translation>Dernière section en travers</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="73"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="79"/>
<source>First guide line</source>
<translation>Première ligne directrice</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="94"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="100"/>
<source>Last guide line</source>
<translation>Dernière ligne directrice</translation>
</message>
<message>
<location filename="../View/ui/MeshingOptions.ui" line="114"/>
<source>Section space step</source>
- <translation>Pas d'espace</translation>
+ <translation type="obsolete">Pas d'espace</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="144"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="161"/>
<source>Distance computation guild line</source>
<translation>Ligne directrice pour le calcule des distances</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="175"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="201"/>
<source>Spline</source>
<translation>Spline</translation>
</message>
<message>
- <location filename="../View/ui/MeshingOptions.ui" line="185"/>
+ <location filename="../View/ui/MeshingOptions.ui" line="211"/>
<source>Linear</source>
<translation>Linéaire</translation>
</message>
@@ -693,6 +694,26 @@
<source>Comment lines start with '*' char (let see the mage documentation for more details)</source>
<translation>Les lignes de commentaire commence pas un charactère '*' (voir la documentation de mage pour plus de détails)</translation>
</message>
+ <message>
+ <location filename="../View/ui/MeshingOptions.ui" line="20"/>
+ <source>Limits</source>
+ <translation>Limites</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/MeshingOptions.ui" line="121"/>
+ <source>Options</source>
+ <translation>Options</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/MeshingOptions.ui" line="127"/>
+ <source>Section space step (m)</source>
+ <translation>Pas d'espace (m)</translation>
+ </message>
+ <message>
+ <location filename="../View/ui/MeshingOptions.ui" line="192"/>
+ <source>Type of interpolation:</source>
+ <translation>Type d'interpolation :</translation>
+ </message>
</context>
<context>
<name>Documentation</name>
@@ -2470,14 +2491,9 @@
<translation>Profil</translation>
</message>
<message>
- <location filename="../View/Results/PlotH.py" line="55"/>
- <source>Discharge (m³/s)</source>
- <translation type="obsolete">Débit (m³/s)</translation>
- </message>
- <message encoding="UTF-8">
<location filename="../View/Results/PlotH.py" line="55"/>
<source>Discharge (m³/s)</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Débit (m³/s)</translation>
</message>
</context>
<context>
@@ -2926,14 +2942,9 @@
<translation>Date (format ISO)</translation>
</message>
<message>
- <location filename="../View/Translate.py" line="64"/>
- <source>Discharge (m³/s)</source>
- <translation type="obsolete">Débit (m³/s)</translation>
- </message>
- <message encoding="UTF-8">
<location filename="../View/Translate.py" line="64"/>
<source>Discharge (m³/s)</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">Débit (m³/s)</translation>
</message>
</context>
</TS>
--
GitLab