From: vsr Date: Wed, 15 Feb 2012 16:36:00 +0000 (+0000) Subject: 0021179: EDF 1654 SMESH GEOM: better look'n'feel X-Git-Tag: V6_5_0a1~45 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e6c51b6305e845cc04d0932ae14ba0ce271fff1c;p=modules%2Fgui.git 0021179: EDF 1654 SMESH GEOM: better look'n'feel Introduce gradient background in the 3D viewer. Improve and update help on application preferences --- diff --git a/doc/salome/gui/images/import.png b/doc/salome/gui/images/import.png index 093c667f2..100d433e0 100755 Binary files a/doc/salome/gui/images/import.png and b/doc/salome/gui/images/import.png differ diff --git a/doc/salome/gui/images/pref11.png b/doc/salome/gui/images/pref11.png deleted file mode 100755 index e5f64414e..000000000 Binary files a/doc/salome/gui/images/pref11.png and /dev/null differ diff --git a/doc/salome/gui/images/pref12.png b/doc/salome/gui/images/pref12.png deleted file mode 100755 index 819510362..000000000 Binary files a/doc/salome/gui/images/pref12.png and /dev/null differ diff --git a/doc/salome/gui/images/pref13.png b/doc/salome/gui/images/pref13.png deleted file mode 100755 index 0bd100d80..000000000 Binary files a/doc/salome/gui/images/pref13.png and /dev/null differ diff --git a/doc/salome/gui/images/pref14.png b/doc/salome/gui/images/pref14.png deleted file mode 100755 index e28a261fa..000000000 Binary files a/doc/salome/gui/images/pref14.png and /dev/null differ diff --git a/doc/salome/gui/images/pref41.png b/doc/salome/gui/images/pref41.png deleted file mode 100644 index c4d943f7d..000000000 Binary files a/doc/salome/gui/images/pref41.png and /dev/null differ diff --git a/doc/salome/gui/images/pref_salome_directories.png b/doc/salome/gui/images/pref_salome_directories.png new file mode 100644 index 000000000..01dd7ef9b Binary files /dev/null and b/doc/salome/gui/images/pref_salome_directories.png differ diff --git a/doc/salome/gui/images/pref_salome_general.png b/doc/salome/gui/images/pref_salome_general.png new file mode 100644 index 000000000..768404cfc Binary files /dev/null and b/doc/salome/gui/images/pref_salome_general.png differ diff --git a/doc/salome/gui/images/pref_salome_objbrowser.png b/doc/salome/gui/images/pref_salome_objbrowser.png new file mode 100644 index 000000000..1ef5b7af3 Binary files /dev/null and b/doc/salome/gui/images/pref_salome_objbrowser.png differ diff --git a/doc/salome/gui/images/pref_salome_occviewer.png b/doc/salome/gui/images/pref_salome_occviewer.png new file mode 100644 index 000000000..73e44e7e2 Binary files /dev/null and b/doc/salome/gui/images/pref_salome_occviewer.png differ diff --git a/doc/salome/gui/images/pref_salome_plot2dviewer.png b/doc/salome/gui/images/pref_salome_plot2dviewer.png new file mode 100644 index 000000000..f1efa0c1e Binary files /dev/null and b/doc/salome/gui/images/pref_salome_plot2dviewer.png differ diff --git a/doc/salome/gui/images/pref_salome_shortcuts.png b/doc/salome/gui/images/pref_salome_shortcuts.png new file mode 100644 index 000000000..7c0aee69a Binary files /dev/null and b/doc/salome/gui/images/pref_salome_shortcuts.png differ diff --git a/doc/salome/gui/images/pref_salome_vtkviewer.png b/doc/salome/gui/images/pref_salome_vtkviewer.png new file mode 100644 index 000000000..6d62b6f7a Binary files /dev/null and b/doc/salome/gui/images/pref_salome_vtkviewer.png differ diff --git a/doc/salome/gui/input/salome_preferences.doc b/doc/salome/gui/input/salome_preferences.doc index b3f75bbcf..fa51cc38d 100644 --- a/doc/salome/gui/input/salome_preferences.doc +++ b/doc/salome/gui/input/salome_preferences.doc @@ -2,10 +2,10 @@ \page salome_preferences_page SALOME preferences -To begin setting preferences for your study, select \b Preferences in the -main menu, the following dialog box will appear: +General application preferences are specified at the \b SALOME section +of the \b Preferences dialog box. These preferences affect on the +application look-n-feel and common functionality. -\image html pref11.png If you've just started your study and haven't yet loaded other modules, you'll be able to change only those settings, which refer to the whole GUI SALOME session. These settings will be valid for the @@ -13,264 +13,257 @@ whole study session.

