From 5796a26d6925386f93f18a3f5567e8ea85558d41 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 18 Dec 2013 14:10:17 +0000 Subject: [PATCH 1/1] Merge from V7_3_BR branch 18/12/2013 --- CMakeLists.txt | 8 +- doc/salome/gui/images/arranging1.png | Bin 0 -> 165243 bytes doc/salome/gui/images/arranging3.png | Bin 0 -> 222158 bytes doc/salome/gui/images/objectbrowser2.png | Bin 16560 -> 29249 bytes doc/salome/gui/images/polyselectionvtk11.png | Bin 0 -> 6708 bytes doc/salome/gui/images/polyselectionvtk21.png | Bin 0 -> 4588 bytes doc/salome/gui/images/rectselectionvtk.png | Bin 0 -> 3354 bytes doc/salome/gui/images/rectselectionvtk2.png | Bin 0 -> 2351 bytes doc/salome/gui/input/common_functionality.doc | 83 ++- doc/salome/gui/input/occ_3d_viewer.doc | 94 +-- doc/salome/gui/input/salome_architecture.doc | 4 +- doc/salome/gui/input/salome_desktop.doc | 86 +-- doc/salome/gui/input/using_object_browser.doc | 20 +- doc/salome/gui/input/viewers_chapter.doc | 17 +- doc/salome/gui/input/vtk_3d_viewer.doc | 80 +-- src/CASCatch/CASCatch_CatchSignals.cxx | 22 +- .../resources/GraphicsView_msg_fr.ts | 36 ++ src/LightApp/LightApp_Application.cxx | 9 +- src/LightApp/resources/LightApp_msg_ja.ts | 60 +- src/LogWindow/resources/LogWindow_msg_ja.ts | 2 +- src/OCCViewer/OCCViewer_ClippingDlg.cxx | 3 - src/OCCViewer/resources/OCCViewer_msg_en.ts | 9 +- src/OCCViewer/resources/OCCViewer_msg_fr.ts | 2 +- src/OCCViewer/resources/OCCViewer_msg_ja.ts | 569 +++++++++++------- src/Plot2d/resources/Plot2d_msg_fr.ts | 4 + src/Plot2d/resources/Plot2d_msg_ja.ts | 22 +- src/Qtx/Qtx.cxx | 1 + src/STD/resources/STD_msg_ja.ts | 40 +- src/SUIT/SUIT_TreeModel.cxx | 2 +- src/SUIT/resources/SUIT_msg_ja.ts | 18 +- src/SVTK/resources/SVTK_msg_ja.ts | 80 +-- src/SalomeApp/SalomeApp_Study.cxx | 10 +- src/SalomeApp/resources/SalomeApp.xml | 2 +- src/SalomeApp/resources/SalomeApp_msg_en.ts | 4 + src/SalomeApp/resources/SalomeApp_msg_fr.ts | 4 + src/SalomeApp/resources/SalomeApp_msg_ja.ts | 82 ++- src/TOOLSGUI/resources/ToolsGUI_msg_ja.ts | 36 +- src/TreeData/DockWidgets.cxx | 1 + src/VTKViewer/resources/VTKViewer_msg_ja.ts | 36 +- .../resources/ViewerTools_msg_ja.ts | 2 +- 40 files changed, 774 insertions(+), 674 deletions(-) create mode 100644 doc/salome/gui/images/arranging1.png create mode 100644 doc/salome/gui/images/arranging3.png create mode 100644 doc/salome/gui/images/polyselectionvtk11.png create mode 100644 doc/salome/gui/images/polyselectionvtk21.png create mode 100644 doc/salome/gui/images/rectselectionvtk.png create mode 100644 doc/salome/gui/images/rectselectionvtk2.png diff --git a/CMakeLists.txt b/CMakeLists.txt index b536f06ee..6b252c1ac 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) @@ -59,6 +59,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # ============ OPTION(SALOME_BUILD_DOC "Generate SALOME GUI documentation" ON) OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) +OPTION(SALOME_GUI_USE_OBSERVERS "Use study observers in GUI (advanced)" ON) # Advanced options: OPTION(SALOME_USE_VTKVIEWER "Enable VTK visualization (Mandatory in classic configurations)" ON) @@ -88,7 +89,6 @@ MARK_AS_ADVANCED(SALOME_USE_PYCONSOLE SALOME_USE_QXGRAPHVIEWER) FIND_PACKAGE(SalomePython REQUIRED) FIND_PACKAGE(SalomePThread REQUIRED) FIND_PACKAGE(SalomeSWIG REQUIRED) -#FIND_PACKAGE(SalomeLibXml2 REQUIRED) FIND_PACKAGE(SalomeBoost REQUIRED) FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) @@ -118,7 +118,9 @@ ENDIF() FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt4 # Build with GUI observers feature -ADD_DEFINITIONS(-DWITH_SALOMEDS_OBSERVER) +IF(SALOME_GUI_USE_OBSERVERS) + ADD_DEFINITIONS(-DWITH_SALOMEDS_OBSERVER) +ENDIF() # OCCT FIND_PACKAGE(SalomeCAS REQUIRED) diff --git a/doc/salome/gui/images/arranging1.png b/doc/salome/gui/images/arranging1.png new file mode 100644 index 0000000000000000000000000000000000000000..5a50eda361877f0f4a5283a2c72c1a59d80746b8 GIT binary patch literal 165243 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 WwYdwv`iqXK7hGDk;#)uX<^Kazo9l`I literal 0 HcmV?d00001 diff --git a/doc/salome/gui/images/arranging3.png b/doc/salome/gui/images/arranging3.png new file mode 100644 index 0000000000000000000000000000000000000000..04cc29ad6119427c4c5d84a565aaf75f9a88305d GIT binary patch literal 222158 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 QILFDSpHsT@w9DuGe{@liJOBUy literal 0 HcmV?d00001 diff --git a/doc/salome/gui/images/objectbrowser2.png b/doc/salome/gui/images/objectbrowser2.png index e010ef2b0f355bfe72f08ce2ae156415b1998316..67b2b9fe9f60ce4e2f8498fb8491f324ed464b13 100755 GIT binary patch literal 29249 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 DzkWDm literal 16560 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 diff --git a/doc/salome/gui/images/polyselectionvtk11.png b/doc/salome/gui/images/polyselectionvtk11.png new file mode 100644 index 0000000000000000000000000000000000000000..77563dbf3d3f053d435fe312d199219197cba4bf GIT binary patch literal 6708 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/images/polyselectionvtk21.png b/doc/salome/gui/images/polyselectionvtk21.png new file mode 100644 index 0000000000000000000000000000000000000000..03daf3f4b97e16bd64e3cfa68206929e3025f749 GIT binary patch literal 4588 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 P1_bc(K*Af`e!BHPQt92- literal 0 HcmV?d00001 diff --git a/doc/salome/gui/input/common_functionality.doc b/doc/salome/gui/input/common_functionality.doc index 7e4e2d73b..6b0e9b536 100644 --- a/doc/salome/gui/input/common_functionality.doc +++ b/doc/salome/gui/input/common_functionality.doc @@ -1,6 +1,6 @@ /*! -\page common_functionality_page Common functionality +\page common_functionality_page Functionality common for OCC and VTK viewers \anchor viewer_background

Background

@@ -12,10 +12,10 @@ popup menu command that opens the following dialog box: The following types of the background are supported: -- Single color: the background is colored with the solid color +- Single color: the background is colored with the solid color specified by the user in the dialog box. -- Gradient background: the background is gradiently colored according +- Gradient background: the background is gradiently colored according to two colors and the gradient type specified in the dialog box. The following types of background are supported: @@ -35,13 +35,13 @@ The following types of the background are supported: - Fourth corner -- Image: allows to set image as viewer background and define filling type: +- \b Image: allows to set image as viewer background and define filling type: - - Center: the image is located at the center of the viewer backgound + - \b Center: the image is located at the center of the viewer backgound - - Tile: the image fills the entire viewer backgound one by one + - \b Tile: the image fills the entire viewer backgound one by one - - Stretch: the image is stretched to the entire viewer backgound. + - \b Stretch: the image is stretched to the entire viewer backgound. Default background for the OCC viewer is specified via the \ref occ_preferences "OCC 3D Viewer Preferences" and for the @@ -51,48 +51,49 @@ VTK viewer via the \ref vtk_preferences "VTK 3D Viewer Preferences".

Selection

-For selecting it is necessary to click by left mouse button on the required -element. Thus, this element will be selected. +An element can be selected by clicking on it with the left mouse button. +Selecting objects with locked Shift key produces a multi selection. -Also, holding down the Shift key while selecting objects will -produce multi selection. - -In the viewers there are two mechanism for selecting: rectangle and +In the viewers there are two selection mechanisms: rectangle and polyline selection.

Rectangle selection

-The Rectangle Selection tool is designed to select rectangular regions: -it is the most basic of the selection tools and very commonly used. +Rectangle Selection is the basic and commonly used selection tool. -For selecting area by rectangle press left mouse button and draw it on -the viewer holding down the left mouse button. - -To add an area to the existing selection it is necessary to hold down -Shift key while selecting. +To select a rectangle area press and hold the left mouse button while drawing the diagonal of the selection rectangle in the viewer. \image html rectselectionvtk.png -As a result, only a rectangle is selected. + +As a result, the objects within the rectangle are selected. + \image html rectselectionvtk2.png + +\note It is possible to add an area to the existing selection by holding down +Shift key while selecting. + +

Polyline selection

