X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_GeoreferencementOp.cxx;h=eb89f4c471b89df580dae8eeecf46d1b5ef238c1;hb=53641ec32e8a7e7d3afe059ef050e1c42d2c83b6;hp=fe1743ed72f25a85c423f2d6d11da792c55cee91;hpb=c1af1bfcf7dd246ce365d0e012e3687c532cd7eb;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
index fe1743ed..eb89f4c4 100644
--- a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -65,6 +61,9 @@ void HYDROGUI_GeoreferencementOp::startOperation()
   }
 
   aPanel->reset();
+  setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>( 
+                       module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
+  setCursor();
 
   if ( myInitialMode == All ) {
     onModeActivated( HYDROGUI_GeoreferencementDlg::AllProfiles );
@@ -92,6 +91,7 @@ void HYDROGUI_GeoreferencementOp::abortOperation()
     anApp->desktop()->disconnect( this );
   }
 
+  restoreCursor();
   HYDROGUI_Operation::abortOperation();
 }
 
@@ -102,6 +102,7 @@ void HYDROGUI_GeoreferencementOp::commitOperation()
     anApp->desktop()->disconnect( this );
   }
 
+  restoreCursor();
   HYDROGUI_Operation::commitOperation();
 }
 
@@ -115,9 +116,10 @@ HYDROGUI_InputPanel* HYDROGUI_GeoreferencementOp::createInputPanel() const
 }
 
 bool HYDROGUI_GeoreferencementOp::processApply( int& theUpdateFlags,
-                                                QString& theErrorMsg )
+                                                QString& theErrorMsg,
+                                                QStringList& theBrowseObjectsEntries )
 {
-  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
   return store( theErrorMsg );
 }
@@ -152,12 +154,23 @@ void HYDROGUI_GeoreferencementOp::onModeActivated( const int theActualMode )
                                            SUIT_MessageBox::Yes) == SUIT_MessageBox::Yes;
   }
   // Store modifications if needed
-  if ( isToStore && !store( anErrorMsg ) ) {
-    anErrorMsg.append( "\n" + tr( "INPUT_VALID_DATA" ) );
-    SUIT_MessageBox::critical( module()->getApp()->desktop(),
-                               tr( "INSUFFICIENT_INPUT_DATA" ),
-                               anErrorMsg );
-    return;
+  if ( isToStore )
+  {
+    startDocOperation();
+    if ( !store( anErrorMsg ) )
+    {
+      abortDocOperation();
+
+      anErrorMsg.append( "\n" + tr( "INPUT_VALID_DATA" ) );
+      SUIT_MessageBox::critical( module()->getApp()->desktop(),
+                                 tr( "INSUFFICIENT_INPUT_DATA" ),
+                                 anErrorMsg );
+      return;
+    }
+    else
+    {
+      commitDocOperation();
+    }
   }
 
   aPanel->setMode( theActualMode );
@@ -203,6 +216,8 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
 {
   // Clear the error string
   theErrorMsg.clear();
+  
+  HYDROGUI_Module* aModule = module();
 
   // Get the panel
   HYDROGUI_GeoreferencementDlg* aPanel = 
@@ -212,44 +227,42 @@ 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 ) );
+        if ( !aProfile->IsValid() ) // Show the profile after it became valid
+          aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, true );
+
+        aProfile->SetLeftPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ), false );
+        aProfile->SetRightPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ), false );
       } else {
         aProfile->Invalidate();
+        aModule->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( aModule ), aProfile, false );
       }
 
       aProfile->Update();
     }
   }
 
-  module()->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
-  commitDocOperation(); // TODO: analyze the consequences
+  aModule->update( UF_Model | UF_OCCViewer | UF_OCC_Forced );
 
   return true;
 }
@@ -275,7 +288,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() ) {
@@ -285,18 +298,20 @@ 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, false ) &&
+         aProfile->GetRightPoint( aLastPoint, false ) ) {
       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