General Preferences

- -\par -For detailed settings in \ref select_color_and_font_page "Select Font" -dialog box press the "..." button(see the picture below). +\image html pref_salome_general.png -\image html image69.png ""..." button" +- Language + - Current language - the language used by the application + GUI. The language change will come in force only after the application is restarted. +- Look and feel + - Opaque resize - force opaque resize mode for viewers area (tabbed workspace). + Clear this checkbox for less perfomant workstations. + - Drop-down buttons in toolbars for action groups - when + checked, the action groups are represented in the viewer toolbars as + a single drop-down button, switchable by the user. Otherwise, all + the buttons from the action groups are displayed in the toolbar. +- Study Properties + - Multi file save - if checked in, your study will be saved in + several HDF files (one basic HDF file which will store the main + information about the saved study and several other files for the + data created by each component used during the study + session). Opening of this study requires that \b ALL saved files + should be stored in the \b SAME directory. If you would like to + copy your saved study in another directory or machine, you should + copy all stored files. Otherwise, if you try to open this study, + some data will be lost and it will lead to invalid functioning of + the SALOME platform. + - ASCII save - if checked in, your study will be saved in + ASCII format file (or files). + - Store positions of windows - if checked in, positions of windows + will be saved in a special file at the end of the current session and + then restored for a new session. + - Auto-save interval (min) - allows to specify the time interval (in + minutes) for automatic study saving operation. If the time interval is + equal to 0 ("Disabled" value is shown) the automatic saving is not performed. + - Store/restore last GUI state - if checked in, all GUI settings are + saved with the rest of the data whenever you save the study. When the + study is reopened, the GUI state is restored. + - Multi file python dump - allows to generate multiple files + (separately for each component) for dumping of a study to a python script. + If the option is disabled, the study is dumped to a single python script. + - Publish in study in python dump - if this option is switched on, + the Python script resulting from Dump Python operation will + include commands related to the publication of the data in the + study (if this option is supported by specific module). + - Save GUI state in python dump - if this option is switched on, + the Python script resulting from Dump Python operation will + include commands related to the GUI state. +- External browser - allow to define what browser will + be used to show SALOME reference manuals: internal (built-in + SALOME browser) or external (IE, Netscape, Mozilla, ...). In + addition, it is possible to specify + - \b Application - this option allows you to set an external browser (IE, + Netscape) which will be used for viewing SALOME reference manuals. By + default, Mozilla is used. + - \b Parameters - additional parameters required for launching of + the external browser (if applicable). +- Python console - here you can quickly set the parameters + (style, size, face) of the \ref font_color_dlg "font" used in + embedded Python console. +- Show MRU items - allows to define the maximum \b Number of +items in Most Recently Used list and the Link type: + - \b Long - shows the full path to the file. + - \b Short - shows the file name only. + - \b Auto - shows full paths to the files only if some files from +different locations have the same name. -

Viewers Preferences

+\anchor occ_preferences +

OCC Viewer 3d Preferences

