Merge from BR_V5_DEV 16Feb09

[modules/visu.git] / src / VISUGUI / VisuGUI_StreamLinesDlg.h

diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.h b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
index 08ca73474c2a394db30ec8056c5c1e0bbaed7727..a9997da79f45e9b7ee9b36b9e86543fc7660d8aa 100644 (file)
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
@@ -1,42 +1,44 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : VisuGUI_StreamLinesDlg.h
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
-
+//
 #ifndef VISUGUI_STREAMLINESDLG_H
 #define VISUGUI_STREAMLINESDLG_H
 
 #include "VisuGUI_Prs3dDlg.h"
 
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qstringlist.h>
-#include <qtabwidget.h>
+class QTabWidget;
+class QCheckBox;
+class QComboBox;
+
 
 #include "VISUConfig.hh"
 
 class SalomeApp_Module;
 class VisuGUI_InputPane;
-class QtxDblSpinBox;
+class QtxDoubleSpinBox;
+class QtxColorButton;
 
 namespace VISU
 {
@@ -74,25 +76,24 @@ private slots:
 private:
   VISU::Mesh_ptr createMesh(VISU::VISUType theType, QString theName);
 
-    QtxDblSpinBox* myStepLen;
-    QtxDblSpinBox* myIntegStepLen;
-    QtxDblSpinBox* myPropTime;
+    QtxDoubleSpinBox* myStepLen;
+    QtxDoubleSpinBox* myIntegStepLen;
+    QtxDoubleSpinBox* myPropTime;
     QComboBox* myDirCombo;
     QCheckBox* myUseScalar;
-    QPushButton*    SelColor;
-    QColor          myColor;
+    QtxColorButton*   SelColor;
     //QCheckBox* myUseSrcChk;
     QComboBox* myUseSrcCombo;
-    QtxDblSpinBox* myPntPercent;
+    QtxDoubleSpinBox* myPntPercent;
     QComboBox* mySrcCombo;
 
     QTabWidget*            myTabBox;
     VisuGUI_InputPane*     myInputPane;
 
-    QValueList<VISU::Prs3d_var> myPrsList;
-    QValueList<VISU::Prs3d_var> myEntityList;
-    QValueList<VISU::Prs3d_var> myFamilyList;
-    QValueList<VISU::Prs3d_var> myGroupList;
+    QList<VISU::Prs3d_var> myPrsList;
+    QList<VISU::Prs3d_var> myEntityList;
+    QList<VISU::Prs3d_var> myFamilyList;
+    QList<VISU::Prs3d_var> myGroupList;
     QStringList myEntitiesLst;
     QStringList myFamilisLst;
     QStringList myGroupsLst;
@@ -103,7 +104,7 @@ private:
     SalomeApp_Module* myVisuGUI;
 
 private slots:
-  void setVColor();
+  //void setVColor();
   void enableSetColor();
 };