From: skv Date: Fri, 12 Dec 2014 12:35:24 +0000 (+0300) Subject: Documentation creation X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fskv%2F22766;p=modules%2Fgeom.git Documentation creation --- diff --git a/doc/salome/gui/GEOM/images/transfer_data1.png b/doc/salome/gui/GEOM/images/transfer_data1.png new file mode 100644 index 000000000..4cd196163 Binary files /dev/null and b/doc/salome/gui/GEOM/images/transfer_data1.png differ diff --git a/doc/salome/gui/GEOM/images/transfer_data2.png b/doc/salome/gui/GEOM/images/transfer_data2.png new file mode 100644 index 000000000..374147d7d Binary files /dev/null and b/doc/salome/gui/GEOM/images/transfer_data2.png differ diff --git a/doc/salome/gui/GEOM/input/transfer_data.doc b/doc/salome/gui/GEOM/input/transfer_data.doc new file mode 100644 index 000000000..b34b34f31 --- /dev/null +++ b/doc/salome/gui/GEOM/input/transfer_data.doc @@ -0,0 +1,53 @@ +/*! + +\page transfer_data_page Transfer Data + +This operation performs copying of non-topological data +from one shape to another. The topology of the destination object +will not change, only non-topological data will be transferred +(if it is present in the source object). It is possible to transfer +the following data with this operation: + + +To use this operation, select in the Main Menu Operations -> Transfer Data. +The following dialog box will appear. + +\image html transfer_data1.png "Transfer Data Dialog" + +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: + +\image html transfer_data2.png "Transfer Data Information" + +TUI Command: geompy.TransferData(ObjectFrom, ObjectTo, FindMethod), +
where \em ObjectFrom is a data source object, \em ObjectTo is a +destination object and \em FindMethod is a same shape detection method with +default value \em GEOM.FSM_GetInPlace. + +Our TUI Scripts provide you with useful example of the use of +\ref swig_TransferData "Transfer Data" functionality. + +*/ diff --git a/doc/salome/gui/GEOM/input/transforming_geom_objs.doc b/doc/salome/gui/GEOM/input/transforming_geom_objs.doc index 573182a4d..8ded8676a 100644 --- a/doc/salome/gui/GEOM/input/transforming_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/transforming_geom_objs.doc @@ -25,6 +25,8 @@ into water. special case of \b Explode operation.
  • \subpage shared_shapes_page "Get shared shapes" operation, a special case of \b Explode operation.
    • +
  • \subpage transfer_data_page "Transfer Data" operation, which copies +non-topological data from one shape to another.
  • \subpage restore_presentation_parameters_page "Restore presentation parameters". diff --git a/doc/salome/gui/GEOM/input/tui_test_others.doc b/doc/salome/gui/GEOM/input/tui_test_others.doc index 701a1b52b..86630b77d 100644 --- a/doc/salome/gui/GEOM/input/tui_test_others.doc +++ b/doc/salome/gui/GEOM/input/tui_test_others.doc @@ -96,6 +96,9 @@ \anchor swig_GetSharedShapes \until "sharedEdge_" +\anchor swig_TransferData +\until subBlackWhite[1] + \anchor swig_CheckAndImprove \until "blocksComp" diff --git a/resources/transfer_data.png b/resources/transfer_data.png index 05ac19352..275444be8 100644 Binary files a/resources/transfer_data.png and b/resources/transfer_data.png differ diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 2cb39a2bf..548204a65 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -562,6 +562,18 @@ def TestOtherOperations (geompy, math): ind = ind + 1 pass + # TransferData + path = os.getenv("DATA_DIR") + fileName = path + "/Shapes/Step/black_and_white.step" + blackWhite = geompy.ImportSTEP(fileName) + blackWhiteCopy = geompy.MakeCopy(blackWhite[0]) + subBlackWhite = geompy.SubShapeAll(blackWhiteCopy, GEOM.SOLID) + geompy.TransferData(blackWhite[0], blackWhiteCopy) + geompy.addToStudy(blackWhite[0], "blackWhite") + geompy.addToStudy(blackWhiteCopy, "blackWhiteCopy") + geompy.addToStudyInFather( blackWhiteCopy, subBlackWhite[0], "" ) + geompy.addToStudyInFather( blackWhiteCopy, subBlackWhite[1], "" ) + # CheckAndImprove blocksComp = geompy.CheckAndImprove(part) diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py old mode 100644 new mode 100755 index 310674111..4d7d15c0e --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -12869,6 +12869,8 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # @return True in case of success; False otherwise. # # @ingroup l1_geomBuilder_auxiliary + # + # @ref swig_TransferData "Example" @ManageTransactions("InsertOp") def TransferData(self, theObjectFrom, theObjectTo, theFindMethod=GEOM.FSM_GetInPlace): @@ -12887,8 +12889,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): Returns: True in case of success; False otherwise. - Example of usage: isOk = geompy.TransferData(theObjectFrom, theObjectTo, - GEOM.FSM_GetInPlace) + # Example: see GEOM_TestOthers.py """ # Example: see GEOM_TestAll.py isOk = self.InsertOp.TransferData(theObjectFrom, diff --git a/src/OperationGUI/OperationGUI_TransferDataDlg.cxx b/src/OperationGUI/OperationGUI_TransferDataDlg.cxx old mode 100644 new mode 100755 index 3697c2afa..9c5d48f97 --- a/src/OperationGUI/OperationGUI_TransferDataDlg.cxx +++ b/src/OperationGUI/OperationGUI_TransferDataDlg.cxx @@ -71,7 +71,7 @@ OperationGUI_TransferDataDlg::OperationGUI_TransferDataDlg (GeometryGUI* theGeom layout->addWidget(myGroup); /***************************************************************/ - setHelpFileName("transferdata_page.html"); + setHelpFileName("transfer_data_page.html"); Init(); }