Dump Image data to python script (Feature #13).

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

diff --git a/src/HYDROGUI/HYDROGUI_InputPanel.cxx b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index 269e5ca3882d2997030779c6f4f0003bd231fb65..5857decfd8efd5b27317b8119518f25620e92d9a 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_InputPanel.cxx
+++ b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
@@ -41,12 +41,12 @@ HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr
   setWidget( aFrame );
   QVBoxLayout* aLayout = new QVBoxLayout( aFrame );
   
-  myMainFrame = new QFrame( this );
-  QGridLayout* aMainLayout = new QGridLayout( myMainFrame );
+  myMainFrame = new QFrame( aFrame );
+  QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
   aMainLayout->setMargin( 0 );
   aMainLayout->setSpacing( 5 );
 
-  myBtnFrame = new QFrame( this );
+  myBtnFrame = new QFrame( aFrame );
   aLayout->addWidget( myMainFrame, 1 );
   aLayout->addWidget( myBtnFrame, 0 );
 
@@ -63,9 +63,9 @@ HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr
   aBtnsLayout->addStretch( 1 );
   aBtnsLayout->addWidget( myHelp, 0 );
 
-  connect( myApply,  SIGNAL( clicked() ), this, SLOT( OnApply()  ) );
-  connect( myCancel, SIGNAL( clicked() ), this, SLOT( OnCancel() ) );
-  connect( myHelp,   SIGNAL( clicked() ), this, SLOT( OnHelp()   ) );
+  connect( myApply,  SIGNAL( clicked() ), this, SLOT( onApply()  ) );
+  connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
+  connect( myHelp,   SIGNAL( clicked() ), this, SLOT( onHelp()   ) );
 }
 
 HYDROGUI_InputPanel::~HYDROGUI_InputPanel()
@@ -77,51 +77,34 @@ HYDROGUI_Module* HYDROGUI_InputPanel::module() const
   return myModule;
 }
 
-void HYDROGUI_InputPanel::OnApply()
+void HYDROGUI_InputPanel::onApply()
 {
   emit panelApply(); 
 }
 
-void HYDROGUI_InputPanel::OnCancel()
+void HYDROGUI_InputPanel::onCancel()
 {
   emit panelCancel();
 }
 
-void HYDROGUI_InputPanel::OnHelp()
+void HYDROGUI_InputPanel::onHelp()
 {
 }
 
-void HYDROGUI_InputPanel::addWidget( const QString& theLabel, QWidget* theWidget )
+void HYDROGUI_InputPanel::addWidget( QWidget* theWidget )
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  int aRow = aMainLayout->rowCount();
-  aMainLayout->addWidget( new QLabel( theLabel, this ), aRow, 0 );
-  aMainLayout->addWidget( theWidget, aRow, 1 );
+  QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
+  aMainLayout->addWidget( theWidget );
 }
 
-void HYDROGUI_InputPanel::addWidget( QWidget* theWidget,
-                                     const int theRow,
-                                     const int theColumn )
+void HYDROGUI_InputPanel::addLayout( QLayout* theLayout )
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  aMainLayout->addWidget( theWidget, theRow, theColumn );
+  QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
+  aMainLayout->addLayout( theLayout );
 }
 
-void HYDROGUI_InputPanel::addSeparator()
+void HYDROGUI_InputPanel::addStretch()
 {
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  int aRow = aMainLayout->rowCount();
-
-  QFrame* aLine = new QFrame();
-  aLine->setFrameShape( QFrame::HLine );
-  aLine->setFrameShadow( QFrame::Sunken );
-
-  aMainLayout->addWidget( aLine, aRow, 0, 1, 2 );
-}
-
-void HYDROGUI_InputPanel::setRowStretch()
-{
-  QGridLayout* aMainLayout = dynamic_cast<QGridLayout*>( myMainFrame->layout() );
-  int aRow = aMainLayout->rowCount();
-  aMainLayout->setRowStretch( aRow, 1 );
+  QBoxLayout* aMainLayout = dynamic_cast<QBoxLayout*>( myMainFrame->layout() );
+  aMainLayout->addStretch();
 }