lots 3,8 - corrections

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.cxx b/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.cxx
index c3d9488f872559c42382f29a59116dbb60f7d20b..381a78c1d9beb1cc13851e076b3f7bdf8926c660 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportGeomObjectOp.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
@@ -23,10 +19,11 @@
 #include "HYDROGUI_ImportGeomObjectOp.h"
 
 #include "HYDROGUI_GeomObjectDlg.h"
-
+#include "HYDROGUI_DataObject.h"
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Obstacle.h>
@@ -41,6 +38,7 @@
 #include <LightApp_UpdateFlags.h>
 
 #include <SUIT_Desktop.h>
+#include <SUIT_MessageBox.h>
 
 #include <QDialog>
 
@@ -144,7 +142,8 @@ void HYDROGUI_ImportGeomObjectOp::commitOperation()
 }
 
 bool HYDROGUI_ImportGeomObjectOp::processApply( int& theUpdateFlags,
-                                                QString& theErrorMsg )
+                                                QString& theErrorMsg,
+                                                QStringList& theBrowseObjectsEntries )
 {
   // Get active SalomeApp_Study
   SalomeApp_Study* aStudy = 
@@ -210,14 +209,16 @@ bool HYDROGUI_ImportGeomObjectOp::processApply( int& theUpdateFlags,
 
       if ( anObjectToEdit.IsNull() ) {
         if ( myOpType == ImportCreatedAsObstacle || myOpType == ImportSelectedAsObstacle ) {
-          anObject = 
-            Handle(HYDROData_Obstacle)::DownCast( doc()->CreateObject(KIND_OBSTACLE) );
+          anObject = doc()->CreateObject( KIND_OBSTACLE );
           Handle(HYDROData_Obstacle) anObstacle = Handle(HYDROData_Obstacle)::DownCast( anObject );
-          anObstacle->SetFillingColor( HYDROData_Obstacle::DefaultFillingColor() );
-          anObstacle->SetBorderColor( HYDROData_Obstacle::DefaultBorderColor() );
+          anObstacle->SetFillingColor( anObstacle->DefaultFillingColor() );
+          anObstacle->SetBorderColor( anObstacle->DefaultBorderColor() );
+          anObstacle->SetGeomObjectEntry( anEntry.toLatin1().constData() );
         } else if ( myOpType == ImportSelectedAsPolyline ) {
-          anObject = 
-            Handle(HYDROData_PolylineXY)::DownCast( doc()->CreateObject(KIND_POLYLINEXY) );
+          anObject = doc()->CreateObject( KIND_POLYLINEXY );
+          Handle(HYDROData_PolylineXY) aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anObject );
+          aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
+          aPolylineObj->SetGeomObjectEntry( anEntry.toLatin1().constData() );
         }
       } else {
         anObject = anObjectToEdit;
@@ -242,14 +243,28 @@ bool HYDROGUI_ImportGeomObjectOp::processApply( int& theUpdateFlags,
         anIsOk = true;
       } else if ( myOpType == ImportSelectedAsPolyline ) {
         Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( anObject );
-        // TODO ISSUE #228: set the shape ("aShape") to the polyline
-        // anIsOk = aPolyline->setShape( aShape );
+        anIsOk = aPolyline->ImportShape( aShape, false, NULL );
+
+        /* TODO: check it before start operation
+        if ( anIsOk && !aPolyline->IsEditable() )
+        {
+          anIsOk = SUIT_MessageBox::question( module()->getApp()->desktop(),
+                                              tr( "POLYLINE_IS_UNRECOGNIZED_TLT" ),
+                                              tr( "POLYLINE_IS_UNRECOGNIZED_MSG" ),
+                                              QMessageBox::Yes | QMessageBox::No,
+                                              QMessageBox::No ) == QMessageBox::Yes;
+          setPrintErrorMessage( anIsOk );
+        }
+        */
       }
 
       // Check operation status
       if ( anIsOk ) {
         anObject->Update();
-        theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+        module()->setIsToUpdate( anObject );
+        QString aHydroObjEntry = HYDROGUI_DataObject::dataObjectEntry( anObject );
+        theBrowseObjectsEntries.append( aHydroObjEntry );
+        theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
       }
     }
   }
@@ -315,6 +330,9 @@ void HYDROGUI_ImportGeomObjectOp::onExternalOperationFinished(
 
   // Update the default name of the HYDRO object
   updateDefaultName();
+
+  // Close the dialog corresponding to the external operation
+  closeExternalOperationDlg();
 }
 
 void HYDROGUI_ImportGeomObjectOp::closeExternalOperationDlg()
@@ -352,4 +370,4 @@ QList<GEOM::shape_type> HYDROGUI_ImportGeomObjectOp::getPolylineTypes()
   aTypes << GEOM::WIRE << GEOM::EDGE;
 
   return aTypes;
-}
\ No newline at end of file
+}