-OCC and VTK Viewers features a special Polyline Selection mechanism, -which allows selecting an arbitraty part of the graphic area using a +OCC and VTK Viewers feature a special Polyline Selection mechanism, +which allows selecting an arbitrary part of the graphic area using a polygon frame (rubber band), instead of the usual selection with a rectangular frame. -To produce a Polyline Selection, lock the right mouse button and draw -the first side of the polygon, then change the direction by clicking -the left mouse button add draw another side, etc. The whole selection -frame is drawn with the locked right mouse button. +To produce a Polyline Selection, press and hold the right mouse button and draw +the first side of the selection polygon, then change the direction by clicking +the left mouse button add draw another side, etc. + +\image html polyselectionvtk11.png + +As a result, the objects within the polygon are selected. + +\image html polyselectionvtk21.png To add an area to the existing selection it is necessary to hold down Shift key while selecting. -\image html polyselectionvtk11.png -As a result, only the faces within the frame are selected. -\image html polyselectionvtk21.png
@@ -103,28 +104,26 @@ OCC and VTK 3D viewers support two different navigation modes: - Salome standard controls - Rectangle selection in this mode is performed by left mouse button, - polyline selection is done by right mouse button; + Rectangle selection in this mode is performed by the left mouse button + and polyline selection by the right mouse button; multiple selection is available when \b Shift button is pressed. - Also, holding \b Ctrl key pressed in conjunction with - mouse buttons performs view transformations: + Also, holding \b Ctrl key with pressed mouse buttons performs the following view transformations: - \b Ctrl + left mouse button - zooming; - \b Ctrl + middle mouse button - panning; - \b Ctrl + right mouse button - rotation. - Keyboard free style - This mode allows to process all view transformations without using - keyboard (only by mouse): + This mode allows performing all view transformations without using the + keyboard (only by the mouse): - \b Left mouse button performs view rotation; - \b Middle mouse button performs panning; - \b Right mouse button makes zooming. - . - - In this style selection of objects in view is performed by pressing - "S" key or by left mouse button click. Rectangle selection is done - by left mouse button when holding \b Ctrl key; polyline selection - is done by right mouse button with \b Ctrl key pressed. + . + In this style selection of objects in the viewer is performed by pressing + "S" key or by the left mouse button click. Rectangle selection is done + by the left mouse button with \b Ctrl key pressed; polyline selection + is done by the right mouse button with \b Ctrl key pressed. */ diff --git a/doc/salome/gui/input/occ_3d_viewer.doc b/doc/salome/gui/input/occ_3d_viewer.doc index bb4818e14..7ab47b2ca 100644 --- a/doc/salome/gui/input/occ_3d_viewer.doc +++ b/doc/salome/gui/input/occ_3d_viewer.doc @@ -43,7 +43,7 @@ current cursor position) zooming styles. \image html occ_view_preselection.png -Enable/Disable preselection - enables or disables preselection in the view. +Enable/Disable preselection - enables or disables preselection (highlighting) in the view.
\image html occ_view_selection.png @@ -156,29 +156,25 @@ scene.
\anchor clipping_planes -\image html occ_view_clipping.png -Clipping - allows to create cross-section views (clipping -planes) of geometrical objects. +\b Clipping allows creating cross-section views (clipping planes) +of your mesh. -To start, click on the \em New button. +To create a clipping plane, click on the \b New button in the dialog and choose how it is definition by \b Absolute or \b Relative coordinates. -Now you must specify what mode of creating plane you want to choose: -absolute or relative. - -Absolute mode +Absolute Coordinates \image html Clipping_Absolute.png -- Base point - allows to define the coordinates of the base +- Base point - allows defining the coordinates of the base point for the clipping plane. - Reset - returns the base point to coordinate origin. -- Direction - allows to define the orientation of the +- Direction - allows defining the orientation of the clipping plane. - - Invert - allows to select which part of the object will be + - Invert - allows selecting, which part of the object will be removed and which will remain after clipping. Relative mode @@ -186,17 +182,20 @@ absolute or relative. \image html Clipping_Relative.png - \b Orientation ( ||X-Y, ||X-Z or ||Y-Z). + - \b Distance between the opposite extremities of the boundary box of selected objects, if it is set to 0.5 the boundary box is split in two halves. + - \b Rotation (in angle degrees) around X (Y to Z) and around Y (X to Z) (depending on the chosen Orientation) +The other parameters are available in both modes : +- Preview check-box shows the clipping plane in the 3D Viewer. +- Auto Apply check-box shows button is on, you can preview the +cross-section in the 3D Viewer. -If the Show preview button is on, you can see the clipping plane -in the viewer. - -If the Auto Apply button is on, you can preview the -cross-section in the viewer. +It is also possible to interact with the clipping plane directly in 3D +view using the mouse.
@@ -269,66 +268,5 @@ or other view operation done in one view is automatically applied to the other view.
-\anchor occ_background -

Background

- -OCC Viewer background can be customized using the "Change background" -popup menu command that opens the following dialog box: - -\image html change_background_dlg.png - -The following types of the background are supported: - -- Single color: the background is colored with the solid color - specified by the user in the dialog box. - -- Gradient background: the background is gradiently colored according - to two colors and the gradient type specified in the dialog box. The - following types of background are supported: - - - Horizontal - - - Vertical - - - First diagonal - - - Second diagonal - - - First corner - - - Second corner - - - Third corner - - - Fourth corner - -- Image: allows to set image as viewer background and define filling type: - - - Center: the image is located at the center of the viewer backgound - - - Tile: the image fills the entire viewer backgound one by one - - - Stretch: the image is stretched to the entire viewer backgound. - -Default background for the viewer is specified via the -\ref occ_preferences "application preferences". - -

Polyline selection

