From cec70e0c91d4f3473773c00c05be8d8fdf0dd7ca Mon Sep 17 00:00:00 2001 From: adv Date: Wed, 4 Dec 2013 12:07:50 +0000 Subject: [PATCH] Image positioning corrected (Bug #60). --- src/HYDROData/HYDROData_Image.cxx | 6 +++--- src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx index 082f160c..bed15ad4 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -353,15 +353,15 @@ void HYDROData_Image::UpdateTrsf() { double aXCart = 0, aYCart = 0; - HYDROData_Lambert93::toXY( aTrsfPointA.x(), aTrsfPointA.y(), aXCart, aYCart ); + HYDROData_Lambert93::toXY( aTrsfPointA.y(), aTrsfPointA.x(), aXCart, aYCart ); aTrsfPointA = QPointF( aXCart, aYCart ); - HYDROData_Lambert93::toXY( aTrsfPointB.x(), aTrsfPointB.y(), aXCart, aYCart ); + HYDROData_Lambert93::toXY( aTrsfPointB.y(), aTrsfPointB.x(), aXCart, aYCart ); aTrsfPointB = QPointF( aXCart, aYCart ); if ( !anIsByTwoPoints ) { - HYDROData_Lambert93::toXY( aTrsfPointC.x(), aTrsfPointC.y(), aXCart, aYCart ); + HYDROData_Lambert93::toXY( aTrsfPointC.y(), aTrsfPointC.x(), aXCart, aYCart ); aTrsfPointC = QPointF( aXCart, aYCart ); } } diff --git a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx index dba3dfb7..692c16ff 100644 --- a/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_ImportImageDlg.cxx @@ -181,7 +181,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co myGeodesicLabels << aPointXDegLabel << aPointYDegLabel << aPointXMinLabel << aPointYMinLabel << aPointXSecLabel << aPointYSecLabel - << aPointLonLabel << aPointLatLabel; + << aPointLatLabel << aPointLonLabel; QtxIntSpinBox* aPointXDeg = new QtxIntSpinBox( -180, 180, 1, myTransformGroup ); QtxIntSpinBox* aPointYDeg = new QtxIntSpinBox( 0, 89, 1, myTransformGroup ); @@ -217,7 +217,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aTransformLayout->addWidget( aPointXMinLabel, aRow + 1, 6 ); aTransformLayout->addWidget( aPointXSec, aRow + 1, 7 ); aTransformLayout->addWidget( aPointXSecLabel, aRow + 1, 8 ); - aTransformLayout->addWidget( aPointLonLabel, aRow + 1, 9 ); + aTransformLayout->addWidget( aPointLatLabel, aRow + 1, 9 ); aTransformLayout->addWidget( aCartPointX, aRow + 1, 3, 1, 6 ); aTransformLayout->addWidget( aRefPointX, aRow + 1, 3, 1, 6 ); @@ -230,7 +230,7 @@ HYDROGUI_ImportImageDlg::HYDROGUI_ImportImageDlg( HYDROGUI_Module* theModule, co aTransformLayout->addWidget( aPointYMinLabel, aRow + 2, 6 ); aTransformLayout->addWidget( aPointYSec, aRow + 2, 7 ); aTransformLayout->addWidget( aPointYSecLabel, aRow + 2, 8 ); - aTransformLayout->addWidget( aPointLatLabel, aRow + 2, 9 ); + aTransformLayout->addWidget( aPointLonLabel, aRow + 2, 9 ); aTransformLayout->addWidget( aCartPointY, aRow + 2, 3, 1, 6 ); aTransformLayout->addWidget( aRefPointY, aRow + 2, 3, 1, 6 ); -- 2.39.2