VisuGUI_InputPane added

diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po
index 63a9c4cd1aad227dc4aafffc1ee552fa21289965..3dde5df081dca7866dcb070922283a282bbc9452 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.po
+++ b/src/VISUGUI/VISU_msg_en.po
@@ -572,6 +572,9 @@ msgstr "Deformed Shape"
 msgid "VisuGUI_DeformedShapeDlg::SCALAR_BAR_TAB"
 msgstr "Scalar Bar"
 
+msgid "VisuGUI_DeformedShapeDlg::INPUT_TAB"
+msgstr "Input"
+
 msgid "VisuGUI_DeformedShapeDlg::MAGNITUDE_COLORING"
 msgstr "Magnitude coloring"
 
@@ -596,6 +599,9 @@ msgstr "Scalar Map on Deformed Shape"
 msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::SCALAR_BAR_TAB"
 msgstr "Scalar Bar"
 
+msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::INPUT_TAB"
+msgstr "Input"
+
 msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::SCALE_FACTOR"
 msgstr "Scale Factor:"
 
@@ -1073,6 +1079,9 @@ msgstr "Plot 3D"
 msgid "VisuGUI_Plot3DDlg::SCALAR_BAR_TAB_TITLE"
 msgstr "Scalar Bar"
 
+msgid "VisuGUI_Plot3DDlg::INPUT_TAB_TITLE"
+msgstr "Input"
+
 msgid "VisuGUI_Plot3DPane::ORIENTATION"
 msgstr "Orientation"
 
@@ -1858,6 +1867,9 @@ msgstr "Gauss Points"
 msgid "VisuGUI_GaussPointsDlg::SCALAR_BAR_TAB"
 msgstr "Scalar Bar"
 
+msgid "VisuGUI_GaussPointsDlg::INPUT_TAB"
+msgstr "Input"
+
 msgid "VisuGUI_GaussPointsDlg::PRS_TITLE"
 msgstr "Presentation"
 

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index fad1a6ae32d0037c49db8eaa64a89d467a7bb756..0b79b5ffe81f96e7e7b82c4c3e27eb07c8bf3356 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -26,6 +26,7 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_Gen_i.hh"
 #include "VISU_CutLines_i.hh"
@@ -79,7 +80,7 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule)
   hasInit = false;
 
   // Tab pane
-  QTabWidget* aTabPane = new QTabWidget(this);
+  myTabBox = new QTabWidget(this);
 
   // Plane of lines
   QFrame* aPlanePane = new QFrame(this);
@@ -153,7 +154,7 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule)
   aPlaneLayout->addStretch();
 
 
-  aTabPane->addTab( aPlanePane, tr("LBL_LINES_PLANE") );
+  myTabBox->addTab( aPlanePane, tr("LBL_LINES_PLANE") );
 
   // Number of lines
   QFrame* aLinesPane = new QFrame(this);
@@ -209,13 +210,15 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule)
   aLinesLayout->addWidget( aPosBox2 );
   aLinesLayout->addStretch();
 
-  aTabPane->addTab( aLinesPane, tr("LBL_LINES_CUT") );
+  myTabBox->addTab( aLinesPane, tr("LBL_LINES_CUT") );
 
   myScalarPane = new VisuGUI_ScalarBarPane(this, false);
   myScalarPane->setMargin( 5 );
-  aTabPane->addTab(myScalarPane, "Scalar Bar");
+  myInputPane = new VisuGUI_InputPane(theModule, this);
+  myTabBox->addTab(myScalarPane, "Scalar Bar");
+  myTabBox->addTab(myInputPane, "Input");
 
-  aMainLayout->addWidget(aTabPane);
+  aMainLayout->addWidget(myTabBox);
 
   // Dialog buttons
   QHBox* aBtnBox = new QHBox(this);
@@ -289,6 +292,15 @@ void VisuGUI_CutLinesDlg::initFromPrsObject (VISU::CutLines_i* thePrs)
   myPrs = thePrs;
   myScalarPane->initFromPrsObject(thePrs);
 
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
+
   myRotXSpn->setValue(thePrs->GetRotateX()*180./PI);
   myRotYSpn->setValue(thePrs->GetRotateY()*180./PI);
   myPosSpn->setValue(thePrs->GetDisplacement());
@@ -321,6 +333,13 @@ int VisuGUI_CutLinesDlg::storeToPrsObject (VISU::CutLines_i* thePrs)
 {
   myScalarPane->storeToPrsObject(thePrs);
 
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+    myInputPane->storeToPrsObject( thePrs );
+  }
+
   thePrs->SetOrientation(getOrientaion(),
                          myRotXSpn->value()*PI/180.,
                          myRotYSpn->value()*PI/180.);

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.h b/src/VISUGUI/VisuGUI_CutLinesDlg.h
index 8b0e1da4b3cab9fac9aa897d4984c24223de7606..0894d5ad5efbe944f0e37c33203ccb37ceeabd74 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.h
@@ -28,9 +28,11 @@
 
 #include <qhbuttongroup.h>
 #include <qvalidator.h>