-\image html pref12.png +\image html pref_salome_occviewer.png -- Common - - Drop-down buttons in toolbars for action groups - when - checked, the action groups are represented in the viewer toolbars - as a single drop-down button, switchable by the user. Otherwise, - all the buttons from the action groups are displayed in the toolbar. -- \anchor occ_preferences OCC Viewer 3d - - Trihedron size - this submenu allows to set the size of - coordinate axes displayed in the viewer. - - Relative size - if checked in, trihedron axes scale to fit the - size of the area displayed in 3D Viewer. - - Navigation - this option allows to choose one of the +- Trihedron - viewer trihedron settings: + - Size - size of the coordinate axes (global trihedron) + displayed in the viewer. + - Relative size - if this option is switched on, trihedron + axes scale to fit the size of the scene displayed in 3D viewer. + - Show static trihedron - allows to show/hide the static + mini-trihedron located in the bottom-left corner of the viewer. +- Number of isolines - this submenu allows to specify the + number of isolines along the axes of coordinates: + - Along U and + - Along V +- Background - specifies the default background for the viewers, + separately for (for more details, refer to the \ref occ_background + "this page"): + - 3D View + - XZ View + - YZ View + - XY View +- Navigation style - this option allows to choose one of the modes of work with mouse in OCC and VTK 3D viewers. - - Salome Standard Controls - allows to manipulate objects in the - viewer with the mouse and locked Ctrl button: increase or decrease the - zoom ratio with the left mouse button, translate object in any - direction with the central mouse button or rotate it with the right - mouse button. - - Keyboard Free - allows to manipulate objects in the viewer - with the mouse without locking Ctrl button. In this case the - operations are assigned to the buttons differently: rotation is made - with the left button, translation with the right and zoom with both - pressed in the same time. - - Number of isolines along U (or V) - this submenu allows to specify - the number of isolines along the axes of coordinates. - - XZ, XY, YZ and 3D View background color - - these submenus allow to select background color. Click on the colored line - to access to the \ref select_color_and_font_page "Select Color" dialog box. - - Zooming - this option allows to choose a zooming mode. - - Relative to the view's center - allows to zoom the view - relatively to its center. - - Relative to the cursor - allows to zoom the view - relatively to the current cursor position. - - Show static trihedron - allows to show/hide the static trihedron - located in the bottom-left corner of the viewer. -- \anchor vtk_preferences VTK Viewer 3d - - Projection mode - allows choosing between \b Orthogonal and - \b Perspective projection mode. - - Background Color - this submenu allows to select background - color. Click on the colored line to access to the - \ref select_color_and_font_page "Select Color" dialog box. - - Trihedron size - this submenu allows to set the size of - coordinate axes displayed in the viewer. - - Relative size - if checked in, trihedron axes scale to fit the - size of the area displayed in 3D Viewer. - - Navigation - this option allows to choose one of the + - Salome Standard Controls - allows to manipulate objects in the + viewer with the mouse and locked Ctrl button: increase or decrease the + zoom ratio with the left mouse button, translate object in any + direction with the central mouse button or rotate it with the right + mouse button. + - Keyboard Free - allows to manipulate objects in the viewer + with the mouse without locking Ctrl button. In this case the + operations are assigned to the buttons differently: rotation is made + with the left button, translation with the right and zoom with both + pressed in the same time. +- Zooming style - this option allows to choose a zooming mode. + - Relative to the view's center - allows to zoom the view + relatively to its center. + - Relative to the cursor - allows to zoom the view + relatively to the current cursor position. + +\anchor vtk_preferences +

VTK Viewer 3d Preferences