- -OCC Viewer features a special Polyline Selection mechanism, -which allows selecting an arbitraty part of the graphic area using a -polygon frame (rubber band), instead of the usual selection with a -rectangular frame. - -To produce a Polyline Selection, lock the right mouse button and draw -the first side of the polygon, then change the direction by clicking -the left mouse button add draw another side, etc. The whole selection -frame is drawn with the locked right mouse button. - -\image html polyselection1.png - -As a result, only the nodes within the frame are selected. - -\image html polyselection2.png */ diff --git a/doc/salome/gui/input/salome_architecture.doc b/doc/salome/gui/input/salome_architecture.doc index 387c201a1..c91983ef4 100644 --- a/doc/salome/gui/input/salome_architecture.doc +++ b/doc/salome/gui/input/salome_architecture.doc @@ -21,7 +21,7 @@ cooperate dynamically and be configurable. etc. Third party modules optionally can have GUI, but in any case they always connected with KERNEL.
  • \b Geometry : facilitates construction and optimization of geometrical models using a wide range of CAD functions.
  • \b Mesh : generates meshes on geometrical models previously created or imported by the Geometry component. -
  • \b Post-Pro : performs data visualization and post-processing. +
  • \b ParaVis : performs data visualization and post-processing.
  • \b MED : allows to work with MED files. @@ -46,7 +46,7 @@ other components.          -All software components (Post-Pro, Geometry, Mesh...) integrated into +All software components (Geometry, Mesh...) integrated into \b SALOME platform implement predefined interfaces. Each component provides data for the \b SALOME study in a form of links (stored in the Study) to the specific data created and stored in the diff --git a/doc/salome/gui/input/salome_desktop.doc b/doc/salome/gui/input/salome_desktop.doc index 03704ae0b..2c60c00e3 100644 --- a/doc/salome/gui/input/salome_desktop.doc +++ b/doc/salome/gui/input/salome_desktop.doc @@ -3,14 +3,13 @@ \page salome_desktop_page SALOME desktop Multi-Desktop Approach used in Salome means that there is a separate Desktop -for each Study and all windows connected to one Study (viewers, dockable -windows etc) are placed in one container. +for each Study and all windows connected to the same Study (viewers, dockable +windows, etc.) are placed in one container. This approach positively differs from the classic multi document interface if many windows are used, i.e. when one document contains a lot of viewers, dialogs, etc. Each desktop also has its own menu and toolbar. -The main SALOME Desktop consists of the following sections and -toolbars: +The main SALOME Desktop consists of the following sections and toolbars: \image html desktop.png @@ -19,31 +18,24 @@ toolbars:
    • Main menu - This is a set of context-sensitive menus, which will be updated according to the functionality of the currently active component. In -general, these menus contain all functional options of SALOME -platform.
      • -
    • Standard toolbar - This toolbar contains standard actions +general, these menus contain all functional options of SALOME platform.
      • +
    • Standard toolbar - contains standard actions that allow creating new or opening existing study, saving study, deleting objects etc.
      • -
    • Components toolbar - This toolbar allows activating +
    • Components toolbar - allows activating components in SALOME platform.
      • -
    • Module toolbars - These toolbars contain actions specific to the +
    • Module toolbars - contains actions specific to the currently active module.
      • -
    • Viewer toolbar - This is a set of tools destined for visualization +
    • Viewer toolbar - provides a set of tools destined for visualization of the presentations in the viewer.
    -        All toolbars in the -\b SALOME Platform are context-sensitive. Loading of a definite component -(Geometry, Post-Pro, Mesh etc.) will automatically add some additional -toolbars specific to this component. To display/hide a definite -toolbar, in the main menu choose View > Toolbars, and from this -submenu check or uncheck the toolbar, you would like to display/hide. +All toolbars in the \b SALOME Platform are context-sensitive. Loading of a definite component +(Geometry, Mesh etc.) will automatically add some additional +toolbars specific to this component. To display/hide a toolbar, in the main menu choose View > Toolbars, and from this submenu check or uncheck the toolbar that you would like to display/hide. -        By default all -toolbars are located on the top of the SALOME desktop. But you can -relocate toolbars by dragging with the mouse and dropping it in any -place of the window. +By default all toolbars are located on top of the SALOME desktop, but you can relocate a toolbar by dragging it with the mouse and dropping in any place of the window. Parts of the study window:
      @@ -57,8 +49,7 @@ right-click in this window gives access to Copy/Paste/SelectAll/ClearAll options.
    -        Object Browser, Python -Console, MenuBar, etc are, in fact, separate dockable windows. +Object Browser, Python Console, MenuBar, etc are, in fact, separate dockable windows. Dockable windows can be placed in special areas, on the borders of desktop like toolbars. You can change the size and the position of dockable windows, hide them or even place outside desktop. SALOME @@ -70,8 +61,7 @@ activated). Also each module can indicate which common windows are necessary for working, and only they will be displayed when this module is active. -All parts of Salome desktop and study window can be managed through \b -View menu. +All parts of Salome desktop and study window can be managed through \b View menu. \image html viewmenu.png @@ -80,53 +70,31 @@ View menu.
  • \b Windows - allows to show and hide dockable windows, such as Object Browser and Python Console
  • Status Bar allows showing and hiding the Status Bar.
    • -
  • \ref themes_page "Theme" - allows to select and edit the style (colors and fonts) for -Salome session.
    • +
  • \ref themes_page "Theme" - allows to select and edit the style (colors and fonts) for Salome session.
    • -If there are several viewer windows in your current study and -you want to display more then one at the same time, you can use the -functionalities provided by the \b Window menu. +If there are several viewer windows in your current study and you want to display more then one at the same time, you can use the functionalities provided by the \b Window menu. \image html windowmenu.png
      -
    • New window - allows to open a new instance of any -viewer.
      • +
    • New window - allows to open a new instance of any viewer.
    • Close - closes the currently active viewer window.
    • Close all - closes all viewer windows.
    • Group all - arranges all created viewer windows on the same desktop
      • -
    • Arrange Views - choice of split scheme and list of used views. +
    • Arrange Views - allows choosing the necessary views and their layout. + \image html arrange_views_dlg.png -- Views Layout - - - Three radio-buttons to specify numbers of the views to arrange (2, 3 or 4). - - - Buttons (depending on the chosen number of views) with images to specify - view layout. - - - Buttons "Previous" and "Next" for possibility to change split schemas. - -- Views List - - - The list of opened view windows - the user have to select corresponding - views to be arranged. - - - Two radio-buttons that specify an action to be applied to the remaining views. - - - "Close the remaining views" - all remaining views will be closed. - - - "Stack the remaining views" - all remaining views will be stacker to the - last tab area. +- The radio-buttons in Views Layout section allow choosing the number of views to be arranged (2, 3 or 4). The buttons with images allow choosing the view layout (depending on the chosen number of views). +- Views List contains the list of opened view windows, where it is possible to check in the necessary views. +- Close the remaining views check-box allows closing all non-selected views. +- Stack the remaining views check-box allows stacking all non-selected views in the last tab area. -
    • Split Vertically and Split Horizontally allows to split -the representation area into two parts, in horizontal or vertical -direction.
      • -
    • List of all opened viewer windows provides fast access to -them.
      • -
    • \b Rename - allows to rename the currently selected viewer -window.
      • +
    • Split Vertically and Split Horizontally allow splitting +the representation area into two parts, in horizontal or vertical direction.
      • +
    • List of all opened viewer windows provides fast access to them.
      • +
    • \b Rename - allows renaming the currently selected viewer window.
    diff --git a/doc/salome/gui/input/using_object_browser.doc b/doc/salome/gui/input/using_object_browser.doc index 6511e7995..d147ad329 100644 --- a/doc/salome/gui/input/using_object_browser.doc +++ b/doc/salome/gui/input/using_object_browser.doc @@ -32,25 +32,19 @@ attributes. \image html objectbrowser2.png -
      -
    • \b Entry - Identification index of the object in the structure of -the study
      • -
    • \b IOR - Interoperable Object Reference
      • -
    • Reference entry - Identification index of the references -to the objects
      • -
    • \b Value - Displays the value of the first object attribute
      • -
    +- \b Name; +- \b Entry - Identification index of the object in the structure of the study; +- \b IOR - Interoperable Object Reference; +- Reference entry - Identification index of the references to the objects; +- \b Value - Displays the value of the first object attribute. \note Entry, IOR and Reference entry attributes are displayed for debugging purposes only. -

    Enable sorting

    +

    Sorting

    By default the objects in the object browser are sorted in the creation order. \n -However, it is possible to enable sorting -in the alphabetical order (or the reverse alphabetical order) by right -clicking in the header of the tree (near the "Name" field) and -checking "enable sorting" in the popup menu. +However, it is possible to enable sorting in the alphabetical order (or the reverse alphabetical order) by right clicking in the header of the tree (near the \b Name field) and checking "enable sorting" in the context menu. \n It is possible to use the arrow near "Name" to reverse the order. If "enable sorting" is unchecked, the objects are sorted in the default order again. diff --git a/doc/salome/gui/input/viewers_chapter.doc b/doc/salome/gui/input/viewers_chapter.doc index fd493caab..17eadb87d 100644 --- a/doc/salome/gui/input/viewers_chapter.doc +++ b/doc/salome/gui/input/viewers_chapter.doc @@ -2,25 +2,26 @@ \page viewers_page Viewers -SALOME provides a set of viewers for data representation. SALOME GUI -module includes several 2D and 3D viewers, that are used for + + +SALOME GUI module includes several 2D and 3D viewers, that are used for different purposes within the platform: - \subpage occ_3d_viewer_page has been developed on the basis of Open CASCADE Technology (http://www.opencascade.org). -This is the default viewer for SALOME Geometry module, it provids good +This is the default viewer for SALOME Geometry module, it provides good representation of construction and transformation of geometrical objects. - \subpage vtk_3d_viewer_page has been developed basing on Kitware Visualization ToolKit library (http://www.vtk.org). This is the default viewer for SALOME Mesh module, where it is used -for visualization of meshes. It is also used in SALOME Post-Pro module -for all 3D presentations. +for visualization of meshes. + +OCC and VTK 3d viewers share some \subpage common_functionality_page "common functionality". - \subpage plot2d_viewer_page has been developed basing on the open-source Qwt library (http://qwt.sourceforge.net). -It is used, for example, for the representation of 2D plots and graphs -in the SALOME Post-Pro module. +It can be used, for example, for the representation of 2D plots and graphs. - \subpage gl_2d_viewer_page is a general purpose OpenGL-based viewer, which can be used for visualization of 2D @@ -31,6 +32,6 @@ directly, but can be used in custom modules for 2D visualization purposes. developed on the basis of Qt QGraphicsView scene. This viewer is used in SALOME YACS module for visualization of computation schemes. -- \subpage common_functionality_page used in OCC and VTK 3d viewers. + */ diff --git a/doc/salome/gui/input/vtk_3d_viewer.doc b/doc/salome/gui/input/vtk_3d_viewer.doc index e3838531e..d09134121 100644 --- a/doc/salome/gui/input/vtk_3d_viewer.doc +++ b/doc/salome/gui/input/vtk_3d_viewer.doc @@ -6,7 +6,7 @@ The functionalities of VTK viewer are available via its Viewer Toolbar. Buttons marked with small downward triangles have extended -functionality which can be accessed by locking on them with left mouse +functionality, which can be accessed by locking on them with left mouse button. \image html vtkviewer_toolbar.png @@ -14,8 +14,7 @@ button. \image html vtk_view_camera_dump.png -Dump View - exports an object from the viewer in bmp, png or -jpeg image format. +Dump View - exports an object from the viewer in bmp, png or jpeg image format.
    \image html vtk_view_style_switch.png @@ -35,14 +34,10 @@ only for parallel (non-perspective) view's mode. \image html vtk_view_highlight.png -These buttons allow to switch between three pre-selection modes. -Possible choices: -- Standard preselection mode - pre-selection is enabled in a standard mode; -- Dynamic preselection mode - when the dynamic pre-selection is chosen, -an objects can be selected by clicking the point/cell belonging to -this object, with some performance loss. Switch dynamic pre-selection -off to have a good performance on big objects (for example, huge meshes); -- Disable preselection - pre-selection is disabled. +These buttons allow switching between three pre-selection (highlighting) modes: +- Static pre-selection mode - pre-selection is done in terms of bounding boxes; +- Dynamic pre-selection mode - pre-selection is done in terms of cells, i.e. an object can be selected by clicking the point/cell belonging to this object. This mode causes some performance loss. It is advisable to switch dynamic pre-selection off to have a good performance on big objects (for example, huge meshes); +- Disable pre-selection - pre-selection is disabled.
    @@ -76,15 +71,14 @@ the contents of a frame drawn with pressed left mouse button. \image html vtk_view_pan.png 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. +visible area and you do not wish to use Fit all functionality, +click on this button to drag the scene to see its remote parts.
    \image html vtk_view_glpan.png Global panning - allows to select a point to be the center of -the presentation showing all displayed objects in the visible ares. +the presentation showing all displayed objects in the visible area.
    \image html vtk_view_rotation_point.png @@ -99,7 +93,7 @@ box of an object. \image html set_rotation_point_dialog2.png -Unchecking Use Bounding Box Center checkbox allows you to +Unchecking Use Bounding Box Center check-box allows you to define the coordinates of the rotation point manually. - Set to Origin button restores the default rotation point @@ -129,7 +123,7 @@ These buttons orientate the scene strictly about coordinate axes: \image html vtk_view_anticlockwise.png -Rotate counterclockwise - rotates view 90° counterclockwise. +Rotate counter-clockwise - rotates view 90° counter-clockwise.
    \image html vtk_view_clockwise.png @@ -202,46 +196,39 @@ graduate them. \image html vtk_view_parameters.png -Change View Parameters - this button provides access to the -dialog box allowing customization different parameters of the view. +Change View Parameters - this button gives access to the +dialog for customization of various view parameters. \image html vtk_view_parameters_dlg.png -- Projection Mode - switchs to the Orthogonal / Perspective - projection mode +- Projection Mode - switches between the \b Orthogonal and \b Perspective projection modes. - Focal Point - allows to specify the focal point of the view - Set to Bounding Box Center - chooses the center of the - bounding box of the current scene as the focal point. - + bounding box of the current scene as the focal point; - Set to Origin - chooses the global coordinates system origin as - the focal point - + the focal point; - Select Point from View - allows to specify the focal point by the - direct selection of a point in the view window - + direct selection of a point in the view window; - X, Y, Z - allows to input the coordinates of the focal - point directly + point directly. - Camera Position - allows to specify the position of the view camera: - - - Absolute Coordinates - either in absolute coordinates, - - - Relative to Focal Point - or as a offset to the focal point; - + - Absolute Coordinates - in absolute coordinates; + - Relative to Focal Point - as a offset to the focal point; - Projection Direction - allows specify the direction of the projection vector; + - Focal Distance - the focal distance value. - - Focal Distance - the focal distance value; - - - View Up Direction - direction of the "view up" vector. +- View Up Direction - direction of the "view up" vector. -- Zooming - the current zoom factor (available in the Orthogonal - mode only) +- Zooming -- View Angle - the current view angle (available in the Perspective - mode only) + - \b Scale - the current zoom factor (available in the Orthogonal + mode only); + - View Angle - the current view angle (available in the Perspective + mode only).
    @@ -249,16 +236,13 @@ dialog box allowing customization different parameters of the view. Synchronize view - allows to synchronize 3d view parameters. This button has two states - checked and -unchecked. Clicking on this button opens a drop-down menu listing the -compatible 3d views. As soon as the user selects any view from the -list, the parameters (view point, position, zoom coefficient, etc.) of -the current view are synchronized with the selected view (static +unchecked. Clicking on this button opens a drop-down menu listing +compatible 3d views. When a view is selected in the list , the parameters (view point, position, zoom coefficient, etc.) of the current view are synchronized with the selected view (static synchronization). -In addition, when this button is in the "checked" state, the dynamic -synchronization of the views is performed, i.e. any zoom, pan, rotate -or other view operation done in one view is automatically applied to -the other view. +In addition, when this button is "checked", the +views are synchronized dynamically, i.e. any zoom, pan, rotate +or other view operation done in one view is automatically applied to the other view.
    \image html vtk_view_parallel.png diff --git a/src/CASCatch/CASCatch_CatchSignals.cxx b/src/CASCatch/CASCatch_CatchSignals.cxx index ce25080a9..8798adcf0 100644 --- a/src/CASCatch/CASCatch_CatchSignals.cxx +++ b/src/CASCatch/CASCatch_CatchSignals.cxx @@ -22,27 +22,24 @@ // File : CASCatch_CatchSignals.cxx // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com) -// -#include "CASCatch_CatchSignals.hxx" +#include "CASCatch_CatchSignals.hxx" #include "CASCatch_Failure.hxx" #include "CASCatch_ErrorHandler.hxx" + #include #define MAX_HANDLER_NUMBER 6 - //================================================================================ /*! Public - * \brief creates a CASCatch_CatchSignals */ //================================================================================ CASCatch_CatchSignals::CASCatch_CatchSignals() - :myIsActivated(Standard_False) + : myIsActivated( Standard_False ) { - - Standard_Integer i = 0; - for(; i<=MAX_HANDLER_NUMBER; i++) + for ( Standard_Integer i = 0; i <= MAX_HANDLER_NUMBER; i++ ) mySigStates[i] = NULL; } @@ -64,9 +61,7 @@ CASCatch_CatchSignals::CASCatch_CatchSignals() #include #endif -//============================== typedef void (ACT_SIGIO_HANDLER)(void) ; - ACT_SIGIO_HANDLER *ADR_ACT_SIGIO_HANDLER = NULL ; typedef void (* SIG_PFV) (int); @@ -108,7 +103,7 @@ typedef void (* SIG_PFV) (int); * \brief universal handler for signals */ //================================================================================ -static void Handler(const OSD_Signals theSig, const OSD_Signals) +static void Handler(const int theSig) { sigset_t set; sigemptyset(&set); @@ -128,7 +123,7 @@ static void Handler(const OSD_Signals theSig, const OSD_Signals) * \brief handler for SIGSEGV signal */ //================================================================================ -static void SegvHandler(const OSD_Signals, const Standard_Address, const Standard_Address) +static void SegvHandler(const int, siginfo_t*, const Standard_Address) { sigset_t set; sigemptyset(&set); @@ -159,9 +154,8 @@ void CASCatch_CatchSignals::Activate() act.sa_handler = (SIG_PFV) &Handler ; sigemptyset(&act.sa_mask) ; - - stat = sigaction(SIGHUP,&act,(struct sigaction*)mySigStates[0]); // ...... hangup - stat = sigaction(SIGFPE,&act,(struct sigaction*) mySigStates[1]); // ...... floating point exception + stat = sigaction(SIGHUP,&act,(struct sigaction*)mySigStates[0]); // ...... hangup + stat = sigaction(SIGFPE,&act,(struct sigaction*) mySigStates[1]); // ...... floating point exception stat = sigaction(SIGINT,&act,(struct sigaction*)mySigStates[2]); // ...... interrupt stat = sigaction(SIGQUIT,&act,(struct sigaction*)mySigStates[3]); // ...... quit stat = sigaction(SIGBUS,&act,(struct sigaction*)mySigStates[4]); // ...... bus error diff --git a/src/GraphicsView/resources/GraphicsView_msg_fr.ts b/src/GraphicsView/resources/GraphicsView_msg_fr.ts index 03e229e3c..a837c94d7 100644 --- a/src/GraphicsView/resources/GraphicsView_msg_fr.ts +++ b/src/GraphicsView/resources/GraphicsView_msg_fr.ts @@ -74,6 +74,42 @@ GraphicsView_Viewer + + TEST_CROP_OPERATOR + Test Crop operator + + + TEST_FUSE_OPERATOR + Test Fuse operator + + + PROPERTIES + Properties + + + SEND_BACKWARD + Send backward + + + BRING_FORWARD + Bring forward + + + SEND_TO_BACK + Send to back + + + BRING_TO_FRONT + Bring to front + + + REMOVE_IMAGES + Remove image(s) + + + ADD_IMAGE + Add image + CHANGE_BGCOLOR Changer l'arrière-plan... diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index d50b77fe0..1461178bc 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -686,7 +686,7 @@ void LightApp_Application::createActions() if ( icon.isNull() ) { icon = modIcon; - INFOS ( "****************************************************************" << std::endl + INFOS ( "\n****************************************************************" << std::endl << "* Icon for " << (*it).toLatin1().constData() << " not found. Using the default one." << std::endl << "****************************************************************" << std::endl ); @@ -1827,6 +1827,9 @@ void LightApp_Application::onPreferenceChanged( QString& modName, QString& secti /*!Remove all windows from study.*/ void LightApp_Application::beforeCloseDoc( SUIT_Study* s ) { + if ( SUIT_DataBrowser* ob = objectBrowser() ) + ob->setModel(0); + CAM_Application::beforeCloseDoc( s ); } @@ -3727,7 +3730,7 @@ bool LightApp_Application::isLibExists( const QString& moduleTitle ) const if ( !isLibFound ) { - INFOS( "****************************************************************" << std::endl + INFOS( "\n****************************************************************" << std::endl << "* Warning: library " << lib.toLatin1().constData() << " cannot be found" << std::endl << "* Module " << moduleTitle.toLatin1().constData() << " will not be available in GUI mode" << std::endl << "****************************************************************" << std::endl ); @@ -3764,7 +3767,7 @@ bool LightApp_Application::isLibExists( const QString& moduleTitle ) const return true; } - printf( "****************************************************************\n" ); + printf( "\n****************************************************************\n" ); printf( "* Warning: python library for %s cannot be found:\n", moduleTitle.toLatin1().constData() ); if (!isPyLib) printf( "* No module named %s\n", moduleName( moduleTitle ).toLatin1().constData() ); diff --git a/src/LightApp/resources/LightApp_msg_ja.ts b/src/LightApp/resources/LightApp_msg_ja.ts index 98727cd19..7d43b2781 100644 --- a/src/LightApp/resources/LightApp_msg_ja.ts +++ b/src/LightApp/resources/LightApp_msg_ja.ts @@ -9,7 +9,7 @@ ABOUT_COPYRIGHT - Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE + Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,7 +20,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS ABOUT_BASE - 基本情報 + 一般的な情報 ABOUT_MODULE_INFOS @@ -36,7 +36,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS APP_NAME - Salome-Meca + SALOME ABOUT_LICENSE @@ -44,7 +44,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS ABOUT_VERSION - バージョン %1 + Version %1 ENTRY_COLUMN @@ -60,11 +60,11 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS BROWSER_FILEMENU - ファイル (&F) + ファイル(&F) BROWSER_CLOSE - 閉じる (&C) + 閉じる(&C) BROWSER_BACK @@ -72,7 +72,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS BROWSER_FORWARD - 進む + 前に進む BROWSER_FIND @@ -91,7 +91,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITASLightApp_Application LANG_CHANGED - アプリケーションの言語が変更されました。\n変更は、次のセッションに適用されます。 + アプリケーションの言語が変更されました。<BR>変更は、次のセッションに適用されます。 MEN_DESK_THEME @@ -155,7 +155,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PRP_DESK_PREFERENCES - 設定を変更することができます + 設定を変更することができます。 PREF_GROUP_DIRECTORIES @@ -171,7 +171,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PREF_STORE_TOOL_POS - PREF_STORE_TOOL_POS + ツールバーの位置を保存します。 PREF_AUTO_SAVE @@ -195,7 +195,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PREF_NAVIGATION - ナビゲーション: + ナビゲーション スタイル PREF_STANDARD_STYLE @@ -211,7 +211,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PREF_ZOOMING_AT_CENTER - 画面の中心を基準に + ビューの中心を基準 PREF_ZOOMING_AT_CURSOR @@ -495,7 +495,11 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS NEW_WINDOW_4 - QxGraph 2D view(&Q) + シーン QxScene(&S) + + + NEW_WINDOW_5 + グラフィックの表示 （&r） CREATING_NEW_WINDOW @@ -603,7 +607,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PREF_CATEGORY_SALOME - Salome-Meca + SALOME PREF_DROP_DOWN_BUTTONS @@ -615,7 +619,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PREF_GROUP_3DVIEWER - PREF_GROUP_3DVIEWER + 3D シーン PREF_GROUP_OCCVIEWER @@ -711,31 +715,31 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS PREF_GROUP_SELECTION - PREF_GROUP_SELECTION + 選択 PREF_ENABLE_SELECTION - PREF_ENABLE_SELECTION + 選択範囲を有効にします。 PREF_ENABLE_PRESELECTION - PREF_ENABLE_PRESELECTION + 予選を有効にします。 PREF_PRESELECTION - PREF_PRESELECTION + 予選 PREF_PRESELECTION_STANDARD - PREF_PRESELECTION_STANDARD + 標準 PREF_PRESELECTION_DYNAMIC - PREF_PRESELECTION_DYNAMIC + 動的 PREF_PRESELECTION_DISABLED - PREF_PRESELECTION_DISABLED + 無効になっています。 TOT_CLOSE @@ -775,7 +779,7 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS ERR_DOC_NOT_EXISTS - %1 を開くことができません。ファイルが存在しません。 + %1 を開くことができません。ファイルが存在しません PREF_GROUP_MRU @@ -878,18 +882,18 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS STB_ERASE_ALL - すべて非表示 + すべてを非表示 TOP_ERASE_ALL - すべて非表示 + すべてを非表示 LightApp_ModuleDlg DESCRIPTION - You're activating module\n + モジュール <b>%1</b> を起動します。<br>下のボタンを押して動作を選択して下さい。 CANCEL @@ -917,6 +921,10 @@ CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITASIMPORT_PREFERENCES インポート設定 + + XML_FILES_FILTER + XMLファイル （*.xml） + CAPTION 環境設定 diff --git a/src/LogWindow/resources/LogWindow_msg_ja.ts b/src/LogWindow/resources/LogWindow_msg_ja.ts index 2eca7104e..414cd5300 100644 --- a/src/LogWindow/resources/LogWindow_msg_ja.ts +++ b/src/LogWindow/resources/LogWindow_msg_ja.ts @@ -36,7 +36,7 @@ BUT_OK - OK(&O) + わかりました(&O) diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx index 56c428eca..880406d30 100644 --- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx +++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx @@ -492,7 +492,6 @@ OCCViewer_ClippingDlg::OCCViewer_ClippingDlg(OCCViewer_ViewWindow* parent , OCCV SliderDistance = new QSlider( Qt::Horizontal, GroupParameters ); SliderDistance->setObjectName( "SliderDistance" ); - SliderDistance->setFocusPolicy( Qt::NoFocus ); SliderDistance->setMinimumSize( 300, 0 ); SliderDistance->setMinimum( 0 ); SliderDistance->setMaximum( 100 ); @@ -514,7 +513,6 @@ OCCViewer_ClippingDlg::OCCViewer_ClippingDlg(OCCViewer_ViewWindow* parent , OCCV SliderRotation1 = new QSlider( Qt::Horizontal, GroupParameters ); SliderRotation1->setObjectName( "SliderRotation1" ); - SliderRotation1->setFocusPolicy( Qt::NoFocus ); SliderRotation1->setMinimumSize( 300, 0 ); SliderRotation1->setMinimum( -180 ); SliderRotation1->setMaximum( 180 ); @@ -537,7 +535,6 @@ OCCViewer_ClippingDlg::OCCViewer_ClippingDlg(OCCViewer_ViewWindow* parent , OCCV SliderRotation2 = new QSlider( Qt::Horizontal, GroupParameters ); SliderRotation2->setObjectName( "SliderRotation2" ); - SliderRotation2->setFocusPolicy( Qt::NoFocus ); SliderRotation2->setMinimumSize( 300, 0 ); SliderRotation2->setMinimum( -180 ); SliderRotation2->setMaximum( 180 ); diff --git a/src/OCCViewer/resources/OCCViewer_msg_en.ts b/src/OCCViewer/resources/OCCViewer_msg_en.ts index 89ff97be4..efdf010e6 100644 --- a/src/OCCViewer/resources/OCCViewer_msg_en.ts +++ b/src/OCCViewer/resources/OCCViewer_msg_en.ts @@ -289,7 +289,8 @@ OCC_TEXTURE_FILES - Image files (*.bmp *.gif *.pix *.xwd *.rgb *.rs) + Update to new supported format (see OCCT Image_AlienPixMap documentation) + Image files (*.jpeg *jpg *.jpe *.png *.bmp *.gif *.ppm *.tif *.tiff* .tga *.exr) DSC_MAXIMIZE_VIEW @@ -468,11 +469,11 @@ BTN_NEW New - - + + BTN_DELETE Delete - + AUTO_APPLY Auto Apply diff --git a/src/OCCViewer/resources/OCCViewer_msg_fr.ts b/src/OCCViewer/resources/OCCViewer_msg_fr.ts index 865b63fa6..8e094db3d 100755 --- a/src/OCCViewer/resources/OCCViewer_msg_fr.ts +++ b/src/OCCViewer/resources/OCCViewer_msg_fr.ts @@ -289,7 +289,7 @@ OCC_TEXTURE_FILES - Fichiers images (*.bmp *.gif *.pix *.xwd *.rgb *.rs) + Fichiers images (*.jpeg *jpg *.jpe *.png *.bmp *.gif *.ppm *.tif *.tiff* .tga *.exr) DSC_MAXIMIZE_VIEW diff --git a/src/OCCViewer/resources/OCCViewer_msg_ja.ts b/src/OCCViewer/resources/OCCViewer_msg_ja.ts index c38798db3..6ec3398a5 100644 --- a/src/OCCViewer/resources/OCCViewer_msg_ja.ts +++ b/src/OCCViewer/resources/OCCViewer_msg_ja.ts @@ -1,446 +1,565 @@ - - + + @default - MNU_FRONT_VIEW - 転送 + MNU_FRONT_VIEW + 正面 - ERROR - エラー + ERROR + エラー - MNU_DUMP_VIEW - 保存 + MNU_DUMP_VIEW + シーンを保存します。 - DSC_TOP_VIEW - 上から見る + DSC_TOP_VIEW + 上から見る - MNU_PAN_VIEW - パンニング + MNU_PAN_VIEW + 並進移動 - MNU_CLONE_VIEW - ビューの複製 + MNU_CLONE_VIEW + ビューの複製 - DSC_SHOW_TRIHEDRE - 表示/非表示の三面体をシーンに + DSC_SHOW_TRIHEDRE + 表示/非表示の三面体をシーンに - MNU_SHOW_TRIHEDRE - 軸の表示/非表示 + MNU_SHOW_TRIHEDRE + 軸の表示/非表示 - MNU_TOP_VIEW - トップ + MNU_TOP_VIEW + 上面 - DSC_GLOBALPAN_VIEW - ビューの新しい中心地の選択 + DSC_GLOBALPAN_VIEW + ビューの新しい中心地の選択 - DSC_ROTATE_VIEW - ステージの中心の周りを回転します。 + DSC_ROTATE_VIEW + ステージの中心の周りを回転します。 - MNU_ZOOM_VIEW - ズーム + MNU_ZOOM_VIEW + ズーム - DSC_PAN_VIEW - ビューを移動します。 + DSC_PAN_VIEW + ビューを移動します。 - DSC_LEFT_VIEW - 左側のビュー + DSC_LEFT_VIEW + 左側のビュー - DSC_SHOOT_VIEW - 状態の現在のシーンを保存し、一覧に追加 + DSC_SHOOT_VIEW + 状態の現在のシーンを保存し、一覧に追加 - DSC_FITALL - すべてのオブジェクトを表示します。 + DSC_FITALL + すべてのオブジェクトを表示するには、シーンを Redimentionner - MNU_FITALL - すべて表示 + MNU_FITALL + 全体表示 - MNU_ROTATE_VIEW - 回転 + MNU_ROTATE_VIEW + 回転 - DSC_FRONT_VIEW - 正面 + DSC_FRONT_VIEW + 正面 - MNU_ROTATIONPOINTGRAVITY_VIEW - 回転点: 重力の中心部 + MNU_ROTATIONPOINTGRAVITY_VIEW + 回転点: 重力の中心部 - MNU_GLOBALPAN_VIEW - グローバルパンニング + MNU_GLOBALPAN_VIEW + グローバルパンニング - INF_APP_DUMP_VIEW - ビューを保存します。 + INF_APP_DUMP_VIEW + ビューを保存します。 - DSC_CLIPPING - クリップ平面を定義します。 + DSC_CLIPPING + クリップ平面を定義します。 - DSC_CLONE_VIEW - 現在のステージの可視化の新しいウィンドウを開く + DSC_CLONE_VIEW + 現在のステージの可視化の新しいウィンドウを開く - INF_APP_SHOOT_VIEW - 場面を覚えています。 + INF_APP_SHOOT_VIEW + 場面を覚えています。 - MNU_CLIPPING - 断面 + MNU_CLIPPING + 断面 - MNU_BACK_VIEW - 背面 + MNU_BACK_VIEW + 背面 - MNU_SHOOT_VIEW - ビューの保存 + MNU_SHOOT_VIEW + ビューの保存 - DSC_CHANGINGROTATIONPOINT_VIEW - シーンになってポイントを変更します。 + DSC_CHANGINGROTATIONPOINT_VIEW + シーンになってポイントを変更します。 - MNU_BOTTOM_VIEW - Bottom + MNU_BOTTOM_VIEW + 底面 - MNU_RESET_VIEW - 復元 + MNU_RESET_VIEW + 表示リセット - MNU_LEFT_VIEW - 左 + MNU_LEFT_VIEW + 左側面 - DSC_RIGHT_VIEW - 右側のビュー + DSC_RIGHT_VIEW + 右側のビュー - DSC_ANTICLOCKWISE_VIEW - 表示を左に + DSC_ANTICLOCKWISE_VIEW + 表示を左に - DSC_CLOCKWISE_VIEW - 右のビューを回転させる + DSC_CLOCKWISE_VIEW + 右のビューを回転させる - MNU_CHANGINGROTATIONPOINT_VIEW - 回転の基準点を変更 + MNU_CHANGINGROTATIONPOINT_VIEW + 回転の基準点を変更 - DSC_FITRECT - 領域にビューを表示します。 + DSC_FITRECT + 彼の党をボックスで選択を表示するには、ステージのサイズを変更します。 - MNU_FITRECT - 表示エリア + MNU_FITRECT + 表示エリア - DSC_BOTTOM_VIEW - 下から表示します。 + DSC_BOTTOM_VIEW + 下から表示します。 - DSC_DUMP_VIEW - 現在のビューをイメージ ファイルに保存します。 + DSC_DUMP_VIEW + 現在のシーンをイメージ ファイルに保存します。 - DSC_ZOOM_VIEW - ズーム + DSC_ZOOM_VIEW + ズーム - MNU_ROTATIONPOINT000_VIEW - 回転点: (0,0,0) + MNU_ROTATIONPOINT000_VIEW + 回転点: (0,0,0) - MNU_ROTATIONPOINTSELECTED_VIEW - 回転点: ユーザーが選択したポイント + MNU_ROTATIONPOINTSELECTED_VIEW + 回転点: ユーザーが選択したポイント - DSC_RESET_VIEW - ビューのポイントを復元します。 + DSC_RESET_VIEW + ビューのポイントを復元します。 - ERR_DOC_CANT_SAVE_FILE - ファイルを保存できませんでした。 + ERR_DOC_CANT_SAVE_FILE + ファイルを保存できませんでした。 - DSC_PRESETS_VIEW - 状態の復元は、現在のシーンの記憶 + DSC_PRESETS_VIEW + 状態の復元は、現在のシーンの記憶 - MNU_PRESETS_VIEW - ビューの読み込み + MNU_PRESETS_VIEW + ビューの読み込み - MNU_ANTICLOCKWISE_VIEW - 左回転 + MNU_ANTICLOCKWISE_VIEW + 左回転 - MNU_CLOCKWISE_VIEW - 右回転 + MNU_CLOCKWISE_VIEW + 右回転 - MNU_RIGHT_VIEW - 法律 + MNU_RIGHT_VIEW + 右側面 - INF_APP_PRESETS_VIEW - シーンを復元します。 + INF_APP_PRESETS_VIEW + ビューの復元 - LBL_XYTOOLBAR_LABEL - XY 表示での操作 + LBL_XYTOOLBAR_LABEL + XY ビューの操作 - LBL_XZTOOLBAR_LABEL - XZ ビューの操作 + LBL_XZTOOLBAR_LABEL + XZ ビューの操作 - LBL_YZTOOLBAR_LABEL - YZ ビューの操作 + LBL_YZTOOLBAR_LABEL + YZ ビューの操作 - LBL_3DTOOLBAR_LABEL - 3D ビューの操作 + LBL_3DTOOLBAR_LABEL + 3D ビューの操作 - DSC_BACK_VIEW - 背面図 + DSC_BACK_VIEW + 背面図 - DSC_SCALING - 座標のスケールの軸を変更します。 + DSC_SCALING + 座標のスケールの軸を変更します。 - MNU_SCALING - スケールを変更します。 + MNU_SCALING + 軸のスケーリング - DSC_GRADUATED_AXES - 目盛付軸 + DSC_GRADUATED_AXES + 目盛付軸 - MNU_GRADUATED_AXES - 軸に目盛り付け + MNU_GRADUATED_AXES + 目盛付軸 - DSC_AMBIENT - アンビエント ライトを表示します。 + DSC_AMBIENT + 環境光のみの表示 - MNU_AMBIENT - アンビエント ライトを表示します。 + MNU_AMBIENT + アンビエント ライトを表示します。 - DSC_STYLE_SWITCH - 相互作用のスタイルを変更します。 + DSC_STYLE_SWITCH + 相互作用のスタイルを変更します。 - MNU_STYLE_SWITCH - 相互作用のスタイルを変更します。 + MNU_STYLE_SWITCH + 相互作用のスタイルを変更します。 - DSC_ZOOMING_STYLE_SWITCH - ズームのスタイルを変更します。 + DSC_ZOOMING_STYLE_SWITCH + ズームのスタイルを変更します。 - MNU_ZOOMING_STYLE_SWITCH - ズームのスタイルを変更します。 + MNU_ZOOMING_STYLE_SWITCH + ズームのスタイルを変更します。 - DSC_ENABLE_PRESELECTION - DSC_ENABLE_PRESELECTION + DSC_ENABLE_PRESELECTION + 予選の有効/無効にします。 - MNU_ENABLE_PRESELECTION - MNU_ENABLE_PRESELECTION + MNU_ENABLE_PRESELECTION + 予選の有効/無効にします。 - DSC_ENABLE_SELECTION - DSC_ENABLE_SELECTION + DSC_ENABLE_SELECTION + 選択を有効/無効にします。 - MNU_ENABLE_SELECTION - MNU_ENABLE_SELECTION + MNU_ENABLE_SELECTION + 選択を有効/無効にします。 - OCC_IMAGE_FILES - イメージ ファイル (*.bmp (*.png) *.png *.jpg *.jpeg *.eps 年 .ps) + OCC_IMAGE_FILES + イメージファイル (*.bmp *.png *.jpg *.jpeg *.eps *.ps) - OCC_TEXTURE_FILES - ファイル (*.bmp, *.gif *.pix *.xwd *.rgb ※ .rs） + OCC_TEXTURE_FILES + イメージファイル (*.jpeg *jpg *.jpe *.png *.bmp *.gif *.ppm *.tif *.tiff* .tga *.exr) - DSC_MAXIMIZE_VIEW - ビューを最大化します。 + DSC_MAXIMIZE_VIEW + ビューの最大化 - DSC_MINIMIZE_VIEW - ビューを最小化します。 + DSC_MINIMIZE_VIEW + ビューの最小化 - MNU_MAXIMIZE_VIEW - 最大化します。 + DSC_RETURN_3D_VIEW + 3D view に戻る - MNU_MINIMIZE_VIEW - 最小化する + MNU_MAXIMIZE_VIEW + ビューの最大化 - - + + MNU_MINIMIZE_VIEW + ビューの最小化 + + + MNU_RETURN_3D_VIEW + 3D に戻る + + + OCCViewer_CreateRestoreViewDlg - CAPTION - 表示を元に戻す + CAPTION + ビューの読み込み - - + + OCCViewer_SetRotationPointDlg - LBL_X - X: + LBL_X + X: - LBL_Y - Y: + LBL_Y + Y: - LBL_Z - Z: + LBL_Z + Z: - USE_BBCENTER - 境界ボックスの中心を使用します。 + USE_BBCENTER + 境界ボックスの中心を使用します。 - LBL_TOORIGIN - 原点を設定 + LBL_TOORIGIN + 原点を設定 - CAPTION - 回転中心設定 + CAPTION + 回転中心設定 - LBL_SELECTPOINT - ビューで、項目を選択します。 + LBL_SELECTPOINT + ビューで、項目を選択します。 - - + + OCCViewer_ViewManager - OCC_VIEW_TITLE - シーン OCC: %M - ビューアー: %V + OCC_VIEW_TITLE + シーン OCC: %M - ビューアー: %V - - + + OCCViewer_Viewer - MEN_DUMP_VIEW - ビューを保存します。 + MEN_DUMP_VIEW + ビューの保存 - MEN_SHOW_TOOLBAR - ツールバーを表示 + MEN_SHOW_TOOLBAR + ツールバーを表示 - MEN_CHANGE_BACKGROUND - 背景を変更 + MEN_CHANGE_BACKGROUND + 背景の変更 - MEN_CHANGE_IMAGE - 背景画像を設定/変更... + MEN_CHANGE_IMAGE + 背景画像の設定/変更 - SELECT_IMAGE - 画像を選択します。 + SELECT_IMAGE + イメージの選択 - CENTERED - 中心のモード + CENTERED + 中心のモード - TILED - テンキー モード + TILED + テンキー モード - STRETCHED - ストレッチ モード + STRETCHED + ストレッチ モード - GT_HORIZONTALGRADIENT - 水平方向のグラデーション + GT_HORIZONTALGRADIENT + 水平方向のグラデーション - GT_VERTICALGRADIENT - 垂直方向のグラデーション + GT_VERTICALGRADIENT + 垂直方向のグラデーション - GT_FIRSTDIAGONALGRADIENT - 最初の斜めのグラデーション + GT_FIRSTDIAGONALGRADIENT + 最初の斜めのグラデーション - GT_SECONDDIAGONALGRADIENT - 2 番目の斜めのグラデーション + GT_SECONDDIAGONALGRADIENT + 2 番目の斜めのグラデーション - GT_FIRSTCORNERGRADIENT - 最初のコーナーのグラデーション + GT_FIRSTCORNERGRADIENT + 最初のコーナーのグラデーション - GT_SECONDCORNERGRADIENT - グラデーションの 2 番目の角 + GT_SECONDCORNERGRADIENT + グラデーションの 2 番目の角 - GT_THIRDCORNERGRADIENT - 3 番目の角勾配 + GT_THIRDCORNERGRADIENT + 3 番目の角勾配 - GT_FORTHCORNERGRADIENT - 第 4 コーナー グラデーション + GT_FORTHCORNERGRADIENT + 第 4 コーナー グラデーション - BG_IMAGE_FILES - ファイル (*.bmp, *.gif *.pix *.xwd *.rgb ※ .rs） + BG_IMAGE_FILES + イメージ ファイル (*.bmp *.gif *.pix *.xwd *.rgb * .rs) - - + + OCCViewer_AxialScaleDlg - DLG_SCALING - スケールの変更 + DLG_SCALING + スケールの変更 + + + LBL_X + X: + + + LBL_Y + Y: + + + LBL_Z + Z: + + + + OCCViewer_ClippingDlg + + CLIPPING_PLANES + 平面の切り抜き + + + NO_PLANES + 平面がない + + + IS_ACTIVE_PLANE + アクティブな平面 + + + BTN_NEW + 新規 + + + BTN_DELETE + 削除 + + + AUTO_APPLY + 自動適用 + + + MODE + モード + + + ORIENTATION + 方向 + + + DISTANCE + 距離 + + + ROTATION_AROUND_X_Y2Z + X軸周りに回転（Y軸からZ軸へ） + + + ROTATION_AROUND_Y_X2Z + Y軸周りに回転（X軸からZ軸へ） + + + ROTATION_AROUND_Z_Y2X + Z軸周りに回転（Y軸からX軸へ） + + + ROTATION_AROUND_X_Z2Y + X軸周りに回転（Z軸からY軸へ） + + + ROTATION_AROUND_Y_Z2X + Y軸周りに回転（Z軸からX軸へ） + + + ROTATION_AROUND_Z_X2Y + Z軸周りに回転（X軸からY軸へ） + + + ALONG_XY + XY平面に平行 + + + ALONG_YZ + YZ平面に平行 + + + ALONG_ZX + ZX平面に平行 + + + ABSOLUTE + 絶対 + + + RELATIVE + 相対 + + + BTN_DISABLE_ALL + すべて無効 + + + PREVIEW + プレビュー + + + RESET + リセット + + + INVERT + 反転 - LBL_X - X: + BASE_POINT + 基準点 - LBL_Y - Y: + DIRECTION + 方向 - LBL_Z - Z: + PARAMETERS + パラメータ - + diff --git a/src/Plot2d/resources/Plot2d_msg_fr.ts b/src/Plot2d/resources/Plot2d_msg_fr.ts index 480806403..e4796f09a 100755 --- a/src/Plot2d/resources/Plot2d_msg_fr.ts +++ b/src/Plot2d/resources/Plot2d_msg_fr.ts @@ -694,6 +694,10 @@ L'échelle logarithmique de l'ordonnée n'est pas permise. Plot2d_AnalyticalCurveDlg + + AC_OK_BTN + Ok + ANALYTICAL_CURVE_TLT Propriétés des courbes analytiques diff --git a/src/Plot2d/resources/Plot2d_msg_ja.ts b/src/Plot2d/resources/Plot2d_msg_ja.ts index e8da989a6..052384f1a 100644 --- a/src/Plot2d/resources/Plot2d_msg_ja.ts +++ b/src/Plot2d/resources/Plot2d_msg_ja.ts @@ -3,6 +3,10 @@ @default + + PDF_FILES + PDF files (*.pdf) + PLOT2D_CURVE_TYPE_LBL 曲線の種類: @@ -21,7 +25,7 @@ MNU_DUMP_VIEW - 保存 + ビューを保存. PLOT2D_SCALE_MODE_HOR @@ -137,7 +141,7 @@ DSC_FITALL - すべてのオブジェクトを表示します。 + すべてのオブジェクトを表示するには、シーンを調整します。 MNU_FITALL @@ -169,7 +173,7 @@ DSC_CLONE_VIEW - 現在のステージの可視化の新しいウィンドウを開く + 現在のステージの新しいビューアー OCC を開く DSC_PRINT_VIEW @@ -349,15 +353,15 @@ WRN_XLOG_NOT_ALLOWED - 非陽性値、x 軸上で検出されたポイント。X 軸の対数スケールは許可されていません。 + X 軸上非陽性値を持つポイントが検出されました。カテゴリの対数目盛は許可されていません。 WRN_YLOG_NOT_ALLOWED - 非陽性値、y 軸上で検出されたポイント。Y 軸の対数スケールは許可されていません。 + Y 軸上非陽性値を持つポイントが検出されました。切片の対数目盛は許可されていません。 DSC_FITRECT - 領域にビューを表示します。 + シーンのボックスで選択した領域を調整します。 PLOT2D_LEGEND_POSITION_LEFT @@ -497,7 +501,7 @@ NONE_MARKER_LBL - なし + [なし] ERR_DOC_CANT_SAVE_FILE @@ -549,7 +553,7 @@ NONE_LINE_LBL - なし + [なし] PLOT2D_MARKER_SIZE_LBL @@ -746,7 +750,7 @@ AC_CANT_CALCULATE - 曲線を計算することはできません。\n 入力パラメーターをチェック + 曲線は計算できません。入力パラメーターを確認してください。 AC_CLOSE_BTN diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx index 07a665e54..43f258ffa 100755 --- a/src/Qtx/Qtx.cxx +++ b/src/Qtx/Qtx.cxx @@ -2041,6 +2041,7 @@ Qt::HANDLE Qtx::getVisual() GLX_RGBA, // Needs to support OpenGL GLX_DEPTH_SIZE, 16, // Needs to support a 16 bit depth buffer GLX_DOUBLEBUFFER, // Needs to support double-buffering + GLX_STENCIL_SIZE, 1, None // end of list }; diff --git a/src/STD/resources/STD_msg_ja.ts b/src/STD/resources/STD_msg_ja.ts index 0b90d7c1a..4d5f96a85 100644 --- a/src/STD/resources/STD_msg_ja.ts +++ b/src/STD/resources/STD_msg_ja.ts @@ -73,11 +73,11 @@ ERR_DOC_UNKNOWNTYPE_OPEN - 不明な種類のドキュメント ( %1 ) を開こうとしています。 + 不明な種類 (%1) のドキュメントを開こうとしています。 ERR_DOC_UNKNOWNTYPE_SAVE - 不明な種類のドキュメント ( %1 ) として保存しようとしています。 + 不明な種類 (%1) のドキュメントを保存しようしています。 TOT_DESK_NEWWINDOW @@ -117,7 +117,7 @@ BUT_OK - OK + OK(&O) FILTER_FILES @@ -137,7 +137,7 @@ TOT_DESK_FILE_NEW - 新しいドキュメントを作成 + 新しいドキュメント PRP_DESK_FILE_NEW @@ -173,7 +173,7 @@ PRP_DESK_HELP_ABOUT - About'ダイアログ ボックスの表示 + ソフト情報の表示 MEN_DESK_FILE @@ -211,6 +211,10 @@ BUT_CLOSE 閉じる(&C) + + BUT_APPLY_AND_CLOSE + 適用して閉じる（&p） + INF_DESK_EXIT 終了 @@ -233,7 +237,7 @@ WRN_WARNING - 注意 ！ + 警告 TOT_DESK_HELP_ABOUT @@ -301,7 +305,7 @@ MEN_DESK_WINDOW_VTILE - 垂直方向のモザイク(&V) + 垂直方向に並べて表示(&V) ERR_DOC_PERMISSIONDENIED_SAVE @@ -313,7 +317,7 @@ TIT_FILE_SAVEAS - 別名で保存 + 別名保存 MEN_DESK_FILE_CLOSE @@ -329,7 +333,7 @@ MEN_DESK_HELP_SEARCH - サーチ...(&S) + 検索...(&S) MEN_DESK_VIEW_STDTOOLBAR @@ -337,7 +341,7 @@ MEN_DESK_FILE_SAVEAS - 別名で保存...(&A) + 別名保存...(&A) PRP_DESK_VIEW_STDTOOLBAR @@ -357,11 +361,11 @@ TOT_DESK_FILE_OPEN - ドキュメントを開く + 文書を開く TOT_DESK_FILE_REOPEN - ドキュメントを開く + ドキュメントの再読み込み PRP_DESK_FILE_EXIT @@ -405,7 +409,7 @@ MEN_DESK_FILE_REOPEN - 再開 + 再読み込み MEN_DESK_FILE_LOAD @@ -428,7 +432,7 @@ STD_Application INF_DOC_MODIFIED - ドキュメントが変更されています。\n変更を保存しますか。？ + ドキュメントが変更されています。変更を保存しますか。 INF_DOC_SAVING @@ -444,11 +448,11 @@ MEN_DOCK_WINDOWS - Window およびツールバー + ウィンドウとツールバー ABOUT_INFO - 標準アプリケーションの適合 + SUIT標準アプリケーション INF_DOC_SAVING_FAILS @@ -456,7 +460,7 @@ INF_DOCUMENT_MODIFIED - ドキュメント"%1"が変更されました。\n変更を保存しますか？ + ドキュメント"%1"が変更されました。変更を保存しますか。 CLOSE_STUDY @@ -468,7 +472,7 @@ REOPEN_STUDY - スタディを再開 + スタディを再読み込み REOPEN_QUESTION diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx index a612095f5..3a8eacc1a 100755 --- a/src/SUIT/SUIT_TreeModel.cxx +++ b/src/SUIT/SUIT_TreeModel.cxx @@ -1627,7 +1627,7 @@ void SUIT_TreeModel::updateItem( SUIT_TreeModel::TreeItem* item, bool emitLayout fromIndexes.append( index( obj, i )); toIndexes.append(QModelIndex()); } - changePersistentIndexList(fromIndexes, toIndexes); // Limitation: can lead to loss of selection + //changePersistentIndexList(fromIndexes, toIndexes); // Limitation: can lead to loss of selection emit dataChanged( toIndexes.first(), toIndexes.last() ); obj->setModified(false); diff --git a/src/SUIT/resources/SUIT_msg_ja.ts b/src/SUIT/resources/SUIT_msg_ja.ts index 1dc8b2153..d85573f3f 100644 --- a/src/SUIT/resources/SUIT_msg_ja.ts +++ b/src/SUIT/resources/SUIT_msg_ja.ts @@ -21,7 +21,7 @@ PRP_DESK_WINDOW_CASCADE - ウィンドウを重ねて整理 + Windows ではスーパーイン ポーズ ERR_DIR_NOT_EXIST @@ -49,23 +49,23 @@ PRP_DESK_WINDOW_ACTIVATE - このウィンドウをアクティブ化 + アクティブ ウィンドウ ERR_PERMISSION_DENIED - ファイル"%1"を保存できませんでした。\n権限がありません。 + ファイル"%1"を保存できません。アクセス許可は、禁じられています。 ERR_OPEN_PERMISSION_DENIED - ファイル"%1"を開くことができません。\n権限がありません。 + ファイル"%1"を開けません。アクセス許可は、禁じられています。 ERR_DIR_READ_PERMISSION_DENIED - ディレクトリ"%1"を読み取れません。\n権限がありません。 + ディレクトリ"%1"を読み取れません。アクセス許可は、禁じられています。 ERR_DIR_WRITE_PERMISSION_DENIED - 「1%」のディレクトリへの書き込みすることはできません。\n権限がありません。 + ディレクトリ"%1"に書き込めませんでした。アクセス許可は、禁じられています。 ERR_ERROR @@ -85,7 +85,7 @@ PRP_DESK_WINDOW_TILE - ウィンドウを並べて表示 + ウィンドウの場所 MEN_DESK_WINDOW_VTILE @@ -97,7 +97,7 @@ PRP_DESK_WINDOW_VTILE - ウィンドウを上下に並べて表示 + 垂直方向のモザイクで Windows の場所 MEN_DESK_WINDOW_TILE @@ -139,7 +139,7 @@ BUT_ADD_PATH - パスを追加します。 + パスの追加 INF_DESK_DOC_OPEN diff --git a/src/SVTK/resources/SVTK_msg_ja.ts b/src/SVTK/resources/SVTK_msg_ja.ts index b4ab22a4f..24b7fe4a9 100644 --- a/src/SVTK/resources/SVTK_msg_ja.ts +++ b/src/SVTK/resources/SVTK_msg_ja.ts @@ -13,15 +13,15 @@ MNU_ANTICLOCKWISE_VIEW - 左回転 + 表示を左に MNU_CLOCKWISE_VIEW - 右回転 + 右のビューを回転させる MNU_FRONT_VIEW - 転送 + -OX ERROR @@ -29,11 +29,11 @@ MNU_DUMP_VIEW - 保存 + 表示状態の保存 DSC_TOP_VIEW - 上から見る + -OZ View MNU_PAN_VIEW @@ -41,11 +41,11 @@ MNU_TOP_VIEW - トップ + -OZ DSC_GLOBALPAN_VIEW - ビューの新しい中心地の選択 + ビューの新しい中心の選択 DSC_ROTATE_VIEW @@ -61,15 +61,15 @@ DSC_LEFT_VIEW - 左側のビュー + +OY View DSC_FITALL - すべてのオブジェクトを表示します。 + すべてのオブジェクトを表示するには、ステージのサイズを変更します。 MNU_FITALL - すべて表示 + 全域表示 MNU_ROTATE_VIEW @@ -81,7 +81,7 @@ DSC_FRONT_VIEW - 正面 + -OX View MNU_GLOBALPAN_VIEW @@ -93,7 +93,7 @@ MNU_BACK_VIEW - 背面 + +OX MNU_SHOW_TRIHEDRON @@ -105,7 +105,7 @@ MNU_BOTTOM_VIEW - Bottom + +OZ MNU_RESET_VIEW @@ -113,11 +113,11 @@ MNU_LEFT_VIEW - 左 + +OY DSC_RIGHT_VIEW - 右側のビュー + -OY View MNU_CHANGINGROTATIONPOINT_VIEW @@ -125,19 +125,19 @@ DSC_FITRECT - 領域にビューを表示します。 + 選択領域の表示 MNU_FITRECT - 表示エリア + 選択領域の表示 DSC_BOTTOM_VIEW - 下から表示します。 + +OZ View DSC_DUMP_VIEW - 現在のビューをイメージ ファイルに保存します。 + 表示状態の保存 DSC_ZOOM_VIEW @@ -145,7 +145,7 @@ VTK_IMAGE_FILES - イメージ (*.bmp *.png *.jpg *.jpeg) ファイル + イメージファイル (*.bmp *.png *.jpg *.jpeg) DSC_RESET_VIEW @@ -153,11 +153,11 @@ ERR_DOC_CANT_SAVE_FILE - ファイルを保存できませんでした。 + ファイルを保存できません。 MNU_RIGHT_VIEW - 法律 + -OY LBL_TOOLBAR_LABEL @@ -165,19 +165,19 @@ DSC_BACK_VIEW - 背面図 + +OX View SVTK_IMAGE_FILES - イメージ (*.bmp *.png *.jpg *.jpeg *. pdf.PS *.eps) ファイル + イメージファイル (*.bmp *.png *.jpg *.jpeg *. pdf *.ps *.eps) MNU_VIEWPARAMETERS_VIEW - 可視化の設定を変更します。 + 表示パラメーターの変更 DSC_VIEWPARAMETERS_VIEW - ビューの設定を変更します。 + 表示パラメータの変更 MNU_SVTK_PARALLEL_MODE @@ -213,35 +213,35 @@ DSC_SVTK_PRESELECTION_STANDARD - DSC_SVTK_PRESELECTION_STANDARD + 標準の事前選択モード MNU_SVTK_PRESELECTION_STANDARD - MNU_SVTK_PRESELECTION_STANDARD + 標準の事前選択モード DSC_SVTK_PRESELECTION_DYNAMIC - DSC_SVTK_PRESELECTION_DYNAMIC + 動的な事前選択モード MNU_SVTK_PRESELECTION_DYNAMIC - MNU_SVTK_PRESELECTION_DYNAMIC + 動的な事前選択モード DSC_SVTK_PRESELECTION_DISABLED - DSC_SVTK_PRESELECTION_DISABLED + 事前選択を無効にします。 MNU_SVTK_PRESELECTION_DISABLED - MNU_SVTK_PRESELECTION_DISABLED + 事前選択を無効にします。 DSC_SVTK_ENABLE_SELECTION - DSC_SVTK_ENABLE_SELECTION + 選択を有効/無効にします。 MNU_SVTK_ENABLE_SELECTION - MNU_SVTK_ENABLE_SELECTION + 選択を有効/無効にします。 @@ -323,7 +323,7 @@ MSG_NO_AVI_MAKER - AVI ファイルを保存するために必要な jpeg2yuv ツールは使用できません。マニュアルを参照してください。 + AVI ファイルを保存するために必要な jpeg2yuv ツールは利用できません。マニュアルを参照してください。 @@ -459,11 +459,11 @@ SVTK_ViewParameterDlg LBL_X - X: + X : LBL_Y - Y: + Y : LBL_Z @@ -628,15 +628,15 @@ GT_SECONDCORNERGRADIENT - 2 番目のコーナーのグラデーション + グラデーションの 2 番目の角 GT_THIRDCORNERGRADIENT - 3 番目のコーナーのグラデーション + 3 番目の角勾配 GT_FOURTHCORNERGRADIENT - 4 番目のコーナーのグラデーション + 第 4 コーナー グラデーション BG_IMAGE_FILES diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx index 07ffd4aba..f483ef866 100644 --- a/src/SalomeApp/SalomeApp_Study.cxx +++ b/src/SalomeApp/SalomeApp_Study.cxx @@ -427,7 +427,7 @@ QString SalomeApp_Study::studyName() const // it can be changed outside of GUI // TEMPORARILY SOLUTION: better to be implemented with help of SALOMEDS observers if ( studyDS() ) { - QString newName = studyDS()->Name().c_str(); + QString newName = QString::fromUtf8(studyDS()->Name().c_str()); if ( LightApp_Study::studyName() != newName ) { SalomeApp_Study* that = const_cast( this ); that->setStudyName( newName ); @@ -1163,7 +1163,13 @@ void SalomeApp_Study::updateFromNotebook( const QString& theFileName, bool isSav LightApp_DataObject* SalomeApp_Study::findObjectByEntry( const QString& theEntry ) { - LightApp_DataObject* o = dynamic_cast( myObserver ? myObserver->findObject( theEntry.toLatin1().constData() ) : 0 ); + LightApp_DataObject* o = 0; + if ( myObserver ) { + o = dynamic_cast( myObserver->findObject( theEntry.toLatin1().constData() ) ); + } + if ( !o ) { + o = LightApp_Study::findObjectByEntry( theEntry ); + } return o; } diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml index e03fd0f60..e4a353e9b 100644 --- a/src/SalomeApp/resources/SalomeApp.xml +++ b/src/SalomeApp/resources/SalomeApp.xml @@ -35,7 +35,7 @@ - +
    diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts index ee092821e..446b0292a 100644 --- a/src/SalomeApp/resources/SalomeApp_msg_en.ts +++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts @@ -12,6 +12,10 @@ Python file must include only letters, digits and underscores and start from let WRN_FILE_NOT_EXIST The file %1 does not exist. + + WRN_STUDY_LOCKED + Study is locked. + CLOSE_LOCKED_STUDY Close locked study? diff --git a/src/SalomeApp/resources/SalomeApp_msg_fr.ts b/src/SalomeApp/resources/SalomeApp_msg_fr.ts index 0823f7f8c..faf47a579 100755 --- a/src/SalomeApp/resources/SalomeApp_msg_fr.ts +++ b/src/SalomeApp/resources/SalomeApp_msg_fr.ts @@ -12,6 +12,10 @@ Un fichier Python ne doit être composé que de lettres, chiffres et tirets bas WRN_FILE_NOT_EXIST Le fichier %1 n'existe pas. + + WRN_STUDY_LOCKED + Study is locked. + CLOSE_LOCKED_STUDY Fermer l'étude verrouillée ? diff --git a/src/SalomeApp/resources/SalomeApp_msg_ja.ts b/src/SalomeApp/resources/SalomeApp_msg_ja.ts index b56a71aa2..819d6272d 100644 --- a/src/SalomeApp/resources/SalomeApp_msg_ja.ts +++ b/src/SalomeApp/resources/SalomeApp_msg_ja.ts @@ -5,15 +5,19 @@ @default WRN_FILE_NAME_BAD - 正しいファイル名を指定します。Python ファイルは文字、数字、ダッシュを構成する必要があり、、文字またはアンダー スコアで始まる必要があります。 + 有効なファイル名を入力してください。Pythonのファイル名は、文字、数字、およびアンダー スコアで構成され、文字かアンダー スコアで始まる必要があります。 WRN_FILE_NOT_EXIST ファイル %1 は存在しません。 + + WRN_STUDY_LOCKED + Study is locked. + CLOSE_LOCKED_STUDY - ロックされた研究を閉じますか。 + ロックされたスタディを閉じますか。 PUBLISH_IN_STUDY @@ -21,7 +25,7 @@ MULTI_FILE_DUMP - 複数ファイルをダンプする + 複数ファイルの書き出し BUT_NEW @@ -82,6 +86,30 @@ SalomeApp_Application + + PRP_SIMAN_LOCAL_CHECK_IN + Check In for module + + + MEN_SIMAN_LOCAL_CHECK_IN + Check In for module + + + TOT_SIMAN_LOCAL_CHECK_IN + Check In for module + + + PRP_SIMAN_CHECK_IN + Check In + + + MEN_SIMAN_CHECK_IN + Check In + + + TOT_SIMAN_CHECK_IN + Check In + ALL_FILES_FILTER すべてのファイル (*. *) @@ -100,7 +128,7 @@ MEN_DELETE_INVALID_REFERENCE - 無効な参照を削除します + 無効な参照を削除します。 TOT_FILE_DESK_PREFERENCES @@ -116,7 +144,7 @@ MEN_DESK_REGISTRY_DISPLAY - 表示を登録(&D) + レジストリの表示(&D) APPCLOSE_SAVE @@ -168,11 +196,11 @@ QUE_DOC_ALREADYEXIST - ドキュメント %1 は、既にStudyのマネージャーに存在します。\n再読み込みしますか？ + ドキュメント %1 は研究のマネージャーに既に存在します。それを再読み込みしますか。 MEN_RENAME_VS - 名前変更 + 名前の変更 TOT_DESK_CATALOG_GENERATOR @@ -224,7 +252,7 @@ TOT_DESK_REGISTRY_DISPLAY - CORBA のレジスタを表示します。 + レジストリの表示 OBJ_BROWSER_COLUMN_0 @@ -240,11 +268,11 @@ OBJ_BROWSER_COLUMN_3 - 参照のエントリ + 参照エントリ PREF_CATEGORY_SALOME - Salome-Meca + SALOME PYTHON_CONSOLE @@ -371,7 +399,7 @@ PRP_VERSIONS - 格納されたデータ + 格納されているデータ PRP_DATE_MODIF @@ -437,11 +465,11 @@ VARNAME_COLUMN - 変数の名前 + 変数名 VARVALUE_COLUMN - 変数の値 + 値 VARVALUE_INCORRECT @@ -453,68 +481,68 @@ VARNAME_EXISTS - 変数"%1"です。 + 変数名「%1」が存在します。 SalomeApp_NoteBook NOTEBOOK_TITLE - NOTEBOOK_TITLE + ノート BUT_UPDATE_STUDY - BUT_UPDATE_STUDY + スタディ更新(&U) BUT_REMOVE - BUT_REMOVE + 削除(&R) BUT_APPLY_AND_CLOSE - BUT_APPLY_AND_CLOSE + 適用して閉じる(&p) BUT_HELP - BUT_HELP + ヘルプ(&H) CLOSE_CAPTION - CLOSE_CAPTION + レジストリを閉じます CLOSE_DESCRIPTION - CLOSE_DESCRIPTION + レジストリに変更を保存しますか? INCORRECT_DATA - INCORRECT_DATA + 少なくとも、一つの変数の定義が正しくありません。その設定を編集または一覧から削除して下さい。 ERR_UPDATE_STUDY_FAILED - ERR_UPDATE_STUDY_FAILED + スタディの更新に失敗しました！ SalomeApp_DoubleSpinBox VALID_RANGE_VAR_MSG - 変数名または%3桁の精度で(%1; %2) の範囲の小数点で入力します。 + 小数点以下%3桁の精度で（%1; %2）の範囲の数値または変数名を入力してください。 VALID_RANGE_NOVAR_MSG - %3桁の精度で（%1; %2）の範囲の小数点を入力します。 + %3桁の精度で（%1; %2）の範囲の浮動小数点値を入力します。 SalomeApp_IntSpinBox VALID_RANGE_VAR_MSG - 変数名または%3桁の精度で(%1; %2) の範囲の小数点で入力します。 + 変数名または整数値のいずれか (%1;%2) の範囲で指定します VALID_RANGE_NOVAR_MSG - %3桁の精度で（%1; %2）の範囲の小数点を入力します。 + (%1;%2) の範囲の整数値を指定します。 diff --git a/src/TOOLSGUI/resources/ToolsGUI_msg_ja.ts b/src/TOOLSGUI/resources/ToolsGUI_msg_ja.ts index 404ca4f7a..2d08692cc 100644 --- a/src/TOOLSGUI/resources/ToolsGUI_msg_ja.ts +++ b/src/TOOLSGUI/resources/ToolsGUI_msg_ja.ts @@ -9,7 +9,7 @@ TOOLS_BUT_BROWSE - 移動... + 開く... TOOLS_ERR_ERROR @@ -72,7 +72,7 @@ TOOLS_COMP_MULTISTD - マルチ-練習曲: + Multistudy: TOOLS_COMP_USERNAME @@ -80,7 +80,7 @@ TOOLS_CATALOG_GENERATOR - カタログの生成 + カタログ ジェネレーター TOOLS_FILES @@ -88,15 +88,15 @@ TOOLS_MEN_IMPORT_PNG - Png (*.png) + PNG ファイル (*.png) TOOLS_MEN_IMPORT_IDL - IDL (*.idl) ファイル + IDL ファイル (*.idl) TOOLS_MEN_EXPORT_XML - XML (*.xml) ファイル + XML ファイル (*.xml) TOOLS_IDL_FILE @@ -107,11 +107,11 @@ ToolsGUI_RegWidget TLT_REFRESH_INTERVAL - リフレッシュ レート + 更新間隔 LAB_REFRESH_INTERVAL - 新たな周波数の更新 （秒） で + 更新頻度 （秒） TLT_REGISTRY @@ -135,7 +135,7 @@ MEN_INTERVAL - リフレッシュ レート. + 更新間隔. STB_INTERVAL @@ -151,7 +151,7 @@ TAB_RUNNING - 電流 + 実行中 TAB_HISTORY @@ -167,7 +167,7 @@ HDR_USERNAME - ユーザーの名前 + ユーザー名 HDR_HOSTNAME @@ -175,19 +175,19 @@ HDR_STARTED - 開始 + 開始日時 HDR_FINISHED - 完成品 + 終了 HDR_HELLO - 最後の ping + 最後の アクセス ERR_NO_REGISTRY - エラー: サーバー レジストリが見つからない + エラー: レジストリ サーバーが見つかりません INFO_SERVICE @@ -195,7 +195,7 @@ INFO_PROCESS - マシン名 %2 (IPアドレス: %3 )上プロセス (PID: %1); %4 のユーザによって起動 (UID: %5) ディレクトリ %6。 + マシン名 %2 (IPアドレス: %3 )上のプロセス (PID: %1); ディレクトリ%6でユーザ%4(UID: %5)によって起動された 。 INFO_STARTED @@ -203,7 +203,7 @@ INFO_LAST_PING - 最終信号: %1 + 最終アクセス: %1 INFO_FINISHED @@ -211,7 +211,7 @@ INFO_RUNNING - 電流 + 実行中 INFO_TIME_DIFF diff --git a/src/TreeData/DockWidgets.cxx b/src/TreeData/DockWidgets.cxx index 6a7922c03..06a18802f 100644 --- a/src/TreeData/DockWidgets.cxx +++ b/src/TreeData/DockWidgets.cxx @@ -49,6 +49,7 @@ DockWidgets::DockWidgets(SalomeApp_Application* salomeApp, _dwDataPanel = new QDockWidget(parent); _dwDataPanel->setVisible(false); _dwDataPanel->setWindowTitle(title); + _dwDataPanel->setObjectName(title); parent->addDockWidget(Qt::LeftDockWidgetArea, _dwDataPanel); // // At this step, the _dwDataPanel is located side by side with the object diff --git a/src/VTKViewer/resources/VTKViewer_msg_ja.ts b/src/VTKViewer/resources/VTKViewer_msg_ja.ts index 4b587acb9..84277f7c3 100644 --- a/src/VTKViewer/resources/VTKViewer_msg_ja.ts +++ b/src/VTKViewer/resources/VTKViewer_msg_ja.ts @@ -21,7 +21,7 @@ MNU_FRONT_VIEW - 転送 + 正面 ERROR @@ -29,7 +29,7 @@ MNU_DUMP_VIEW - 保存 + ビューを保存. DSC_TOP_VIEW @@ -37,11 +37,11 @@ MNU_PAN_VIEW - パンニング + 並進移動 MNU_TOP_VIEW - トップ + 上面 DSC_GLOBALPAN_VIEW @@ -65,11 +65,11 @@ DSC_FITALL - すべてのオブジェクトを表示します。 + すべてのオブジェクトを表示するには、ステージのサイズを変更します。 MNU_FITALL - すべて表示 + 全体表示 MNU_ROTATE_VIEW @@ -77,7 +77,7 @@ DSC_SHOW_TRIHEDRON - 三面体をを表示 + 現在のビューの三面体を表示/非表示 DSC_FRONT_VIEW @@ -97,15 +97,15 @@ MNU_SHOW_TRIHEDRON - 軸の表示/非表示 + 三面体を表示/非表示 MNU_BOTTOM_VIEW - Bottom + 底面 MNU_RESET_VIEW - 復元 + 表示リセット MNU_LEFT_VIEW @@ -117,11 +117,11 @@ DSC_FITRECT - 領域にビューを表示します。 + 選択領域をビューフレーム内に表示 MNU_FITRECT - 表示エリア + 選択範囲表示 DSC_BOTTOM_VIEW @@ -129,7 +129,7 @@ DSC_DUMP_VIEW - 現在のビューをイメージ ファイルに保存します。 + 現在のシーンをイメージファイルで保存 DSC_ZOOM_VIEW @@ -141,7 +141,7 @@ DSC_RESET_VIEW - ビューのポイントを復元します。 + ビューポイントをリセット ERR_DOC_CANT_SAVE_FILE @@ -157,7 +157,7 @@ DSC_BACK_VIEW - 背面図 + 後側のビュー @@ -241,15 +241,15 @@ GT_SECONDCORNERGRADIENT - 2 番目のコーナーのグラデーション + グラデーションの 2 番目の角 GT_THIRDCORNERGRADIENT - 3 番目のコーナーのグラデーション + 3 番目の角勾配 GT_FOURTHCORNERGRADIENT - 4 番目のコーナーのグラデーション + 第 4 コーナー グラデーション BG_IMAGE_FILES diff --git a/src/ViewerTools/resources/ViewerTools_msg_ja.ts b/src/ViewerTools/resources/ViewerTools_msg_ja.ts index 4371a15f8..5512ffbf8 100644 --- a/src/ViewerTools/resources/ViewerTools_msg_ja.ts +++ b/src/ViewerTools/resources/ViewerTools_msg_ja.ts @@ -17,7 +17,7 @@ CAPTION - 軸に目盛り付け + 目盛付軸 IS_VISIBLE -- 2.30.2