+#include <qtabwidget.h>
 
 class SUIT_ViewManager;
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 
 namespace VISU{
   class CutLines_i;
@@ -100,7 +102,9 @@ private:
   QDoubleValidator *mydvalidator;
   VISU::CutLines_i* myCutLines;
 
+  QTabWidget*            myTabBox;
   VisuGUI_ScalarBarPane* myScalarPane;
+  VisuGUI_InputPane*     myInputPane;
 
   VISU::CutPlanes::Orientation getOrientaion (bool IsBasePlane = true);
   void setOrientation (const VISU::CutPlanes::Orientation orient);

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index d7b4aeb7177bbf0f2dc34ab3b7347d20b637181b..bc0e0ec4fca974cd20c3a23fcfd781528390f2ca 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -31,6 +31,7 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_CutPlanes_i.hh"
 #include "VISU_CutPlanesPL.hxx"
@@ -480,14 +481,16 @@ VisuGUI_CutPlanesDlg::VisuGUI_CutPlanesDlg (SalomeApp_Module* theModule)
   TopLayout->setMargin(11);
 
   // Tab pane
-  QTabWidget* aTabBox = new QTabWidget(this);
+  myTabBox = new QTabWidget(this);
   myCutPane = new VisuGUI_CutPlanesPane(this/*, myMgr*/);
-  aTabBox->addTab(myCutPane, "Cut Planes");
+  myTabBox->addTab(myCutPane, "Cut Planes");
   myScalarPane = new VisuGUI_ScalarBarPane(this, false);
   myScalarPane->setMargin(5);
-  aTabBox->addTab(myScalarPane, "Scalar Bar");
+  myInputPane = new VisuGUI_InputPane(theModule, this);
+  myTabBox->addTab(myScalarPane, "Scalar Bar");
+  myTabBox->addTab(myInputPane, "Input");
 
-  TopLayout->addWidget(aTabBox);
+  TopLayout->addWidget(myTabBox);
 
   QGroupBox* GroupButtons = new QGroupBox(this, "GroupButtons");
   GroupButtons->setGeometry(QRect(10, 10, 281, 48));
@@ -530,12 +533,29 @@ void VisuGUI_CutPlanesDlg::initFromPrsObject (VISU::CutPlanes_i* thePrs)
   myPrs = thePrs;
   myScalarPane->initFromPrsObject(thePrs);
   myCutPane->initFromPrsObject(thePrs);
+
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
 }
 
 int VisuGUI_CutPlanesDlg::storeToPrsObject (VISU::CutPlanes_i* thePrs)
 {
-  return (myScalarPane->storeToPrsObject(thePrs) &&
-          myCutPane->storeToPrsObject(thePrs));
+  int ok = 1;
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+
+    ok = myInputPane->storeToPrsObject( thePrs );
+  }
+
+  return ok && myScalarPane->storeToPrsObject(thePrs) && myCutPane->storeToPrsObject(thePrs);
 }
 
 void VisuGUI_CutPlanesDlg::accept()

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.h b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
index b7f9e4cf129b1b668c801de2437bc84220ce418a..2cd58c9746e885aa4707f7db66f11367d804ca8e 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
@@ -36,6 +36,7 @@
 
 #include <qradiobutton.h>
 #include <qtable.h>
+#include <qtabwidget.h>
 
 #include "SALOMEconfig.h"
 #include CORBA_CLIENT_HEADER(VISU_Gen)
@@ -44,6 +45,7 @@ class QtxDblSpinBox;
 class SUIT_ViewWindow;
 class SUIT_ViewManager;
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 
 
 class VisuGUI_CutPlanesPane : public QFrame
@@ -121,8 +123,10 @@ protected slots:
     void onHelp();
 
 private:
+    QTabWidget*            myTabBox;
     VisuGUI_CutPlanesPane* myCutPane;
     VisuGUI_ScalarBarPane* myScalarPane;
+    VisuGUI_InputPane*     myInputPane;
     VISU::CutPlanes_i*     myPrs;
 };
 

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index 2a092922b7575c931ebbb7794d2d96822d81b1a9..8149ef89bfce4baf81e7d42e45d7d568d554ed1c 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -30,6 +30,7 @@
 
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_DeformedShape_i.hh"
 
@@ -49,7 +50,7 @@ using namespace std;
  * Constructor
  */
 VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule)