+ +\image html pref_salome_vtkviewer.png + +- Projection mode - allows choosing between \b Orthogonal and +\b Perspective projection mode. +- Background - specifies the default background for the viewer; + for more details, refer to the \ref vtk_background "this page". +- Navigation style - this option allows to choose one of the modes of work with mouse in OCC and VTK 3D viewers (for more details see \ref occ_preferences "preferences for OCC Viewer 3d"). - - Zooming mode - this option allows to choose a zooming mode +- Zooming style - this option allows to choose a zooming mode (for more details see \ref occ_preferences "preferences for OCC Viewer 3d"). - - Speed Increment - defines the number of units by +- Speed Increment - defines the number of units by which the speed increases or respectively decreases after pressing [+] or [-] keyboard buttons. - - Modification Mode - allows choosing between \b Arithmetic +- Modification Mode - allows choosing between \b Arithmetic and \b Geometrical progression used for zooming. - - Show static trihedron - allows to show/hide the static trihedron - located in the bottom-left corner of the viewer. - - Dynamic pre-selection - switches dynamic pre-selection on/off. - - Spacemouse - a mouse-like manipulator device specially designed +- Dynamic pre-selection - switches dynamic pre-selection on/off. +- Trihedron - viewer trihedron settings: + - Size - size of the coordinate axes displayed in the viewer. + - Relative size - if this option is switched on, trihedron + axes scale to fit the size of the scene displayed in 3D viewer. + - Show static trihedron - allows to show/hide the static + mini-trihedron located in the bottom-left corner of the viewer. +- Spacemouse - a mouse-like manipulator device specially designed for working with 3D presentations, objects, etc. You can reassign the actions listed below to any of its buttons. - - Decrease Speed Increment - decreases by 1 the speed - increment used for the keyboard (same as [-] key). - - Increase Speed Increment - increase by 1 the speed - increment used for the keyboard (same as [+] key). - - Dominant / combined switch - toggles button to switch to - dominant or combined movements. - - AVI Recording - - Mode - allows to choose from two recording regimes: - - Recording all displayed frames - records exactly at the - FPS rate specified by the user. - - Recording at a given FPS - records only when the contents - of the viewer change (some activity is performed). In the AVI file - non-recorded images are substituted with the copies of the latest - recorded image, which produces files with lower quality but requires - less system resources. - - FPS - allows to define the FPS (frames per second) rate for - the clip. Set greater value for better quality. - - Quality - allows to set the quality of the clip in the - interval between 0 and 100. - - Progressive - allows to record a progressive API - file. - - Names of groups - allows to specify parameters of the - titles displayed in the viewer: - - Text color - allows selecting the text color; - - Transparency - allows selecting the text transparency. -- Plot2d Viewer - - Show legend - this options specifies if it's necessary to - show legend by default. - - Legend Position - this submenu allows to set the default position - of the legend, it can be located to the left, to the right, on top or - on bottom of the graph. - - Legend font - this allows to set type and face for the font of Legend item. - - Curve Type - this allows to set the representation of graphs in - your presentations. You can see only Points, points connected with - Lines or points connected with smooth Splines. - - Marker Size - this submenu allows you to set the size of - markers in your graphs. - - Horizontal and Vertical axis scale - this submenu allows you to set - the scale for vertical and horizontal axes. It can be either Linear or - Logarithmic. Note that the Logarithmic scale can be used only - if the minimum value of corresponding component (abscissa or ordinate) - of all points displayed in the viewer is greater than zero. - If this condition is not met, the scale is switched to Linear - automatically, even if it is set to Logarithmic. - - Background color - this submenu allows to select the background - color. Click on the colored line to access to the - \ref select_color_and_font_page "Select Color" dialog box. - - Legend font color - this allows to select the color of the font of the legend item. - - Highlighted legend font color - this submenu allows to select the color of the font of the selected legend item. - - Selection color - this submenu allows to select the color of selected object in the viewer. - - Deviation marker color - this submenu allows to select the color of the deviation marker. - - Deviation marker line width allows to define line width of the deviation marker. - - Deviation marker tick size allows to define size of the upper and lower horizontal lines of the deviation marker. + - Decrease Speed Increment - decreases by 1 the speed + increment used for the keyboard (same as [-] key). + - Increase Speed Increment - increase by 1 the speed + increment used for the keyboard (same as [+] key). + - Dominant / combined switch - toggles button to switch to + dominant or combined movements. +- AVI Recording + - Mode - allows to choose from two recording regimes: + - Recording all displayed frames - records exactly at the + FPS rate specified by the user. + - Recording at a given FPS - records only when the contents + of the viewer change (some activity is performed). In the AVI file + non-recorded images are substituted with the copies of the latest + recorded image, which produces files with lower quality but requires + less system resources. + - FPS - allows to define the FPS (frames per second) rate for + the clip. Set greater value for better quality. + - Quality - allows to set the quality of the clip in the + interval between 0 and 100. + - Progressive - allows to record a progressive API file. +- Names of groups - allows to specify parameters of the +titles displayed in the viewer: + - Text color - allows selecting the text color; + - Transparency - allows selecting the text transparency. + +\anchor plot2d_preferences +

