From: nri <nri@opencascade.com>
Date: Thu, 10 Jul 2003 17:12:52 +0000 (+0000)
Subject: NRI : Merge from V1_2.
X-Git-Tag: V_02092003~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eea3e78db35998ce321d460e8ed480ec87b1c6d3;p=modules%2Fvisu.git

NRI : Merge from V1_2.
---

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 78af7a0d..104eb6f3 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -371,7 +371,7 @@ bool VisuGUI::OnGUIEvent(int theCommandID,  QAD_Desktop* parent)
 
     case 122:
       {
-	visuGUI->ExportToFile();
+	//visuGUI->ExportToFile();
 	break;
       }
 
@@ -2503,7 +2503,7 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri
 
       case VISU::TRESULT:
 	//thePopup->insertItem("Create Mesh", visuGUI, SLOT(CreateMesh()));    
-	thePopup->insertItem("Export To File", visuGUI, SLOT(ExportToFile()));    
+	//thePopup->insertItem("Export To File", visuGUI, SLOT(ExportToFile()));    
 	//thePopup->insertItem("Delete", visuGUI, SLOT(DeletePrs()));
 	break;
 	
@@ -3187,12 +3187,13 @@ void VisuGUI::ImportFromFile(){
   //flt.append( "Exportable Files (*.med *.dat)" );
   //flt.append( "Dat Files (*.dat)" );
   flt.append( "Med Files (*.med)" );
+  flt.append( "Dat Files (*.xls)" );
   QString aDir = getVisuInputDir();
-  QString aFile = QAD_FileDlg::getFileName(QAD_Application::getDesktop(),
-					  aDir,flt,tr("Import From File"),true);
-  if(!aFile.isEmpty()){
-    QAD_Application::getDesktop()->putInfo( "Importing From File " + aFile + "..." );
-    aDir = QAD_Tools::getDirFromPath(aFile);
+  QFileInfo aFileInfo = QAD_FileDlg::getFileName(QAD_Application::getDesktop(),
+						 aDir,flt,tr("Import From File"),true);
+  if(aFileInfo.exists()){
+    QAD_Application::getDesktop()->putInfo( "Importing From File " + aFileInfo.filePath() + "..." );
+    aDir = QAD_Tools::getDirFromPath(aFileInfo.filePath());
     QAD_CONFIG->addSetting("Visu:InputDir",aDir);
     QAD_WaitCursor wc;
 
@@ -3242,7 +3243,7 @@ void VisuGUI::ExportToFile(){
       QAD_CONFIG->addSetting("Visu:OutputDir",aDir);
       if(VISU::Result_i* aResult = dynamic_cast<VISU::Result_i*>(aBase)){
 	try{
-	  aResult->GetInput()->ToFile(aFile.latin1());
+	  //APO - aResult->GetInput()->ToFile(aFile.latin1());
 	  QAD_Application::getDesktop()->putInfo(aFile+" exported.");
 	}catch(...){
 	  QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"),
diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 858902f4..3b3f8e3e 100644
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -28,6 +28,7 @@
 
 using namespace std;
 #include "VisuGUI_IsoSurfacesDlg.h"
+#include <limits.h>
 #include <qlayout.h>
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
index 8b6d6408..1694a48d 100644
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
@@ -28,6 +28,7 @@
 
 using namespace std;
 #include "VisuGUI_ScalarBarDlg.h"
+#include <limits.h>
 #include <qlayout.h>
 #include <qvalidator.h>
 #include "QAD_Application.h"