patch for install error on Linux

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportSinusXOp.cxx b/src/HYDROGUI/HYDROGUI_ImportSinusXOp.cxx
index 583def4b7de8537cdede5f688640555a96ae588f..4f30e80256c3ee52da222e821eadd0570ff4b6b4 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportSinusXOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportSinusXOp.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -25,7 +21,7 @@
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_UpdateFlags.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include <HYDROData_PolylineXY.h>
 #include <HYDROData_Polyline3D.h>
 #include <HYDROGUI_DataObject.h>
@@ -79,37 +75,40 @@ void HYDROGUI_ImportSinusXOp::onApply()
     return;
   }
 
-  QString aFileName = myFileDlg->selectedFile();
-  if ( aFileName.isEmpty() )
-  {
-    abort();
-    return;
-  }
-
-  QString anExt = aFileName.split('.', QString::SkipEmptyParts).back();
+  QStringList aFileNames = myFileDlg->selectedFiles();
+  bool IsImported = false;
+  
+  QApplication::setOverrideCursor( Qt::WaitCursor );  
+  startDocOperation();
 
-  if (anExt == "sx")
+  foreach (QString aFileName, aFileNames) 
   {
-    QApplication::setOverrideCursor( Qt::WaitCursor );
+    if ( aFileName.isEmpty() )
+      continue;
 
-    startDocOperation();
+    QString anExt = aFileName.split('.', QString::SkipEmptyParts).back();
 
-    HYDROData_SinusX aSinusXImporter;
-    NCollection_Sequence<Handle_HYDROData_Entity> anEntities;
-    if (aSinusXImporter.Import(aFileName, doc(), anEntities)) 
+    if (anExt == "sx")
     {
-      UpdateView(anEntities);
-      commitDocOperation();
-      commit();
-    }
-    else
-    {
-      abort();
+      HYDROData_SinusX aSinusXImporter;
+      NCollection_Sequence<Handle_HYDROData_Entity> anEntities;
+      if (aSinusXImporter.Import(aFileName, doc(), anEntities)) 
+      {
+        UpdateView(anEntities);
+        IsImported = true;
+      }
     }
   }
 
-  module()->update( UF_Model | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init );
-  
+  if (IsImported)
+  {
+    commitDocOperation();
+    commit();
+  }
+  else
+    abort();
+
+  module()->update( UF_Model | UF_VTKViewer | UF_OCCViewer );  
   QApplication::restoreOverrideCursor();
 }
 
@@ -117,7 +116,7 @@ void HYDROGUI_ImportSinusXOp::UpdateView( NCollection_Sequence<Handle_HYDROData_
 {
   size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
   if ( anActiveViewId == 0 )
-    anActiveViewId = HYDROGUI_Tool::GetActiveOCCViewId( module() );
+    anActiveViewId = HYDROGUI_Tool::GetActiveViewId( module() );
 
   for (int i = 1; i <= anEntities.Size() ; i++)
   {