Plot2d Viewer Preferences

+ +\image html pref_salome_plot2dviewer.png +- Show legend - this options specifies if it's necessary to +show legend by default. +- Legend Position - this submenu allows to set the default position +of the legend, it can be located to the left, to the right, on top or +on bottom of the graph. +- Legend font - this allows to set type and face for the font of Legend item. +- Curve Type - this allows to set the representation of graphs in +your presentations. You can see only Points, points connected with +Lines or points connected with smooth Splines. +- Marker Size - this submenu allows you to set the size of +markers in your graphs. +- Horizontal and Vertical axis scale - this submenus allow you to set +the scale for vertical and horizontal axes. It can be either Linear or +Logarithmic. Note that the Logarithmic scale can be used only +if the minimum value of corresponding component (abscissa or ordinate) +of all points displayed in the viewer is greater than zero. +If this condition is not met, the scale is switched to Linear +automatically, even if it is set to Logarithmic. +- Background color - this submenu allows to select the background +color. Click on the colored line to access to the +\ref select_color_and_font_page "Select Color" dialog box. +- Legend font color - this allows to select the color of the +font of the legend item. +- Highlighted legend font color - this submenu allows to select +the color of the font of the selected legend item. +- Selection color - this submenu allows to select the color of +selected object in the viewer. +- Deviation marker color - this submenu allows to select the +color of the deviation marker. +- Deviation marker line width allows to define line width of +the deviation marker. +- Deviation marker tick size allows to define size of the upper +and lower horizontal lines of the deviation marker.

Directories Preferences

-\image html pref13.png +\image html pref_salome_directories.png -

Object Browser Preferences

-\image html pref14.png - - +\image html pref_salome_objbrowser.png - +- Search Tool - specifies behavior of the +\ref using_find_tool_page "Search tool". + - Enable auto-hiding checkbox - hides the search tool + automatically after short perioud of time when it is not used. +- Look and feel + - Auto size for the first column - this checkbox enables automatic + resizing for the first column. + - Auto size for other columns - this checkbox enables + automatic resizing for the other columns. + - Resize columns after expanding an item - this checkbox enables + resizing columns on expanding an object browser item. + - Browse to the published object - this combobox allows to enable + automatic browsing to the objects just published to the study (using GUI + dialogs only). It means that the object browser will be scrolled to the + published objects, make them visible if they are collapsed and select the + first of them. Three modes are allowed for activating this feature: + - Never - automatic browsing is disabled. + - After Apply & Close only - browsing is activated when the + dialog is accepted by Apply & Close or Ok buttons (or if + the objects are published without using a dialog, for example, by + clicking a context menu button) and not activated when the + Apply button is pressed and therefore the dialog remains visible. + - Always - automatic browsing is always enabled. +- Default columns - these checkboxes allow to display or hide Value, +Entry, IOR and Reference entry columns in the Object Browser.

Shortcuts Preferences

-\image html pref41.png +\image html pref_salome_shortcuts.png - */ diff --git a/doc/salome/gui/input/select_color_and_font.doc b/doc/salome/gui/input/select_color_and_font.doc index 96b570a99..4e6e6258e 100644 --- a/doc/salome/gui/input/select_color_and_font.doc +++ b/doc/salome/gui/input/select_color_and_font.doc @@ -2,6 +2,7 @@ \page select_color_and_font_page Select Color and Font +\anchor select_color_dlg Select Color and Select Font menus are used in many Preferences. @@ -17,6 +18,7 @@ colors or by typing in its numeric parameters in the lower right corner of the window, then click Add to Custom Colors button. The chosen color will be added to Custom Colors table. +\anchor font_color_dlg

