X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_GeoreferencementOp.cxx;h=4aaf3214fa327a6b7eedce682c0aa51f422160e8;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=32355f8a982beede7991bdc5df6ea107de71b9da;hpb=609b17cdbd000d6813a1f3fc569027f9b7a741e7;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx
index 32355f8a..4aaf3214 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
@@ -115,9 +111,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 +149,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 +211,8 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
 {
   // Clear the error string
   theErrorMsg.clear();
+  
+  HYDROGUI_Module* aModule = module();
 
   // Get the panel
   HYDROGUI_GeoreferencementDlg* aPanel = 
@@ -233,18 +243,21 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg )
         HYDROGUI_Tool::FindObjectByName( module(), aGeoData.Name, KIND_PROFILE ) );
     if ( !aProfile.IsNull() ) {
       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;
 }
@@ -283,7 +296,8 @@ void HYDROGUI_GeoreferencementOp::setPanelData(
     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( aGeoData.Name, 
                                                       aFirstPoint.X(), aFirstPoint.Y(),