refs #441: crash in digue construction

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_GeoreferencementDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
index 57bfafb6f4df207c3210b54852eb9be1f1d6f736..082505cbab9c0883f84c6ab00767830cde82f100 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
@@ -22,7 +22,9 @@
 
 #include "HYDROGUI_GeoreferencementDlg.h"
 
-#include <GEOMUtils.hxx>
+#include "HYDROGUI_Tool.h"
+
+#include <CurveCreator_Utils.h>
 
 #include <OCCViewer_ViewWindow.h>
 #include <OCCViewer_ViewManager.h>
@@ -43,9 +45,11 @@
 
 //! Profile data structre constructor
 HYDROGUI_GeoreferencementDlg::ProfileGeoData::ProfileGeoData( 
+  const QString& theName,
   const QString& theXg, const QString& theYg, 
   const QString& theXd, const QString& theYd)
 {
+  this->Name = theName;
   this->isEmpty = theXg.isEmpty() && theYg.isEmpty() &&
                  theXd.isEmpty() && theYd.isEmpty();
   this->isIncomplete = !isEmpty;
@@ -93,7 +97,10 @@ QWidget* HYDROGUI_GeoreferencementDlg::Delegate::createEditor(
 
   if ( theIndex.column() > 0 ) {
     QLineEdit* aLineEdit = new QLineEdit( theParent );
-    aLineEdit->setValidator( new QDoubleValidator( aLineEdit ) );
+    QDoubleValidator* aDoubleValidator = new QDoubleValidator();
+    aDoubleValidator->setNotation( QDoubleValidator::StandardNotation );
+    aDoubleValidator->setDecimals( 2 );
+    aLineEdit->setValidator( aDoubleValidator );
     anEditor = aLineEdit;
   } else {
     anEditor = QItemDelegate::createEditor( theParent, theOption, theIndex );
@@ -205,27 +212,26 @@ void HYDROGUI_GeoreferencementDlg::setMode( const int theMode )
   myModeButtons->blockSignals( isBlocked );
 }
 
-void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataMap& theMap )
+void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataList& theData )
 {
   disconnect( myTable->model(), SIGNAL( dataChanged ( const QModelIndex&, const QModelIndex& ) ), 
               this, SLOT( onDataChanged() ) );
 
   myTable->setRowCount( 0 );
 
-  foreach ( const QString& aProfileName, theMap.keys() ) {
+  foreach ( const ProfileGeoData& aGeoData, theData ) {
     // Check the current profile name
-    if ( aProfileName.isEmpty() ) {
+    if ( aGeoData.Name.isEmpty() ) {
       continue;
     }
 
     // Get georeferencement data for the current profile
-    ProfileGeoData aGeoData = theMap.value( aProfileName );
     QString aXg, anYg, aXd, anYd;
     if ( !aGeoData.isEmpty ) {
-      aXg = getString( aGeoData.Xg );
-      anYg = getString( aGeoData.Yg );
-      aXd = getString( aGeoData.Xd );
-      anYd = getString( aGeoData.Yd );
+      aXg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xg, false );
+      anYg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yg, false );
+      aXd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xd, false );
+      anYd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yd, false );
     }
     
     // Insert row with the data
@@ -233,11 +239,13 @@ void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataMap& theMap )
     myTable->insertRow( aRow );
 
     // "Profile" column
-    QTableWidgetItem* aNameItem = new QTableWidgetItem( aProfileName );
-    aNameItem->setFlags( Qt::ItemIsEnabled );
+    QTableWidgetItem* aNameItem = new QTableWidgetItem( aGeoData.Name );
+    aNameItem->setFlags( aNameItem->flags() & ~Qt::ItemIsEnabled );
+    /* Bold font is not used in other tables. Keep the common style.
     QFont aFont = aNameItem->font();
     aFont.setBold( true );
-    aNameItem->setFont( aFont ); 
+    aNameItem->setFont( aFont );
+    */ 
     myTable->setItem( aRow, 0, aNameItem );
 
     // "Xg" column
@@ -262,10 +270,10 @@ void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataMap& theMap )
            this, SLOT( onDataChanged() ) );
 }
 
-void HYDROGUI_GeoreferencementDlg::getData( ProfilesGeoDataMap& theMap )
+void HYDROGUI_GeoreferencementDlg::getData( ProfilesGeoDataList& theData ) const
 {
-  // Clear the map
-  theMap.clear();
+  // Clear the list
+  theData.clear();
 
   // Fill the map
   bool isOk = false;
@@ -278,7 +286,7 @@ void HYDROGUI_GeoreferencementDlg::getData( ProfilesGeoDataMap& theMap )
     aXd = myTable->item( aRow, 3 )->text();
     anYd = myTable->item( aRow, 4 )->text();
    
-    theMap.insert( aProfileName, ProfileGeoData( aXg, anYg, aXd, anYd ) );
+    theData.append( ProfileGeoData( aProfileName, aXg, anYg, aXd, anYd ) );
   }
 }
 
@@ -301,20 +309,17 @@ void HYDROGUI_GeoreferencementDlg::onMousePress(
 
   // Get the selected point coordinates
   OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
-  gp_Pnt aPnt = GEOMUtils::ConvertClickToPoint( theEvent->x(), theEvent->y(), 
-                                                aViewPort->getView() );
+  gp_Pnt aPnt = CurveCreator_Utils::ConvertClickToPoint( theEvent->x(), theEvent->y(), 
+                                                         aViewPort->getView() );
 
   // Set the coordinates to the corresponding cells of the table
   int aColumnX = aColumn < 3 ? 1 : 3;
   int aColumnY = aColumnX + 1;
   
-  myTable->item( aRow, aColumnX )->setText( getString( aPnt.X() ) );
-  myTable->item( aRow, aColumnY )->setText( getString( aPnt.Y() ) );
-}
-
-QString HYDROGUI_GeoreferencementDlg::getString( const double theNumber ) const
-{
-  return QString::number( theNumber, 'g', 12 );
+  QString aXStr = HYDROGUI_Tool::GetCoordinateString( aPnt.X(), false );
+  QString anYStr = HYDROGUI_Tool::GetCoordinateString( aPnt.Y(), false );
+  myTable->item( aRow, aColumnX )->setText( aXStr );
+  myTable->item( aRow, aColumnY )->setText( anYStr );
 }
 
 void HYDROGUI_GeoreferencementDlg::onDataChanged()