From 1d0e50ef3f20440808ab6e2bdf231384a96bd4f3 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 24 Oct 2014 17:35:34 +0400 Subject: [PATCH] Minor improvement of Inertia dialog box look-n-feel. --- src/GEOMGUI/GEOM_msg_en.ts | 8 - src/GEOMGUI/GEOM_msg_fr.ts | 8 - src/GEOMGUI/GEOM_msg_ja.ts | 8 - .../MeasureGUI_1Sel12LineEdit_QTD.ui | 381 +++++++++++------- src/MeasureGUI/MeasureGUI_InertiaDlg.cxx | 16 +- 5 files changed, 244 insertions(+), 177 deletions(-) diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 754afda3d..79079b8c8 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -908,14 +908,6 @@ Please, select face, shell or solid and try again GEOM_INERTIA_CONSTR Matrix And Moments Of Inertia - - GEOM_INERTIA_I - %1:1 : - - - GEOM_INERTIA_IXYZ - IX & IY & IZ : - GEOM_INERTIA_TITLE Calculs Of Inertia diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 07c02e244..7bb28365f 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -920,14 +920,6 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_INERTIA_CONSTR Matrice et moment d'inertie - - GEOM_INERTIA_I - %1:1 : - - - GEOM_INERTIA_IXYZ - IX & IY & IZ : - GEOM_INERTIA_TITLE Calcul de l'inertie diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts index 8d7cd8e2d..8ee7476d7 100644 --- a/src/GEOMGUI/GEOM_msg_ja.ts +++ b/src/GEOMGUI/GEOM_msg_ja.ts @@ -899,14 +899,6 @@ GEOM_INERTIA_CONSTR 行列とモーメント - - GEOM_INERTIA_I - %1:1。 - - - GEOM_INERTIA_IXYZ - IX & IY & IZ : - GEOM_INERTIA_TITLE 慣性の計算 diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui index 30b225aad..2f0e56b0e 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui +++ b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui @@ -1,63 +1,48 @@ - + + MeasureGUI_1Sel12LineEdit_QTD - - + + 0 0 - 196 - 162 + 501 + 171 - + - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - + + + + - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - + + + + + TL1 + + + + + + + + 0 + 0 + + + + + + + + + + 300 0 @@ -65,109 +50,207 @@ - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - - - - - - - TL2 - - - - - - - - - - TL4 - - - - - - - - - - - - - - - - - - - - - - - - - TL5 - - - - - - - - - - - - - - - - TL3 - - - - - - - - - TL1 + + + + TL2_1 - - - - - 0 - 0 - + + + + + 100 + 0 + - - + + + + + + TL2_2 + + + + + + + + 100 + 0 + + + + + + + + TL2_3 + + + + + + + + 100 + 0 + + + + + + + + TL3_1 + + + + + + + + 100 + 0 + + + + + + + + TL3_2 + + + + + + + + 100 + 0 + + + + + + + + TL3_3 + + + + + + + + 100 + 0 + + + + + + + + TL4_1 + + + + + + + + 100 + 0 + + + + + + + + TL4_2 + + + + + + + + 100 + 0 + + + + + + + + TL4_3 + + + + + + + + 100 + 0 + + + + + + + + TL5_1 + + + + + + + + 100 + 0 + + + + + + + + TL5_2 + + + + + + + + 100 + 0 + + + + + + + + TL5_3 + + + + + + + + 100 + 0 + diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx index 3a17446b4..3a011a5fe 100644 --- a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx @@ -62,10 +62,18 @@ MeasureGUI_InertiaDlg::MeasureGUI_InertiaDlg( GeometryGUI* GUI, QWidget* parent myGrp = new MeasureGUI_1Sel12LineEdit( centralWidget() ); myGrp->GroupBox1->setTitle( tr( "GEOM_MATRIX" ) ); myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) ); - myGrp->TextLabel2->setText( tr( "GEOM_INERTIA_I" ).arg( "1" ) ); - myGrp->TextLabel3->setText( tr( "GEOM_INERTIA_I" ).arg( "2" ) ); - myGrp->TextLabel4->setText( tr( "GEOM_INERTIA_I" ).arg( "3" ) ); - myGrp->TextLabel5->setText( tr( "GEOM_INERTIA_IXYZ" ) ); + myGrp->TextLabel2_1->setText( "1:1" ); + myGrp->TextLabel2_2->setText( "1:2" ); + myGrp->TextLabel2_3->setText( "1:3" ); + myGrp->TextLabel3_1->setText( "2:1" ); + myGrp->TextLabel3_2->setText( "2:2" ); + myGrp->TextLabel3_3->setText( "2:3" ); + myGrp->TextLabel4_1->setText( "3:1" ); + myGrp->TextLabel4_2->setText( "3:2" ); + myGrp->TextLabel4_3->setText( "3:3" ); + myGrp->TextLabel5_1->setText( "IX" ); + myGrp->TextLabel5_2->setText( "IY" ); + myGrp->TextLabel5_3->setText( "IZ" ); myGrp->LineEdit11->setReadOnly( true ); myGrp->LineEdit12->setReadOnly( true ); myGrp->LineEdit13->setReadOnly( true ); -- 2.39.2