From 8848e99acfeb6fb101320e961ead48c4a603a440 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 22 Nov 2007 08:31:50 +0000 Subject: [PATCH] NPAL15530: implement 'Help' button for 'Plot2d View Settings' dlg. --- doc/salome/gui/GUI/images/plot2d_clone.gif | Bin 0 -> 1008 bytes doc/salome/gui/GUI/images/plot2d_legend.gif | Bin 0 -> 1050 bytes doc/salome/gui/GUI/images/plot2d_lines.gif | Bin 0 -> 908 bytes .../images/plot2d_logarithmic_horizontal.gif | Bin 0 -> 988 bytes .../images/plot2d_logarithmic_vertical.gif | Bin 0 -> 983 bytes doc/salome/gui/GUI/images/plot2d_points.gif | Bin 0 -> 966 bytes doc/salome/gui/GUI/images/plot2d_settings.gif | Bin 0 -> 1042 bytes doc/salome/gui/GUI/images/plot2d_splines.gif | Bin 0 -> 970 bytes .../gui/GUI/images/plot2d_view_settings.png | Bin 0 -> 23377 bytes .../gui/GUI/input/gui_module_chapter.doc | 3 +- doc/salome/gui/GUI/input/index.doc | 3 +- doc/salome/gui/GUI/input/plot2d_viewer.doc | 94 ++++++++++++++++++ doc/salome/gui/GUI/input/viewers_chapter.doc | 3 +- src/Plot2d/Plot2d_SetupViewDlg.cxx | 20 +++- src/Plot2d/Plot2d_SetupViewDlg.h | 2 + src/SUIT/SUIT_Application.cxx | 9 ++ src/SUIT/SUIT_Application.h | 1 + 17 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 doc/salome/gui/GUI/images/plot2d_clone.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_legend.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_lines.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_logarithmic_horizontal.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_logarithmic_vertical.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_points.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_settings.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_splines.gif create mode 100644 doc/salome/gui/GUI/images/plot2d_view_settings.png create mode 100644 doc/salome/gui/GUI/input/plot2d_viewer.doc 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 0000000000000000000000000000000000000000..f980a5dd27a0e875284528035a8e43f5f66cba96 GIT binary patch literal 1008 zcmZ?wbh9u|lwpu!_|5$6Dudv zACr|^)Pv`9&SPTjn)r%gwe#GxyI$L#g)d4J_cP_b_QGuv7xRj(H@7Ws*v&M@iTA+t z^@pZ~@p8!7EZA_PwdnsXnKcO;k`E?rot66MhT++EUCr>e9+SsO2Yb!Ak9qId-}bU^+B9jg3i;U2H~KcTQ|ve2hti zzeC1z(~^@D6~sjpBp0MMOg7+O5@UHOm4T5x=T%LoQHt+$CN>!Xhb=2E&eMuy60J&T zxV${TRm@{T!!wV?KFNz*8V-7dkxc@3Yu aSFhjSM7Qo6>|yuM?cM$T{S{^=25SI|qKmBn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d1dc2313e469f3feea1e0f678c86559b545938f GIT binary patch literal 908 zcmZ?wbh9u|6lV};_|5Tu+h;i9YS5)O0ma4=W{07C;hF8}}l literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3473ad94a34225a6b29358ded6b9790b061e6d30 GIT binary patch literal 988 zcmZ?wbh9u|lx2`%_|Cv!XlS@}>C$`m?mY*B_s`$IfBzi_{(t}f|3AYh7!85p9s)Wb z4}$Un1IIxIb`BYj4GRu7GYe?MoY=7NaJzuA*Bp;T; zXVy9V=DH?bQP6mRiAh8tp~B$tvHoC$`m?mY*B_s`$IfBzi_{(t}f|3AYh7!85p9s)Wb z4}$Un1IHc)b`BYj4GSEbIE1ufPHb3sxLrWmYt9S-2iI;9NhSt?14+kQr48-2oS3N0 zG?~kqtz*R{6?aDQcsHG$L1|7?4aDVc?EL)n7y~2Amp__Qo-;CgOlC7xP+$mNsz2Fl zt`@_}hE+j}{qCMJU3qO?0&h!y)i%duGkFka=iv7{nyXdp5CtK zx7YDE*EZ=H@9rI}`Q9hm5K-`u$wA(H-RT+cuAZ7~{8{zD&dtxyFR+!D@vU-jV6X-N Dz&&b^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6700f0078b07372ed258446f7cf0120d8dba505d GIT binary patch literal 966 zcmZ?wbh9u|6lV};_|50W);?ou~^XH+$f;zWpZG{!=pXyW<_r* z1Q|Uh%Iem&a4@KzoXX00LPo(b^<BwX3?8gHvNo7Cj5lCI_KDs|<_eJ?!421EIb7dnn>B%BJ23P7cH!lG5^DlqL>)_)c>nzU`}g00;Q#mk|Nlc(jZ&i_ zFziA=2jnAAUSQz(&cMqd536l7?eZos&NXM@lZ=jludhvs-Lc<9dRAUZ?G^T1N?xi*|Ep&twz zFS9U+Na=cgU3zAU{(QBJUnZ+AvIhI|d8{&RWLz6~Q11^{!hr^+2+k?Cx4$Od+Lq5P za$?ogb(gmY+!ia?6`mKrC1Ecg>+f$b@9pe}Hml3}u`+%|r|^7{m@>Vl^BfGfYq@uQ zN#DG*eU(`Bfs#yCHlN*deXGl|ug_QBb?x+S^ZYwIlbPl1V$452Ue>D|FZZ$G^YaUf Sy{GqW*j3uCXvoIGU=08&XNPkD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1d50b2097130ed74ad0cd8cf38a7cbbf03160c98 GIT binary patch literal 970 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 T&B(x`vN literal 0 HcmV?d00001 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 @@
  • \ref occ_3d_viewer_page
  • \ref vtk_3d_viewer_page
    • +
  • \ref plot2d_viewer_page
  • \subpage setting_preferences_page
      • @@ -35,4 +36,4 @@
    -*/ \ 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 occ_3d_viewer_page
    • \ref vtk_3d_viewer_page
      • +
    • \ref plot2d_viewer_page
  • \ref setting_preferences_page
      • @@ -47,4 +48,4 @@
    -*/ \ 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: +
      +
    • Main title: the title of the XY plot. By default, it will +consist of the names of the tables, on the basis of which the curve +lines have been constructed.
      • +
    • Curve type: you can select from \b Points, \b Lines and \b Spline.
      • +
    • Show legend: here you can define the position of the +description table on the XY plot (to the \b Left, to the \b Right, on +\b Top or on \b Bottom).
      • +
    • Marker size - size of the points (markers) forming curve lines.
      • +
    • Background color of the XY plot.
      • +
    • Scale mode: here you can select the type of scaling (\b +Linear or \b Logarithmic) along X (Horizontal) or Y (Vertical) axes.
      • +
    + +You can define settings for each axis separately: +
      +
    • \b Horizontal or \b Vertical axis title.
      • +
    • Grid/Axes marks: here you can define the maximum number of major +and minor scale divisions for a specified axis. The real number of +intervals fits to {1,2,5}*10^N, where N is a natural number, and +doesn't exceed the maximum.
      • +
    • Save settings as default: If this check box is marked, all +XY plots will be displayed with these defined properties.
      • +
    + +*/ 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 @@
    • \subpage occ_3d_viewer_page
    • \subpage vtk_3d_viewer_page
      • +
    • \subpage plot2d_viewer_page
    -*/ \ 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(); -- 2.39.2