bug #237: fatal error on profile

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

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
index 269cd83e7d2f72e0ed9941e7612f72f263b0a584..a3b5295ee8a85108ec46ab0aa04ebbcbd53e2a5c 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
@@ -77,20 +77,31 @@ void HYDROGUI_GeoreferencementOp::startOperation()
     dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), false ) );
   if ( aViewManager ) {
     connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
-             aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+             aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ), 
+             Qt::UniqueConnection );
   }
 
   connect( anApp->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ),
-           this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) );
+           this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ), Qt::UniqueConnection );
 }
 
 void HYDROGUI_GeoreferencementOp::abortOperation()
 {
+  LightApp_Application* anApp = module()->getApp();
+  if ( anApp && anApp->desktop() ) {
+    anApp->desktop()->disconnect( this );
+  }
+
   HYDROGUI_Operation::abortOperation();
 }
 
 void HYDROGUI_GeoreferencementOp::commitOperation()
 {
+  LightApp_Application* anApp = module()->getApp();
+  if ( anApp && anApp->desktop() ) {
+    anApp->desktop()->disconnect( this );
+  }
+
   HYDROGUI_Operation::commitOperation();
 }
 
@@ -182,7 +193,8 @@ void HYDROGUI_GeoreferencementOp::onWindowActivated( SUIT_ViewWindow* theViewWin
       ::qobject_cast<HYDROGUI_GeoreferencementDlg*>( inputPanel() );
     if ( aPanel ) {
       connect( aViewManager, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
-               aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) );
+               aPanel, SLOT( onMousePress( SUIT_ViewWindow*, QMouseEvent* ) ),
+               Qt::UniqueConnection);
     }
   }
 }
@@ -200,34 +212,29 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
   }
 
   // Get georeferencement data from the panel
-  HYDROGUI_GeoreferencementDlg::ProfilesGeoDataMap aGeoDataMap;
-  aPanel->getData( aGeoDataMap );
-
-  if ( aGeoDataMap.empty() ) {
+  HYDROGUI_GeoreferencementDlg::ProfilesGeoDataList aGeoDataList;
+  aPanel->getData( aGeoDataList );
+  if ( aGeoDataList.empty() ) {
     return true;
   }
 
   // Check the data validity
-  foreach ( const QString& aProfileName, aGeoDataMap.keys() ) {
-    HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData = 
-      aGeoDataMap.value( aProfileName );
+  foreach ( const HYDROGUI_GeoreferencementDlg::ProfileGeoData& aGeoData, aGeoDataList ) {
     if ( aGeoData.isIncomplete ) {
-      theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( aProfileName );
+      theErrorMsg = tr( "INCOMPLETE_DATA" ).arg( aGeoData.Name );
       return false;
     }
   }
 
   // Store the data in the data model
-  foreach ( const QString& aProfileName, aGeoDataMap.keys() ) {
+  foreach ( const HYDROGUI_GeoreferencementDlg::ProfileGeoData& aGeoData, aGeoDataList ) {
     Handle(HYDROData_Profile) aProfile = 
       Handle(HYDROData_Profile)::DownCast(
-        HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+        HYDROGUI_Tool::FindObjectByName( module(), aGeoData.Name, KIND_PROFILE ) );
     if ( !aProfile.IsNull() ) {
-      HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData = 
-        aGeoDataMap.value( aProfileName );
       if ( !aGeoData.isEmpty ) {
-        aProfile->SetFirstPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) );
-        aProfile->SetLastPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) );
+        aProfile->SetLeftPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) );
+        aProfile->SetRightPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) );
       } else {
         aProfile->Invalidate();
       }
@@ -263,7 +270,7 @@ void HYDROGUI_GeoreferencementOp::setPanelData(
   }
 
   // Get georeferencement data from the data model
-  HYDROGUI_GeoreferencementDlg::ProfilesGeoDataMap aDataMap;
+  HYDROGUI_GeoreferencementDlg::ProfilesGeoDataList aData;
 
   HYDROData_SequenceOfObjects::Iterator anIter( theProfiles );
   for ( ; anIter.More(); anIter.Next() ) {
@@ -273,18 +280,19 @@ void HYDROGUI_GeoreferencementOp::setPanelData(
       continue;
     }
 
-    HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData;
+    HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData( aProfile->GetName() );
 
     gp_XY aFirstPoint, aLastPoint;
-    if ( aProfile->GetFirstPoint( aFirstPoint ) && aProfile->GetLastPoint( aLastPoint ) ) {
+    if ( aProfile->GetLeftPoint( aFirstPoint ) && aProfile->GetRightPoint( aLastPoint ) ) {
       aGeoData = 
-        HYDROGUI_GeoreferencementDlg::ProfileGeoData( aFirstPoint.X(), aFirstPoint.Y(),
+        HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name, 
+                                                      aFirstPoint.X(), aFirstPoint.Y(),
                                                       aLastPoint.X(), aLastPoint.Y() );
     }
    
-    aDataMap.insert( aProfile->GetName(), aGeoData );
+    aData.append( aGeoData );
   }
 
   // Set the collected data to the dialog
-  aPanel->setData( aDataMap );
+  aPanel->setData( aData );
 }
\ No newline at end of file