-    : QDialog(VISU::GetDesktop(theModule), "VisuGUI_DeformedShapeDlg", true,
+    : QDialog(VISU::GetDesktop(theModule), "VisuGUI_DeformedShapeDlg", false,
               WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
   setCaption(tr("DLG_TITLE"));
@@ -59,7 +60,7 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule)
   TopLayout->setSpacing(6);
   TopLayout->setMargin(11);
 
-  QTabWidget* aTabBox = new QTabWidget (this);
+  myTabBox = new QTabWidget (this);
 
   // Deformed shape pane
   QVBox* aBox = new QVBox (this);
@@ -87,13 +88,15 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule)
   UseMagn->setChecked(true);
   TopGroupLayout->addMultiCellWidget(UseMagn, 1, 1, 0, 1);
 
-  aTabBox->addTab(aBox, tr("DEFORMED_SHAPE_TAB"));
+  myTabBox->addTab(aBox, tr("DEFORMED_SHAPE_TAB"));
 
   // Scalar bar pane
   myScalarPane = new VisuGUI_ScalarBarPane (this, false);
   myScalarPane->setMargin(5);
+  myInputPane = new VisuGUI_InputPane(theModule, this);
 
-  aTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
+  myTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
+  myTabBox->addTab(myInputPane, tr("INPUT_TAB"));
 
   // Buttons
   QGroupBox* GroupButtons = new QGroupBox (this, "GroupButtons");
@@ -123,7 +126,7 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule)
   GroupButtonsLayout->addWidget(buttonHelp, 0, 3);
 
   // Add Tab box and Buttons to the top layout
-  TopLayout->addWidget(aTabBox);
+  TopLayout->addWidget(myTabBox);
   TopLayout->addWidget(GroupButtons);
 
   // signals and slots connections
@@ -135,12 +138,30 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule)
 void VisuGUI_DeformedShapeDlg::initFromPrsObject (VISU::DeformedShape_i* thePrs)
 {
   myScalarPane->initFromPrsObject(thePrs);
+
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
+
   setFactor(thePrs->GetScale());
   UseMagn->setChecked(thePrs->IsColored());
 }
 
 int VisuGUI_DeformedShapeDlg::storeToPrsObject(VISU::DeformedShape_i* thePrs) {
   myScalarPane->storeToPrsObject(thePrs);
+
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+    myInputPane->storeToPrsObject( thePrs );
+  }
+
   thePrs->SetScale(getFactor());
   thePrs->ShowColored(isColored());
   return 1;

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
index 32c10f4cc79ccc77ad7c30439f09dda8b4f8588d..f23aa1920df82af2e7aca8547a7d686d3454d3e5 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
@@ -38,8 +38,10 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
+#include <qtabwidget.h>
 
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 
 namespace VISU{
   class DeformedShape_i;
@@ -75,7 +77,9 @@ protected slots:
  private:
     QtxDblSpinBox* ScalFact;
     QCheckBox* UseMagn;
+    QTabWidget*            myTabBox;
     VisuGUI_ScalarBarPane* myScalarPane;
+    VisuGUI_InputPane*     myInputPane;
 };
 
 #endif // VISUGUI_DEFORMEDSHAPEDLS_H

diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
index 0459eef8f072a57ab6ad8b6843e049832cbf02b0..25ea6eb418c6261cd7e847c672c578e60fa85da0 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
@@ -30,6 +30,7 @@
 #include "VISUConfig.hh"
 
 #include "VisuGUI_Tools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_GaussPoints_i.hh"
 #include "VISU_GaussPointsPL.hxx"
