From: rkv <rkv@opencascade.com>
Date: Wed, 6 Nov 2013 13:47:41 +0000 (+0000)
Subject: Lambert = Cartesian (x,y), another mode is Geodesic (grad, min, sec).
X-Git-Tag: BR_hydro_v_0_3~38
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f1a702c86bc9ad7065a246fc0cef83d1ae10efbf;p=modules%2Fhydro.git

Lambert = Cartesian (x,y), another mode is Geodesic (grad, min, sec).
---

diff --git a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx
index 775a43ba..26f9b5ad 100644
--- a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx
@@ -98,13 +98,13 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co
   aPainter.drawPixmap( 0, 0, anArrowPixmap );
   aPainter.end();
 
-  QRadioButton* aManualCartesianBtn = new QRadioButton( tr( "MANUALLY_CARTESIAN" ), myTransformGroup );
-  QRadioButton* aManualLambertBtn = new QRadioButton( tr( "MANUALLY_LAMBERT93" ), myTransformGroup );
+  QRadioButton* aManualLambertBtn = new QRadioButton( tr( "MANUALLY_GEODESIC" ), myTransformGroup );
+  QRadioButton* aManualCartesianBtn = new QRadioButton( tr( "MANUALLY_LAMBERT93" ), myTransformGroup );
   QRadioButton* aRefImageBtn = new QRadioButton( tr( "BY_REFERENCE_IMAGE" ), myTransformGroup );
 
   myModeGroup = new QButtonGroup( myTransformGroup );
-  myModeGroup->addButton( aManualCartesianBtn, HYDROData_Image::ManualCartesian );
   myModeGroup->addButton( aManualLambertBtn, HYDROData_Image::ManualLambert );
+  myModeGroup->addButton( aManualCartesianBtn, HYDROData_Image::ManualCartesian );
   myModeGroup->addButton( aRefImageBtn, HYDROData_Image::ReferenceImage );
 
   myRefImage = new QComboBox( myTransformGroup );
@@ -116,8 +116,8 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co
   QGridLayout* aModeLayout = new QGridLayout( myTransformGroup );
   aModeLayout->setMargin( 0 );
   aModeLayout->setSpacing( 5 );
-  aModeLayout->addWidget( aManualCartesianBtn, 0, 0 );
-  aModeLayout->addWidget( aManualLambertBtn,   1, 0 );
+  aModeLayout->addWidget( aManualLambertBtn,   0, 0 );
+  aModeLayout->addWidget( aManualCartesianBtn, 1, 0 );
   aModeLayout->addWidget( aRefImageBtn,        2, 0 );
   aModeLayout->addWidget( myRefImage,          2, 1 );
   aModeLayout->setColumnStretch( 1, 1 );
@@ -660,15 +660,15 @@ void HYDROGUI_ImportImageDlg::onModeActivated( int theMode )
   for( int aPointType = HYDROGUI_PrsImage::PointA;
        aPointType <= HYDROGUI_PrsImage::PointC; aPointType++ )
   {
-    myPointXDegMap[ aPointType ]->setVisible( anIsManualCartesian );
-    myPointYDegMap[ aPointType ]->setVisible( anIsManualCartesian );
-    myPointXMinMap[ aPointType ]->setVisible( anIsManualCartesian );
-    myPointYMinMap[ aPointType ]->setVisible( anIsManualCartesian );
-    myPointXSecMap[ aPointType ]->setVisible( anIsManualCartesian );
-    myPointYSecMap[ aPointType ]->setVisible( anIsManualCartesian );
-
-    myCartPointXMap[ aPointType ]->setVisible( anIsManualLambert );
-    myCartPointYMap[ aPointType ]->setVisible( anIsManualLambert );
+    myPointXDegMap[ aPointType ]->setVisible( anIsManualLambert );
+    myPointYDegMap[ aPointType ]->setVisible( anIsManualLambert );
+    myPointXMinMap[ aPointType ]->setVisible( anIsManualLambert );
+    myPointYMinMap[ aPointType ]->setVisible( anIsManualLambert );
+    myPointXSecMap[ aPointType ]->setVisible( anIsManualLambert );
+    myPointYSecMap[ aPointType ]->setVisible( anIsManualLambert );
+
+    myCartPointXMap[ aPointType ]->setVisible( anIsManualCartesian );
+    myCartPointYMap[ aPointType ]->setVisible( anIsManualCartesian );
 
     myRefPointXMap[ aPointType ]->setVisible( anIsRefImage );
     myRefPointYMap[ aPointType ]->setVisible( anIsRefImage );
diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
index 6389a4b1..e931d9b8 100644
--- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
+++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts
@@ -252,7 +252,7 @@ file cannot be correctly imported for a Bathymetry definition.</translation>
       <translation>Import image from file</translation>
     </message>
     <message>
-      <source>MANUALLY_CARTESIAN</source>
+      <source>MANUALLY_GEODESIC</source>
       <translation>Manually input Geodesic coordinates</translation>
     </message>
     <message>