From c5191b152a70aedf8b7de09ccd23da797ddaa5e6 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 25 Mar 2022 23:41:58 +0100 Subject: [PATCH] [skip CI] [FEM] results dialog: fix layout issued reported by Qt Designer --- src/Mod/Fem/Gui/Resources/ui/ResultHints.ui | 441 +++++++------- src/Mod/Fem/Gui/Resources/ui/ResultShow.ui | 605 +++++++++++--------- 2 files changed, 535 insertions(+), 511 deletions(-) diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui index a4ad8b6f00..f2719c886c 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultHints.ui @@ -6,243 +6,226 @@ 0 0 - 451 - 768 + 391 + 218 Hints user defined equations - + - - - - - Available result types: - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 - - - displacement: x, y, z - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - -1 - - - Qt::TextSelectableByMouse - - - - - - - mass flow rate: MF - - - Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - network pressure: NP - - - Qt::TextSelectableByMouse - - - - - - - von Mises stress: vM - - - Qt::TextSelectableByMouse - - - - - - - temperature: T - - - Qt::TextSelectableByMouse - - - - - - - min. principal stress vector: s1x, s1y, s1z - - - Qt::TextSelectableByMouse - - - - - - - principal stresses: P1, P2, P3 - - - Qt::TextSelectableByMouse - - - - - - - reinforcement ratio: rx, ry, rz - - - Qt::TextSelectableByMouse - - - - - - - equivalent plastic strain: Peeq - - - Qt::TextSelectableByMouse - - - - - - - med. principal stress vector: s2x, s2y, s2z - - - Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - 1 - - - stress: sxx, syy, szz, sxy, sxz, syz - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - -1 - - - Qt::TextSelectableByMouse - - - - - - - strain: exx, eyy, ezz, exy, exz, eyz - - - Qt::TextSelectableByMouse - - - - - - - Mohr Coulomb: mc - - - Qt::TextSelectableByMouse - - - - - - - max. principal stress vector: s3x, s3y, s3z - - - Qt::TextSelectableByMouse - - - - + + + Available result types: + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 1 + + + displacement: x, y, z + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + -1 + + + Qt::TextSelectableByMouse + + + + + + + mass flow rate: MF + + + Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + network pressure: NP + + + Qt::TextSelectableByMouse + + + + + + + von Mises stress: vM + + + Qt::TextSelectableByMouse + + + + + + + temperature: T + + + Qt::TextSelectableByMouse + + + + + + + min. principal stress vector: s1x, s1y, s1z + + + Qt::TextSelectableByMouse + + + + + + + principal stresses: P1, P2, P3 + + + Qt::TextSelectableByMouse + + + + + + + reinforcement ratio: rx, ry, rz + + + Qt::TextSelectableByMouse + + + + + + + equivalent plastic strain: Peeq + + + Qt::TextSelectableByMouse + + + + + + + med. principal stress vector: s2x, s2y, s2z + + + Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 1 + + + stress: sxx, syy, szz, sxy, sxz, syz + + + false + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + -1 + + + Qt::TextSelectableByMouse + + + + + + + strain: exx, eyy, ezz, exy, exz, eyz + + + Qt::TextSelectableByMouse + + + + + + + Mohr Coulomb: mc + + + Qt::TextSelectableByMouse + + + + + + + max. principal stress vector: s3x, s3y, s3z + + + Qt::TextSelectableByMouse + + - - - - - - Qt::Vertical - - - - 20 - 240 - - - - - + + + diff --git a/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui b/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui index 7fe15353b0..793eb5b063 100644 --- a/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui +++ b/src/Mod/Fem/Gui/Resources/ui/ResultShow.ui @@ -6,308 +6,349 @@ 0 0 - 400 - 548 + 350 + 567 Show result - + - - - - - Result type - - - - - - - - Displacement Magnitude - - - - - - - None - - - true - - - - - - - Displacement Y - - - - - - - Displacement X - - - - - - - Peeq - - - - - - - Displacement Z - - - - - - - Temperature - - - - - - - von Mises Stress - - - - - - - Max Principal Stress - - - - - - - Min Principal Stress - - - - - - - Max Shear Stress (Tresca) - - - - - - - Mass Flow Rate - - - - - - - Network Pressure - - - - + + + Result type + + + + + + + + + 0 + 20 + + + + None + + + true + + - - - - - - Min: - - - - - - - true - - - mm - - - - - - - Max: - - - - - - - true - - - mm - - - - - - - Histogram - - - - + + + + + 0 + 20 + + + + Displacement Magnitude + + + + + + + von Mises Stress + + + + + + + + 0 + 20 + + + + Displacement X + + + + + + + Max Principal Stress + + + + + + + + 0 + 20 + + + + Displacement Y + + + + + + + Min Principal Stress + + + + + + + + 0 + 20 + + + + Displacement Z + + + + + + + Max Shear Stress (Tresca) + + + + + + + + 0 + 20 + + + + Peeq + + + + + + + Mass Flow Rate + + + + + + + + 0 + 20 + + + + Temperature + + + + + + + Network Pressure + + - - - - - - Displacement - - - - - - - - Show - - - false - - - - - - - false - - - - 0 - 0 - - - - 100 - - - Qt::Horizontal - - - - + + + + + + + Min: + + - - - - - - false - - - Factor: - - - - - - - true - - - Qt::ImhFormattedNumbersOnly - - - false - - - 1 - - - 1000000.000000000000000 - - - - + + + + + + + true + + + mm + + - - - - - - false - - - Slider max: - - - - - - - true - - - Qt::ImhFormattedNumbersOnly - - - false - - - 1 - - - 1000000.000000000000000 - - - - + + + + Max: + + + + + + + true + + + mm + + + + + + + Histogram + + - - - - - - User defined equation - - + + + + + + + + Displacement + + + + - - - - - Calculate and plot - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + Show + + + false + + + + + + + false + + + + 0 + 0 + + + + 100 + + + Qt::Horizontal + + + + + + + + + + + false + + + Factor: + + + + + + + true + + + Qt::ImhFormattedNumbersOnly + + + false + + + 1 + + + 1000000.000000000000000 + + + + + + + + + + + false + + + Slider max: + + + + + + + true + + + Qt::ImhFormattedNumbersOnly + + + false + + + 1 + + + 1000000.000000000000000 + + + + + + + + + + + + User defined equation + + + + + + + + Calculate and plot + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:8pt;">P1-P3 # Stress intensity stress equation. Available values are numpy array format. Calculation np.function can be used on available values. </span></p></body></html> - - - - + + - - - + + +