From: jfa Date: Thu, 22 Nov 2007 08:31:50 +0000 (+0000) Subject: NPAL15530: implement 'Help' button for 'Plot2d View Settings' dlg. X-Git-Tag: V4_1_0rc2~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8848e99acfeb6fb101320e961ead48c4a603a440;p=modules%2Fgui.git NPAL15530: implement 'Help' button for 'Plot2d View Settings' dlg. --- diff --git a/doc/salome/gui/GUI/images/plot2d_clone.gif b/doc/salome/gui/GUI/images/plot2d_clone.gif new file mode 100644 index 000000000..f980a5dd2 Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_clone.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_legend.gif b/doc/salome/gui/GUI/images/plot2d_legend.gif new file mode 100644 index 000000000..a40211e8a Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_legend.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_lines.gif b/doc/salome/gui/GUI/images/plot2d_lines.gif new file mode 100644 index 000000000..8d1dc2313 Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_lines.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif b/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif new file mode 100644 index 000000000..3473ad94a Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif b/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif new file mode 100644 index 000000000..0d3b25ef4 Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_points.gif b/doc/salome/gui/GUI/images/plot2d_points.gif new file mode 100644 index 000000000..6700f0078 Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_points.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_settings.gif b/doc/salome/gui/GUI/images/plot2d_settings.gif new file mode 100644 index 000000000..87e1105c6 Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_settings.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_splines.gif b/doc/salome/gui/GUI/images/plot2d_splines.gif new file mode 100644 index 000000000..1d50b2097 Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_splines.gif differ diff --git a/doc/salome/gui/GUI/images/plot2d_view_settings.png b/doc/salome/gui/GUI/images/plot2d_view_settings.png new file mode 100644 index 000000000..79dcc495a Binary files /dev/null and b/doc/salome/gui/GUI/images/plot2d_view_settings.png differ diff --git a/doc/salome/gui/GUI/input/gui_module_chapter.doc b/doc/salome/gui/GUI/input/gui_module_chapter.doc index c2cbe5c5a..3d4f43ce0 100644 --- a/doc/salome/gui/GUI/input/gui_module_chapter.doc +++ b/doc/salome/gui/GUI/input/gui_module_chapter.doc @@ -23,6 +23,7 @@
  • \subpage setting_preferences_page
    • -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/GUI/input/index.doc b/doc/salome/gui/GUI/input/index.doc index fe9d047a7..1f340a405 100644 --- a/doc/salome/gui/GUI/input/index.doc +++ b/doc/salome/gui/GUI/input/index.doc @@ -34,6 +34,7 @@
  • \ref setting_preferences_page
    • -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/GUI/input/plot2d_viewer.doc b/doc/salome/gui/GUI/input/plot2d_viewer.doc new file mode 100644 index 000000000..e6208d618 --- /dev/null +++ b/doc/salome/gui/GUI/input/plot2d_viewer.doc @@ -0,0 +1,94 @@ +/*! + +\page plot2d_viewer_page Plot 2D viewer + +\n Plot 2d viewer is destined to the representation of 2d +plots and graphs in Post-Pro module. +\n Its viewer toolbar gives you fast access to the following +operations: + +\image html image77.gif +
    Dump View - exports an object from the viewer in bmp, +png, jpg or jpeg image format.
    + +\image html image96.gif +
    Fit all - scales the display to show the entire +scene. Use this to resize the scene so that it could fit within the +Viewer boundary.
    + +\image html image97.gif +
    Fit area - resizes the view to place in the visible +area only the contents of a frame drawn with pressed left mouse +button.
    + +\image html image98.gif +
    Zoom - allows to zoom in and out.
    + +\image html image99.gif +
    \b Panning - if the represented objects are greater that the +visible area and you don't wish to use Fit all functionality, click on +this button and you'll be able to drag the scene to see its remote +parts.
    + +\image html image100.gif +
    Global panning - allows to define the center of the +scene presenting all displayed objects in the visible area.
    + +\image html plot2d_points.gif +
    Draw Points - represents points on the graph.
    + +\image html plot2d_lines.gif +
    Draw Lines - represents lines on the graph.
    + +\image html plot2d_splines.gif +
    Draw Splines - represents splines on the graph.
    + +\image html plot2d_logarithmic_horizontal.gif +
    Horizontal axis logarithmic - changes the scaling on +horizontal axis to logarithmic.
    + +\image html plot2d_logarithmic_vertical.gif +
    Vertical axis logarithmic - changes the scaling on vertical +axis to logarithmic.
    + +\image html plot2d_legend.gif +
    Show Legend - reveals all verbal and numerical +information on the graphs.
    + +\image html plot2d_settings.gif +
    \b Settings - calls a menu, in which you can specify advanced +settings for your Plot 2d Viewer.
    + +\image html plot2d_clone.gif +
    Clone view - opens a new duplicate scene.
    + +\anchor settings +\n \image html plot2d_view_settings.png + +The options are as follows: + + +You can define settings for each axis separately: + + +*/ diff --git a/doc/salome/gui/GUI/input/viewers_chapter.doc b/doc/salome/gui/GUI/input/viewers_chapter.doc index b13b5cf57..44271fcf1 100644 --- a/doc/salome/gui/GUI/input/viewers_chapter.doc +++ b/doc/salome/gui/GUI/input/viewers_chapter.doc @@ -5,6 +5,7 @@ -*/ \ No newline at end of file +*/ diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx index 9f1b2f03a..e8c8b54c1 100755 --- a/src/Plot2d/Plot2d_SetupViewDlg.cxx +++ b/src/Plot2d/Plot2d_SetupViewDlg.cxx @@ -23,6 +23,9 @@ #include "Plot2d_SetupViewDlg.h" +#include "SUIT_Session.h" +#include "SUIT_Application.h" + #include #include #include @@ -247,16 +250,20 @@ Plot2d_SetupViewDlg::Plot2d_SetupViewDlg( QWidget* parent, bool showDefCheck, bo aTabWidget->setCurrentPage( 0 ); /* "Set as default" check box */ myDefCheck = new QCheckBox( tr( "PLOT2D_SET_AS_DEFAULT_CHECK" ), this ); - /* OK/Cancel buttons */ + + /* OK/Cancel/Help buttons */ myOkBtn = new QPushButton( tr( "BUT_OK" ), this ); myOkBtn->setAutoDefault( TRUE ); myOkBtn->setDefault( TRUE ); myCancelBtn = new QPushButton( tr( "BUT_CANCEL" ), this ); myCancelBtn->setAutoDefault( TRUE ); + myHelpBtn = new QPushButton( tr( "BUT_HELP" ), this ); + myHelpBtn->setAutoDefault( TRUE ); QHBoxLayout* btnLayout = new QHBoxLayout; btnLayout->addWidget( myOkBtn ); btnLayout->addStretch(); btnLayout->addWidget( myCancelBtn ); + btnLayout->addWidget( myHelpBtn ); // layout widgets topLayout->addWidget( myTitleCheck, 0, 0 ); @@ -293,6 +300,7 @@ Plot2d_SetupViewDlg::Plot2d_SetupViewDlg( QWidget* parent, bool showDefCheck, bo connect( myOkBtn, SIGNAL( clicked() ), this, SLOT( accept() ) ); connect( myCancelBtn, SIGNAL( clicked() ), this, SLOT( reject() ) ); + connect( myHelpBtn, SIGNAL( clicked() ), this, SLOT( onHelp() ) ); if (mySecondAxisY) { connect( myTitleY2Check, SIGNAL( clicked() ), this, SLOT( onY2TitleChecked() ) ); @@ -681,3 +689,13 @@ bool Plot2d_SetupViewDlg::isSetAsDefault() { return myDefCheck->isChecked(); } + +/*! + Slot, called when user clicks "Help" button +*/ +void Plot2d_SetupViewDlg::onHelp() +{ + SUIT_Application* app = SUIT_Session::session()->activeApplication(); + if (app) + app->onHelpContextModule("GUI", "plot2d_viewer_page.html#settings"); +} diff --git a/src/Plot2d/Plot2d_SetupViewDlg.h b/src/Plot2d/Plot2d_SetupViewDlg.h index 37db3d641..d04623a8b 100755 --- a/src/Plot2d/Plot2d_SetupViewDlg.h +++ b/src/Plot2d/Plot2d_SetupViewDlg.h @@ -84,6 +84,7 @@ protected slots: void onXGridMinorChecked(); void onYGridMinorChecked(); void onY2GridMinorChecked(); + void onHelp(); private: QCheckBox* myTitleCheck; @@ -118,6 +119,7 @@ private: QPushButton* myOkBtn; QPushButton* myCancelBtn; + QPushButton* myHelpBtn; bool mySecondAxisY; }; diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx index 421014056..3281323e0 100755 --- a/src/SUIT/SUIT_Application.cxx +++ b/src/SUIT/SUIT_Application.cxx @@ -636,3 +636,12 @@ void SUIT_Application::onDesktopActivated() { emit activated( this ); } + +/*! + SLOT: is used for Help browsing +*/ + +void SUIT_Application::onHelpContextModule (const QString& /*theComponentName*/, + const QString& /*theFileName*/) +{ +} diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h index b6d69edca..151877d67 100755 --- a/src/SUIT/SUIT_Application.h +++ b/src/SUIT/SUIT_Application.h @@ -116,6 +116,7 @@ signals: public slots: virtual void updateCommandsStatus(); + virtual void onHelpContextModule( const QString&, const QString& ); private slots: void onInfoClear();