@@ -507,7 +508,7 @@ void VisuGUI_GaussScalarBarPane::onTextPref()
  */
 VisuGUI_GaussPointsDlg::VisuGUI_GaussPointsDlg(SalomeApp_Module* theModule, bool SetPref):
   QDialog(VISU::GetDesktop(theModule), 
-         "VisuGUI_GaussPointsDlg", true,
+         "VisuGUI_GaussPointsDlg", false,
          WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
   myPrs(NULL)
 {
@@ -530,7 +531,7 @@ VisuGUI_GaussPointsDlg::VisuGUI_GaussPointsDlg(SalomeApp_Module* theModule, bool
   myGeometryButton = new QRadioButton( tr( "GEOMETRY" ), PrsGroup );
   myDefShapeButton = new QRadioButton( tr( "DEFORMED_SHAPE" ), PrsGroup );
 
-  QTabWidget* aTabBox = new QTabWidget (this);
+  myTabBox = new QTabWidget (this);
 
   // Gauss points pane
   QVBox* aBox = new QVBox (this);
@@ -564,6 +565,8 @@ VisuGUI_GaussPointsDlg::VisuGUI_GaussPointsDlg(SalomeApp_Module* theModule, bool
   myScalarPane = new VisuGUI_GaussScalarBarPane(this, SetPref);
   myScalarPane->setMargin(5);
 
+  // Input pane
+  myInputPane = new VisuGUI_InputPane(theModule, this);
 
   connect( myResultsButton,  SIGNAL( clicked() ),       mySizeBox,    SLOT( onToggleResults() ) );
   connect( myResultsButton,  SIGNAL( toggled( bool ) ), myScalarPane, SLOT( setEnabled( bool ) ) );
@@ -571,8 +574,9 @@ VisuGUI_GaussPointsDlg::VisuGUI_GaussPointsDlg(SalomeApp_Module* theModule, bool
   connect( myDefShapeButton, SIGNAL( toggled( bool ) ), this,         SLOT( onToggleDefShape( bool ) ) );
   connect( myDefShapeButton, SIGNAL( toggled( bool ) ), myScalarPane, SLOT( setEnabled( bool ) ) );
 
-  aTabBox->addTab(aBox, tr("GAUSS_POINTS_TAB"));
-  aTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
+  myTabBox->addTab(aBox, tr("GAUSS_POINTS_TAB"));
+  myTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
+  myTabBox->addTab(myInputPane, tr("INPUT_TAB"));
 
   // Common buttons ===========================================================
   QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
@@ -599,7 +603,7 @@ VisuGUI_GaussPointsDlg::VisuGUI_GaussPointsDlg(SalomeApp_Module* theModule, bool
   GroupButtonsLayout->addWidget( buttonHelp, 0, 3 );
 
   TopLayout->addWidget( PrsGroup );
-  TopLayout->addWidget( aTabBox );
+  TopLayout->addWidget( myTabBox );
   TopLayout->addWidget( GroupButtons );
 
   connect( buttonOk,     SIGNAL( clicked() ), this, SLOT( accept() ) );
@@ -638,6 +642,15 @@ void VisuGUI_GaussPointsDlg::initFromPrsObject( VISU::GaussPoints_i* thePrs )
 
   myScalarPane->initFromPrsObject(thePrs);
 
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
+
   myPrs = thePrs;
 }
 
@@ -680,7 +693,16 @@ int VisuGUI_GaussPointsDlg::storeToPrsObject( VISU::GaussPoints_i* thePrs )
   thePrs->SetMagnification( mySizeBox->getMagnification() );
   thePrs->SetMagnificationIncrement( mySizeBox->getIncrement() );
 
-  return myScalarPane->storeToPrsObject(thePrs);
+  int ok = 1;
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+
+    ok = myInputPane->storeToPrsObject( thePrs );
+  }
+
+  return ok && myScalarPane->storeToPrsObject(thePrs);
 }
 
 void VisuGUI_GaussPointsDlg::onToggleDefShape( bool on )

diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.h b/src/VISUGUI/VisuGUI_GaussPointsDlg.h
index 1ce86e4303529931c281471990d6fd3d34669db8..44d16e8644a88173efa339a18adbf7eaa9af73c6 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.h
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.h
@@ -42,11 +42,13 @@
 #include <qspinbox.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
+#include <qtabwidget.h>
 
 class SalomeApp_Module;
 class VVTK_PrimitiveBox;
 class VVTK_SizeBox;
 class VisuGUI_TextPrefDlg;
+class VisuGUI_InputPane;
 
 namespace VISU
 {
@@ -150,7 +152,10 @@ protected slots:
 
 private:
   VISU::GaussPoints_i*     myPrs;
+
+  QTabWidget*              myTabBox;
   VisuGUI_GaussScalarBarPane* myScalarPane;
+  VisuGUI_InputPane*       myInputPane;
 
   QRadioButton*            myResultsButton;
   QRadioButton*            myGeometryButton;

diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 909c730df5e6dd48e38b57dcad960b606954f6aa..34156ba5326a54f0fb970a036c78531c4d08edc6 100644 (file)
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -30,6 +30,7 @@
 
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "LightApp_Application.h"
 
@@ -164,7 +165,7 @@ bool VisuGUI_IsoSurfPane::check()
   Constructor
 */
 VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (SalomeApp_Module* theModule)
-     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_IsoSurfacesDlg", true,
+     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_IsoSurfacesDlg", false,
                WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
   setCaption(tr("DEFINE_ISOSURFACES"));
@@ -174,16 +175,18 @@ VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (SalomeApp_Module* theModule)
   TopLayout->setSpacing( 6 );
   TopLayout->setMargin(11);
 
-  QTabWidget* aTabBox = new QTabWidget(this);
+  myTabBox = new QTabWidget(this);
   myIsoPane = new  VisuGUI_IsoSurfPane(this);
   myIsoPane->setMargin( 5 );
-  aTabBox->addTab(myIsoPane, "Iso Surface");
+  myTabBox->addTab(myIsoPane, "Iso Surface");
   myScalarPane = new VisuGUI_ScalarBarPane(this, false);
   myIsoPane->setScalarBarPane(myScalarPane);
   myScalarPane->setMargin( 5 );
-  aTabBox->addTab(myScalarPane, "Scalar Bar");
+  myInputPane = new VisuGUI_InputPane(theModule, this);
+  myTabBox->addTab(myScalarPane, "Scalar Bar");
+  myTabBox->addTab(myInputPane, "Input");
 
-  TopLayout->addWidget(aTabBox);
+  TopLayout->addWidget(myTabBox);
 
   QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
   GroupButtons->setGeometry( QRect( 10, 10, 281, 48 ) );
@@ -230,6 +233,35 @@ void VisuGUI_IsoSurfacesDlg::reject()
   QDialog::reject();
 }
 
+void VisuGUI_IsoSurfacesDlg::initFromPrsObject(VISU::IsoSurfaces_i* thePrs)
+{
+  myScalarPane->initFromPrsObject(thePrs);
+  myIsoPane->initFromPrsObject(thePrs);
+
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
+}
+
+int VisuGUI_IsoSurfacesDlg::storeToPrsObject(VISU::IsoSurfaces_i* thePrs)
+{
+  int ok = 1;
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+
+    ok = myInputPane->storeToPrsObject( thePrs );
+  }
+
+  return ok && myScalarPane->storeToPrsObject(thePrs) && myIsoPane->storeToPrsObject(thePrs);
+}
+
 void VisuGUI_IsoSurfacesDlg::onHelp()
 {
   QString aHelpFileName = "/files/iso_surfaces_presentation.htm";

diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
index 385fa64668810116542701e2ace9cf0d09f97229..e97cae7aec8abb5f7622e0d80bd4de777f2ed307 100644 (file)
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
@@ -39,8 +39,10 @@
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
+#include <qtabwidget.h>
 
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 
 class VisuGUI_IsoSurfPane : public QVBox
 {
@@ -77,11 +79,8 @@ class VisuGUI_IsoSurfacesDlg : public QDialog
   VisuGUI_IsoSurfacesDlg (SalomeApp_Module* theModule);
   ~VisuGUI_IsoSurfacesDlg() {};
 
-  void initFromPrsObject(VISU::IsoSurfaces_i* thePrs)
-    {myScalarPane->initFromPrsObject(thePrs); myIsoPane->initFromPrsObject(thePrs);}
-
-  int storeToPrsObject(VISU::IsoSurfaces_i* thePrs)
-    {return myScalarPane->storeToPrsObject(thePrs) && myIsoPane->storeToPrsObject(thePrs);}
+  void initFromPrsObject(VISU::IsoSurfaces_i* thePrs);
+  int storeToPrsObject(VISU::IsoSurfaces_i* thePrs);
 
  private:
   void keyPressEvent( QKeyEvent* e );
@@ -92,8 +91,10 @@ class VisuGUI_IsoSurfacesDlg : public QDialog
   void onHelp();
 
  private:
+  QTabWidget*            myTabBox;
   VisuGUI_IsoSurfPane*   myIsoPane;
   VisuGUI_ScalarBarPane* myScalarPane;
+  VisuGUI_InputPane*     myInputPane;
 };
 
 #endif // VISUGUI_ISOSURFACESDLG_H

diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
index a46e9730a81352ed8daea36e62fb07616bf9736c..b5e3768c0b003d1539f7728700d77319c0528573 100644 (file)
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
@@ -31,6 +31,7 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Plot3DPL.hxx"
@@ -552,15 +553,17 @@ VisuGUI_Plot3DDlg::VisuGUI_Plot3DDlg (SalomeApp_Module* theModule)
   TopLayout->setSpacing(6);
   TopLayout->setMargin(11);
 
-  QTabWidget* aTabBox = new QTabWidget (this);
+  myTabBox = new QTabWidget (this);
   myIsoPane = new VisuGUI_Plot3DPane (this);
   myIsoPane->setMargin(5);
-  aTabBox->addTab(myIsoPane, tr("PLOT3D_TAB_TITLE"));
+  myTabBox->addTab(myIsoPane, tr("PLOT3D_TAB_TITLE"));
   myScalarPane = new VisuGUI_ScalarBarPane (this, false);
   myScalarPane->setMargin(5);
-  aTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB_TITLE"));
+  myInputPane = new VisuGUI_InputPane(theModule, this);
+  myTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB_TITLE"));
+  myTabBox->addTab(myInputPane, tr("INPUT_TAB_TITLE"));
 
-  TopLayout->addWidget(aTabBox);
+  TopLayout->addWidget(myTabBox);
 
   QGroupBox* GroupButtons = new QGroupBox (this, "GroupButtons");
   GroupButtons->setGeometry(QRect(10, 10, 281, 48));
@@ -617,6 +620,43 @@ void VisuGUI_Plot3DDlg::reject()
   QDialog::reject();
 }
 
+//=======================================================================
+//function : initFromPrsObject
+//purpose  :
+//=======================================================================
+void VisuGUI_Plot3DDlg::initFromPrsObject (VISU::Plot3D_i* thePrs)
+{
+  myScalarPane->initFromPrsObject(thePrs);
+  myIsoPane->initFromPrsObject(thePrs);
+
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
+}
+
+//=======================================================================
+//function : storeToPrsObject
+//purpose  :
+//=======================================================================
+int VisuGUI_Plot3DDlg::storeToPrsObject (VISU::Plot3D_i* thePrs)
+{ 
+  int ok = 1;
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+
+    ok = myInputPane->storeToPrsObject( thePrs );
+  }
+
+  return ok && myScalarPane->storeToPrsObject(thePrs) && myIsoPane->storeToPrsObject(thePrs);
+}
+
 //=======================================================================
 //function : onHelp
 //purpose  :

diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.h b/src/VISUGUI/VisuGUI_Plot3DDlg.h
index 230df0004e3b1bc1bf8887ed651441ee83e5e0f3..980ef9802cccad57eec15108b415acaa416845ed 100644 (file)
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.h
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.h
@@ -34,8 +34,10 @@
 #include "VISU_Plot3D_i.hh"
 
 #include <qhbuttongroup.h>
+#include <qtabwidget.h>
 
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 
 namespace VISU {
   class Plot3D_i;
@@ -103,11 +105,8 @@ class VisuGUI_Plot3DDlg : public QDialog
   VisuGUI_Plot3DDlg (SalomeApp_Module* theModule);
   ~VisuGUI_Plot3DDlg() {};
 
-  void initFromPrsObject (VISU::Plot3D_i* thePrs)
-    { myScalarPane->initFromPrsObject(thePrs); myIsoPane->initFromPrsObject(thePrs); }
-
-  int storeToPrsObject (VISU::Plot3D_i* thePrs)
-    { return myScalarPane->storeToPrsObject(thePrs) && myIsoPane->storeToPrsObject(thePrs); }
+  void initFromPrsObject (VISU::Plot3D_i* thePrs);
+  int storeToPrsObject (VISU::Plot3D_i* thePrs);
 
   void setPlane(int theOrientation, double theXRotation, double theYRotation, double thePlanePos);
 
@@ -120,8 +119,10 @@ class VisuGUI_Plot3DDlg : public QDialog
   void onHelp();
 
  private:
+  QTabWidget*            myTabBox;
   VisuGUI_Plot3DPane*    myIsoPane;
   VisuGUI_ScalarBarPane* myScalarPane;
+  VisuGUI_InputPane*     myInputPane;
 };
 
 #endif // VISUGUI_PLOT3D_H

diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
index 88ef543d77d2f17665105729da4963d184ce8b91..a3a60f9807295ca2e0c24132161c5fe0047721c7 100644 (file)
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
@@ -28,11 +28,10 @@
 
 #include "VisuGUI_ScalarBarDlg.h"
 
-#include "VisuGUI_InputPane.h"
-
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "SVTK_ViewWindow.h"
 #include "SVTK_FontWidget.h"
@@ -1178,10 +1177,12 @@ void VisuGUI_ScalarBarDlg::initFromPrsObject(VISU::ScalarMap_i* thePrs)
     myInputPane->initFromPrsObject( thePrs );
     myTabBox->showPage( myInputPane );
   }
