POSEIDONGUI issue #31415: API to hide widgets for title editing, not to confuse the...

diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx
index 8b8c5ae7b1d39c776da48af6d651c72797409176..0402410f36bb7a46fb8f57478b21f0cda4dde221 100755 (executable)
--- a/src/Plot2d/Plot2d_SetupViewDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupViewDlg.cxx
@@ -516,6 +516,86 @@ QString Plot2d_SetupViewDlg::getY2Title()
   return myTitleY2Edit->text();
 }
 
+/*!
+  \brief Shows/hides widgets for the main title editing
+  \sa isTitleEditable()
+*/
+void Plot2d_SetupViewDlg::setTitleEditable( bool editable )
+{
+  myTitleCheck->setVisible( editable );
+  myTitleEdit->setVisible( editable );
+}
+
+/*!
+  \brief Get visibility state of the widgets for the main title editing
+  \return true if the widgets are visible
+  \sa setTitleEditable()
+*/
+bool Plot2d_SetupViewDlg::isTitleEditable()
+{
+  return myTitleEdit->isVisible();
+}
+
+/*!
+  \brief Shows/hides widgets for the X axis title editing
+  \sa isXTitleEditable()
+*/
+void Plot2d_SetupViewDlg::setXTitleEditable( bool editable )
+{
+  myTitleXCheck->setVisible( editable );
+  myTitleXEdit->setVisible( editable );
+}
+ 
+/*!
+  \brief Get visibility state of the widgets for the X axis title editing
+  \return true if the widgets are visible
+  \sa setXTitleEditable()
+*/
+bool Plot2d_SetupViewDlg::isXTitleEditable()
+{
+  return myTitleXEdit->isVisible();
+}
+
+/*!
+  \brief Shows/hides widgets for the Y axis title editing
+  \sa isYTitleEditable()
+*/
+void Plot2d_SetupViewDlg::setYTitleEditable( bool editable )
+{
+  myTitleYCheck->setVisible( editable );
+  myTitleYEdit->setVisible( editable );
+}
+ 
+/*!
+  \brief Get visibility state of the widgets for the Y axis title editing
+  \return true if the widgets are visible
+  \sa setYTitleEditable()
+*/
+bool Plot2d_SetupViewDlg::isYTitleEditable()
+{
+  return myTitleYEdit->isVisible();
+}
+
+/*!
+  \brief Shows/hides widgets for the second Y axis title editing
+  \sa isY2TitleEditable()
+*/
+void Plot2d_SetupViewDlg::setY2TitleEditable( bool editable )
+{
+  myTitleY2Check->setVisible( editable );
+  myTitleY2Edit->setVisible( editable );
+}
+ 
+/*!
+  \brief Get visibility state of the widgets for the second Y axis title editing
+  \return true if the widgets are visible
+  \sa setY2TitleEditable()
+*/
+bool Plot2d_SetupViewDlg::isY2TitleEditable()
+{
+  return myTitleY2Edit->isVisible();
+}
+
 /*!
   \brief Set curve type.
   \param type curve type: 0 (points), 1 (lines) or 2 (splines)

diff --git a/src/Plot2d/Plot2d_SetupViewDlg.h b/src/Plot2d/Plot2d_SetupViewDlg.h
index 923dd5f40bac50ac7e4e1bde69857bb91dacaf10..342a64f04b2807fad96b534eca3e6f34a88f8bdd 100755 (executable)
--- a/src/Plot2d/Plot2d_SetupViewDlg.h
+++ b/src/Plot2d/Plot2d_SetupViewDlg.h
@@ -57,6 +57,15 @@ public:
   QString         getYTitle();
   QString         getY2Title();
 
+  void            setTitleEditable( bool );
+  bool            isTitleEditable();
+  void            setXTitleEditable( bool );
+  bool            isXTitleEditable();
+  void            setYTitleEditable( bool );
+  bool            isYTitleEditable();
+  void            setY2TitleEditable( bool );
+  bool            isY2TitleEditable();
+
   void            setCurveType( const int );
   int             getCurveType();
 

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index d8957f229d5fa27c1715740b6b6b7e854916328f..5039740b63f85b3e69c1ce250fcb35c7573b3ccc 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -932,6 +932,16 @@ int Plot2d_ViewFrame::testOperation( const QMouseEvent& me )
   }
 }
 
+/*!
+  Protected virtual method called by onSettings() slot, 
+  can be redefined to customize the dialog box appearance.
+  \param theDlg a pointer to the 2D plot settings dialog box instance
+  \sa onSettings()
+*/
+void Plot2d_ViewFrame::setupSettingsDlg( Plot2d_SetupViewDlg* /*theDlg*/ )
+{
+}
+
 /*!
   "Settings" toolbar action slot
 */
@@ -977,6 +987,10 @@ void Plot2d_ViewFrame::onSettings()
 #endif
   
   Plot2d_SetupViewDlg* dlg = new Plot2d_SetupViewDlg( this, true, mySecondY );
+
+  // Allow derived classes to customize the dialog box appearance
+  setupSettingsDlg( dlg );
+
   dlg->setMainTitle( myTitleEnabled, myTitle );
   dlg->setXTitle( myXTitleEnabled, myXTitle );
   dlg->setYTitle( myYTitleEnabled, myYTitle );

diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index 40335b34aa675ac0254036a9b486570ecf0d95a4..76291eb42e1d9aceaf3df73f93636d75f9988c8e 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -27,6 +27,7 @@
 
 class Plot2d_Plot2d;
 class Plot2d_Prs;
+class Plot2d_SetupViewDlg;
 class QCustomEvent;
 class QwtPlotCurve;
 class QwtPlotGrid;
@@ -169,6 +170,8 @@ protected:
 
   void    setCurveType( QwtPlotCurve* curve, int curveType );
 
+  virtual void setupSettingsDlg( Plot2d_SetupViewDlg* );
+
 public slots:
   void    onViewPan(); 
   void    onViewZoom();
@@ -191,6 +194,7 @@ protected:
   void    plotMousePressed( const QMouseEvent& );
   bool    plotMouseMoved( const QMouseEvent& );
   void    plotMouseReleased( const QMouseEvent& );
+  
 
 signals:
   void    vpModeHorChanged();