ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-26 21:40:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

EDF 1337 : Sketcher 3D, add definition of a point by an angle

Browse Source 
+ Added missing translations
This commit is contained in:
rnc 2012-10-08 15:29:42 +00:00
parent f1f709067a
commit e7430c090d
6 changed files with 130 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
View File

@ -84,7 +84,7 @@
// + Améliorer rendu des cotes pour coordonées cylindriques (tailles relatives
// de la cote rayon et de la cote hauteur)
// + Prendre en compte les remarques de Raphaël
// + Traductions
// + Traductions Done
enum
{
@ -135,11 +135,11 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q
GroupType = new EntityGUI_Type(centralWidget());
GroupType->GroupType2->setTitle(tr("GEOM_COORDINATES_TYPE"));
GroupType->GroupType1->setTitle(tr("Scope")); // TODO translation
GroupType->GroupType1->setTitle(tr("GEOM_MODE"));
GroupType->RadioButton1->setText(tr("GEOM_SKETCHER_ABS"));
GroupType->RadioButton2->setText(tr("GEOM_SKETCHER_REL"));
GroupType->RadioButton3->setText(tr("(X,Y,Z)")); //TODO translation
GroupType->RadioButton4->setText(tr("Angles")); //TODO translation
GroupType->RadioButton3->setText(tr("(X,Y,Z)"));
GroupType->RadioButton4->setText(tr("GEOM_ANGLES"));
myTypeGroup1 = new QButtonGroup(this);
myTypeGroup1->setExclusive(true);
@ -164,14 +164,16 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q
GroupAngles->buttonApply->setText(tr("GEOM_SKETCHER_APPLY"));
GroupAngles->buttonUndo->setIcon(image1);
GroupAngles->buttonRedo->setIcon(image2);
GroupAngles->checkBox ->setText(tr("Angle 2")); //TODO translation
GroupAngles->checkBox_2->setText(tr("Height")); //TODO translation
GroupAngles->TextLabel1->setText(tr("GEOM_LENGTH"));
GroupAngles->TextLabel2->setText(tr("GEOM_ANGLE"));
GroupAngles->checkBox ->setText(tr("GEOM_ANGLE_2"));
GroupAngles->checkBox_2->setText(tr("GEOM_HEIGHT"));
GroupControls = new EntityGUI_Controls(centralWidget());
GroupControls->GroupBox1->setTitle(tr("GEOM_CONTROLS"));
GroupControls->CheckBox1->setText(tr("Show length dimensions")); //TODO translation
GroupControls->CheckBox2->setText(tr("Show angle dimensions")); //TODO translation
GroupControls->CheckBox3->setText(tr("Show start/end point coordinates")); //TODO translation
GroupControls->CheckBox1->setText(tr("GEOM_SHOW_LENGTH"));
GroupControls->CheckBox2->setText(tr("GEOM_SHOW_ANGLE"));
GroupControls->CheckBox3->setText(tr("GEOM_SHOW_POINTS_COORD"));
GroupControls->lineEdit_1->setReadOnly(true);
GroupControls->lineEdit_2->setReadOnly(true);
GroupControls->lineEdit_3->setReadOnly(true);
@ -184,6 +186,8 @@ EntityGUI_3DSketcherDlg::EntityGUI_3DSketcherDlg (GeometryGUI* theGeometryGUI, Q
GroupControls->label_4->setText(tr("X:"));
GroupControls->label_5->setText(tr("Y:"));
GroupControls->label_6->setText(tr("Z:"));
GroupControls->label_7->setText(tr("GEOM_START"));
GroupControls->label_8->setText(tr("GEOM_END"));
buttonOk()->setText(tr("GEOM_BUT_END_SKETCH"));
buttonApply()->setText(tr("GEOM_BUT_CLOSE_SKETCH"));
@ -1112,7 +1116,6 @@ EntityGUI_3DSketcherDlg::XYZ EntityGUI_3DSketcherDlg::getCurrentPoint() const
//=================================================================================
gp_Dir EntityGUI_3DSketcherDlg::getPresentationPlane() const
{
MESSAGE("EntityGUI_3DSketcherDlg::getPresentationPlane()")
bool withAngle = (myCoordType == 1);
bool twoAngles = GroupAngles->checkBox->isChecked();
@ -1434,7 +1437,6 @@ void EntityGUI_3DSketcherDlg::displayLength (gp_Pnt P1,
if (aLength < Precision::Confusion())
return;
MESSAGE("REPERE 001; P1.Distance(P2) = "<<P1.Distance(P2))
Handle(AIS_LengthDimension) anIO = createAISLengthDimension(aLength, P1, P2, theNormal);
if (store)

4
src/EntityGUI/EntityGUI_Angles_QTD.ui
View File

@ -27,7 +27,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel4">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -53,7 +53,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel1">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>

30
src/EntityGUI/EntityGUI_Controls_QTD.ui
View File

@ -45,7 +45,7 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="CheckBox3">
<property name="text">
<string/>
@ -56,13 +56,6 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Start:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_1">
<property name="text">
@ -93,13 +86,6 @@
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_3"/>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_7">
<property name="text">
<string>End:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_4">
<property name="text">
@ -130,6 +116,20 @@
<item row="3" column="3">
<widget class="QLineEdit" name="lineEdit_6"/>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Start :</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="label_8">
<property name="text">
<string>End :</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>

62
src/EntityGUI/EntityGUI_Type_QTD.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>315</width>
<width>271</width>
<height>92</height>
</rect>
</property>
@ -17,35 +17,6 @@
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="GroupType1">
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="RadioButton1">
<property name="text">
<string>RadioButton1</string>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="RadioButton2">
<property name="text">
<string>RadioButton2</string>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupType2">
<property name="title">
@ -75,13 +46,40 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="GroupType1">
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="RadioButton1">
<property name="text">
<string>RadioButton1</string>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="RadioButton2">
<property name="text">
<string>RadioButton2</string>
</property>
<property name="autoExclusive">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<tabstops>
<tabstop>RadioButton1</tabstop>
<tabstop>RadioButton2</tabstop>
<tabstop>RadioButton3</tabstop>
</tabstops>
<resources/>

34
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -113,6 +113,14 @@ Please, select face, shell or solid and try again</translation>
<source>GEOM_ANGLE</source>
<translation>Angle :</translation>
</message>
<message>
<source>GEOM_ANGLES</source>
<translation>Angles</translation>
</message>
<message>
<source>GEOM_ANGLE_2</source>
<translation>Angle 2 :</translation>
</message>
<message>
<source>GEOM_ANGLE_1</source>
<translation>Angle</translation>
@ -1078,6 +1086,10 @@ Please, select face, shell or solid and try again</translation>
<source>GEOM_MIRROR_TITLE</source>
<translation>Mirror An Object</translation>
</message>
<message>
<source>GEOM_MODE</source>
<translation>Mode</translation>
</message>
<message>
<source>GEOM_MULTIROTATION</source>
<translation>Multi-Rotation</translation>
@ -1638,6 +1650,18 @@ Please, select face, shell or solid and try again</translation>
<source>GEOM_SHELL_TITLE</source>
<translation>Shell Construction</translation>
</message>
<message>
<source>GEOM_SHOW_LENGTH</source>
<translation>Show length dimensions</translation>
</message>
<message>
<source>GEOM_SHOW_ANGLE</source>
<translation>Show angle dimensions</translation>
</message>
<message>
<source>GEOM_SHOW_POINTS_COORD</source>
<translation>Show start/end point coordinates</translation>
</message>
<message>
<source>GEOM_SKETCH</source>
<translation>Sketch</translation>
@ -1848,7 +1872,7 @@ Please, select face, shell or solid and try again</translation>
</message>
<message>
<source>GEOM_CONTROLS</source>
<translation>Dimensions</translation>
<translation>Controls</translation>
</message>
<message>
<source>GEOM_SOLID</source>
@ -1886,6 +1910,14 @@ Please, select face, shell or solid and try again</translation>
<source>GEOM_SQUARE</source>
<translation>Square</translation>
</message>
<message>
<source>GEOM_START</source>
<translation>Start :</translation>
</message>
<message>
<source>GEOM_END</source>
<translation>End :</translation>
</message>
<message>
<source>GEOM_START_LCS</source>
<translation>Start LCS</translation>

38
src/GEOMGUI/GEOM_msg_fr.ts
View File

@ -109,6 +109,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>GEOM_ANGLE</source>
<translation>Angle :</translation>
</message>
<message>
<source>GEOM_ANGLES</source>
<translation>Angles</translation>
</message>
<message>
<source>GEOM_ANGLE_2</source>
<translation>Angle 2 :</translation>
</message>
<message>
<source>GEOM_ANGLE_1</source>
<translation>Angle</translation>
@ -836,7 +844,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
</message>
<message>
<source>GEOM_HEIGHT</source>
<translation>Hauteur:</translation>
<translation>Hauteur :</translation>
</message>
<message>
<source>GEOM_HEXAGON</source>
@ -1058,6 +1066,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>GEOM_MIRROR_TITLE</source>
<translation>Refléter un objet</translation>
</message>
<message>
<source>GEOM_MODE</source>
<translation>Mode</translation>
</message>
<message>
<source>GEOM_MULTIROTATION</source>
<translation>Multi-rotation</translation>
@ -1618,6 +1630,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>GEOM_SHELL_TITLE</source>
<translation>Construction d&apos;une coque</translation>
</message>
<message>
<source>GEOM_SHOW_LENGTH</source>
<translation>Afficher les cotes de longueur</translation>
</message>
<message>
<source>GEOM_SHOW_ANGLE</source>
<translation>Afficher les cotes d'angle</translation>
</message>
<message>
<source>GEOM_SHOW_POINTS_COORD</source>
<translation>Afficher les points de départ/arrivée</translation>
</message>
<message>
<source>GEOM_SKETCH</source>
<translation>Esquisse</translation>
@ -1826,6 +1850,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>GEOM_COORDINATES_TYPE</source>
<translation>Type de coordonnées</translation>
</message>
<message>
<source>GEOM_CONTROLS</source>
<translation>Eléments de contrôle</translation>
</message>
<message>
<source>GEOM_SOLID</source>
<translation>Solide</translation>
@ -1862,6 +1890,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>GEOM_SQUARE</source>
<translation>Carré</translation>
</message>
<message>
<source>GEOM_START</source>
<translation>Départ :</translation>
</message>
<message>
<source>GEOM_END</source>
<translation>Arrivée :</translation>
</message>
<message>
<source>GEOM_START_LCS</source>
<translation>SCL du Début</translation>