-
   myTabBox->setCurrentPage( 0 );
 }
 
+/*!
+  Store dialog to the presentation
+*/
 int VisuGUI_ScalarBarDlg::storeToPrsObject(VISU::ScalarMap_i* thePrs)
 {
   int ok = 1;

diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx
index 27e8b5bf4762e4a47f08e565bbcb5c21ff03d1dd..90b62a8df0285bcc4e7e9af2996c956e1be1ce89 100644 (file)
--- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx
@@ -28,6 +28,7 @@
 #include "VisuGUI_ScalarMapOnDeformedShapeDlg.h"
 
 #include "VisuGUI_Tools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_Result_i.hh"
 #include "VISU_ScalarMapOnDeformedShape_i.hh"
@@ -74,7 +75,7 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome
   TopLayout->setSpacing(6);
   TopLayout->setMargin(11);
 
-  QTabWidget* aTabBox = new QTabWidget (this);
+  myTabBox = new QTabWidget (this);
 
   // Scalar Map on Deformed shape pane
   QVBox* aBox = new QVBox (this);
@@ -112,13 +113,15 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome
   TopGroupLayout->addWidget(myTimeStampsCombo,2,1);
 
   //
-  aTabBox->addTab(aBox, tr("SCALAR_MAP_ON_DEFORMED_SHAPE_TAB"));
+  myTabBox->addTab(aBox, tr("SCALAR_MAP_ON_DEFORMED_SHAPE_TAB"));
 
   // Scalar bar pane
   myScalarPane = new VisuGUI_ScalarBarPane (this, false);
   myScalarPane->setMargin(5);
+  myInputPane = new VisuGUI_InputPane(theModule, this);
 
-  aTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
+  myTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
+  myTabBox->addTab(myInputPane, tr("INPUT_TAB"));
 
   // Buttons
   QGroupBox* GroupButtons = new QGroupBox (this, "GroupButtons");
@@ -148,7 +151,7 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome
   GroupButtonsLayout->addWidget(buttonHelp, 0, 3);
 
   // Add Tab box and Buttons to the top layout
-  TopLayout->addWidget(aTabBox);
+  TopLayout->addWidget(myTabBox);
   TopLayout->addWidget(GroupButtons);
 
   // signals and slots connections
@@ -297,6 +300,15 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject
   SetScalarField( false );
 
   myScalarPane->initFromPrsObject(myPrs);
+
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
 }
 
 int VisuGUI_ScalarMapOnDeformedShapeDlg::storeToPrsObject