Select font

\image html selectfont.png @@ -27,4 +29,4 @@ preview them in the \b Sample window. \b Script dialog-box gives the possibility to use not only Latin and Latin Extended but also Cyrillic, Greek, Arabic, Runic and many other subsets. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/input/setting_preferences.doc b/doc/salome/gui/input/setting_preferences.doc index 33608f4d2..0ecc8a2a4 100644 --- a/doc/salome/gui/input/setting_preferences.doc +++ b/doc/salome/gui/input/setting_preferences.doc @@ -2,36 +2,53 @@ \page setting_preferences_page Setting Preferences -In \b SALOME you can set preferences for each module in the common editor -of preferences. \subpage salome_preferences_page "SALOME preferences" refer to the whole GUI SALOME -session, other preferences are module-specific and are accessible only -after you load a respective module. -It is possible to set preferences for -\subpage geometry_preferences_page "Geometry", -\subpage mesh_preferences_page "Mesh" and -\subpage postpro_preferences_page "Post-Pro" modules. +All user preferences of \b SALOME application can be customized using the +common \b Preferences dialog box. This dialog can be invoked using the +File > Preferences... menu item. + +The \b Preferences dialog box consists of two parts: +- Available preferences sections are listed at the left of the dialog +box; usually this list contains "SALOME" item that specifies general +application preferences and separate section for each SALOME module +available in the current session. +- The tabbed widget at the right side of the dialog box provides +controls that can be used to customize the preferences. + +\note The preferences for the modules become accessible only after +explicit loading of these modules. Until that time the dialog box will +show corresponding warning message. + +For more details about application preferences can be found in the +following chapters: +- \subpage salome_preferences_page +- \subpage geometry_preferences_page +- \subpage mesh_preferences_page +- \subpage postpro_preferences_page \subpage select_color_and_font_page "Font and color preferences" -dialogs are often called from other \b Preferences dialogs. +are most oftenly used types of user settings. -\n When you change settings (click \b OK or \b Apply button) each module +When you change settings (click \b OK or \b Apply button) each module receives the notification about what preferences are changed. You can also click \b Defaults button to restore default preferences or \b Close -button to quit the menu without any changes. -\n \b Import button allows to load a user file containing preferences -from your home directory through a standard Import dialog box. +button to quit the dialog box without any changes. + +\b Import button allows loading specific user file containing +preferences from any location at the computer through a standard +Import dialog box. \image html import.png -This file has no extension and by default starts with -.SalomeApprc. followed by Salome version number. There exists one file -for each Salome version in use. -\n The preferences, set during the current study session, are -automatically saved in this file at the end of the session. Next time -you launch SALOME application, these preferences will be restored. +The preferences files usually have *.xml extension. Also, +preferences files automatically saved by application (stored in the +~/.config/salome directory) have no extension and by default start with +.SalomeApprc. followed by SALOME version number. Usually there is a +separate preferences file for each SALOME version in use. Preferences +are saved to the file in the end of the working session and restored +at the application start-up. \note The preferences you set will be default preferences for all \b new objects, but they are not retroactive and do not automatically apply to the existing objects. -*/ \ No newline at end of file +*/ diff --git a/doc/salome/gui/input/viewers_chapter.doc b/doc/salome/gui/input/viewers_chapter.doc index be85863d3..eb15ef2da 100644 --- a/doc/salome/gui/input/viewers_chapter.doc +++ b/doc/salome/gui/input/viewers_chapter.doc @@ -22,8 +22,8 @@ basing on open-source Qwt library. It is destined for the representation of 2d plots and graphs in Post-Pro module.
  • GL 2D viewer - general purpose OpenGL-based viewer, which can be used for visualization of 2D scenes.
    • -
  • QxScene 2D viewer - has been developed on the basis of -QGraphicsView scene by Trolltech. This viewer is used in YACS module +
  • QxScene 2D viewer - has been developed on the basis of Qt's +QGraphicsView scene. This viewer is used in YACS module for visualization of computation schemes.