diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b8e90fac..dbf940714 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,8 @@ 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 5) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 6) +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}) SET(${PROJECT_NAME_UC}_VERSION_DEV 1) diff --git a/adm_local/cmake_files/FindSalomeOpenCV.cmake b/adm_local/cmake_files/FindSalomeOpenCV.cmake index 8556e961d..63932fea4 100644 --- a/adm_local/cmake_files/FindSalomeOpenCV.cmake +++ b/adm_local/cmake_files/FindSalomeOpenCV.cmake @@ -23,7 +23,14 @@ # # !! Please read the generic detection procedure in SalomeMacros.cmake !! # -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR 2) +SET(UpCount 2) + +IF (WIN32) + SET(UpCount 0) +ENDIF (WIN32) + +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR ${UpCount}) + #MARK_AS_ADVANCED() IF(OpenCV_FOUND) diff --git a/doc/salome/gui/GEOM/collect_geom_methods.py b/doc/salome/gui/GEOM/collect_geom_methods.py index 3639181c4..2f489aefb 100644 --- a/doc/salome/gui/GEOM/collect_geom_methods.py +++ b/doc/salome/gui/GEOM/collect_geom_methods.py @@ -117,16 +117,22 @@ if __name__ == "__main__": if len( args ) < 1: sys.exit("Plugin name is not specified") f = open(options.output, "w") - + + if len(args) > 1: + plugins_names = " ".join(args) + " plugins" + elif len(args) == 1: + plugins_names = args[0] + " plugin" + else: + plugins_names = "" output = [] if options.dummygeomhelp: output.append( "## @package geomBuilder" ) - output.append( "# Documentation of the methods dynamically added by the " + plugin_name + " Geometry plug-in to the geomBuilder class." ) + output.append( "# Documentation of the methods dynamically added by the " + plugins_names + " to the @b %geomBuilder class." ) # Add dummy Geometry help # This is supposed to be done when generating documentation for Geometry module plug-ins output.append( "# @note The documentation below does not provide complete description of class @b %geomBuilder" ) output.append( "# from @b geomBuilder package. This documentation provides only information about" ) - output.append( "# the methods dynamically added to the %geomBuilder class by the " + plugin_name + " plugin" ) + output.append( "# the methods dynamically added to the %geomBuilder class by the " + plugins_names + "." ) output.append( "# For more details on the %geomBuilder class, please refer to the SALOME %Geometry module" ) output.append( "# documentation." ) pass diff --git a/doc/salome/gui/GEOM/images/pref15.png b/doc/salome/gui/GEOM/images/pref15.png index d2b5966a6..26d0a40dd 100644 Binary files a/doc/salome/gui/GEOM/images/pref15.png and b/doc/salome/gui/GEOM/images/pref15.png differ diff --git a/doc/salome/gui/GEOM/images/tolerances.png b/doc/salome/gui/GEOM/images/tolerances.png new file mode 100644 index 000000000..69b136767 Binary files /dev/null and b/doc/salome/gui/GEOM/images/tolerances.png differ diff --git a/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc b/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc index 187cefbcd..92d6c31a1 100644 --- a/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc +++ b/doc/salome/gui/GEOM/input/add_point_on_edge_operation.doc @@ -10,25 +10,24 @@ This operation is available in OCC Viewer only. The \b Result will be a \b GEOM_Object. -\n Location of a new vertex on a selected edge can be defined two ways: +\n The location of a new vertex on the selected edge can be defined in two ways:
    -
  1. We can specify a position (ranging from 0.0 to 1.0) of the - vertex on the selected edge either by length or by parameter. +
  2. By specifying the position (ranging from 0.0 to 1.0) by length or by parameter.

    TUI Command: geompy.DivideEdge(Shape, EdgeID, Value, IsByParameter)

    \b Arguments: Name + 1 Edge + 1 Value setting the position of - the point according to one of the selected modes. + the point according to the selected mode. The difference between "by parameter" and "by length" modes becomes apparent on the edges with irregular parametrization (for example, @@ -41,15 +40,15 @@ The \b Result will be a \b GEOM_Object. \image html repair8.png \n\n
    3. -
  3. We can select several points that will be projected to the selected +
  4. By selecting several points that will be projected to the selected edge to find the location of new vertices.

    - TUI Command: geompy.DivideEdgeByPoint(Shape, Edge, Points) + TUI Command: geompy.DivideEdgeByPoint(Shape, Edge, Points):

    \b Arguments: Name + 1 Edge + 1 or more Points. diff --git a/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc b/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc index 7151dcff7..d903fc1ba 100644 --- a/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc +++ b/doc/salome/gui/GEOM/input/check_compound_of_blocks.doc @@ -8,10 +8,10 @@ This operation checks whether a shape is a compound of glued blocks. To be considered as a compound of blocks, the given shape must satisfy the following conditions: -- Each element of the compound should be a Block (6 quadrangle faces); -- Each quadrangle face is a face that has 1 wire with 4 edges. If there are -more than 4 edges in a single wire and C1 continuity mode is switched on, -a face is quadrangular if it has 4 bounds of C1 continuity. +- Each element of the compound should be a Block, i.e. have 6 quadrangle faces; +- Each quadrangle face should have one wire with four edges. If there are +more than four edges in a single wire and C1 continuity mode is switched on, +a face is quadrangular if it has four bounds with C1 continuity. - Blocks can be connected only via an entire quadrangle face or an entire edge; - The compound should be connected; - Each couple of connecting quadrangle faces should be glued. @@ -20,7 +20,7 @@ a face is quadrangular if it has 4 bounds of C1 continuity. In this dialog: - \b Object - the checked object. \b Selection button allows picking it in the viewer or in the object browser. -- Use C1 criterion - option that shitches on/off the C1 continuity mode. +- Use C1 criterion - option switches on/off the C1 continuity mode. - Angular Tolerance - angular tolerance to check C1 continuity between neighbor edges in a wire. - \b Errors list informs of possible errors, for example: - Not a block; diff --git a/doc/salome/gui/GEOM/input/check_self_intersections.doc b/doc/salome/gui/GEOM/input/check_self_intersections.doc index 8cf4d57bf..41658151a 100644 --- a/doc/salome/gui/GEOM/input/check_self_intersections.doc +++ b/doc/salome/gui/GEOM/input/check_self_intersections.doc @@ -9,17 +9,14 @@ This operation checks the topology of the selected shape to detect self-intersec In this dialog: - \b Object - the checked object. \b Selection button allows picking it in the viewer or in the object browser. -- Level of check - The combo box that allows to set the level of checking shape on self-interference. - It defines which interferferences will be checked. Default value is "All interferences". -- Compute self-intersections button computes self-interferences. -- \b Summary section contains the general report if the object has self-intersections and/or if errors are occured during computation. -- \b Self-intersections list contains the list of self-intersections detected. -Select the intersection(s) to show Sub-shapes in the field to the right. -- \b Apply and Apply and Close buttons are used to store interferences selected in the "Self-intersections" list box in the study for further analysis. -If no any interference is selected, all interferences are published in the study. Each interference is published as a child -compound of the source shape and contains a couple of intersecting sub-shapes. +- Level of check - combo box allows setting the level of self-interference checking. It defines, which interferences will be checked. The default value is "All interferences". +- Compute self-intersections button performs the computation. +- \b Summary section contains the general report about self-intersections of the object and/or errors that occurred during the computation. +- \b Self-intersections list contains the list of detected self-intersections. Select the intersection to show Sub-shapes in the field to the right. +- \b Apply and Apply and Close buttons store the interferences selected in the Self-intersections list box in the study for further analysis. +If no interferences are selected, all of them are published in the study. Each interference is published as a child compound of the source shape and contains a couple of intersecting sub-shapes. -\note This tool is useful for detection of shapes, not suitable for +\note This tool is useful for detection of shapes that are not suitable as arguments of Boolean operations and Partition algorithm. For more information about Partition and Boolean Operations Algorithms and their limitations refer to this document. diff --git a/doc/salome/gui/GEOM/input/creating_complex_obj.doc b/doc/salome/gui/GEOM/input/creating_complex_obj.doc index 1fbb1d6a2..01b6eb85f 100644 --- a/doc/salome/gui/GEOM/input/creating_complex_obj.doc +++ b/doc/salome/gui/GEOM/input/creating_complex_obj.doc @@ -15,10 +15,8 @@ axis, creating a body of revolution.
  5. \subpage create_extrusion_alongpath_page "Extrude an object along a path", creating a more complex trajectory object.
  6. \subpage create_pipe_path_page "Restore Path" of a pipe-like shape.
    7. -
  7. \subpage create_thickness_page "Thickness" operation that allows to add a thickness to objects.
    8. - -
  8. \subpage create_groups_page "Generate Groups". -This cross-operation functionality allows creation of groups for certain generation operations.
    9. +
  9. \subpage create_thickness_page "Add thickness" to objects.
    10. +
  10. \subpage create_groups_page "Generate Groups" for certain generation operations.
    11. New entity -> Advanced sub-menu allows creating new geometric diff --git a/doc/salome/gui/GEOM/input/creating_explode.doc b/doc/salome/gui/GEOM/input/creating_explode.doc index c25b719ae..693773973 100644 --- a/doc/salome/gui/GEOM/input/creating_explode.doc +++ b/doc/salome/gui/GEOM/input/creating_explode.doc @@ -16,7 +16,7 @@ obtain from it. The \b Result of the operation will be a List of \b GEOM_Objects (vertexes, edges, wires, faces, shells or solids). -Available choices in the Sub Shapes Type combo box depend on the type +The choices available in the Sub Shapes Type combo box depend on the type of selected Main Object: - \b Compound: to extract compounds; - \b Compsolid: to extract compsolids; @@ -29,72 +29,70 @@ of selected Main Object: - \b Shape: to extract top-level contents of the compound shape; - \b Flat: to extract "flat" contents of the compound shape. -Note: "flat" contents means top-level simple-type sub-shapes extracted from -the compound object recursively (i.e. there is no compounds in the result). -For example, if a compound C1 contains a solid S1 and another compound C2 that -contains solids S2 and S3 (see picture below): +Note: "flat" contents means that top-level simple-type sub-shapes are extracted from +the compound object recursively (i.e. there are no compounds in the result). + +Let us take, for example, compound C1 that contains solid S1 and another compound C2 that +contains solids S2 and S3 (see the picture below): - Explode operation with \b Shape type given as parameter will return S1 and C2; - Explode operation with \b Flat type given as parameter will return S1, S2 and S3. \image html flat_contents.png Switching on Select Sub-shapes check box allows manual selection of sub-shapes -to be extracted from the main object. In this mode the user can select sub-shapes +to be extracted from the main object. In this mode it is possible to select sub-shapes directly in 3D viewer. When Select Sub-shapes check box is switched on, additional \b Filter controls -allow to automatically pick up entites which satisfy specified threshold value(s). -The numerical functor for each sub-shape that is compared with threshold value(s) -is computed according to the shape's topological properties: -- length for edges and wires -- area for faces and shells -- volume for solids, compounds, compsolids +allow to automatically pick up entities, which satisfy the specified threshold value(s). +The numerical functor for each sub-shape that is compared with the threshold value(s) +is computed according to the topological properties of the shape: +- length for edges and wires; +- area for faces and shells; +- volume for solids, compounds and compsolids. Filtering capabilities are not available for vertices. -In order to filter out some entities: -- Activate one or two filtering controls by switching on corresponding check boxes; -- Select required threshold comparator type; the following choices are available: +To filter out some entities it is necessary to do the following: +- Activate one or two filtering controls by switching on the corresponding check boxes; +- Select the required threshold comparator type; the following choices are available: - Less Than or Equal or Less Than for the first comparator; - Greater Than or Equal or Greater Than for the second comparator; -- Enter required threshold value (values); +- Enter the required threshold value (values); - Press \b Apply button in the \b Filter group. -The entities which satisfy entered filtering parameters will be automatically highlighted +The entities, which correspond to the entered filtering parameters, will be automatically highlighted in the 3D viewer. Using TUI Commands you can perform this operation in a variety of ways: - geompy.ExtractShapes(Shape, Type, isSorted) explodes a Shape into sub-shapes of a given Type and returns a List of sub-shapes. - This method does not return the Shape itself if it matches the - Type. -- geompy.SubShapeAll(Shape, Type) explodes a Shape on + This method does not return the Shape itself if it matches the Type. +- geompy.SubShapeAll(Shape, Type) explodes a Shape into sub-shapes of a given Type and returns a List of sub-shapes. -- geompy.SubShapeAllIDs(Shape, Type) explodes a Shape on - sub-shapes of a given Type and returns a List of IDs of - sub-shapes. +- geompy.SubShapeAllIDs(Shape, Type) explodes a Shape into sub-shapes of a given Type and returns a List of IDs of sub-shapes. - geompy.SubShapeAllSortedCentres(Shape, Type) explodes a - shape on sub-shapes of a given type and sorts them taking into account + shape into sub-shapes of a given type and sorts them taking into account their gravity centers, to provide a stable order of sub-shapes. It returns a list of sub-shapes. - geompy.SubShapeAllSortedCentresIDs(Shape, Type) explodes - a shape on sub-shapes of a given type and sorts them taking into + a shape into sub-shapes of a given type and sorts them taking into account their gravity centers, to provide a stable order of sub-shapes. It returns a List of IDs of sub-shapes. - geompy.SubShape(Shape, Type, ListOfInd) allows to obtain - a compound of sub-shapes of the Shape, selected by they indices in a + a compound of sub-shapes of the Shape, selected by their indexes in a list of all sub-shapes of the given Type. Each index is in the range [1, Nb_Sub-Shapes_Of_Given_Type]. - geompy.SubShapeSortedCentres(Shape, Type, ListOfInd) allows to obtain a compound of sub-shapes of the Shape, selected by - they indices in sorted list of all sub-shapes of the given Type. Each + their indexes in a sorted list of all sub-shapes of the given Type. Each index is in the range [1, Nb_Sub-Shapes_Of_Given_Type] Arguments: 1 SHAPE + 1 type of SubShape. Example: -\image html explode.png "A box, exploded into faces" +\image html explode.png "A box exploded into faces" */ diff --git a/doc/salome/gui/GEOM/input/creating_surface_from_face.doc b/doc/salome/gui/GEOM/input/creating_surface_from_face.doc index 6034ed5e3..a707dc64e 100644 --- a/doc/salome/gui/GEOM/input/creating_surface_from_face.doc +++ b/doc/salome/gui/GEOM/input/creating_surface_from_face.doc @@ -4,10 +4,10 @@ To create a Surface From Face in the Main Menu select New Entity - > Basic - > Surface From Face -\n This function takes some face as input parameter and creates new -GEOM_Object, i.e. topological shape by extracting underlying surface -of the source face and limiting it by the Umin, Umax, Vmin, Vmax -parameters of the source face (in the parametrical space). +\n This function takes a face at input and creates a new +GEOM_Object, i.e. topological shape by extracting the underlying surface +of the source face and limiting it by the Umin, Umax, Vmin and Vmax +parameters of the source face (in the parametric space). \n \ref restore_presentation_parameters_page "Advanced options". diff --git a/doc/salome/gui/GEOM/input/creating_thickness_page.doc b/doc/salome/gui/GEOM/input/creating_thickness_page.doc index 140c02fc1..88dfc221e 100644 --- a/doc/salome/gui/GEOM/input/creating_thickness_page.doc +++ b/doc/salome/gui/GEOM/input/creating_thickness_page.doc @@ -2,26 +2,28 @@ \page create_thickness_page Thickness Construction -To add a \b Thickness to a shape in the Main Menu select New Entity - > Generation - > Thickness -\n -It is possible to create a Solid from a Face or a Shell by applying a -\b Thickness. To do it you should define an \b Object that is a Face or a -Shell, \b Thickness and to define the thickness direction by means of -Thicken towards the inside check box. +To add \b Thickness to a shape in the Main Menu select New Entity - > Generation - > Thickness. + +Switch between adding thickness to a Face (Shell) or a Solid using radio buttons. + +Firstly, \b Thickness can be applied to a Face or a Shell to create a Solid. \image html thickness.png +It is necessary to define an \b Object (Face or Shell) and the value of \b Thickness. +Thicken towards the inside check box allows changing the thickness direction. + Example: \image html thickness_result.png "Thickness of Shell" -It is possible to apply \b Thickness to a Solid. The result of this operation -is the hollowed Solid. To do it you should define an \b Object that is a Solid, -\b Faces to be removed from result, \b Thickness and the thickness direction by -means of Thicken towards the inside check box. +Secondly, the \b Thickness can be applied to a Solid to create a hollowed Solid. \image html thicksolid.png +It is necessary to define a Solid \b Object \b Faces to be removed from the result and \b Thickness. +Thicken towards the inside check box allows changing the thickness direction. + Example: \image html thicksolid_result.png "Thickness of Solid" @@ -36,8 +38,8 @@ Modifies a shape to make it a thick solid. Arguments: Name + 1 shape (face, shell or solid) + thickness + the list of face IDs. -\n If the shape is face or shell the list of face IDs is not used. -The thickness can be positive or negative for thicken towards the inside. +\n If the shape is a face or a shell the list of face IDs is not used. +The thickness can be positive or negative for thickening towards the inside. \n\n Advanced options \ref preview_anchor "Preview" Our TUI Scripts provide you with useful examples of creation of diff --git a/doc/salome/gui/GEOM/input/dependency_tree.doc b/doc/salome/gui/GEOM/input/dependency_tree.doc index 2f07c9bd3..b8346eec7 100644 --- a/doc/salome/gui/GEOM/input/dependency_tree.doc +++ b/doc/salome/gui/GEOM/input/dependency_tree.doc @@ -34,7 +34,7 @@ All necessary parameters of Dependency Tree Viewer can be edited in the \ref pre Tree nodes in the Dependency Viewer are named according to the study names of the corresponding objects. -All nodes have fixed size, so long names are cut; the full object name can be seen in the tooltip +All nodes have fixed size, so long names are cut; the full object name can be seen in the tool-tip when the cursor is hovered over the node. "Dependency Tree" view supports the following states of nodes: @@ -61,11 +61,11 @@ Browser, OCC Viewer or Dependency Tree Viewer; Dependency Tree Viewer shows oriented links between nodes to represent the dependency direction. The viewer supports the following states of links: - + \image html tree_unidir_link.png - + \image html tree_bidir_link.png diff --git a/doc/salome/gui/GEOM/input/display_mode.doc b/doc/salome/gui/GEOM/input/display_mode.doc index 7ba535184..af842ccf1 100644 --- a/doc/salome/gui/GEOM/input/display_mode.doc +++ b/doc/salome/gui/GEOM/input/display_mode.doc @@ -29,7 +29,7 @@ functionality for all objects in the current view via the main menu \n TUI Command: gg.setVectorsMode(ID, Bool) -\n Also it is possible to show the vertices of the selected +\n It is possible to show the vertices of the selected shape. For this, choose in the context menu of the shape Display mode -> Show Vertices, or apply this functionality for all objects in the current view via the main menu @@ -40,10 +40,9 @@ functionality for all objects in the current view via the main menu \n TUI Command: gg.setVerticesMode(ID, Bool) -\n Moreover user can show the name of the selected -shape. For this, choose in the context menu of the shape +\n To show the name of the selected shape, choose in its context menu Display mode -> Show Name, or apply this -functionality for all objects in the current view via the main menu +functionality for all objects in the current view via the main menu option View -> Display Mode -> Show/Hide Name. \image html name_mode.png diff --git a/doc/salome/gui/GEOM/input/extension_operation.doc b/doc/salome/gui/GEOM/input/extension_operation.doc index 605ff176f..dd2ad27fa 100644 --- a/doc/salome/gui/GEOM/input/extension_operation.doc +++ b/doc/salome/gui/GEOM/input/extension_operation.doc @@ -1,25 +1,20 @@ /*! -\page extension_operation_page Extension of an Edge or a Face +\page extension_operation_page Extension -\n To produce an \b Extension in the Main Menu select -Operations - > Transformation - > Extension +\n To produce an \b Extension of an Edge or a Face select in the Main Menu +Operations - > Transformation - > Extension. The type of extension is defined using the radio buttons. -\n This operation resizes an \b Edge by means of first - and last parameters modification or a \b Face by means of modification - of minimal and maximal U- and V-Parameters. \n -\ref restore_presentation_parameters_page "Advanced options". +Firstly it is possible to resize an \b Edge by modifying its first +and last parameters -The type of extension is defined using the radio buttons. +\image html extension1.png "Edge Extension" -Firstly it is possible to resize an \b Edge. \n TUI Command: geompy.ExtendEdge(theEdge, theMin, theMax), where \em theEdge the input edge to be resized, \em theMin the minimal parameter value, \em theMax the maximal parameter value. \n Arguments: Name + Object (Edge) + 2 values (Min and Max Parameters). -\image html extension1.png "Extension of an Edge" - \n Example: \image html extend_edge_example.png "Original edge (white) and extended edge" @@ -28,8 +23,12 @@ parameter value, \em theMax the maximal parameter value. negative, the input Edge is extended, otherwise it is shrinked by \b theMin parameter. If \b theMax is greater than 1, the Edge is extended, otherwise it is shrinked by \b theMax parameter. + +Secondly it is possible to resize a \b Face by modifying its +minimal and maximal U- and V-Parameters. -Secondly it is possible to resize a \b Face. + \image html extension2.png "Face Extension" + \n TUI Command: geompy.ExtendFace(theFace, theUMin, theUMax, theVMin, theVMax), where \em theFace the input face to be resized, \em theUMin the minimal U-Parameter value, \em theUMax the maximal U-Parameter @@ -38,18 +37,16 @@ V-Parameter value. \n Arguments: Name + Object (Face) + 4 values (Min and Max U- and V-Parameters). -\image html extension2.png "Extension of a Face" \n Example: -\image html extend_face_example.png "The original face (gray) and a result - face shrinked along U-Direction and extended along V-Direction" +\image html extend_face_example.png "The original face (gray) and a result face shrinked along U-Direction and extended along V-Direction" \note The input Face U- and V-Parameters range is [0, 1]. If \b theUMin parameter is negative, the input Face is extended, otherwise it is - shrinked along U-Direction by \b theUMin parameter. If theUMax is + shrinked along U-Direction by \b theUMin parameter. If \b theUMax is greater than 1, the Face is extended, otherwise it is shrinked along - U-Direction by \b theUMax parameter. So as for \b theVMin, \b theVMax + U-Direction by \b theUMax parameter. The same applies to \b theVMin, \b theVMax and V-Direction of the input Face. Our TUI Scripts provide you with useful examples of the use of diff --git a/doc/salome/gui/GEOM/input/faq.doc b/doc/salome/gui/GEOM/input/faq.doc index 78fa0d58c..3976f44ea 100644 --- a/doc/salome/gui/GEOM/input/faq.doc +++ b/doc/salome/gui/GEOM/input/faq.doc @@ -6,6 +6,7 @@ Here you can find the answers to some frequently asked questions: diff --git a/doc/salome/gui/GEOM/input/fast_intersection.doc b/doc/salome/gui/GEOM/input/fast_intersection.doc index 4de27fc29..f27a6d944 100644 --- a/doc/salome/gui/GEOM/input/fast_intersection.doc +++ b/doc/salome/gui/GEOM/input/fast_intersection.doc @@ -1,11 +1,11 @@ /*! \page fast_intersection_page Fast intersection -This operation checks whether or not two selected shapes are overlapped. +This operation checks if two selected shapes are overlapped. This tool is useful for fast detection of intersections and gaps. In contrast to Boolean Operations, Partition and Detect Self-intersection -algorithms that compute topological intersections, this algoritm computes +algorithms that compute topological intersections, this algorithm computes intersections by generating tessellation (triangulation) of the source shapes and detecting overlapping of resulting meshes. High performance is achieved through the use of existing triangulation of faces. @@ -28,22 +28,21 @@ of the GUI module's documentation. In this dialog: -- \b Object 1 - first checked object. \b Selection button allows picking it in the viewer or in the object browser. -- \b Object 2 - second checked object. \b Selection button allows picking it in the viewer or in the object browser. +- Object 1 and Object 2 the checked objects. \b Selection button allows picking them in the viewer or in the object browser. - Deflection coefficient specifies the quality of shapes tessellation. - Detect gaps - when switched on, allows detecting gaps between shapes. -- Tolerance - specifies a distance between shapes used for detecting gaps. +- Tolerance - specifies the distance between shapes used for detecting gaps. - Compute intersections - press this button to compute interferences. - Sub-shapes of Object 1 - list of sub-shapes from the first source shape that localize the intersection. - Sub-shapes of Object 2 - list of sub-shapes from the second source shape that localize the intersection. - \b Apply and Apply and Close buttons are used to store selected intersected shapes in the study for further analysis (see below). -\note Quality of the result depends on the quality of triangulation. Changing a value of the deflection coefficient -parameter can strongly affect the result. On the other hand, small values of deflection coefficient might lead to +\note The result quality depends on the quality of triangulation. Changing the value of the deflection coefficient +parameter can strongly affect the result. However, small values of the deflection coefficient might lead to some performance loss of the algorithm, as number of triangles of the tesselation mesh depends on this parameter. -It is possible to store sub-shapes selected by the user in the study, for the further analysis. +Press Apply and Close or \b Apply button to store the selected sub-shapes in the study for further analysis. The selection will be published as a compound containing intersected sub-shapes from both source objects. TUI Command: geompy.FastIntersect(theShape1, theShape2, theTolerance = 0.0, theDeflection = 0.001), \n diff --git a/doc/salome/gui/GEOM/input/geometry_preferences.doc b/doc/salome/gui/GEOM/input/geometry_preferences.doc index 87bb9fc56..454ac3210 100644 --- a/doc/salome/gui/GEOM/input/geometry_preferences.doc +++ b/doc/salome/gui/GEOM/input/geometry_preferences.doc @@ -5,7 +5,8 @@ \anchor pref_settings

    Settings

    In the \b Geometry module you can set preferences for visualization of -geometrical figures, which can be used in later sessions with this module. +geometrical figures, which can be used right now or in later sessions +with this module according to the preferences. \image html pref15.png @@ -48,16 +49,16 @@ place (in the back) and add the additional wireframe actor in the viewer foregro
  11. Shading With Edges - allows to switch display mode to shading with edges mode after "top-level" operation.
    12. -
  12. Transparency - allows to define default transparency value.
    13. -
  13. Deflection coefficient - allows to define default deflection +
  14. Default transparency - allows to define default transparency value.
    15. +
  15. Default deflection coefficient - allows to define default deflection coefficient for lines and surfaces. A smaller coefficient provides better quality of a shape in the viewer.
  16. Show predefined materials in popup menu - allows to customize the displaying of popup menu with list of predefined materials.
  17. Default material - allows to define default material.
  18. Subshapes color for editing a group - allows to select default color for subshapes in a group.
    19. -
  19. Edges width - allows to define default width of the edges.
    20. -
  20. Isolines width - allows to define default width of the isolines.
    21. +
  21. Default edges width - allows to define default width of the edges.
    22. +
  22. Default isolines width - allows to define default width of the isolines.
  23. Preview edges width - allows to define width of the edges for preview.
  24. Measures line width - allows to define lines width of measurements tools.
  25. Step value for spin boxes - allows to define the increment @@ -82,7 +83,7 @@ of values set in spin boxes.
    26. - - + diff --git a/doc/salome/gui/GEOM/input/glue_edges_operation.doc b/doc/salome/gui/GEOM/input/glue_edges_operation.doc index eb7d2377c..2b5c8a981 100644 --- a/doc/salome/gui/GEOM/input/glue_edges_operation.doc +++ b/doc/salome/gui/GEOM/input/glue_edges_operation.doc @@ -17,7 +17,7 @@ given tolerance value. \n TUI Command:

    geompy.MakeGlueEdges( theShapes, theTolerance ), -\n where \em theShapes is either a list or compound of shapes to be +\n where \em theShapes is a list or compound of shapes to be glued, and \em theTolerance is a maximum distance between two edges, which can be considered as coincident. @@ -41,12 +41,12 @@ The selected edges will be marked in white. theTolerance is a maximum distance between two edges, which can be considered as coincident. The \b Result will be a list of \b GEOM_Objects (edges), containing one sub-shape per each detected set of - coincident sub-shapes. For example if there are two coincident edges -in selected shapes, the result list contains one of the two coincident edges. + coincident sub-shapes. For example, if there are two coincident edges +in the selected shapes, the result list contains one of the two coincident edges. geompy.MakeGlueEdgesByList( theShapes, theTolerance, theEdges ), -\n where \em theShape is either a list or compound of shapes to be glued, \em - theTolerance is a maximum distance between two edges, which can +\n where \em theShape is a list or compound of shapes to be glued, +\em theTolerance is a maximum distance between two edges, which can be considered as coincident, \em theEdges is a list of edges to be glued. diff --git a/doc/salome/gui/GEOM/input/glue_faces_operation.doc b/doc/salome/gui/GEOM/input/glue_faces_operation.doc index 8f020115b..c6a6fa021 100644 --- a/doc/salome/gui/GEOM/input/glue_faces_operation.doc +++ b/doc/salome/gui/GEOM/input/glue_faces_operation.doc @@ -41,12 +41,12 @@ The selected faces will be marked in white. When the faces are glued their edges are glued as well. By default, other edges are not glued. To force gluing of all edges, check Glue all coincident edges -checkbox. +check-box. \n TUI Commands: geompy.GetGlueFaces( theShapes, theTolerance ), -\n where \em theShapes is either a list or compound of shapes to be glued, \em +\n where \em theShapes is a list or compound of shapes to be glued, \em theTolerance is a maximum distance between two faces, which can be considered as coincident. The \b Result will be a list of \b GEOM_Objects (faces), containing one sub-shape per each detected set of diff --git a/doc/salome/gui/GEOM/input/inspect_object_operation.doc b/doc/salome/gui/GEOM/input/inspect_object_operation.doc index 40cc4c027..0650bd47b 100755 --- a/doc/salome/gui/GEOM/input/inspect_object_operation.doc +++ b/doc/salome/gui/GEOM/input/inspect_object_operation.doc @@ -12,11 +12,11 @@ In this dialog: - Click on the "selection" button and select an object to inspect in the Object Browser or in the viewer. - Show/hide sub-shape(s) in the 3D viewer, by pressing “eye” icon in the first column of the tree view. - Show/hide all sub-shapes in the 3D viewer, by pressing “eye” icon in the first column of the tree view header. -- Rename selected sub-shape by double-clicking on the item or pressing key. -- Show selected sub-shape(s) in the 3D viewer by pressing Show Selected button. -- Show selected sub-shape(s) in the 3D viewer and erase all currently shown objects by pressing Show Only Selected button. -- Hide selected sub-shape(s) from the 3D viewer by pressing Hide Selected button. -- Publish selected sub-shapes in the study, by pressing Publish Selected button. +- Rename the selected sub-shape by double-clicking on the item or pressing key. +- Show the selected sub-shape(s) in the 3D viewer by pressing Show Selected button. +- Show the selected sub-shape(s) in the 3D viewer and erase all currently shown objects by pressing Show Only Selected button. +- Hide the selected sub-shape(s) from the 3D viewer by pressing Hide Selected button. +- Publish the selected sub-shapes in the study, by pressing Publish Selected button. - Close dialog box, by pressing Close button. */ diff --git a/doc/salome/gui/GEOM/input/projection_on_cylinder_operation.doc b/doc/salome/gui/GEOM/input/projection_on_cylinder_operation.doc index be0c5aa27..88e4d9fbd 100644 --- a/doc/salome/gui/GEOM/input/projection_on_cylinder_operation.doc +++ b/doc/salome/gui/GEOM/input/projection_on_cylinder_operation.doc @@ -14,12 +14,11 @@ To make a projection it is necessary to define: - \b Object to be projected. It can be either a planar wire or a face; - \b Radius of the cylinder; - Starting angle from the cylinder's X axis around Z axis. This is -the angle of the projection starting. -- Length angle in which to project the total length of -the wire. If it is unchecked the projection is not scaled and natural +the angle of the projection start. +- Length angle where the total length of +the wire should be projected. If it is unchecked the projection is not scaled and the natural wire length is kept for the projection. - -\ref restore_presentation_parameters_page "Advanced options". +- \ref restore_presentation_parameters_page "Advanced options". \image html proj_on_cyl_dlg.png @@ -29,8 +28,8 @@ wire length is kept for the projection. \n TUI Command: geompy.MakeProjectionOnCylinder(theObject, theRadius, theStartAngle=0.0, theAngleLength=-1.0), -where \em theObject is a shape which has to be projected, \em theRadius -is a cylinder radius, \em theStartAngle the starting angle of projection in +where \em theObject is a shape to be projected, \em theRadius +is a cylinder radius, \em theStartAngle is the starting angle of projection in radians, \em theAngleLength the projection length angle in radians. The \em Result will be a \em GEOM_Object. diff --git a/doc/salome/gui/GEOM/input/sewing_operation.doc b/doc/salome/gui/GEOM/input/sewing_operation.doc index 0008dc80a..9d293dec4 100644 --- a/doc/salome/gui/GEOM/input/sewing_operation.doc +++ b/doc/salome/gui/GEOM/input/sewing_operation.doc @@ -3,18 +3,18 @@ \page sewing_operation_page Sewing \b Sewing operation allows uniting several faces (possibly contained -in a shell, solid or compound) into one shell while geometrically +in a shell, solid or compound) into one shell. Geometrically coincident (within a specified tolerance) edges (or parts of edges) of different faces are replaced by one edge thus producing a shell of faces with shared boundaries.

    This operation is similar to New Entity - > Build - > Shell operation, the difference is that with \b Sewing you can specify the -tolerance and can get a non-manifold result.

    -Possibility to create a non-manifold shell can be used e.g. to create a +tolerance and get a non-manifold result.

    +The possibility to create a non-manifold shell can be used e.g. to create a shell forming several closed domains and then to create several solids with shared boundaries from this shell. -\note Geometrically coincident faces (or part of faces) won't be +\note Geometrically coincident faces (or parts of faces) will not be replaced by one face during \b Sewing. To produce a \b Sewing operation in the Main Menu select Repair - > Sewing. diff --git a/doc/salome/gui/GEOM/input/shape_processing_operation.doc b/doc/salome/gui/GEOM/input/shape_processing_operation.doc index c92d48b8c..643c70638 100644 --- a/doc/salome/gui/GEOM/input/shape_processing_operation.doc +++ b/doc/salome/gui/GEOM/input/shape_processing_operation.doc @@ -56,22 +56,22 @@ merge with neighboring edges.

  26. 3D Tolerance (DropSmallEdges.Tolerance3d) - defines minimum possible distance between two parallel edges.
    27. -
  27. Drop Small Solids (DropSmallSolids) - either removes small +
  28. Drop Small Solids (DropSmallSolids) - removes small solids or merges them with neighboring ones.
    29. If the both tolerances are activated a solid is considered small if -it meets the both criteria. +it meets both criteria.
  29. Split Angle (SplitAngle) - splits faces based on conical surfaces, surfaces of revolution and cylindrical surfaces in segments using a certain angle.
    30. diff --git a/doc/salome/gui/GEOM/input/shared_shapes.doc b/doc/salome/gui/GEOM/input/shared_shapes.doc index 802fc45a1..23d94d2f0 100755 --- a/doc/salome/gui/GEOM/input/shared_shapes.doc +++ b/doc/salome/gui/GEOM/input/shared_shapes.doc @@ -15,22 +15,22 @@ Shared Shapes. The following dialog box will appear. In this dialog: - Name is the base name of the resulting shapes. -- Shapes are the shapes to fing shared sub-shapes of. +- Shapes are the shapes whose shared sub-shapes should be found. - Sub-shapes Type is the type of required sub-shapes. - Shared by all option specifies what type of shared sub-shapes should be checked: - - \b On: causes to search sub-shapes from the first input shape shared with all other input shapes; - - \b Off: causes to search sub-shapes shared between couples of input shapes. + - \b On: searches for sub-shapes from the first input shape shared with all other input shapes; + - \b Off: searches for sub-shapes shared between couples of input shapes. \note For the case when "Shared by all" option is switched off - if an input list of shapes -contains single compound, the sub-shapes shared between all possible couples of its top-level shapes -are searched; otherwise, only sub-shapes that are shared between first input shape and all rest input -shapes are searched. +contains a single compound, the sub-shapes shared between all possible couples of its top-level shapes +are searched for; otherwise, only sub-shapes that are shared between the first input shape and +all other input shapes are searched. Advanced options: \ref preview_anchor "Preview" TUI Command: geompy.GetSharedShapesMulti( Shapes, Type ), -
    where \em Shapes is a list or compound of shapes to fing shared sub- -shapes of and \em Type is the type of required sub-shapes. +
    where \em Shapes is a list or compound of shapes, whose shared sub- +shapes should be found and \em Type is the type of required sub-shapes. Our TUI Scripts provide you with useful examples of the use of Get Shared Shapes functionality: diff --git a/doc/salome/gui/GEOM/input/size_models_range.doc b/doc/salome/gui/GEOM/input/size_models_range.doc new file mode 100644 index 000000000..c8594abff --- /dev/null +++ b/doc/salome/gui/GEOM/input/size_models_range.doc @@ -0,0 +1,83 @@ +/*! + +\page size_models_range Sizes of Models in Salome + +\tableofcontents + +In Salome and Open CASCADE Technology (OCCT), which is a modeling core +of Salome %GEOM module, any model has its location in the 3D-space and size. + +This document defines the range of values (tolerances, locations +and sizes) that should be taken into account for any 3D model design. + +It is not obligatory to create models within this range, +however, algorithms can fail or return unexpected results if the +recommendations are not followed. + +\section sec1 Maximal Size of the Model + +The Maximal Size of the model corresponds to the maximal diameter of +enclosed sphere built for the model. In OCCT any model has a location defined +relatively to the absolute origin. Thus the maximal diameter should be built +taking into account the model itself and its location. + +In OCCT there are two tolerances: Tolerance Confusion (TolC) +and Tolerance Angular (TolA) (see OCCT Precision package for more details). +These values are used for geometric comparisons. However, they are not used inside +low-level algorithms (e.g. intersection), where more precise values are +used instead. The value TolC guarantees that the error associated with +the computations for a given geometric entity is not greater than TolC. + +- TolC - precision value used to check the coincidence of two points + [by default 1.e-7]; +- TolA - precision value used to check the equality of two angles + [by default 1.e-12]. + +For more information on tolerance definition please see +Chapter 4 of this document. To see limitations +that are due to modeling errors or inaccuracies of tolerance usage please +refer to Chapter 9.2.2 of the same document. + +To provide robust geometric modeling the computations should be consistent, +i.e. the one tolerance value should be used for all computations. Thus, the +TolC and TolA values should be consistent: + +
    Smax = TolC / TolA             (1)
    + +\image html tolerances.png "TolC, TolA and Maximal Size Consistency" + +In accordance with (1) the Maximal Size for the Model is [by default]: + +
    Smax = 1.e-7 / 1.e-12 = 1.e+5  (2)
    + +\section sec2 Minimal Size of the Model + +The Minimal Size of the Model is defined as the maximal diameter of enclosed +sphere built for the smallest BRep entity of the Model. + +All models in OCCT are represented using double precision +floating point numbers. This representation contains approximately 14-16 +significant digits. + +From the experience, it is considered that the last four significant +digits contain rounding-off errors occurring during the computation. So +(taking into account the worst cases), there are ten reliable significant digits +for double precision floating point numbers. Having the estimation it is +possible to compute the value of the Minimal size of the model: + +
    Smin=Smax / 1.e+10             (3)
    + +In accordance with (2) for the default value it will be [by default]: + +
    Smin=1.e-5.                    (4)
    + +\section sec3 Full Range of Sizes + +The values Smax (2), Smin (4) are theoretical. Taking into +account the practical purposes of improving the reliability, the lower limit +should be restricted by one order. Thus, the full Range of Sizes of the Models +is: + +
    [Smin, Smax] = [1.e-4, 1.e+5]  (5)
    + +*/ diff --git a/doc/salome/gui/GEOM/input/transfer_data.doc b/doc/salome/gui/GEOM/input/transfer_data.doc index b34b34f31..87a64860f 100644 --- a/doc/salome/gui/GEOM/input/transfer_data.doc +++ b/doc/salome/gui/GEOM/input/transfer_data.doc @@ -21,24 +21,23 @@ In this dialog: -To copy data click on \b Apply or Apply and Close button. As the result -it is possible to see how many names and materials are copied as well as -maximum number of names and materials available for copying. This information is -provided on the following message box: +To copy the data click on \b Apply or Apply and Close button. +It is possible to see how many names and materials are copied as well as +the maximum number of names and materials available for copying. This information is +provided in the following message box: \image html transfer_data2.png "Transfer Data Information" diff --git a/doc/salome/gui/GEOM/input/whatis.doc b/doc/salome/gui/GEOM/input/whatis.doc index fad70f01c..43dc0f6f7 100644 --- a/doc/salome/gui/GEOM/input/whatis.doc +++ b/doc/salome/gui/GEOM/input/whatis.doc @@ -5,13 +5,13 @@ This operation provides the list of types and quantities of all topological entities, composing the selected geometrical object. -For the \em COMPOUND or \em COMPSOLID shape, additionally the information about -"flat" content is shown - a number of "simple" top-level shapes enclosed into the compound. +The information about \em COMPOUND or \em COMPSOLID shapes additionally shows +"flat" content - the number of "simple" top-level shapes enclosed into the compound. \image html measures8.png \note This dialog supports navigation through the selectable objects (in OCC 3D viewer only): -- Scroll mouse wheel with pressed \em Ctrl key or press \em "S", \em "P" keys when input focus is +- Scroll mouse wheel with pressed \em Ctrl key or press \em "S", \em "P" keys when the input focus is in the viewer to navigate between selectable objects. - Press left mouse button to select an appropriate object to the dialog box. . diff --git a/doc/salome/gui/GEOM/input/working_with_groups.doc b/doc/salome/gui/GEOM/input/working_with_groups.doc index df36fd6a2..852047dfb 100644 --- a/doc/salome/gui/GEOM/input/working_with_groups.doc +++ b/doc/salome/gui/GEOM/input/working_with_groups.doc @@ -81,24 +81,24 @@ creation of other groups), or skip it by clicking \b Close button. \n The Result of the operation will be a \b GEOM_Object. -The \b Filter controls allow to automatically pick up entites which satisfy specified +The \b Filter controls allow to automatically pick up entities, which satisfy specified threshold value(s). The numerical functor for each sub-shape that is compared with threshold value(s) is computed according to the shape's topological properties: -- length for edges and wires -- area for faces and shells -- volume for solids, compounds, compsolids +- length for edges and wires; +- area for faces and shells; +- volume for solids, compounds, compsolids. Filtering capabilities are not available for vertices. In order to filter out some entities: -- Activate one or two filtering controls by switching on corresponding check boxes; -- Select required threshold comparator type; the following choices are available: +- Activate one or two filtering controls by switching on the corresponding check boxes; +- Select the required threshold comparator type; the following choices are available: - Less Than or Equal or Less Than for the first comparator; - Greater Than or Equal or Greater Than for the second comparator; -- Enter required threshold value (values); +- Enter the required threshold value (values); - Press \b Apply button in the \b Filter group. -The entities which satisfy entered filtering parameters will be automatically highlighted +The entities, which satisfy the entered filtering parameters, will be automatically highlighted in the 3D viewer. \b Plot button into "Filter" group box provides an access diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index 14419f220..d716f2ae3 100755 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -26,7 +26,10 @@ SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE}) INSTALL(CODE "FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GEOM)") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GEOM DESTINATION ${SALOME_INSTALL_DOC}/tui) +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GEOM + DESTINATION ${SALOME_INSTALL_DOC}/tui + PATTERN "*.md5" EXCLUDE + PATTERN "*.map" EXCLUDE) INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/tui/GEOM) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES GEOM) diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index f63819e97..87a912edc 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -226,6 +226,7 @@ module GEOM string operationName; Parameters params; }; + typedef sequence CreationInformationSeq; /*! * \brief Reporting on shape healing @@ -348,7 +349,7 @@ module GEOM /*! * \brief Return name of operation and values of parameters used for object creation */ - CreationInformation GetCreationInformation(); + CreationInformationSeq GetCreationInformation(); }; //# GEOM_Object diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index d311338c9..cddf9c5cf 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -1474,70 +1474,16 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the face_t->GetLastFunction()->SetDescription(""); theShapes.push_back(face_t); - gp_Pnt aP2 = BRep_Tool::Pnt(TopoDS::Vertex(P2->GetValue())); - gp_Pnt aP5 = BRep_Tool::Pnt(TopoDS::Vertex(vi1->GetValue())); - double deltaZ = aP2.Z() - aP5.Z(); - // std::cerr << "Creating new point from vi1 with deltaZ = " << deltaZ << std::endl; - Handle(GEOM_Object) P5bis = myTransformOperations->TranslateDXDYDZCopy(vi1, 0, 0, deltaZ); - if (P5bis.IsNull()) { - SetErrorCode("Impossible to translate vertex"); + // Create a prism from edge_chan_inc + Handle(GEOM_Object) aPrismDir = myBasicOperations->MakeVectorDXDYDZ(1., 1., 0.); + + if (aPrismDir.IsNull()) { + SetErrorCode("Impossible to build Prism direction"); return false; } - P5bis->GetLastFunction()->SetDescription(""); + aPrismDir->GetLastFunction()->SetDescription(""); + face_t2 = my3DPrimOperations->MakePrismVecH(edge_chan_inc, aPrismDir, theR2 + theW2); - gp_Pnt aP4 = BRep_Tool::Pnt(TopoDS::Vertex(P4->GetValue())); - gp_Pnt aP6 = BRep_Tool::Pnt(TopoDS::Vertex(vi2->GetValue())); - deltaZ = aP4.Z() - aP6.Z(); - // std::cerr << "Creating new point from vi2 with deltaZ = " << deltaZ << std::endl; - Handle(GEOM_Object) P6bis = myTransformOperations->TranslateDXDYDZCopy(vi2, 0, 0, deltaZ); - if (P6bis.IsNull()) { - SetErrorCode("Impossible to translate vertex"); - return false; - } - P6bis->GetLastFunction()->SetDescription(""); - - // std::cerr << "Creating new line 1 from 2 previous points" << std::endl; - Handle(GEOM_Object) Cote_3 = myBasicOperations->MakeLineTwoPnt(P5bis, P2); - if (Cote_3.IsNull()) { - SetErrorCode("Impossible to build edge in thickness"); - return false; - } - Cote_3->GetLastFunction()->SetDescription(""); - - // std::cerr << "Creating new line 2 from 2 previous points" << std::endl; - Handle(GEOM_Object) Cote_4 = myBasicOperations->MakeLineTwoPnt(P6bis, P4); - if (Cote_4.IsNull()) { - SetErrorCode("Impossible to build edge in thickness"); - return false; - } - Cote_4->GetLastFunction()->SetDescription(""); - - // std::cerr << "Creating new line 3 from 2 previous points" << std::endl; - Handle(GEOM_Object) Cote_5 = myBasicOperations->MakeLineTwoPnt(P5bis, P6bis); - if (Cote_4.IsNull()) { - SetErrorCode("Impossible to build edge in thickness"); - return false; - } - Cote_5->GetLastFunction()->SetDescription(""); - - //std::list edgeList2; - //edgeList2.push_back(edge_chan_inc); - //edgeList2.push_back(Cote_3); - //edgeList2.push_back(Cote_5); - //edgeList2.push_back(Cote_4); - // std::cerr << "Creating wire 2" << std::endl; - //wire_t2 = myShapesOperations->MakeWire(edgeList2, 1e-7); - //if (wire_t2.IsNull()) { - // SetErrorCode("Impossible to build wire"); - // return false; - //} - //wire_t2->GetLastFunction()->SetDescription(""); - // std::cerr << "Creating face 2" << std::endl; - //face_t2 = myShapesOperations->MakeFace(wire_t2, false); - - // Mantis issue 0021682 - face_t2 = my3DPrimOperations->MakePrismVecH(edge_chan_inc, Cote_4, - (theR2 + theW2)); - //face_t2 = my3DPrimOperations->MakePrismVecH(edge_chan_inc, Cote_4, - 2.0*theR2); if (face_t2.IsNull()) { SetErrorCode("Impossible to build face"); return false; diff --git a/src/AdvancedGUI/AdvancedGEOM_msg_ja.ts b/src/AdvancedGUI/AdvancedGEOM_msg_ja.ts index fb449602e..67a8923d3 100644 --- a/src/AdvancedGUI/AdvancedGEOM_msg_ja.ts +++ b/src/AdvancedGUI/AdvancedGEOM_msg_ja.ts @@ -129,7 +129,7 @@ INTERNAL_FACES - 内部の顔 + 内部の面 diff --git a/src/BREPPlugin/BREPPlugin_msg_ja.ts b/src/BREPPlugin/BREPPlugin_msg_ja.ts index cca0947a3..cc1bb291f 100644 --- a/src/BREPPlugin/BREPPlugin_msg_ja.ts +++ b/src/BREPPlugin/BREPPlugin_msg_ja.ts @@ -32,7 +32,7 @@ BREPPlugin_GUI BREP_FILES - BREPファイル + BREP ファイル ( *.brep ) EXPORT_TITLE diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index 84b9a7bd5..983666d28 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -613,9 +613,9 @@ void BasicGUI_PointDlg::SetEditCurrentArgument() } send->setDown(true); - if ((send == GroupLineIntersection->PushButton1 || - send == GroupLineIntersection->PushButton2) && !myBusy) - SelectionIntoArgument(); + // if ((send == GroupLineIntersection->PushButton1 || + // send == GroupLineIntersection->PushButton2) && !myBusy) + // SelectionIntoArgument(); } diff --git a/src/BlockFix/BlockFix_UnionEdges.cxx b/src/BlockFix/BlockFix_UnionEdges.cxx index 09e4974c5..4647d9e55 100644 --- a/src/BlockFix/BlockFix_UnionEdges.cxx +++ b/src/BlockFix/BlockFix_UnionEdges.cxx @@ -95,9 +95,11 @@ // be merged. The edges can be merged if: // 1. They belong to same faces. // 2. They either both seam or both not seam on each face. -// 3. They are based on coincident lines, or: -// 4. They are based on coincident circles, or: -// 5. They are based on either Bezier of BSplines. +// 3. There are no another edges (e.g. seam) on each common face +// that are connected to the common vertex of two edges. +// 4. They are based on coincident lines, or: +// 5. They are based on coincident circles, or: +// 6. They are based on either Bezier of BSplines. //======================================================================= static Standard_Boolean IsToMerge (const TopoDS_Edge &theEdge1, @@ -108,7 +110,6 @@ static Standard_Boolean IsToMerge Standard_Boolean aResult = Standard_False; Standard_Boolean isDegen1 = BRep_Tool::Degenerated(theEdge1); Standard_Boolean isDegen2 = BRep_Tool::Degenerated(theEdge2); - Standard_Boolean isCompareGeom = Standard_False; if (isDegen1 && isDegen2) { // Both of edges are degenerated. @@ -141,6 +142,44 @@ static Standard_Boolean IsToMerge Standard_Boolean isSeam2 = BRep_Tool::IsClosed(theEdge2, aFace1); isSame = (isSeam1 && isSeam2) || (isSeam1 == isSeam2); + + if (isSame) { + // Check if there are no other edges (e.g. seam) on this face + // that are connected to the common vertex. + TopoDS_Vertex aVCommon; + + if (TopExp::CommonVertex(theEdge1, theEdge2, aVCommon)) { + TopTools_IndexedDataMapOfShapeListOfShape aMapVE; + + TopExp::MapShapesAndAncestors + (aFace1, TopAbs_VERTEX, TopAbs_EDGE, aMapVE); + + if (aMapVE.Contains(aVCommon)) { + TopTools_ListIteratorOfListOfShape + anItE(aMapVE.FindFromKey(aVCommon)); + + for (; anItE.More(); anItE.Next()) { + const TopoDS_Shape &anEdge = anItE.Value(); + + if (!theEdge1.IsSame(anEdge) && + !theEdge2.IsSame(anEdge)) { + // There is another edge that shares the common vertex. + // Nothing to merge. + isSame = Standard_False; + break; + } + } + } else { + // Common vertex doesn't belong to the face. + // Nothing to merge. NEVERREACHED. + isSame = Standard_False; + } + } else { + // No common vertex. Nothing to merge. NEVERREACHED. + isSame = Standard_False; + } + } + break; } } diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx index b8471abe8..7b6075c2b 100644 --- a/src/CurveCreator/CurveCreator_Utils.cxx +++ b/src/CurveCreator/CurveCreator_Utils.cxx @@ -582,7 +582,7 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo for( aSelection->Init(); aSelection->More(); aSelection->Next() ) { #if OCC_VERSION_LARGE > 0x06080100 - const SelectMgr_HSensitiveEntity aHSenEntity = aSelection->Sensitive(); + const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive(); diff --git a/src/DependencyTree/resources/DependencyTree_msg_fr.ts b/src/DependencyTree/resources/DependencyTree_msg_fr.ts index 33c54ff5a..8e838db17 100644 --- a/src/DependencyTree/resources/DependencyTree_msg_fr.ts +++ b/src/DependencyTree/resources/DependencyTree_msg_fr.ts @@ -31,16 +31,14 @@ UPDATE Mise à jour - - DependencyTree_ViewModel MEN_REBUILD_THE_TREE - Rebuild the tree + Reconstruire l'arbre MEN_REDUCE_STUDY - Reduce study + Réduire l'étude diff --git a/src/DependencyTree/resources/DependencyTree_msg_ja.ts b/src/DependencyTree/resources/DependencyTree_msg_ja.ts index a463109e8..b53b0f588 100644 --- a/src/DependencyTree/resources/DependencyTree_msg_ja.ts +++ b/src/DependencyTree/resources/DependencyTree_msg_ja.ts @@ -5,40 +5,40 @@ DependencyTree_View DEPENDENCY_TREE - Dependency Tree + 依存関係ツリー MOVE_NODES - Move nodes + ノードの移動 HIERARCHY_DEPTH - Hierarchy depth + 階層の深さ DISPLAY_ASCENDANTS - Display ascendants + 上位の表示 DISPLAY_DESCENDANTS - Display descendants + 下位の表示 SHOW_ALL - Show all + すべてを表示 UPDATE - Update + 更新 DependencyTree_ViewModel MEN_REBUILD_THE_TREE - Rebuild the tree + ツリーの再構築 MEN_REDUCE_STUDY - Reduce study + スタディの削減 diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index a2d7c67a2..00b35eaec 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -26,7 +26,8 @@ // SALOME includes #include "EntityGUI_FeatureDetectorDlg.h" -#include +#include "ShapeRec_FeatureDetector.hxx" +#include "GEOM_Constants.h" #include #include @@ -399,7 +400,6 @@ void EntityGUI_FeatureDetectorDlg::SelectionIntoArgument() // TODO supprimer les lignes qui ne servent à rien le cas échéant SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); - std::map< std::string , std::vector >::iterator AISit; SOCC_Viewer* soccViewer = (SOCC_Viewer*)(theViewWindow->getViewManager()->getViewModel()); if (!myEditCurrentArgument->isEnabled()) @@ -433,24 +433,20 @@ void EntityGUI_FeatureDetectorDlg::SelectionIntoArgument() if ( myEditCurrentArgument == mySelectionGroup->LineEdit1 ) { myFace = aSelectedObject; - AISit = soccViewer->entry2aisobjects.find(myFaceEntry.toStdString()); - if (AISit == soccViewer->entry2aisobjects.end()) + + SalomeApp_Study* study = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); + if ( !study ) return; + LightApp_Application* app = ::qobject_cast( study->application() ); + if ( !app ) return; + SUIT_ViewManager* vm = app->activeViewManager(); + if ( !vm ) return; + PropMap propMap = study->getObjectProperties( vm->getGlobalId(), myFaceEntry ); + QString theImgFileName = propMap.value( GEOM::propertyName( GEOM::Texture ) ).toString(); + if ( theImgFileName.isEmpty() ) return; - - Handle(AIS_InteractiveObject) myAIS = (*AISit).second[0]; - Handle(GEOM_AISShape) myAISShape; - if( myAIS->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) { - myAISShape = Handle(GEOM_AISShape)::DownCast( myAIS ); - } - else - return ; - - std::string theImgFileName = myAISShape->TextureFile(); - if ( theImgFileName == "" ) - return ; // Setting the image caracteristics - myDetector->SetPath( theImgFileName ); + myDetector->SetPath( theImgFileName.toStdString() ); height = myDetector->GetImgHeight(); width = myDetector->GetImgWidth(); pictureLeft = -0.5 * width; // X coordinate of the top left corner of the background image in the view diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx index 74eacd8f8..425980457 100644 --- a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx +++ b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx @@ -188,9 +188,9 @@ bool EntityGUI_PictureImportDlg::execute( ObjectList& objects ) delete pixmap; GEOM::GEOM_Object_var P1 = aBasicOperations->MakePointXYZ( -0.5*width, -0.5*height, 0 ); - GEOM::GEOM_Object_var P2 = aBasicOperations->MakePointXYZ( -0.5*width, 0.5*height, 0 ); + GEOM::GEOM_Object_var P2 = aBasicOperations->MakePointXYZ( 0.5*width, -0.5*height, 0 ); GEOM::GEOM_Object_var P3 = aBasicOperations->MakePointXYZ( 0.5*width, 0.5*height, 0 ); - GEOM::GEOM_Object_var P4 = aBasicOperations->MakePointXYZ( 0.5*width, -0.5*height, 0 ); + GEOM::GEOM_Object_var P4 = aBasicOperations->MakePointXYZ( -0.5*width, 0.5*height, 0 ); GEOM::GEOM_Object_var aFace = aBlocksOperations->MakeQuad4Vertices(P1,P2,P3,P4); getDisplayer()->SetDisplayMode(3); diff --git a/src/EntityGUI/EntityGUI_PolylineDlg.cxx b/src/EntityGUI/EntityGUI_PolylineDlg.cxx index 7f8a52283..ed2f4ee36 100644 --- a/src/EntityGUI/EntityGUI_PolylineDlg.cxx +++ b/src/EntityGUI/EntityGUI_PolylineDlg.cxx @@ -162,6 +162,7 @@ EntityGUI_PolylineDlg::EntityGUI_PolylineDlg EntityGUI_PolylineDlg::~EntityGUI_PolylineDlg() { erasePreview(); + myEditorWidget->SetViewer2DMode(false); } //================================================================================= @@ -381,16 +382,6 @@ bool EntityGUI_PolylineDlg::ClickOnApply() return true; } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void EntityGUI_PolylineDlg::ClickOnCancel() -{ - myEditorWidget->SetViewer2DMode(false); - GEOMBase_Skeleton::ClickOnCancel(); -} - //================================================================================= // function : processStartedSubOperation // purpose : diff --git a/src/EntityGUI/EntityGUI_PolylineDlg.h b/src/EntityGUI/EntityGUI_PolylineDlg.h index 53ff8dfc9..3172a040b 100644 --- a/src/EntityGUI/EntityGUI_PolylineDlg.h +++ b/src/EntityGUI/EntityGUI_PolylineDlg.h @@ -152,7 +152,6 @@ protected slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void processStartedSubOperation( QWidget*, bool ); void processFinishedSubOperation( QWidget* ); void SetEditCurrentArgument( bool ); diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 29af40921..f489c89c2 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -632,15 +632,14 @@ void EntityGUI_SketcherDlg::RectClicked() SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); GroupRect->show(); - + myX1=0; - myX2=10; - myY1=0; - myY2=10; - GroupRect->SpinBox_DX1->setValue(myX1); + myY1=0; GroupRect->SpinBox_DY1->setValue(myY1); + myX2=10; GroupRect->SpinBox_DX2->setValue(myX2); + myY2=10; GroupRect->SpinBox_DY2->setValue(myY2); resize( minimumSizeHint() ); diff --git a/src/GEOM/GEOM_BaseObject.cxx b/src/GEOM/GEOM_BaseObject.cxx index 6c56f0f71..b2a5efca7 100644 --- a/src/GEOM/GEOM_BaseObject.cxx +++ b/src/GEOM/GEOM_BaseObject.cxx @@ -493,18 +493,17 @@ Handle(TColStd_HSequenceOfTransient) GEOM_BaseObject::GetLastDependency() */ //================================================================================ -Handle(TFunction_Driver) GEOM_BaseObject::GetCreationDriver() +Handle(TFunction_Driver) GEOM_BaseObject::GetCreationDriver(int funNb) { - Handle(TFunction_Driver) aDriver; - - Handle(GEOM_Function) function = GetFunction(1); + Handle(TFunction_Driver) driver; + Handle(GEOM_Function) function = GetFunction(funNb); if ( !function.IsNull() ) { Standard_GUID aGUID = function->GetDriverGUID(); - if ( TFunction_DriverTable::Get()->FindDriver(aGUID, aDriver)) - aDriver->Init( function->GetEntry() ); + if ( TFunction_DriverTable::Get()->FindDriver(aGUID, driver )) + driver->Init( function->GetEntry() ); } - return aDriver; + return driver; } //============================================================================= diff --git a/src/GEOM/GEOM_BaseObject.hxx b/src/GEOM/GEOM_BaseObject.hxx index 83388851f..68e6bdc5a 100644 --- a/src/GEOM/GEOM_BaseObject.hxx +++ b/src/GEOM/GEOM_BaseObject.hxx @@ -31,6 +31,8 @@ #include #include +#include + class GEOM_BaseObject; class Handle(TFunction_Driver); class GEOM_Engine; @@ -146,8 +148,8 @@ public: //Returns the dependencies of the last function Standard_EXPORT Handle(TColStd_HSequenceOfTransient) GetLastDependency(); - //Returns a driver creator of this object - Standard_EXPORT Handle(TFunction_Driver) GetCreationDriver(); + //Returns drivers creators of this object + Standard_EXPORT Handle(TFunction_Driver) GetCreationDriver(int funNb); //########################################################### // Internal methods diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx index ed44029e3..57184bff1 100644 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx @@ -222,6 +222,19 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace return iRet; } // +#if OCC_VERSION_LARGE > 0x06080000 + // Try to copy PCurve from old edge to the new one. + iRet = BOPTools_AlgoTools2D::AttachExistingPCurve(aEold, aEnew, aF, aCtx); + + if (iRet) { + // Do PCurve using projection algorithm. + iRet = 0; + } else { + // The PCurve is attached successfully. + return iRet; + } +#endif + // BOPTools_AlgoTools2D::BuildPCurveForEdgeOnFace(aEnew, aF); aC2D=BRep_Tool::CurveOnSurface(aEnew, aF, aT1, aT2); if (aC2D.IsNull()){ diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx index 6c1afa4e9..c7abe5e96 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx @@ -126,93 +126,75 @@ Standard_Integer GEOMAlgo_GetInPlaceAPI::GetInPlaceOld return 1; } - TopoDS_Shape aPntShape; - TopoDS_Vertex aVertex; - bool isFound = false; - TopAbs_ShapeEnum iType = TopAbs_SOLID; - //Standard_Real aWhat_Mass = 0., aWhere_Mass = 0.; - Standard_Real tab_aWhat[4], tab_aWhere[4]; - Standard_Real dl_l = 1e-3; - Standard_Real min_l, Tol_0D, Tol_1D, Tol_2D, Tol_3D, Tol_Mass; - Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; - Bnd_Box BoundingBox; - gp_Pnt aPnt, aPnt_aWhat, tab_Pnt[2]; - GProp_GProps aProps; + // Check shape type. + TopAbs_ShapeEnum iType = GEOMUtils::GetTypeOfSimplePart(theWhat); - iType = GEOMUtils::GetTypeOfSimplePart(theWhat); if (iType == TopAbs_SHAPE) { // Error: An attempt to extract a shape of not supported type. return 2; } - TopExp_Explorer Exp_aWhat ( theWhat, iType ); - TopExp_Explorer Exp_aWhere ( theWhere, iType ); - TopExp_Explorer Exp_Edge ( theWhere, TopAbs_EDGE ); + // Compute confusion tolerance. + Standard_Real aTolConf = Precision::Confusion(); + Standard_Integer i; - // Find the shortest edge in theShapeWhere shape - BRepBndLib::Add(theWhere, BoundingBox); - BoundingBox.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); - min_l = fabs(aXmax - aXmin); - if( min_l < fabs(aYmax - aYmin) ) min_l = fabs(aYmax - aYmin); - if( min_l < fabs(aZmax - aZmin) ) min_l = fabs(aZmax - aZmin); - min_l /= dl_l; - // Mantis issue 0020908 BEGIN - if (!Exp_Edge.More()) { - min_l = Precision::Confusion(); - } - // Mantis issue 0020908 END - for ( Standard_Integer nbEdge = 0; Exp_Edge.More(); Exp_Edge.Next(), nbEdge++ ) { - TopExp_Explorer Exp_Vertex( Exp_Edge.Current(), TopAbs_VERTEX); - for ( Standard_Integer nbVertex = 0; Exp_Vertex.More(); Exp_Vertex.Next(), nbVertex++ ) { - aPnt = BRep_Tool::Pnt( TopoDS::Vertex( Exp_Vertex.Current() ) ); - tab_Pnt[nbVertex] = aPnt; - } - if ( ! tab_Pnt[0].IsEqual(tab_Pnt[1], dl_l) ) { - BRepGProp::LinearProperties(Exp_Edge.Current(), aProps); - if ( aProps.Mass() < min_l ) min_l = aProps.Mass(); + for (i = 0; i < 2; ++i) { + TopExp_Explorer anExp(i == 0 ? theWhere : theWhat, TopAbs_VERTEX); + + for (; anExp.More(); anExp.Next()) { + const TopoDS_Vertex aVtx = TopoDS::Vertex(anExp.Current()); + const Standard_Real aTolVtx = BRep_Tool::Tolerance(aVtx); + + if (aTolVtx > aTolConf) { + aTolConf = aTolVtx; + } } } - // Compute tolerances - Tol_0D = dl_l; - Tol_1D = dl_l * min_l; - Tol_2D = dl_l * ( min_l * min_l) * ( 2. + dl_l); - Tol_3D = dl_l * ( min_l * min_l * min_l ) * ( 3. + (3 * dl_l) + (dl_l * dl_l) ); + // Compute mass tolerance. + Bnd_Box aBoundingBox; + Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; + Standard_Real aMassTol; - if (Tol_0D < Precision::Confusion()) Tol_0D = Precision::Confusion(); - if (Tol_1D < Precision::Confusion()) Tol_1D = Precision::Confusion(); - if (Tol_2D < Precision::Confusion()) Tol_2D = Precision::Confusion(); - if (Tol_3D < Precision::Confusion()) Tol_3D = Precision::Confusion(); + BRepBndLib::Add(theWhere, aBoundingBox); + BRepBndLib::Add(theWhat, aBoundingBox); + aBoundingBox.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + aMassTol = Max(aXmax - aXmin, aYmax - aYmin); + aMassTol = Max(aMassTol, aZmax - aZmin); + aMassTol *= aTolConf; - Tol_Mass = Tol_3D; - if ( iType == TopAbs_VERTEX ) Tol_Mass = Tol_0D; - else if ( iType == TopAbs_EDGE ) Tol_Mass = Tol_1D; - else if ( iType == TopAbs_FACE ) Tol_Mass = Tol_2D; - - // Searching for the sub-shapes inside the ShapeWhere shape + // Compute the result. + TopExp_Explorer Exp_aWhat (theWhat, iType); + TopExp_Explorer Exp_aWhere (theWhere, iType); + Standard_Real tab_aWhat[4], tab_aWhere[4]; + gp_Pnt aPnt, aPnt_aWhat; + TopoDS_Shape aPntShape; + TopoDS_Vertex aVertex; + bool isFound = false; TopTools_MapOfShape map_aWhere; - for ( Exp_aWhere.ReInit(); Exp_aWhere.More(); Exp_aWhere.Next() ) { + + for (; Exp_aWhere.More(); Exp_aWhere.Next()) { if (!map_aWhere.Add(Exp_aWhere.Current())) continue; // skip repeated shape to avoid mass addition GetShapeProperties( Exp_aWhere.Current(), tab_aWhere, aPnt ); for ( Exp_aWhat.ReInit(); Exp_aWhat.More(); Exp_aWhat.Next() ) { GetShapeProperties( Exp_aWhat.Current(), tab_aWhat, aPnt_aWhat ); - if ( fabs(tab_aWhat[3] - tab_aWhere[3]) <= Tol_Mass && aPnt_aWhat.Distance(aPnt) <= Tol_1D ) + if (fabs(tab_aWhat[3] - tab_aWhere[3]) <= aMassTol && aPnt_aWhat.Distance(aPnt) <= aTolConf) isFound = true; else { - if ( (tab_aWhat[3] - tab_aWhere[3]) > Tol_Mass ) { + if ((tab_aWhat[3] - tab_aWhere[3]) > aMassTol) { aPntShape = BRepBuilderAPI_MakeVertex( aPnt ).Shape(); aVertex = TopoDS::Vertex( aPntShape ); BRepExtrema_DistShapeShape aWhereDistance ( aVertex, Exp_aWhere.Current() ); BRepExtrema_DistShapeShape aWhatDistance ( aVertex, Exp_aWhat.Current() ); - if ( aWhereDistance.IsDone() && aWhatDistance.IsDone() && - fabs(aWhereDistance.Value() - aWhatDistance.Value()) <= Tol_1D ) + if (aWhereDistance.IsDone() && aWhatDistance.IsDone() && + fabs(aWhereDistance.Value() - aWhatDistance.Value()) <= aTolConf) { // 0020162: "EDF 961 GEOM : Getinplace is getting additionnal orthogonal faces" // aVertex must be projected to the same point on Where and on What gp_Pnt pOnWhat = aWhatDistance.PointOnShape2(1); gp_Pnt pOnWhere = aWhereDistance.PointOnShape2(1); - isFound = ( pOnWhat.Distance(pOnWhere) <= Tol_1D ); + isFound = (pOnWhat.Distance(pOnWhere) <= aTolConf); if ( isFound && iType == TopAbs_FACE ) { // check normals at pOnWhat and pOnWhere diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx index 785ceb416..f5f509496 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx @@ -424,19 +424,18 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF, aPx[i]=aInfoEx.Location(); } // + Standard_Boolean isRectangle = Standard_True; for (i=0; i<4; ++i) { j=(i==3) ? 0 : i+1; aDot=aDx[i]*aDx[j]; if (fabs (aDot) > myTolerance) { - aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE); - return; + isRectangle = Standard_False; + break; } } // // rectangle - aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE); - // - // shift location to the center and calc. sizes + // shift location to the center aXYZc.SetCoord(0.,0.,0.); TopExp::MapShapes(aF, TopAbs_VERTEX, aMV); for (i=1; i<=aNbV; ++i) { @@ -448,33 +447,41 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF, // // Location : aPc in center of rectangle // Position : 0z is plane normal - // 0x is along length + // 0x is along the first edge (quadrangle) or + // along length (rectangle) // aXYZc.Divide(4.); aPc.SetXYZ(aXYZc); - // - gp_Lin aL0(aPx[0], aDx[0]); - gp_Lin aL1(aPx[1], aDx[1]); - // - aD0=aL0.Distance(aPc); - aD1=aL1.Distance(aPc); - // - aLength=aD0; - aWidth =aD1; - aDX=aL1.Direction(); - if (aD0aD1) { + aLength=aD0; + aWidth =aD1; + aDX=aDx[1]; + } + // + aLength=2.*aLength; + aWidth =2.*aWidth; + // + aInfo.SetLength(aLength); + aInfo.SetWidth(aWidth); + aInfo.SetKindOfName(GEOMAlgo_KN_RECTANGLE); + } else { + aInfo.SetKindOfName(GEOMAlgo_KN_QUADRANGLE); } // - aLength=2.*aLength; - aWidth =2.*aWidth; - // - aInfo.SetLocation(aPc); - aInfo.SetLength(aLength); - aInfo.SetWidth(aWidth); - // const gp_Dir& aDZ=aPln.Axis().Direction(); gp_Ax2 aAx2(aPc, aDZ, aDX); gp_Ax3 aAx3(aAx2); diff --git a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx index 88f76b7d8..5c3681e28 100644 --- a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx +++ b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx @@ -21,9 +21,13 @@ // Author : Edward AGAPOV (eap) #include "GEOMGUI_CreationInfoWdg.h" + +#include "GEOMImpl_Types.hxx" -#include #include +#include +#include +#include #include #include @@ -38,33 +42,16 @@ GEOMGUI_CreationInfoWdg::GEOMGUI_CreationInfoWdg( SalomeApp_Application* app ) //:QWidget( app->desktop() ) { setWindowTitle( tr( "CREATION_INFO_TITLE" ) ); - setObjectName( "geomCreationInformation" ); - QFrame* frame = new QFrame( this ); - - QVBoxLayout* myLayout = new QVBoxLayout( this ); - myLayout->addWidget( frame ); - myLayout->setMargin(0); - - QGroupBox* operationGB = new QGroupBox( tr( "OPERATION" ), frame ); - - myIconLbl = new QLabel( operationGB ); - myOperaionLnEd = new QLineEdit( operationGB ); - myOperaionLnEd->setReadOnly( true ); - myParamsTreeWd = new QTreeWidget( frame ); + myParamsTreeWd = new QTreeWidget( this ); myParamsTreeWd->setColumnCount( 2 ); myParamsTreeWd->setHeaderLabels( QStringList() << tr( "PARAMETER" ) << tr( "VALUE" ) ); myParamsTreeWd->header()->setStretchLastSection( true ); myParamsTreeWd->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); - QHBoxLayout* operationLay = new QHBoxLayout( operationGB ); - operationLay->addWidget( myIconLbl ); - operationLay->addWidget( myOperaionLnEd ); - operationLay->setMargin(5); - - QVBoxLayout* aLayout = new QVBoxLayout( frame ); - aLayout->addWidget( operationGB ); + QVBoxLayout* aLayout = new QVBoxLayout( this ); aLayout->addWidget( myParamsTreeWd ); + aLayout->setMargin(11); // get a free dockable window id myWindowID = 10; @@ -73,19 +60,26 @@ GEOMGUI_CreationInfoWdg::GEOMGUI_CreationInfoWdg( SalomeApp_Application* app ) ++myWindowID; // pb when a GEOM is a sole module: CreationInfoWdg replaces Python console } -void GEOMGUI_CreationInfoWdg::setOperation(const QPixmap& icon, const QString& name) -{ - myIconLbl->setPixmap( icon ); - myOperaionLnEd->setText( name ); - - if ( name.isEmpty() ) - myOperaionLnEd->setText( tr("NO_INFO")); -} - -void GEOMGUI_CreationInfoWdg::addParam (const QString& name, const QString& value) +QTreeWidgetItem* GEOMGUI_CreationInfoWdg::addOperation(const QPixmap& icon, const QString& name) { QTreeWidgetItem* item = new QTreeWidgetItem( myParamsTreeWd ); + item->setIcon( 0, icon ); + item->setText( 0, name ); + if ( name.isEmpty() ) + item->setText( 0, tr("NO_INFO")); + + item->setExpanded( true ); + + return item; +} + +void GEOMGUI_CreationInfoWdg::addParam (QTreeWidgetItem* operation, + const QString& name, + const QString& value) +{ + QTreeWidgetItem* item = new QTreeWidgetItem( operation ); + //item->setFlags( Qt::NoItemFlags ); item->setExpanded( true ); @@ -95,8 +89,6 @@ void GEOMGUI_CreationInfoWdg::addParam (const QString& name, const QString& valu void GEOMGUI_CreationInfoWdg::clear() { - myIconLbl->setPixmap( QPixmap() ); - myOperaionLnEd->setText( "" ); myParamsTreeWd->clear(); } @@ -104,3 +96,57 @@ GEOMGUI_CreationInfoWdg::~GEOMGUI_CreationInfoWdg() { //std::cout<<"~GEOMGUI_CreationInfoWdg"< 0 ) + { + SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); + for ( int j = 0, nb = info.length(); j < nb; ++j ) + { + QString name = info[j].operationName.in(); + if ( !name.isEmpty() ) + { + // get plugin_name if any + QString plugin_name; + for ( size_t i = 0; i < info[j].params.length(); ++i ) + { + QString value = info[j].params[i].name.in(); + if ( value == PLUGIN_NAME ) + plugin_name = info[j].params[i].value.in(); + } + // get icon + QString prefix = plugin_name.isEmpty() ? "GEOM" : plugin_name; + icon = resMgr->loadPixmap( prefix, tr( ("ICO_"+name).toLatin1().constData() ), false ); + + // translate operation name + operationName = tr( ("MEN_"+name).toLatin1().constData() ); + if ( operationName.startsWith( "MEN_" )) + operationName = name; // no translation + + QTreeWidgetItem* operation = addOperation( icon, operationName ); + + // add parameters + for ( size_t i = 0; i < info[j].params.length(); ++i ) + addParam( operation, + info[j].params[i].name.in(), + info[j].params[i].value.in() ); + } + } + } + else + { + addOperation( icon, operationName ); + } + } + catch (...) + { + } +} diff --git a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h index 923b5ea91..de935e8f7 100644 --- a/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h +++ b/src/GEOMGUI/GEOMGUI_CreationInfoWdg.h @@ -22,12 +22,16 @@ #include "GEOM_GEOMGUI.hxx" +#include +#include CORBA_SERVER_HEADER(GEOM_Gen) + #include -class QString; class QLabel; class QLineEdit; +class QString; class QTreeWidget; +class QTreeWidgetItem; class SalomeApp_Application; /*! @@ -46,16 +50,18 @@ class GEOMGUI_EXPORT GEOMGUI_CreationInfoWdg : public QWidget GEOMGUI_CreationInfoWdg( SalomeApp_Application* app ); ~GEOMGUI_CreationInfoWdg(); - int getWinID() { return myWindowID; } - + void setInfo( GEOM::CreationInformationSeq& info ); void clear(); - void setOperation(const QPixmap& icon, const QString& name); - void addParam (const QString& name, const QString& value); + + int getWinID() { return myWindowID; } private: - QLabel* myIconLbl; - QLineEdit* myOperaionLnEd; + QTreeWidgetItem* addOperation(const QPixmap& icon, const QString& name); + void addParam (QTreeWidgetItem* operation, const QString& name, const QString& value); + + QLabel* myIconLbl; + //QLineEdit* myOperaionLnEd; QTreeWidget* myParamsTreeWd; int myWindowID; diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index efb4dcd6b..8bed68fb2 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -179,7 +179,7 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, for ( sel->Init(); sel->More(); sel->Next() ) { #if OCC_VERSION_LARGE > 0x06080100 - const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive(); + const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if( aHSenEntity.IsNull() ) continue; diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 9e13e729b..8c43d9c84 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -541,7 +541,7 @@ Please, select face, shell or solid and try again GEOM_CYLINDER_ANGLE_ERR - Angle values 0 and 360 are unsafe to build proper volumes. Please uncheck the "Angle" box to use the regular cylinder constructor. + Angle values 0 and 360 are unsafe to build proper volumes. Please uncheck the "Angle" box to use the regular cylinder constructor. GEOM_D1 @@ -2477,12 +2477,12 @@ Please, select face, shell or solid and try again 2D Polyline - TOP_CURVE_CREATOR - Create 2D polyline + TOP_CURVE_CREATOR + Create 2D polyline - STB_CURVE_CREATOR - Create 2D polyline + STB_CURVE_CREATOR + Create 2D polyline MEN_ALL_SEL_ONLY @@ -3270,7 +3270,7 @@ Please, select face, shell or solid and try again PREF_DEFLECTION - Deflection coefficient + Default deflection coefficient GEOM_PREF_def_precision @@ -3318,7 +3318,7 @@ Please, select face, shell or solid and try again PREF_TRANSPARENCY - Transparency + Default transparency PREF_FREE_BOUND_COLOR @@ -3342,7 +3342,7 @@ Please, select face, shell or solid and try again PREF_GROUP_VERTEX - Marker of Points + Default marker of points PREF_ISOS_COLOR @@ -3422,11 +3422,11 @@ Please, select face, shell or solid and try again PREF_EDGE_WIDTH - Edges width + Default edges width PREF_ISOLINES_WIDTH - Iso lines width + Default isolines width PREF_PREVIEW_EDGE_WIDTH @@ -3486,7 +3486,7 @@ Please, select face, shell or solid and try again PREF_ISOS - Number of isolines + Default number of isolines PREF_ISOS_U @@ -5759,23 +5759,23 @@ shells and solids on the other hand. - CurveCreator_TableView - - TABLE_SECTION - Section - - - TABLE_INDEX - Index - - - TABLE_X - X - - - TABLE_Y - Y - + CurveCreator_TableView + + TABLE_SECTION + Section + + + TABLE_INDEX + Index + + + TABLE_X + X + + + TABLE_Y + Y + CurveCreator_Widget @@ -7199,7 +7199,7 @@ Do you want to create new material? Main shape - GEOM_INSPECT_OBJECT_SHOW + GEOM_INSPECT_OBJECT_SHOW Show Selected @@ -7322,22 +7322,22 @@ Do you want to create new material? GEOM_CHECK_INTE_V_E Vertex to Edge + all above - - GEOM_CHECK_INTE_E_E - Edge to Edge + all above - - - GEOM_CHECK_INTE_V_F - Vertex to Face + all above - - - GEOM_CHECK_INTE_E_F - Edge to Face + all above - - - GEOM_CHECK_INTE_ALL - Face to Face + all above - + + GEOM_CHECK_INTE_E_E + Edge to Edge + all above + + + GEOM_CHECK_INTE_V_F + Vertex to Face + all above + + + GEOM_CHECK_INTE_E_F + Edge to Face + all above + + + GEOM_CHECK_INTE_ALL + Face to Face + all above + MeasureGUI_FastCheckIntersectionsDlg @@ -7549,16 +7549,16 @@ Do you want to create new material? TransformationGUI_ProjectionOnCylDlg - GEOM_PROJ_ON_CYL_TITLE - Projection On A Cylinder + GEOM_PROJ_ON_CYL_TITLE + Projection On A Cylinder - GEOM_PROJ_ON_CYL_START_ANGLE - Starting angle + GEOM_PROJ_ON_CYL_START_ANGLE + Starting angle - GEOM_PROJ_ON_CYL_LENGTH_ANGLE - Length angle + GEOM_PROJ_ON_CYL_LENGTH_ANGLE + Length angle diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 54b86aee7..0d8d4623c 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -679,6 +679,18 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_EXTRUSION_TITLE Construction par extrusion + + GEOM_THICKNESS_TITLE + Epaississement + + + GEOM_THICKNESS_NAME + Epaississement + + + GEOM_TOWARDS_INSIDE + Epaissit vers l'intérieur + GEOM_SCALE_PRISM Appliquer le facteur d'échelle @@ -1252,6 +1264,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_PROJECTION_TITLE Projection sur une face + + GEOM_PROJECTION_NAME + Projection + GEOM_PROJ_ON_FACE_SOURCE Point, arête ou contour source @@ -1400,6 +1416,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_SELECT_UNPUBLISHED_EDGES Choisir les arêtes non-publiées + + GEOM_GENERATE_GROUPS + Générer les groupes + + + GEOM_GROUP_NAME_PREFIX + Préfixe des groupes + GEOM_PLANE Plan @@ -2408,6 +2432,26 @@ Choisissez une face, une coque ou un solide et essayez de nouveau WRN_NULL_OBJECT_OR_SHAPE La forme %1 pour la création d'un solide est invalide + + GROUP_DOWN + Bas + + + GROUP_UP + Haut + + + GROUP_SIDE1 + Gauche + + + GROUP_SIDE2 + Droite + + + GROUP_OTHER + Autre + GEOM_X X : @@ -2433,12 +2477,12 @@ Choisissez une face, une coque ou un solide et essayez de nouveau Créateur de courbe - TOP_CURVE_CREATOR - Créer une courbe + TOP_CURVE_CREATOR + Créer une courbe - STB_CURVE_CREATOR - Créer une courbe + STB_CURVE_CREATOR + Créer une courbe MEN_ALL_SEL_ONLY @@ -2840,6 +2884,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_PROJECTION Projection + + MEN_PROJ_ON_CYL + Projection sur un cylindre + MEN_OPERATIONS Opérations @@ -2860,6 +2908,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_PIPE_PATH Retrouver le chemin + + MEN_THICKNESS + Epaisseur + MEN_PLANE Plan @@ -3218,7 +3270,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_DEFLECTION - Coefficient de déformation + Coefficient de déformation par défaut GEOM_PREF_def_precision @@ -3266,7 +3318,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_TRANSPARENCY - Transparence + Transparence par défaut PREF_FREE_BOUND_COLOR @@ -3290,7 +3342,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_GROUP_VERTEX - Marqueurs de points + Marqueurs de points par défaut PREF_ISOS_COLOR @@ -3298,7 +3350,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_LABEL_COLOR - Color of labels + Couleur des étiquettes PREF_TOPLEVEL_COLOR @@ -3370,11 +3422,11 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_EDGE_WIDTH - Epaisseur des arêtes + Epaisseur des arêtes par défaut PREF_ISOLINES_WIDTH - Epaisseur des isolignes + Epaisseur des isolignes par défaut PREF_PREVIEW_EDGE_WIDTH @@ -3430,11 +3482,11 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_HIDE_INPUT_OBJECT - Hide input objects from the viewer + Cacher dans la vue les objets en entrée PREF_ISOS - Nombre d'isolignes + Nombre d'isolignes par défaut PREF_ISOS_U @@ -3804,6 +3856,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_PROJECTION Projeter un point, une arête ou un contour sur une face + + STB_PROJ_ON_CYL + Projète un contour ou une face sur un cylindre + STB_ORIGIN_AND_VECTORS Créer les vecteurs de base et l'origine @@ -3820,6 +3876,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_PIPE_PATH Retrouver le chemin à partir d'un objet de type tuyau + + STB_THICKNESS + Crée un solide par ajout d'épaisseur + STB_PLANE Créer un plan @@ -3966,7 +4026,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_NAME_MODE - Show/Hide names of visible shapes + Montrer/cacher le nom des objets visibles STB_SHADING_COLOR @@ -4424,6 +4484,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_PROJECTION Projection + + TOP_PROJ_ON_CYL + Projection sur un cylindre + TOP_ORIGIN_AND_VECTORS Créer l'origine et les vecteurs de base @@ -4440,6 +4504,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_PIPE_PATH Retrouver le chemin + + TOP_THICKNESS + Epaississement + TOP_PLANE Créer un plan @@ -5395,22 +5463,6 @@ le paramètre '%1' aux préférences du module Géométrie.TOOL_IMPORTEXPORT Import / Export XAO - - TABLE_SECTION - Section - - - TABLE_INDEX - Indice - - - TABLE_X - X - - - TABLE_Y - Y - BasicGUI_CurveDlg @@ -5706,6 +5758,25 @@ le paramètre '%1' aux préférences du module Géométrie.X=%1, Y=%2, Z=%3 + + CurveCreator_TableView + + TABLE_SECTION + Section + + + TABLE_INDEX + Indice + + + TABLE_X + X + + + TABLE_Y + Y + + CurveCreator_Widget @@ -6064,10 +6135,6 @@ Le nombre de points n'est pas suffisant GEOM_ADD_THICKNESS Epaissir (arêtes ou contours uniquement) - - GEOM_TOWARDS_INSIDE - Epaissir vers l'intérieur - GroupGUI @@ -7132,7 +7199,7 @@ Voulez-vous en créer un nouveau ? Forme principale - GEOM_INSPECT_OBJECT_SHOW + GEOM_INSPECT_OBJECT_SHOW Afficher la sélection @@ -7255,22 +7322,22 @@ Voulez-vous en créer un nouveau ? GEOM_CHECK_INTE_V_E Point à arête + tout au-delà - - GEOM_CHECK_INTE_E_E - Arête à arête + tout au-delà - - - GEOM_CHECK_INTE_V_F - Point à face + tout au-delà - - - GEOM_CHECK_INTE_E_F - Arête à Face + tout au-delà - - - GEOM_CHECK_INTE_ALL - Face à Face + tout au-delà - + + GEOM_CHECK_INTE_E_E + Arête à arête + tout au-delà + + + GEOM_CHECK_INTE_V_F + Point à face + tout au-delà + + + GEOM_CHECK_INTE_E_F + Arête à Face + tout au-delà + + + GEOM_CHECK_INTE_ALL + Face à Face + tout au-delà + MeasureGUI_FastCheckIntersectionsDlg @@ -7479,4 +7546,19 @@ Voulez-vous en créer un nouveau ? Matériaux: %1 de %2 + + TransformationGUI_ProjectionOnCylDlg + + GEOM_PROJ_ON_CYL_TITLE + Projection sur un cylindre + + + GEOM_PROJ_ON_CYL_START_ANGLE + Angle de départ + + + GEOM_PROJ_ON_CYL_LENGTH_ANGLE + Longueur de l'angle + + diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts index 5f181fa6e..6efba76e0 100644 --- a/src/GEOMGUI/GEOM_msg_ja.ts +++ b/src/GEOMGUI/GEOM_msg_ja.ts @@ -35,6 +35,14 @@ DEVIDE_EDGE_NEW_OBJECT_NAME NewObject + + DEVIDE_EDGE_BAD_PROJ_MSG + エッジ外側の投影 + + + DEVIDE_EDGE_BY_PROJ_POINT + 投影点 + ERROR_SHAPE_TYPE 選択したオブジェクトの種類が正しくありません！\nフェース、シェルまたはソリッドを選択し、もう一度やり直してください。 @@ -403,6 +411,10 @@ GEOM_NONBLOCKS GroupeSolidesNonBlocs + + GEOM_USE_C1_CRITERION + C1 criterion の使用 + GEOM_CHECK_INFOS オブジェクトとその位相情報 @@ -412,12 +424,12 @@ 自己交差の検出 - GEOM_FAST_CHECK_INTERSECTIONS - Fast intersection + GEOM_FAST_CHECK_INTERSECTIONS + クイック交点 - GEOM_SHAPE_STATISTICS - Shape Statistics + GEOM_SHAPE_STATISTICS + Shape Statistics GEOM_CHECK_SELF_INTERSECTIONS_FAILED @@ -541,7 +553,7 @@ GEOM_CYLINDER_ANGLE_ERR - Angle values 0 and 360 are unsafe to build proper volumes. Please uncheck the "Angle" box to use the regular cylinder constructor. + 角度値0°と360°はボリューム構築には不適切です。標準の円筒構築機能を使用するために角度ボックスのチェックを外してください。 GEOM_D1 @@ -679,6 +691,18 @@ GEOM_EXTRUSION_TITLE 面の押出し + + GEOM_THICKNESS_TITLE + 厚みの構築 + + + GEOM_THICKNESS_NAME + Thickness + + + GEOM_TOWARDS_INSIDE + 内側への厚み + GEOM_SCALE_PRISM 面のサイズを変えながら押し出す @@ -711,25 +735,29 @@ GEOM_FACE_FFW 顔輪郭またはエッジからの作成 + + GEOM_FACE_FROM_SURFACE + ワイヤによる境界面からの面作成 + GEOM_FACE_OPT 平らなフェースを作成 - GEOM_FACE_FFWC - Face creation from wire and constraints + GEOM_FACE_FFWC + ワイヤと拘束点からの面作成 - GEOM_CONSTRAINTS - Constraints + GEOM_CONSTRAINTS + 拘束 - GEOM_FACE_CONSTRAINT - Constraint Face + GEOM_FACE_CONSTRAINT + 拘束面 - GEOM_SOLID_FROM_FACE_OPT - Intersect/sew shapes + GEOM_SOLID_FROM_FACE_OPT + 形状の交差・縫合 MAKE_FACE_TOLERANCE_TOO_BIG @@ -855,6 +883,10 @@ GEOM_FREE_FACES フリーフェース + + GEOM_FREE_FACES_NAME + Free_face + GEOM_FREE_FACES_TITLE フリーフェース @@ -887,6 +919,14 @@ GEOM_GLUE_EDGES_TITLE エッジ固着 + + GEOM_GLUE_EDGES_DETECT_TITLE + 一致エッジ検出 + + + GEOM_GLUE_FACES_DETECT_TITLE + 一致面検出 + GLUE_ERROR_STICKED_SHAPES 公差の値が大きすぎます。「付着」図形の検出。 @@ -1220,16 +1260,48 @@ 加工図 - GEOM_PROJECTION - Projection + GEOM_PROJECTION_ON_FACE + 面上の投影 + + + GEOM_PROJECTION_ON_WIRE + ワイヤ上の投影 + + + GEOM_PROJECTION_ON_EDGE + エッジ上の投影 GEOM_PROJECTION_TITLE フェース上に投影 - GEOM_SOURCE_OBJECT - 基になるポイント、エッジ、またはワイヤー + GEOM_PROJECTION_NAME + Projection + + + GEOM_PROJ_ON_FACE_SOURCE + ソース頂点、エッジまたはワイヤ + + + GEOM_PROJ_ON_FACE_TARGET + ターゲット面 + + + GEOM_PROJ_ON_WIRE_SOURCE + ソース頂点 + + + GEOM_PROJ_ON_WIRE_TARGET + ターゲットワイヤ + + + GEOM_PROJ_ON_EDGE_SOURCE + ソース頂点 + + + GEOM_PROJ_ON_EDGE_TARGET + ターゲットエッジ GEOM_SOLUTION @@ -1239,10 +1311,6 @@ GEOM_SOLUTION_I %1 のソリューション - - GEOM_TARGET_OBJECT - 目的面 - GEOM_WITH_CONTACT 接触している @@ -1359,6 +1427,14 @@ GEOM_SELECT_UNPUBLISHED_EDGES 非公開のエッジを選択 + + GEOM_GENERATE_GROUPS + グループの作成 + + + GEOM_GROUP_NAME_PREFIX + グループ名Prefix + GEOM_PLANE Plane @@ -1675,6 +1751,10 @@ GEOM_SELECTED_SHAPE 選択した形状 + + GEOM_SELECTED_SHAPES + 選択済み形状 + GEOM_SELECTION 選択 @@ -1953,11 +2033,11 @@ GEOM_SOLID_SHELLS - Make Solid From Shells + シェルからソリッドの作成 GEOM_SOLID_FACES - Make Solid From Connected Set Of Faces/Shells + 接続された面、シェルからソリッド作成 GEOM_SPHERE @@ -2363,6 +2443,26 @@ WRN_NULL_OBJECT_OR_SHAPE ソリッド作成のオブジェクト %1 が無効 + + GROUP_DOWN + 下 + + + GROUP_UP + 上 + + + GROUP_SIDE1 + 横1 + + + GROUP_SIDE2 + 横2 + + + GROUP_OTHER + その他 + GEOM_X X : @@ -2389,11 +2489,11 @@ TOP_CURVE_CREATOR - Create 2D polyline + 2Dポリラインの作成 STB_CURVE_CREATOR - Create 2D polyline + 2Dポリラインの作成 MEN_ALL_SEL_ONLY @@ -2468,8 +2568,8 @@ 自己交差の確認 - MEN_FAST_CHECK_INTERSECTIONS - Fast intersection + MEN_FAST_CHECK_INTERSECTIONS + クイック交点 MEN_SHAPE_STATISTICS @@ -2795,6 +2895,10 @@ MEN_PROJECTION 投影 + + MEN_PROJ_ON_CYL + 円筒の投影 + MEN_OPERATIONS 操作 @@ -2815,6 +2919,10 @@ MEN_PIPE_PATH 経路の復元 + + MEN_THICKNESS + 厚み + MEN_PLANE 平面 @@ -2929,12 +3037,12 @@ MEN_POP_VERTICES - Show Vertices + 頂点の表示 MEN_POP_SHOW_NAME - Show Name - + 名前の表示 + MEN_PREFERENCES 設定 @@ -3023,13 +3131,17 @@ MEN_ISOLINE 等高線 + + MEN_SURFACE_FROM_FACE + 面から表面 + MEN_SOLID ソリッド - MEN_SOLID_FROM_FACES - Solid from connected faces + MEN_SOLID_FROM_FACES + 接続された面からソリッド MEN_SOLID_SEL_ONLY @@ -3065,7 +3177,7 @@ MEN_MATERIALS_LIBRARY - 材料の特性 + 材料ライブラリ MEN_TEXTURE @@ -3113,19 +3225,19 @@ MEN_VERTICES_MODE_ON - Show Vertices + 頂点の表示 MEN_VERTICES_MODE_OFF - Hide Vertices + 頂点の非表示 MEN_NAME_MODE_ON - Show Name + 名前の表示 MEN_NAME_MODE_OFF - Hide Name + 名前の非表示 MEN_WIREFRAME @@ -3151,6 +3263,14 @@ MEN_POP_PREDEF_MATER_CUSTOM カスタム... + + MEN_EDGE_EXTEND + 拡張エッジ + + + MEN_FACE_EXTEND + 拡張面 + NAME_LBL 名前: @@ -3240,8 +3360,8 @@ 輪郭の色 - PREF_LABEL_COLOR - Color of labels + PREF_LABEL_COLOR + ラベルの色 PREF_TOPLEVEL_COLOR @@ -3373,7 +3493,7 @@ PREF_HIDE_INPUT_OBJECT - Hide input objects from the viewer + ビューワから入力したオブジェクトの非表示 PREF_ISOS @@ -3421,11 +3541,11 @@ MATERIAL_LIBRARY_TLT - 図書館資料 + 材料ライブラリ REMOVE_HOLES_NEW_OBJ_NAME - SuppressHoles + SupressHoles REMOVE_INT_WIRES_NEW_OBJ_NAME @@ -3492,12 +3612,12 @@ 自己交差の確認 - STB_FAST_CHECK_INTERSECTIONS - Fast intersection + STB_FAST_CHECK_INTERSECTIONS + クイック交点 - STB_SHAPE_STATISTICS - Shape Statistics + STB_SHAPE_STATISTICS + Shape Statistics STB_CHECK_FREE_BNDS @@ -3747,6 +3867,10 @@ STB_PROJECTION ポイント、エッジ、または輪郭上の 1 つの側面を投影 + + STB_PROJ_ON_CYL + 円筒上のワイヤまたは面を投影 + STB_ORIGIN_AND_VECTORS 起源と基底ベクトルを作成します。 @@ -3763,6 +3887,10 @@ STB_PIPE_PATH 経路の復元 + + STB_THICKNESS + 厚みのあるソリッドの作成 + STB_PLANE 平面を作成 @@ -3837,11 +3965,11 @@ STB_POP_VERTICES - Show Vertices + 頂点の表示 STB_POP_SHOW_NAME - Show Name + 名前の表示 STB_POP_SETTEXTURE @@ -3908,8 +4036,8 @@ エッジの表示モードを変更 - STB_NAME_MODE - Show/Hide names of visible shapes + STB_NAME_MODE + 表示中の形状の名前を表示/非表示 STB_SHADING_COLOR @@ -3939,6 +4067,10 @@ STB_ISOLINE UまたはV方向等高線の作成 + + STB_SURFACE_FROM_FACE + 面から表面の作成 + STB_SOLID ソリッドを構築 @@ -4017,7 +4149,7 @@ SUPRESS_FACE_NEW_OBJ_NAME - SuppressFaces + SupressFaces ShHealOper_ErrorExecution_msg @@ -4117,7 +4249,7 @@ TOP_FAST_CHECK_INTERSECTIONS - Fast intersection + クイック交点 TOP_SHAPE_STATISTICS @@ -4363,6 +4495,10 @@ TOP_PROJECTION 投影 + + TOP_PROJ_ON_CYL + 円筒上に投影 + TOP_ORIGIN_AND_VECTORS 起源と根拠のベクトルを作成します。 @@ -4379,6 +4515,10 @@ TOP_PIPE_PATH 経路の復元 + + TOP_THICKNESS + 厚み + TOP_PLANE 平面を作成 @@ -4511,6 +4651,10 @@ TOP_ISOLINE 等高線 + + TOP_SURFACE_FROM_FACE + 面から表面 + TOP_SOLID ソリッドを作成 @@ -4757,23 +4901,23 @@ MEN_UNION_FACES - 連合に直面しています。 + 面の共有 STB_UNION_FACES 連合に直面しています。 - TOP_INSPECT_OBJECT - Inspect Object + TOP_INSPECT_OBJECT + オブジェクトの点検 - MEN_INSPECT_OBJECT - Inspect Object + MEN_INSPECT_OBJECT + オブジェクトの点検 - STB_INSPECT_OBJECT - Inspect Object + STB_INSPECT_OBJECT + オブジェクトの点検 TOP_NORMALE @@ -4813,11 +4957,11 @@ MEN_POP_SHOW_DEPENDENCY_TREE - Show dependency tree + 依存ツリーの表示 MEN_POP_REDUCE_STUDY - Reduce study + スタディの削減 MEN_POP_SHOW_ALL_DIMENSIONS @@ -5067,6 +5211,30 @@ STB_GET_SHARED_SHAPES 共有アイテムを取得 + + TOP_TRANSFER_DATA + データ転送 + + + MEN_TRANSFER_DATA + データ転送 + + + STB_TRANSFER_DATA + データ転送 + + + TOP_EXTENSION + エッジまたは面の拡張 + + + MEN_EXTENSION + 拡張 + + + STB_EXTENSION + エッジまたは面の拡張 + GEOM_PUBLISH_RESULT_GRP 高度なオプション @@ -5085,63 +5253,63 @@ PREF_TAB_DEPENDENCY_VIEW - Dependency Tree + 依存ツリー PREF_HIERARCHY_TYPE - Hierarchy type + 階層タイプ MEN_ONLY_ASCENDANTS - Display only ascendants tree + ツリー上位のみ表示 MEN_ONLY_DESCENDANTS - Display only descendants tree + ツリー下位のみ表示 MEN_BOTH_ASCENDANTS_DESCENDANTS - Display both ascendants and descendants trees + ツリー上位と下位の両方表示 GEOM_MOVE_POSSIBILITY - Possibility to move nodes + ノード移動可能性 PREF_GROUP_DEPENDENCY_VIEW_COLOR - Color + 色 PREF_DEPENDENCY_VIEW_BACKGROUND_COLOR - Background color + 背景色 PREF_DEPENDENCY_VIEW_NODE_COLOR - Default node color + デフォルトノード色 PREF_DEPENDENCY_VIEW_MAIN_NODE_COLOR - Main node color + 主ノード色 PREF_DEPENDENCY_VIEW_UNPUBLISH_NODE_COLOR - Unpublished node color + 非公開ノード色 PREF_DEPENDENCY_VIEW_SELECT_NODE_COLOR - Selected node color + 選択ノード色 PREF_DEPENDENCY_VIEW_ARROW_COLOR - Default arrow color + デフォルト矢印色 PREF_DEPENDENCY_VIEW_HIGHLIGHT_ARROW_COLOR - Highlighted arrow color + ハイライト矢印色 PREF_DEPENDENCY_VIEW_SELECT_ARROW_COLOR - Selected arrow color + 選択矢印色 GEOM_ALL_IMPORT_FILES @@ -5197,39 +5365,51 @@ CC_PNT_ITEM_X_Y - X=%1, Y=%2 + X=%1, Y=%2 CC_PNT_ITEM_X_Y_Z - X=%1, Y=%2, Z=%3 + X=%1, Y=%2, Z=%3 - GEOM_FILTER - Filter + GEOM_FILTER + フィルタ - GEOM_LESS_THAN - Less Than + GEOM_LESS_THAN + 未満 - GEOM_LESSOREQUAL_THAN - Equal or Less Than + GEOM_LESSOREQUAL_THAN + 以下 - GEOM_GREAT_THAN - Greater Than + GEOM_GREAT_THAN + 超える - GEOM_GREATOREQUAL_THAN - Equal or Greater Than + GEOM_GREATOREQUAL_THAN + 以上 - GEOM_SOME_SHAPES_SELECTED - %1 shape(s) has(have) been selected + GEOM_SOME_SHAPES_SELECTED + %1 個選択済み - GEOM_NO_SHAPES_SELECTED - There are no shapes that meet filtering parameters + GEOM_NO_SHAPES_SELECTED + フィルタリングパラメータに適合する形状はありません + + + GEOM_HEALING_STATS_TITLE + 行われた変更 + + + GEOM_HEALING_STATS_COL_1 + カウント + + + GEOM_HEALING_STATS_COL_2 + 修正 GEOM_PLOT_DISTRIBUTION @@ -5240,71 +5420,55 @@ GeometryGUI TOOL_BASIC - Basic + 基本 TOOL_BLOCKS - Blocks + ブロック TOOL_BOOLEAN - Boolean operations + ブーリアン演算 TOOL_FEATURES - Modification + 修正 TOOL_GENERATION - Generation + 作成 TOOL_PRIMITIVES - Primitives + プリミティブ TOOL_TRANSFORMATION - Transformation + 変形 TOOL_BUILD - Build + 構築 TOOL_OPERATIONS - Operations + 操作 TOOL_PICTURES - Pictures + 画像 TOOL_ADVANCED - Advanced + 上級 TOOL_MEASURES - Inspection + 測定 TOOL_IMPORTEXPORT - Import / Export XAO - - - TABLE_SECTION - Section - - - TABLE_INDEX - Index - - - TABLE_X - X - - - TABLE_Y - Y + インポート / エクスポート XAO @@ -5551,35 +5715,35 @@ CurveCreator_NewSectionDlg SECTION_NAME - Name + 名前 SECTION_LINE_TYPE - Type + タイプ SECTION_POLYLINE_TYPE - Polyline + ポリライン SECTION_SPLINE_TYPE - Spline + スプライン SECTION_LINE_CLOSED - Closed + 閉じたライン SECTION_ADD_BTN - Add + 追加 SECTION_OK_BTN - Ok + Ok SECTION_CANCEL_BTN - Cancel + キャンセル ADD_NEW_SECTION @@ -5594,18 +5758,37 @@ CurveCreator_TreeViewModel X=%1, Y=%2 - X=%1, Y=%2 + X=%1, Y=%2 X=%1, Y=%2, Z=%3 - X=%1, Y=%2, Z=%3 + X=%1, Y=%2, Z=%3 + + + + CurveCreator_TableView + + TABLE_SECTION + Section + + + TABLE_INDEX + Index + + + TABLE_X + X + + + TABLE_Y + Y CurveCreator_Widget SECTION_GROUP_TITLE - Sections + 断面 UNDO @@ -5724,27 +5907,27 @@ EntityGUI_PolylineDlg POLYLINE_DLG_TITLE - Polyline Construction + ポリラインの構築 POLYLINE_TITLE - Polyline + ポリライン POLYLINE_NAME - Polyline + Polyline POLYLINE_IMPORT - Import polyline + ポリラインのインポート POLYLINE_ADD_SECTION - Add section + 断面の追加 POLYLINE_EDIT_SECTION - Edit section + 断面の編集 @@ -5957,10 +6140,6 @@ GEOM_ADD_THICKNESS 厚み追加（エッジまたはワイヤーのみ） - - GEOM_TOWARDS_INSIDE - 内側に向かって厚く - GroupGUI @@ -6268,11 +6447,11 @@ X - X + X Y - Y + Y Z @@ -6700,19 +6879,19 @@ WIDTH_FACTOR_TOL - Width factor tol. + Width factor tol. VOLUME_TOL - Volume tol. + Volume tol. TO_MERGE_SOLIDS - To merge solids + ソリッドのマージ 用 SELECT_ALL - 全選択 + すべて選択 @@ -6901,8 +7080,8 @@ Shared_%1 - GEOM_SHARED_SHAPES_MULTISHARE - Shared by all + GEOM_SHARED_SHAPES_MULTISHARE + すべてが共有する @@ -6940,55 +7119,55 @@ GEOMToolsGUI_ReduceStudyDlg GEOM_REDUCE_STUDY_TITLE - Reduce study + スタディの削減 GEOM_REDUCE_STUDY_KEPT_OBJECTS - Objects to be kept + 保持されたオブジェクト GEOM_REDUCE_STUDY_REMOVE_OBJECTS - Objects to be removed + 削除されたオブジェクト GEOM_REDUCE_STUDY_NAME - Name + Name GEOM_REDUCE_STUDY_OPTIONS - Options + オプション GEOM_REDUCE_STUDY_INTERMEDIATES - Intermediate objects + 中間オブジェクト GEOM_REDUCE_STUDY_SUB_OBJECTS - Sub-objects + サブオブジェクト GEOM_REDUCE_STUDY_KEEP - Keep + 保持 GEOM_REDUCE_STUDY_UNPUBLISH - Unpublish + 非公開 GEOM_REDUCE_STUDY_REMOVE - Remove + 削除 GEOM_REDUCE_STUDY_REMOVE_EMPTY_FOLDER - Remove empty folders + 空フォルダの削除 GEOM_REDUCE_STUDY_SOFT_REMOVAL - Soft removal + ソフト除去 GEOM_REDUCE_STUDY_WARNING_DELETE - Do you really want to delete intermediate objects? After applying this operation study will be broken. + 本当に中間オブジェクトを削除しますか？ この操作の適用後、スタディは無くなります。 @@ -7009,32 +7188,32 @@ RepairGUI_InspectObjectDlg - GEOM_INSPECT_OBJECT_TITLE - Inspect object + GEOM_INSPECT_OBJECT_TITLE + オブジェクト点検 - GEOM_INSPECT_OBJECT_MAIN_SHAPE - Main shape + GEOM_INSPECT_OBJECT_MAIN_SHAPE + 主形状 - GEOM_INSPECT_OBJECT_SHOW - Show Selected + GEOM_INSPECT_OBJECT_SHOW + 選択を表示 - GEOM_INSPECT_OBJECT_SHOW_ONLY - Show Only Selected + GEOM_INSPECT_OBJECT_SHOW_ONLY + 選択のみを表示 - GEOM_INSPECT_OBJECT_HIDE - Hide Selected + GEOM_INSPECT_OBJECT_HIDE + 選択を非表示 - GEOM_INSPECT_OBJECT_PUBLISH - Publish Selected + GEOM_INSPECT_OBJECT_PUBLISH + 選択を公開 - GEOM_INSPECT_OBJECT_NAME - Name + GEOM_INSPECT_OBJECT_NAME + 名前 @@ -7090,105 +7269,105 @@ V-Isoline - + MeasureGUI_CheckSelfIntersectionsDlg - GEOM_CHECK_INTE_INTERSECTIONS - Self-intersections + GEOM_CHECK_INTE_INTERSECTIONS + 自己交差 - GEOM_CHECK_INTE_SUBSHAPES - Sub-shapes + GEOM_CHECK_INTE_SUBSHAPES + サブ形状 - GEOM_CHECK_INTE_CHECK_LEVEL - Level of check + GEOM_CHECK_INTE_CHECK_LEVEL + チェックのレベル - GEOM_CHECK_INTE_SUMMARY - Summary + GEOM_CHECK_INTE_SUMMARY + サマリ - GEOM_CHECK_INTE_COMPUTE - Compute self-intersections + GEOM_CHECK_INTE_COMPUTE + 自己交差の計算 - GEOM_SELF_INTERSECTION_NAME - Self_intersection + GEOM_SELF_INTERSECTION_NAME + 自己交差 - GEOM_NO_SELF_INTERSECTIONS - There are no self-intersections in the shape + GEOM_NO_SELF_INTERSECTIONS + 形状内に自己交差はありません。 - GEOM_SELF_INTERSECTIONS_FOUND - Some self-intersections detected + GEOM_SELF_INTERSECTIONS_FOUND + いくつかの自己交差が検出されました - GEOM_CHECK_SELF_INTERSECTIONS_FAILED - Detection of self-intersections failed + GEOM_CHECK_SELF_INTERSECTIONS_FAILED + 自己交差の検出に失敗しました - GEOM_CHECK_SELF_INTERSECTIONS_ERRORS - Warning: there were errors during the operation, so the list may be incomplete. + GEOM_CHECK_SELF_INTERSECTIONS_ERRORS + 警告: 操作中にエラーが発生したため、リストは完成されません。 - GEOM_CHECK_INTE_V_V - Vertex to Vertex + GEOM_CHECK_INTE_V_V + 頂点から頂点 - GEOM_CHECK_INTE_V_E - Vertex to Edge + all above + GEOM_CHECK_INTE_V_E + 頂点からエッジ と上記すべて - - GEOM_CHECK_INTE_E_E - Edge to Edge + all above - - - GEOM_CHECK_INTE_V_F - Vertex to Face + all above - - - GEOM_CHECK_INTE_E_F - Edge to Face + all above - - - GEOM_CHECK_INTE_ALL - Face to Face + all above - - - + + GEOM_CHECK_INTE_E_E + エッジからエッジと上記すべて + + + GEOM_CHECK_INTE_V_F + 頂点から面と上記すべて + + + GEOM_CHECK_INTE_E_F + エッジから面と上記すべて + + + GEOM_CHECK_INTE_ALL + 面から面と上記すべて + + + MeasureGUI_FastCheckIntersectionsDlg - GEOM_FAST_CHECK_INT_DEFLECT - Deflection coefficient + GEOM_FAST_CHECK_INT_DEFLECT + たわみ係数 - GEOM_FAST_CHECK_INT_DETECT_GAPS - Detect gaps with tolerance + GEOM_FAST_CHECK_INT_DETECT_GAPS + トレランスによるギャップ検出 - GEOM_FAST_CHECK_INT_SUBSHAPES - Sub-shapes of Object %1: + GEOM_FAST_CHECK_INT_SUBSHAPES + オブジェクト %1 のサブ形状: - GEOM_FAST_CHECK_INT_COMPUTE - Compute intersections + GEOM_FAST_CHECK_INT_COMPUTE + 交点の計算 - GEOM_FAST_INTERSECTION_NAME - Fast_intersection + GEOM_FAST_INTERSECTION_NAME + クイック交点 - GEOM_FAST_INTERSECTION_FAILS - No intersections + GEOM_FAST_INTERSECTION_FAILS + 交点はない - GEOM_FAST_CHECK_OBJ - Objects And Results + GEOM_FAST_CHECK_OBJ + オブジェクトと結果 - - + + MeasureGUI_ShapeStatisticsDlg GEOM_SHAPE_STATISTICS_TYPE @@ -7250,63 +7429,133 @@ GEOM_MSG_GROUPS_CREATED %1 groups created - - + + TransformationGUI_ExtensionDlg - GEOM_EXTENSION_TITLE - Extension of Edge or Face + GEOM_EXTENSION_TITLE + エッジまたは面の拡張 - GEOM_EXTENSION - Extension + GEOM_EXTENSION + 拡張 - GEOM_EXTENSION_MIN - First Parameter + GEOM_EXTENSION_MIN + 第1パラメータ - GEOM_EXTENSION_MAX - Last Parameter + GEOM_EXTENSION_MAX + 最後のパラメータ - GEOM_EXTENSION_MIN_U - First U-Parameter + GEOM_EXTENSION_MIN_U + 第1U-パラメータ - GEOM_EXTENSION_MAX_U - Last U-Parameter + GEOM_EXTENSION_MAX_U + 最後のU-パラメータ - GEOM_EXTENSION_MIN_V - First V-Parameter + GEOM_EXTENSION_MIN_V + 第1V-パラメータ - GEOM_EXTENSION_MAX_V - Last V-Parameter + GEOM_EXTENSION_MAX_V + 最後のV-パラメータ - GEOM_EXTENSION_EDGE_NAME - ExtendedEdge + GEOM_EXTENSION_EDGE_NAME + ExtendedEdge - GEOM_EXTENSION_FACE_NAME - ExtendedFace + GEOM_EXTENSION_FACE_NAME + 拡張面 - - + + EntityGUI_SurfFromFaceDlg - GEOM_SURF_FROM_FACE_TITLE - Surface From Face Construction + GEOM_SURF_FROM_FACE_TITLE + 面から表面の作成 - GEOM_SURF_FROM_FACE - Surface From Face + GEOM_SURF_FROM_FACE + 面から表面 - GEOM_SURF_FROM_FACE_NAME - SurfaceFromFace + GEOM_SURF_FROM_FACE_NAME + SurfaceFromFace - + + + OperationGUI_TransferDataDlg + + GEOM_TRANSFER_DATA_TITLE + データ転送 + + + GEOM_TRANSFER_DATA + データ転送 + + + GEOM_TRANSFER_DATA_FROM + ソース形状 + + + GEOM_TRANSFER_DATA_TO + 行き先形状 + + + GEOM_TRANSFER_DATA_METHOD + 検出操作のタイプ + + + GEOM_TD_METHOD_GETINPLACE + 場所の中で取得 + + + GEOM_TD_METHOD_GETINPLACE_OLD + 場所（旧）の中で取得 + + + GEOM_TD_METHOD_GETINPLACE_HISTORY + 履歴より場所の中で取得 + + + GEOM_TRANSFER_DATA_INFO + データ転送: 情報 + + + GEOM_TRANSFER_DATA_NOT_COPIED + コピーされたものはありません。 + + + GEOM_TRANSFER_DATA_COPIED + 以下のデータがコピーされます: + + + GEOM_TRANSFER_DATA_NAMES + 名前: %2 の %1 + + + GEOM_TRANSFER_DATA_MATERIALS + 材料: %2 の %1 + + + + TransformationGUI_ProjectionOnCylDlg + + GEOM_PROJ_ON_CYL_TITLE + 円筒上に投影 + + + GEOM_PROJ_ON_CYL_START_ANGLE + Starting angle + + + GEOM_PROJ_ON_CYL_LENGTH_ANGLE + Length angle + + diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index ffe4ee97f..8b4f0968a 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -1686,7 +1686,7 @@ void GeometryGUI::addPluginActions() // icon QPixmap icon; if ( !adata.icon.empty() ) - icon = resMgr->loadPixmap( pdata.name.c_str(), adata.icon.c_str() ); + icon = resMgr->loadPixmap( pdata.name.c_str(), adata.icon.c_str() ); // menu text (path) QStringList smenus = QString( adata.menuText.c_str() ).split( "/" ); QString actionName = smenus.last(); @@ -1703,30 +1703,30 @@ void GeometryGUI::addPluginActions() actionStat = actionStat.toUpper().prepend( "STB_" ); createAction( id, // ~ adata.label - tr( actionTool.toLatin1().constData() ), - icon, - tr( actionName.toLatin1().constData() ), - tr( actionStat.toLatin1().constData() ), - QKeySequence( tr( adata.accel.c_str() ) ), - application()->desktop(), - false /*toggle*/, - this, SLOT( OnGUIEvent() ), - QString() /*shortcutAction*/ ); + tr( actionTool.toLatin1().constData() ), + icon, + tr( actionName.toLatin1().constData() ), + tr( actionStat.toLatin1().constData() ), + QKeySequence( tr( adata.accel.c_str() ) ), + application()->desktop(), + false /*toggle*/, + this, SLOT( OnGUIEvent() ), + QString() /*shortcutAction*/ ); int menuId = -1; foreach ( QString subMenu, smenus ) { - QStringList subMenuList = subMenu.split( ":" ); - QString subMenuName = subMenuList[0].toUpper().prepend( "MEN_" ); - int subMenuGroup = subMenuList.size() > 1 ? subMenuList[1].toInt() : -1; - menuId = createMenu( tr( subMenuName.toLatin1().constData() ), menuId, -1, subMenuGroup ); + QStringList subMenuList = subMenu.split( ":" ); + QString subMenuName = subMenuList[0].toUpper().prepend( "MEN_" ); + int subMenuGroup = subMenuList.size() > 1 ? subMenuList[1].toInt() : -1; + menuId = createMenu( tr( subMenuName.toLatin1().constData() ), menuId, -1, subMenuGroup ); } createMenu( id, menuId, -1 ); if ( !stools.isEmpty() ) { - QString subTool = stools[0]; - subTool = subTool.toUpper().prepend( "TOOL_" ); - int toolId = createTool( tr( subTool.toLatin1().constData() ) ); - createTool(id, toolId); + QString subTool = stools[0]; + subTool = subTool.toUpper().prepend( "TOOL_" ); + int toolId = createTool( tr( subTool.toLatin1().constData() ) ); + createTool(id, toolId); } // add action id to map @@ -1763,8 +1763,8 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) else { PyObjWrapper result = PyObject_CallMethod(pluginsmanager, (char*)"initialize", (char*)"isss", 1, "geom", - tr("MEN_NEW_ENTITY").toStdString().c_str(), - tr("GEOM_PLUGINS_OTHER").toStdString().c_str()); + tr("MEN_NEW_ENTITY").toUtf8().data(), + tr("GEOM_PLUGINS_OTHER").toUtf8().data()); if ( !result ) PyErr_Print(); } @@ -2041,38 +2041,15 @@ void GeometryGUI::updateCreationInfo() // pass creation info of geomObj to myCreationInfoWdg if ( myCreationInfoWdg ) { - QPixmap icon; - QString operationName; - myCreationInfoWdg->setOperation( icon, operationName ); + GEOM::CreationInformationSeq_var info; try { OCC_CATCH_SIGNALS; - GEOM::CreationInformation_var info = geomObj->GetCreationInformation(); - if ( &info.in() ) { - SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); - QString name = info->operationName.in(); - if ( !name.isEmpty() ) { - - QString plugin_name; - for ( size_t i = 0; i < info->params.length(); ++i ) { - myCreationInfoWdg->addParam( info->params[i].name.in(), - info->params[i].value.in() ); - QString value = info->params[i].name.in(); - if( value == PLUGIN_NAME ) { - plugin_name = info->params[i].value.in(); - } - } - QString prefix = plugin_name.isEmpty() ? "GEOM" : plugin_name; - icon = resMgr->loadPixmap( prefix, tr( ("ICO_"+name).toLatin1().constData() ), false ); - operationName = tr( ("MEN_"+name).toLatin1().constData() ); - if ( operationName.startsWith( "MEN_" )) - operationName = name; // no translation - myCreationInfoWdg->setOperation( icon, operationName ); - } - } + info = geomObj->GetCreationInformation(); } catch (...) { } + myCreationInfoWdg->setInfo( info ); } } @@ -2304,7 +2281,7 @@ void GeometryGUI::createPreferences() LightApp_Preferences::Selector, "Geometry", "toplevel_dm" ); int transparency = addPreference( tr( "PREF_TRANSPARENCY" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "transparency" ); + LightApp_Preferences::IntSpin, "Geometry", "transparency" ); int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup, LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" ); diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 5c0812760..4d6a72f2a 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -548,71 +548,6 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) ) Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result"); - // BEGIN: Mantis issue 0021060: always limit tolerance of BOP result - // 1. Get shape parameters for comparison - int nbTypes [TopAbs_SHAPE]; - { - for (int iType = 0; iType < TopAbs_SHAPE; ++iType) - nbTypes[iType] = 0; - nbTypes[aShape.ShapeType()]++; - - TopTools_MapOfShape aMapOfShape; - aMapOfShape.Add(aShape); - TopTools_ListOfShape aListOfShape; - aListOfShape.Append(aShape); - - TopTools_ListIteratorOfListOfShape itL (aListOfShape); - for (; itL.More(); itL.Next()) { - TopoDS_Iterator it (itL.Value()); - for (; it.More(); it.Next()) { - TopoDS_Shape s = it.Value(); - if (aMapOfShape.Add(s)) { - aListOfShape.Append(s); - nbTypes[s.ShapeType()]++; - } - } - } - } - - // 2. Limit tolerance - TopoDS_Shape aShapeCopy; - TColStd_IndexedDataMapOfTransientTransient aMapTShapes; - TNaming_CopyShape::CopyTool(aShape, aMapTShapes, aShapeCopy); - - if ( GEOMUtils::FixShapeTolerance(aShapeCopy, true) ) { - int iType, nbTypesCopy [TopAbs_SHAPE]; - - for (iType = 0; iType < TopAbs_SHAPE; ++iType) - nbTypesCopy[iType] = 0; - nbTypesCopy[aShapeCopy.ShapeType()]++; - - TopTools_MapOfShape aMapOfShape; - aMapOfShape.Add(aShapeCopy); - TopTools_ListOfShape aListOfShape; - aListOfShape.Append(aShapeCopy); - - TopTools_ListIteratorOfListOfShape itL (aListOfShape); - for (; itL.More(); itL.Next()) { - TopoDS_Iterator it (itL.Value()); - for (; it.More(); it.Next()) { - TopoDS_Shape s = it.Value(); - if (aMapOfShape.Add(s)) { - aListOfShape.Append(s); - nbTypesCopy[s.ShapeType()]++; - } - } - } - - bool isEqual = true; - for (iType = 0; iType < TopAbs_SHAPE && isEqual; ++iType) { - if (nbTypes[iType] != nbTypesCopy[iType]) - isEqual = false; - } - if (isEqual) - aShape = aShapeCopy; - } - // END: Mantis issue 0021060 - return aShape; } diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx old mode 100755 new mode 100644 index 63a21d866..460f1050d --- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -91,12 +92,15 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const TopExp::Vertices(anE, V1, V2, Standard_True); if (!V1.IsNull() && !V2.IsNull()) { gp_Vec aV (BRep_Tool::Pnt(V1), BRep_Tool::Pnt(V2)); - gp_Ax2 anAxes (aP, -aV); - gp_Circ aCirc (anAxes, aCI.GetRadius()); + gp_Ax2 anAxes (aP, aV); + gp_Ax3 anAxes3(anAxes); + gp_Pln aPln(anAxes3); + gp_Ax2 anAxes1(aP, -aV); + gp_Circ aCirc (anAxes1, aCI.GetRadius()); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); BRepBuilderAPI_MakeWire MW; MW.Add(TopoDS::Edge(aCircle)); - BRepBuilderAPI_MakeFace MF (MW, Standard_False); + BRepBuilderAPI_MakeFace MF (aPln, MW); aShape = MF.Shape(); } } @@ -121,10 +125,14 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular())) Standard_ConstructionError::Raise("Disk creation aborted: points lay on one line"); Handle(Geom_Circle) aCirc = GC_MakeCircle(aP3, aP2, aP1).Value(); + gp_Circ aGpCirc = aCirc->Circ(); + gp_Ax2 anAxes = aGpCirc.Position(); + gp_Ax3 anAxes3(anAxes.Location(), -anAxes.Direction()); + gp_Pln aPln(anAxes3); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); BRepBuilderAPI_MakeWire MW; MW.Add(TopoDS::Edge(aCircle)); - BRepBuilderAPI_MakeFace MF (MW, Standard_False); + BRepBuilderAPI_MakeFace MF (aPln, MW); aShape = MF.Shape(); } } @@ -139,12 +147,15 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const else if (anOrient == 3) aV = gp::DY(); - gp_Ax2 anAxes (aP, -aV); - gp_Circ aCirc (anAxes, aCI.GetRadius()); + gp_Ax2 anAxes (aP, aV); + gp_Ax2 anAxes1(aP, -aV); + gp_Ax3 anAxes3(anAxes); + gp_Pln aPln(anAxes3); + gp_Circ aCirc (anAxes1, aCI.GetRadius()); TopoDS_Shape aCircle = BRepBuilderAPI_MakeEdge(aCirc).Edge(); BRepBuilderAPI_MakeWire MW; MW.Add(TopoDS::Edge(aCircle)); - BRepBuilderAPI_MakeFace MF (MW, Standard_False); + BRepBuilderAPI_MakeFace MF (aPln, MW); aShape = MF.Shape(); } else { diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx index 434f0289a..96c30e6a6 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx @@ -83,6 +83,20 @@ GetCreationInformation(std::string& theOperationName, AddParam( theParams, "Step", data.GetStepID() ); AddParam( theParams, "Stamp", data.GetStepStamp() ); } + else if ( funType == GEOM_Field::FUN_CHANGE_COMP_NAMES ) + { + theOperationName = "Change component names"; + } + else if ( funType == GEOM_Field::FUN_CHANGE_STEP_STAMP ) + { + theOperationName = "Change stamp"; + AddParam( theParams, "Stamp", data.GetStepStamp() ); + } + else if ( funType == GEOM_Field::FUN_CHANGE_VALUE ) + { + theOperationName = "FIELD_EDIT";//"Change values"; + AddParam( theParams, "Values", "..." ); + } else { return false; diff --git a/src/GEOMImpl/GEOMImpl_IProjOnCyl.hxx b/src/GEOMImpl/GEOMImpl_IProjOnCyl.hxx index 9fc6024d1..a5162534e 100644 --- a/src/GEOMImpl/GEOMImpl_IProjOnCyl.hxx +++ b/src/GEOMImpl/GEOMImpl_IProjOnCyl.hxx @@ -24,10 +24,10 @@ #include "GEOM_Function.hxx" -#define PROJECTION_ARG_SHAPE 1 -#define PROJECTION_ARG_RADIUS 2 -#define PROJECTION_ARG_START_ANGLE 3 -#define PROJECTION_ARG_ANGLE_LENGTH 4 +#define PROJCYL_ARG_SHAPE 1 +#define PROJCYL_ARG_RADIUS 2 +#define PROJCYL_ARG_START_ANGLE 3 +#define PROJCYL_ARG_ANGLE_LENGTH 4 class GEOMImpl_IProjOnCyl { @@ -37,22 +37,22 @@ public: GEOMImpl_IProjOnCyl(Handle(GEOM_Function) theFunction): _func(theFunction) {} void SetShape (const Handle(GEOM_Function) &theShape) - { _func->SetReference(PROJECTION_ARG_SHAPE, theShape); } + { _func->SetReference(PROJCYL_ARG_SHAPE, theShape); } void SetRadius (const Standard_Real theRadius) - { _func->SetReal(PROJECTION_ARG_RADIUS, theRadius); } + { _func->SetReal(PROJCYL_ARG_RADIUS, theRadius); } void SetStartAngle (const Standard_Real theStartAngle) - { _func->SetReal(PROJECTION_ARG_START_ANGLE, theStartAngle); } + { _func->SetReal(PROJCYL_ARG_START_ANGLE, theStartAngle); } void SetAngleLength (const Standard_Real theAngleLength) - { _func->SetReal(PROJECTION_ARG_ANGLE_LENGTH, theAngleLength); } + { _func->SetReal(PROJCYL_ARG_ANGLE_LENGTH, theAngleLength); } Handle(GEOM_Function) GetShape() - { return _func->GetReference(PROJECTION_ARG_SHAPE); } + { return _func->GetReference(PROJCYL_ARG_SHAPE); } Standard_Real GetRadius() - { return _func->GetReal(PROJECTION_ARG_RADIUS ); } + { return _func->GetReal(PROJCYL_ARG_RADIUS ); } Standard_Real GetStartAngle() - { return _func->GetReal(PROJECTION_ARG_START_ANGLE ); } + { return _func->GetReal(PROJCYL_ARG_START_ANGLE ); } Standard_Real GetAngleLength() - { return _func->GetReal(PROJECTION_ARG_ANGLE_LENGTH ); } + { return _func->GetReal(PROJCYL_ARG_ANGLE_LENGTH ); } private: diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 2afb575f3..affb64b9c 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -2787,9 +2787,31 @@ Handle(TColStd_HSequenceOfInteger) return aSeqOfIDs; } + // Compute classification tolerance. + TopTools_IndexedMapOfShape aMapVtx; + Standard_Real aTol = Precision::Confusion(); + + TopExp::MapShapes(aShape, TopAbs_VERTEX, aMapVtx); + + Standard_Integer i; + Standard_Integer aNbVtx = aMapVtx.Extent(); + + for (i = 1; i <= aNbVtx; ++i) { + const TopoDS_Vertex aVtx = TopoDS::Vertex(aMapVtx.FindKey(i)); + const Standard_Real aVtxTol = BRep_Tool::Tolerance(aVtx); + + if (aTol < aVtxTol) { + aTol = aVtxTol; + } + } + + // Bound the tolerance value. + if (aTol > 0.0001) { + aTol = 0.0001; + } + // Call algo GEOMAlgo_FinderShapeOn2 aFinder; - Standard_Real aTol = 0.0001; // default value Handle(GEOMAlgo_ClsfSolid) aClsfSolid = new GEOMAlgo_ClsfSolid; aClsfSolid->SetShape(aCheckShape); diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index da393a67e..112966a3f 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -210,7 +210,7 @@ GetCreationInformation(std::string& theOperationName, break; case OFFSET_THICKENING: case OFFSET_THICKENING_COPY: - theOperationName = "MakeThickening"; + theOperationName = "THICKNESS"; AddParam( theParams, "Object", aCI.GetShape() ); AddParam( theParams, "Offset", aCI.GetParam() ? -aCI.GetValue() : aCI.GetValue() ); { diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index d226969c8..0c34bc8c2 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -473,41 +473,43 @@ GetCreationInformation(std::string& theOperationName, switch ( aType ) { case PROJECTION_COPY: - { - GEOMImpl_IMirror aCI( function ); + { + GEOMImpl_IMirror aCI( function ); - AddParam( theParams, "Source object", aCI.GetOriginal() ); - AddParam( theParams, "Target face", aCI.GetPlane() ); - break; - } + AddParam( theParams, "Source object", aCI.GetOriginal() ); + AddParam( theParams, "Target face", aCI.GetPlane() ); + break; + } case PROJECTION_ON_WIRE: - { - GEOMImpl_IProjection aProj (function); + { + GEOMImpl_IProjection aProj (function); - AddParam(theParams, "Point", aProj.GetPoint()); - AddParam(theParams, "Shape", aProj.GetShape()); + AddParam(theParams, "Point", aProj.GetPoint()); + AddParam(theParams, "Shape", aProj.GetShape()); - break; - } + break; + } case PROJECTION_ON_CYLINDER: - { - GEOMImpl_IProjOnCyl aProj (function); - const Standard_Real aLengthAngle = aProj.GetAngleLength(); + { + theOperationName = "PROJ_ON_CYL"; - AddParam(theParams, "Shape", aProj.GetShape()); - AddParam(theParams, "Radius", aProj.GetRadius()); - AddParam(theParams, "Start angle", aProj.GetStartAngle()); + GEOMImpl_IProjOnCyl aProj (function); + const Standard_Real aLengthAngle = aProj.GetAngleLength(); - if (aLengthAngle >= 0.) { - AddParam(theParams, "Length angle", aLengthAngle); - } + AddParam(theParams, "Shape", aProj.GetShape()); + AddParam(theParams, "Radius", aProj.GetRadius()); + AddParam(theParams, "Start angle", aProj.GetStartAngle()); - break; + if (aLengthAngle >= 0.) { + AddParam(theParams, "Length angle", aLengthAngle); } + + break; + } default: return false; } - + return true; } @@ -661,7 +663,7 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder GEOMUtils::Handle(HTrsfCurve2d) aTrsfCurve = new GEOMUtils::HTrsfCurve2d(aCurve, aPar[0], aPar[1], aTrsf2d); Approx_Curve2d aConv (aTrsfCurve, aPar[0], aPar[1], - aUResol, aVResol, GeomAbs_C1, + aUResol, aVResol, GeomAbs_C1, 9, 1000); if (!aConv.IsDone() && !aConv.HasResult()) { diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 8ad9f4349..933ad9eea 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -59,6 +59,8 @@ #include #include +#include + #include #include #include @@ -86,6 +88,7 @@ #include #include +#include #include #include #include @@ -208,6 +211,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const // 1. Extract all edges from the given arguments TopTools_MapOfShape aMapEdges; Handle(TopTools_HSequenceOfShape) aSeqEdgesIn = new TopTools_HSequenceOfShape; + TColStd_IndexedDataMapOfTransientTransient aMapTShapes; for (ind = 1; ind <= nbshapes; ind++) { Handle(GEOM_Function) aRefSh_i = Handle(GEOM_Function)::DownCast(aShapes->Value(ind)); @@ -216,7 +220,12 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const TopExp_Explorer anExpE_i (aSh_i, TopAbs_EDGE); for (; anExpE_i.More(); anExpE_i.Next()) { if (aMapEdges.Add(anExpE_i.Current())) { - aSeqEdgesIn->Append(anExpE_i.Current()); + // Copy the original shape. + TopoDS_Shape aShapeCopy; + + TNaming_CopyShape::CopyTool + (anExpE_i.Current(), aMapTShapes, aShapeCopy); + aSeqEdgesIn->Append(aShapeCopy); } } } diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index 4b15e3277..c4c3b509d 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -55,7 +55,7 @@ // Below macro specifies how the closed point set is processed (issue 0022885). // See below for more information. // Currently solution 4 is chosen! -#define BSPLINE_PROCESS_CLOSED_PNTSET 4 +#define BSPLINE_PROCESS_CLOSED_PNTSET 2 namespace { @@ -152,6 +152,8 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const // reorder points if required (bspline only) if ((aType == SPLINE_INTERPOLATION || aType == SPLINE_INTERPOL_TANGENTS) && aCI.GetDoReordering()) { + int nbDup = 0; + gp_Pnt pPrev = points->Value(1); for (int i = 1; i < length - 1; i++) { gp_Pnt pi = points->Value(i); int nearest = 0; @@ -175,6 +177,22 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const points->SetValue(j, points->Value(j-1)); points->SetValue(i+1, p); } + if ( pPrev.Distance(points->Value(i+1)) <= Precision::Confusion() ) + nbDup++; + else + pPrev = points->Value(i+1); + } + if ( nbDup > 0 ) { + Handle(TColgp_HArray1OfPnt) tmpPoints = new TColgp_HArray1OfPnt(1, length-nbDup); + int j = 1; + for (int i = 1; i <= length; i++) { + if (i == 1 || pPrev.Distance(points->Value(i)) > Precision::Confusion() ) { + tmpPoints->SetValue(j++, points->Value(i)); + pPrev = points->Value(i); + } + } + points = tmpPoints; + length = points->Length(); } } // end of reordering diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx index 976d29690..560f43aa2 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2014 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 +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx index d37b7f293..510fdcb66 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2014 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 +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GEOMUtils/GEOMUtils_Trsf2d.cxx b/src/GEOMUtils/GEOMUtils_Trsf2d.cxx index 4938d4979..f96cb9a8a 100644 --- a/src/GEOMUtils/GEOMUtils_Trsf2d.cxx +++ b/src/GEOMUtils/GEOMUtils_Trsf2d.cxx @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2014 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 +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GEOMUtils/GEOMUtils_Trsf2d.hxx b/src/GEOMUtils/GEOMUtils_Trsf2d.hxx index c287f90d8..4bb436650 100644 --- a/src/GEOMUtils/GEOMUtils_Trsf2d.hxx +++ b/src/GEOMUtils/GEOMUtils_Trsf2d.hxx @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2014 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 +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx index 6793bb132..f81acacb8 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2014 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 +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx index b3bd19433..f0d94bbca 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2014 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 +// Copyright (C) 2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc index 5e77c3a45..e16ef5940 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.cc +++ b/src/GEOM_I/GEOM_BaseObject_i.cc @@ -268,50 +268,59 @@ char* GEOM_BaseObject_i::GetParameters() */ //================================================================================ -GEOM::CreationInformation* GEOM_BaseObject_i::GetCreationInformation() +GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation() { - GEOM::CreationInformation_var info = new GEOM::CreationInformation; + GEOM::CreationInformationSeq_var info = new GEOM::CreationInformationSeq(); - Handle(GEOM_BaseDriver) driver = - Handle(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver() ); - if ( !driver.IsNull() ) + int nbFun = _impl->GetNbFunctions(); + info->length( nbFun ); + int nbI = 0; + for ( int i = 1; i <= nbFun; ++i ) { - std::vector params; - std::string operationName; - try + Handle(GEOM_BaseDriver) driver = + Handle(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i )); + if ( !driver.IsNull() ) { - OCC_CATCH_SIGNALS; - if ( driver->GetCreationInformation( operationName, params )) + std::vector params; + std::string operationName; + try { - info->operationName = operationName.c_str(); - info->params.length( params.size() ); - for ( size_t i = 0; i < params.size(); ++i ) + OCC_CATCH_SIGNALS; + if ( driver->GetCreationInformation( operationName, params )) { - info->params[i].name = params[i].name.c_str(); - info->params[i].value = params[i].value.c_str(); + info[nbI].operationName = operationName.c_str(); + info[nbI].params.length( params.size() ); + for ( size_t i = 0; i < params.size(); ++i ) + { + info[nbI].params[i].name = params[i].name.c_str(); + info[nbI].params[i].value = params[i].value.c_str(); + } + nbI++; } - } #ifdef _DEBUG_ - if ( operationName.empty() ) + if ( operationName.empty() ) + { + cout << endl << endl << endl << "Warning: " << endl << "Dear developer!!!" << endl + << " Consider implementing " + << typeid(*(driver.operator->())).name() << "::GetCreationInformation() " << endl + << " for the case of operation which has created '" << GetName() << "' object" << endl + << "PLEEEEEEEASE" << endl + << "\tPLEEEEEEEASE" << endl + << "\t\tPLEEEEEEEASE" << endl + << "\t\t\tPLEEEEEEEASE" << endl + << "\t\t\t\tPLEEEEEEEASE" << endl; + } +#endif + } + catch(...) { - cout << endl << endl << endl << "Warning: " << endl << "Dear developer!!!" << endl - << " Consider implementing " - << typeid(*(driver.operator->())).name() << "::GetCreationInformation() " << endl - << " for the case of operation which has created '" << GetName() << "' object" << endl - << "PLEEEEEEEASE" << endl - << "\tPLEEEEEEEASE" << endl - << "\t\tPLEEEEEEEASE" << endl - << "\t\t\tPLEEEEEEEASE" << endl - << "\t\t\t\tPLEEEEEEEASE" << endl; - } -#endif - } - catch(...) - { #ifdef _DEBUG_ - cout << "Ecxeption in GEOM_BaseObject_i::GetCreationInformation()" << endl; + cout << "Ecxeption in GEOM_BaseObject_i::GetCreationInformation()" << endl; #endif + } } } + info->length( nbI ); + return info._retn(); } diff --git a/src/GEOM_I/GEOM_BaseObject_i.hh b/src/GEOM_I/GEOM_BaseObject_i.hh index e7988fdf3..aeb291ca7 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.hh +++ b/src/GEOM_I/GEOM_BaseObject_i.hh @@ -66,7 +66,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject virtual char* GetParameters(); - virtual GEOM::CreationInformation* GetCreationInformation(); + virtual GEOM::CreationInformationSeq* GetCreationInformation(); Handle(GEOM_BaseObject) GetImpl() { return _impl; } diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 3c6a97386..7a824de35 100755 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -320,24 +320,25 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_LCS"); aNamePrefix = "LocalCS_"; } else if ( mytype >= USER_TYPE_EX ) { - char buf[20]; - sprintf( buf, "%d", aBaseObj->GetType() ); - GEOM::CreationInformation_var info = aBaseObj->GetCreationInformation(); - std::string plgId; - for ( size_t i = 0; i < info->params.length(); ++i ) { - std::string param_name = info->params[i].name.in(); - std::string param_value = info->params[i].value.in(); - if( param_name == PLUGIN_NAME) { - plgId = param_value; - break; - } + char buf[20]; + sprintf( buf, "%d", aBaseObj->GetType() ); + GEOM::CreationInformationSeq_var infoSeq = aBaseObj->GetCreationInformation(); + std::string plgId; + for ( size_t j = 0; j < infoSeq->length(); ++j ) + for ( size_t i = 0; i < infoSeq[j].params.length(); ++i ) { + std::string param_name = infoSeq[j].params[i].name.in(); + std::string param_value = infoSeq[j].params[i].value.in(); + if( param_name == PLUGIN_NAME) { + plgId = param_value; + break; + } } - if(plgId.length() > 0 ) { - plgId += "::"; - } - plgId +="ICON_OBJBROWSER_"; - plgId += buf; - aResultSO->SetAttrString("AttributePixMap",plgId.c_str()); + if(plgId.length() > 0 ) { + plgId += "::"; + } + plgId +="ICON_OBJBROWSER_"; + plgId += buf; + aResultSO->SetAttrString("AttributePixMap",plgId.c_str()); } else if ( mytype > USER_TYPE ) { char buf[20]; sprintf( buf, "%d", aBaseObj->GetType() ); diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index e2bf0b10b..f932a632a 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -3055,10 +3055,12 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): theR,theH,theA,Parameters = ParseParameters(theR, theH, theA) if flag: theA = theA*math.pi/180. - anObj = self.PrimOp.MakeCylinderPntVecRHA(thePnt, theAxis, theR, theH, theA) - RaiseIfFailed("MakeCylinderPntVecRHA", self.PrimOp) - anObj.SetParameters(Parameters) - self._autoPublish(anObj, theName, "cylinder") + if theA<=0. or theA>=2*math.pi: + raise ValueError("The angle parameter should be strictly between 0 and 2*pi.") + anObj = self.PrimOp.MakeCylinderPntVecRHA(thePnt, theAxis, theR, theH, theA) + RaiseIfFailed("MakeCylinderPntVecRHA", self.PrimOp) + anObj.SetParameters(Parameters) + self._autoPublish(anObj, theName, "cylinder") return anObj ## Create a cylinder with given radius and height at @@ -3136,6 +3138,8 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): theR,theH,theA,Parameters = ParseParameters(theR, theH, theA) if flag: theA = theA*math.pi/180. + if theA<=0. or theA>=2*math.pi: + raise ValueError("The angle parameter should be strictly between 0 and 2*pi.") anObj = self.PrimOp.MakeCylinderRHA(theR, theH, theA) RaiseIfFailed("MakeCylinderRHA", self.PrimOp) anObj.SetParameters(Parameters) @@ -4472,7 +4476,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # end of l3_complex ## @} - ## @addtogroup l3_advanced + ## @addtogroup l3_basic_go ## @{ ## Create a linear edge with specified ends. @@ -4904,7 +4908,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self._autoPublish(anObj, theName, "solid") return anObj - # end of l3_advanced + # end of l3_basic_go ## @} ## @addtogroup l2_measure @@ -7375,7 +7379,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): Returns: New GEOM.GEOM_Object, containing copies of theShapes without coincident faces. """ - anObj = self.ShapesOp.MakeGlueFacesByList(ToList(theShapes), theTolerance, theFaces, + anObj = self.ShapesOp.MakeGlueFacesByList(ToList(theShapes), theTolerance, ToList(theFaces), doKeepNonSolids, doGlueAllEdges) if anObj is None: raise RuntimeError, "MakeGlueFacesByList : " + self.ShapesOp.GetErrorCode() @@ -9161,7 +9165,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self._autoPublish(anObj, theName, "projection") return anObj - ## Create a projection projection of the given point on a wire or an edge. + ## Create a projection of the given point on a wire or an edge. # If there are no solutions or there are 2 or more solutions It throws an # exception. # @param thePoint the point to be projected. @@ -9179,7 +9183,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): @ManageTransactions("TrsfOp") def MakeProjectionOnWire(self, thePoint, theWire, theName=None): """ - Create a projection projection of the given point on a wire or an edge. + Create a projection of the given point on a wire or an edge. If there are no solutions or there are 2 or more solutions It throws an exception. @@ -10966,14 +10970,17 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): return aDict def GetCreationInformation(self, theShape): - info = theShape.GetCreationInformation() - # operationName - opName = info.operationName - if not opName: opName = "no info available" - res = "Operation: " + opName - # parameters - for parVal in info.params: - res += " \n %s = %s" % ( parVal.name, parVal.value ) + res = '' + infos = theShape.GetCreationInformation() + for info in infos: + # operationName + opName = info.operationName + if not opName: opName = "no info available" + if res: res += "\n" + res += "Operation: " + opName + # parameters + for parVal in info.params: + res += "\n \t%s = %s" % ( parVal.name, parVal.value ) return res ## Get a point, situated at the centre of mass of theShape. diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt index 5f7afb3a1..b60f1dde6 100755 --- a/src/GenerationGUI/CMakeLists.txt +++ b/src/GenerationGUI/CMakeLists.txt @@ -50,6 +50,10 @@ ADD_DEFINITIONS( ${QT_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + # libraries to link to SET(_link_LIBRARIES GEOMObject diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index a13977ef6..a13236cd2 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -443,11 +443,17 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument() if (send == mySelBtn) { myEditCurrentArgument = myMainName; myShape2Name->setText(""); + mySelBtn->setDown(true); + mySelBtn2->setDown(false); } else if (send == mySelBtn2 || sender() == myRestrictGroup) { setInPlaceObj(GEOM::GEOM_Object::_nil()); myShape2Name->setText(""); - if (subSelectionWay() != ALL_SUBSHAPES) { + if ( send == mySelBtn2 ) { + mySelBtn2->setDown(true); + mySelBtn->setDown(false); + } + if (subSelectionWay() != ALL_SUBSHAPES) { myEditCurrentArgument = myShape2Name; } else { @@ -455,7 +461,11 @@ void GroupGUI_GroupDlg::SetEditCurrentArgument() } } - activateSelection(); + // activateSelection(); + if(myEditCurrentArgument) { + myEditCurrentArgument->setFocus(); + send->setDown(true); + } updateState(); } @@ -562,6 +572,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() { if (subSelectionWay() != ALL_SUBSHAPES && myEditCurrentArgument == myShape2Name) { onGetInPlace(); + if( !myInPlaceObj->_is_nil() ) { + mySelBtn2->setDown(false); + } return; } @@ -586,6 +599,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() } myMainObj = anObj; if (!CORBA::is_nil(myMainObj)) { + mySelBtn->setDown(false); SALOME_View* view = GEOM_Displayer::GetActiveView(); if (view) { CORBA::String_var aMainEntry = myMainObj->GetStudyEntry(); diff --git a/src/IGESPlugin/IGESPlugin_msg_ja.ts b/src/IGESPlugin/IGESPlugin_msg_ja.ts index e7f66919e..ef4817a65 100644 --- a/src/IGESPlugin/IGESPlugin_msg_ja.ts +++ b/src/IGESPlugin/IGESPlugin_msg_ja.ts @@ -32,7 +32,7 @@ IGESPlugin_GUI IGES_FILES - IGESファイル + IGES ファイル ( *.iges *.igs ) EXPORT_TITLE diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx index 370204f94..4618f9c80 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx @@ -135,7 +135,7 @@ MeasureGUI_ManageDimensionsDlg::MeasureGUI_ManageDimensionsDlg( GeometryGUI* the { myObjectSelector->PushButton1->click(); } - + myIsNeedRedisplay = false; setHelpFileName("managing_dimensions_page.html"); } @@ -809,7 +809,9 @@ void MeasureGUI_ManageDimensionsDlg::OnFinish() GEOM::propertyName( GEOM::Dimensions ), QVariant() ); - redisplay( myEditObject.get() ); + if ( myIsNeedRedisplay ) { + redisplay( myEditObject.get() ); + } myGeomGUI->emitDimensionsUpdated( QString( myEditObject->GetStudyEntry() ) ); } @@ -894,8 +896,8 @@ void MeasureGUI_ManageDimensionsDlg::SetEditObject( const GEOM::GeomObjPtr& theO if ( myEditObject.isNull() ) { + myDimensionView->TreeWidget->clear(); myDimensionView->setEnabled( false ); - return; } @@ -960,8 +962,6 @@ void MeasureGUI_ManageDimensionsDlg::RestoreState() myEditObject->GetStudyEntry(), GEOM::propertyName( GEOM::Dimensions ), QVariant() ); - - RedisplayObject(); } //================================================================================= @@ -1112,8 +1112,8 @@ bool MeasureGUI_ManageDimensionsDlg::AllowedToCancelChanges() tr( "WRN_MSG_CHANGES_LOST" ), QMessageBox::Ok, QMessageBox::Cancel ); - - return aResponse == QMessageBox::Ok; + myIsNeedRedisplay = ( aResponse == QMessageBox::Ok ); + return myIsNeedRedisplay; } //================================================================================= diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h index bed9d3465..7fd6f0904 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h @@ -114,7 +114,7 @@ private: private: GEOM::GeomObjPtr myEditObject; - + bool myIsNeedRedisplay; private: DlgRef_1Sel* myObjectSelector; MeasureGUI_1TreeWidget_4Button* myDimensionView; diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 5415d5373..b2a0efa5c 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -109,7 +109,7 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, for ( sel->Init(); sel->More(); sel->Next() ) { #if OCC_VERSION_LARGE > 0x06080100 - const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive(); + const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if( aHSenEntity.IsNull() ) continue; diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx index 2cb53b854..54cf54fe2 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.cxx +++ b/src/OBJECT/GEOM_VTKTrihedron.cxx @@ -259,6 +259,7 @@ void GEOM_VTKTrihedron::SetSize( double theSize ) aRes->AddInputConnection( aSrcZ->GetOutputPort() ); myMapper->SetInputConnection( aRes->GetOutputPort() ); + aRes->Update(); SALOME_Actor::SetMapper( myMapper ); aSrcX->Delete(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index 9149eee9f..fd30c9b44 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -411,7 +411,7 @@ bool PrimitiveGUI_CylinderDlg::isValid (QString& msg) { ok = GroupDimensions->SpinBox_DX->isValid( msg, !IsPreview() ) && GroupDimensions->SpinBox_DY->isValid( msg, !IsPreview() ) && - ( GroupDimensions->checkBox->isChecked() || GroupDimensions->SpinBox_DZ->isValid( msg, !IsPreview() ) ); + ( !GroupDimensions->checkBox->isChecked() || GroupDimensions->SpinBox_DZ->isValid( msg, !IsPreview() ) ); if ( GroupDimensions->checkBox->isChecked() && ( GroupDimensions->SpinBox_DZ->value() <= 0. || GroupDimensions->SpinBox_DZ->value() >= 360. ) ) { msg += tr("GEOM_CYLINDER_ANGLE_ERR") + "\n"; diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 0ad89b708..e3df32f8a 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -959,6 +959,7 @@ void RepairGUI_ShapeProcessDlg::operatorChecked( QListWidgetItem * item ) { if ( item && item->checkState() == Qt::Checked ) { + item->setSelected(true); myStack->setCurrentIndex( myOpList->row( item )); } updateSelectAll(); diff --git a/src/STEPPlugin/STEPPlugin_msg_ja.ts b/src/STEPPlugin/STEPPlugin_msg_ja.ts index 1d8b70447..686db9ad4 100644 --- a/src/STEPPlugin/STEPPlugin_msg_ja.ts +++ b/src/STEPPlugin/STEPPlugin_msg_ja.ts @@ -32,7 +32,7 @@ STEPPlugin_GUI STEP_FILES - STEPファイル + STEP ファイル ( *.step *.stp ) EXPORT_TITLE diff --git a/src/STLPlugin/STLPlugin_msg_ja.ts b/src/STLPlugin/STLPlugin_msg_ja.ts index da367eaf3..5054d2f6a 100644 --- a/src/STLPlugin/STLPlugin_msg_ja.ts +++ b/src/STLPlugin/STLPlugin_msg_ja.ts @@ -32,7 +32,7 @@ STLPlugin_GUI STL_FILES - STLファイル + STL ファイル( *.stl ) EXPORT_TITLE @@ -51,11 +51,11 @@ RELATIVE - Relative + 相対 DEFLECTION - Deflection + たわみ diff --git a/src/VTKPlugin/VTKPlugin_msg_ja.ts b/src/VTKPlugin/VTKPlugin_msg_ja.ts index 87944b0bb..5736f4b5e 100644 --- a/src/VTKPlugin/VTKPlugin_msg_ja.ts +++ b/src/VTKPlugin/VTKPlugin_msg_ja.ts @@ -32,7 +32,7 @@ VTKPlugin_GUI VTK_FILES - VTKファイル + VTKファイル( *.vtk ) EXPORT_TITLE @@ -43,7 +43,7 @@ VTKPlugin_ExportDlg DEFLECTION - Deflection + たわみ diff --git a/src/XAOPlugin/XAOPlugin_msg_ja.ts b/src/XAOPlugin/XAOPlugin_msg_ja.ts index 7d26ad27a..4f340dbdd 100644 --- a/src/XAOPlugin/XAOPlugin_msg_ja.ts +++ b/src/XAOPlugin/XAOPlugin_msg_ja.ts @@ -5,27 +5,27 @@ @default MEN_EXPORTXAO - エクスポートしました。 + XAOエクスポート TOP_EXPORTXAO - エクスポートしました。 + XAOのエクスポート STB_EXPORTXAO - ソテーした形式でフォームをエクスポートします。 + XAOのエクスポート MEN_IMPORTXAO - インポートしました。 + XAOインポート TOP_IMPORTXAO - インポートしました。 + XAOのインポート STB_IMPORTXAO - ソテーしたフォームをインポートします。 + XAOのインポート XAOPLUGIN_IMPORT_SELECT @@ -33,22 +33,22 @@ XAOPLUGIN_EXPORT_SELECT - エクスポートしました。 + XAOへのエクスポート XAOPLUGIN_FILES - ファイルした (*.xao) + XAO ファイル (*.xao) XAOPlugin_ExportDlg XAOPLUGIN_EXPORT_TITLE - エクスポートしました。 + XAOエクスポート XAOPLUGIN_EXPORTXAO - エクスポートしました。 + XAOエクスポート XAOPLUGIN_EXPORT_INGSHAPE @@ -75,11 +75,11 @@ XAOPlugin_ImportDlg XAOPLUGIN_IMPORT_TITLE - インポートしました。 + XAOインポート XAOPLUGIN_IMPORTXAO - インポートしました。 + XAOインポート XAOPLUGIN_IMPORT_INGSHAPE