@@ -321,6 +333,13 @@ int VisuGUI_ScalarMapOnDeformedShapeDlg::storeToPrsObject
 
   myScalarPane->storeToPrsObject(thePrs);
 
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+    myInputPane->storeToPrsObject( thePrs );
+  }
+
   myPrs = thePrs;
 
   return 1;

diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h
index 3151bd934c0a93859c38bb09e140c8ef9788f9a7..cb7c9c6fdb11990da1f35eaec4bed082e39f5b35 100644 (file)
--- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h
+++ b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h
@@ -37,10 +37,12 @@
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
+#include <qtabwidget.h>
 
 #include <set>
 
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 class QComboBox;
 class QString;
 
@@ -85,7 +87,9 @@ private slots:
 
 private:
  QtxDblSpinBox* ScalFact;
+ QTabWidget* myTabBox;
  VisuGUI_ScalarBarPane* myScalarPane;
+ VisuGUI_InputPane*     myInputPane;
  QComboBox *myFieldsCombo;
  QComboBox *myTimeStampsCombo;
  

diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
index 4f81711ef29f7a83404e8cda659c17f3ec296539..129e96a7b3f2cef3af233576d3675bbf81983e0b 100644 (file)
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
@@ -25,6 +25,7 @@
 
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_Mesh_i.hh"
 #include "VISU_Gen_i.hh"
@@ -68,7 +69,7 @@ VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg (SalomeApp_Module* theModule)
   aBoxLayout->setSpacing( 6 );
   aBoxLayout->setMargin( 11 );
 
-  QTabWidget* aTabBox = new QTabWidget(this);
+  myTabBox = new QTabWidget(this);
 
   QFrame* aTopBox = new QFrame(this);
   aTopBox->setMargin( 11 );
@@ -266,12 +267,14 @@ VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg (SalomeApp_Module* theModule)
   connect( SelColor,     SIGNAL( clicked() ), this, SLOT( setVColor() ) );
   TopLayout->addWidget( SelColor, 5, 1);
 
-  aTabBox->addTab(aTopBox, "Stream Lines");
+  myTabBox->addTab(aTopBox, "Stream Lines");
   myScalarPane = new VisuGUI_ScalarBarPane(this, false);
   myScalarPane->setMargin( 5 );
-  aTabBox->addTab(myScalarPane, "Scalar Bar");
+  myInputPane = new VisuGUI_InputPane(theModule, this);
+  myTabBox->addTab(myScalarPane, "Scalar Bar");
+  myTabBox->addTab(myInputPane, "Input");
 
-  aBoxLayout->addWidget(aTabBox);
+  aBoxLayout->addWidget(myTabBox);
 
   QGroupBox* aGroupButtons = new QGroupBox( this, "GroupButtons" );
   aGroupButtons->setColumnLayout(0, Qt::Vertical );
@@ -311,6 +314,15 @@ void VisuGUI_StreamLinesDlg::initFromPrsObject (VISU::StreamLines_i* thePrs)
 {
   myScalarPane->initFromPrsObject(thePrs);
 
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
+
   myPrs = thePrs;
   static int aNbOfSteps = 30;
   VISU_StreamLinesPL* aStreamLinesPL = thePrs->GetSpecificPL();
@@ -379,6 +391,14 @@ void VisuGUI_StreamLinesDlg::initFromPrsObject (VISU::StreamLines_i* thePrs)
 int VisuGUI_StreamLinesDlg::storeToPrsObject (VISU::StreamLines_i* thePrs)
 {
   bool isAccepted = myScalarPane->storeToPrsObject(thePrs);
+
+  if( isAccepted && !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+    isAccepted = myInputPane->storeToPrsObject( thePrs );
+  }
+
   if (isAccepted) {
     thePrs->ShowColored(myUseScalar->isChecked());
     if (!thePrs->IsColored()) {

diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.h b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
index 263ef4be4923dd22c7bdbe8795e138c10647d72c..f40a16f5038968b53945d16f9c3d3aba124d3d19 100644 (file)
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
@@ -30,8 +30,10 @@
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qstringlist.h>
+#include <qtabwidget.h>
 
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 class QtxDblSpinBox;
 
 namespace VISU{
@@ -80,7 +82,9 @@ private:
     QtxDblSpinBox* myPntPercent;
     QComboBox* mySrcCombo;
 
+    QTabWidget*            myTabBox;
     VisuGUI_ScalarBarPane* myScalarPane;
+    VisuGUI_InputPane*     myInputPane;
 
     QValueList<VISU::Prs3d_var> myPrsList;
     QValueList<VISU::Prs3d_var> myEntityList;

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index b9c660c0b466275a3f5d86741a5350c9ac08a896..8f1a409450ae3b28ef97f141192c7370a38bef05 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -31,6 +31,7 @@
 #include "VisuGUI.h"
 //#include "VisuGUI_Selection.h"
 #include "VisuGUI_Tools.h"
+#include "VisuGUI_InputPane.h"
 
 #include "VISU_Vectors_i.hh"
 #include "LightApp_Application.h"
@@ -51,7 +52,7 @@ using namespace std;
   Constructor
 */
 VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule)
-    : QDialog(VISU::GetDesktop(theModule), "VisuGUI_VectorsDlg", true,
+    : QDialog(VISU::GetDesktop(theModule), "VisuGUI_VectorsDlg", false,
       WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
   setCaption(tr("DLG_TITLE"));
@@ -61,7 +62,7 @@ VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule)
   TopLayout->setSpacing( 6 );
   TopLayout->setMargin( 11 );
 
-  QTabWidget* aTabBox = new QTabWidget(this);
+  myTabBox = new QTabWidget(this);
 
   QVBox* aBox = new QVBox(this);
   aBox->setMargin( 11 );
@@ -171,12 +172,14 @@ VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule)
   GroupButtonsLayout->addWidget( buttonHelp, 0, 3 );
 
   // top layout
-  aTabBox->addTab(aBox, "Vectors");
+  myTabBox->addTab(aBox, "Vectors");
   myScalarPane = new VisuGUI_ScalarBarPane(this, false);
   myScalarPane->setMargin( 5 );
-  aTabBox->addTab(myScalarPane, "Scalar Bar");  
+  myInputPane = new VisuGUI_InputPane(theModule, this);
+  myTabBox->addTab(myScalarPane, "Scalar Bar");  
+  myTabBox->addTab(myInputPane, "Input");
 
-  TopLayout->addWidget( aTabBox );
+  TopLayout->addWidget( myTabBox );
   TopLayout->addWidget( GroupButtons );
   
   // signals and slots connections
@@ -201,6 +204,14 @@ VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule)
 
 void VisuGUI_VectorsDlg::initFromPrsObject(VISU::Vectors_i* thePrs) {
   myScalarPane->initFromPrsObject(thePrs);
+  if( thePrs->IsTimeStampFixed() )
+    myTabBox->removePage( myInputPane );
+  else
+  {
+    myInputPane->initFromPrsObject( thePrs );
+    myTabBox->showPage( myInputPane );
+  }
+  myTabBox->setCurrentPage( 0 );
   setScaleFactor(thePrs->GetScale());
   setLineWidth((int)thePrs->GetLineWidth());
   setUseMagnColor(thePrs->IsColored());
@@ -221,6 +232,12 @@ void VisuGUI_VectorsDlg::initFromPrsObject(VISU::Vectors_i* thePrs) {
 
 int VisuGUI_VectorsDlg::storeToPrsObject(VISU::Vectors_i* thePrs) {
   myScalarPane->storeToPrsObject(thePrs);
+  if( !thePrs->IsTimeStampFixed() )
+  {
+    if( !myInputPane->check() )
+      return 0;
+    myInputPane->storeToPrsObject( thePrs );
+  }
   thePrs->SetScale(getScaleFactor());
   thePrs->SetLineWidth(getLineWidth());
   thePrs->ShowColored(getUseMagnColor());

diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.h b/src/VISUGUI/VisuGUI_VectorsDlg.h
index 091fec4d36e49c4b5a12946324087fd85089e658..437538f8211b4e128b3473188429006c0a75c415 100644 (file)
--- a/src/VISUGUI/VisuGUI_VectorsDlg.h
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.h
@@ -40,11 +40,13 @@
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
+#include <qtabwidget.h>
 
 #include "SALOMEconfig.h"
 #include CORBA_CLIENT_HEADER(VISU_Gen)
 
 class SalomeApp_Module;
+class VisuGUI_InputPane;
 
 namespace VISU{
   class Vectors_i;
@@ -112,7 +114,10 @@ private:
     QPushButton*    buttonHelp;
 
     QColor          myColor;
+    QTabWidget*            myTabBox;
+
     VisuGUI_ScalarBarPane* myScalarPane;
+    VisuGUI_InputPane*     myInputPane;
 
 private slots:
     void enableGlyphType();