Archived issue #0024727
Convertation of the generic classes to the non-generic. Part 3
Description
1) Generic class "Intf_InterferencePolyhedron" from "Intf" package converted to the non-generic class and moved to the "IntPatch" package. Name of this class was changed to "IntPatch_InterferencePolyhedron".
2) Generic class "MoniTool_Elem" from "MoniTool" package converted to the non-generic class "MoniTool_TransientElem".
3) Generic class "IntWalk_PWalking" from "IntWalk" package converted to the non-generic class. And internal class "TheInt2S" of "IntWalk_PWalking" moved from IntWalk_PWalking.cdl to IntWalk.cdl for correct building. Also several "*.cxx" files of this class merged to one ".cxx".
4) Generic class "Transfer_SimpleBinder" from "Transfer" package converted to the non-generic class and moved to the "TransferBRep" package. Name of this class was changed to "TransferBRep_BinderOfShape".
5) Generic class "Geom2dInt_CurveTool" from "Geom2dInt" package converted to the non-generic class "Geom2dInt_Geom2dCurveTool".
6) Generic class "MAT2d_BisectingLocus" from "MAT2d" package converted to the non-generic class and moved to the "BRepMAT2d" package. Name of this class was changed to "BRepMAT2d_BisectingLocus".
7) Generic class "MAT_Mat" from "MAT" package converted to the non-generic class and moved to the "MAT2d" package. Name of this class was changed to "MAT2d_Mat2d".
2) Generic class "MoniTool_Elem" from "MoniTool" package converted to the non-generic class "MoniTool_TransientElem".
3) Generic class "IntWalk_PWalking" from "IntWalk" package converted to the non-generic class. And internal class "TheInt2S" of "IntWalk_PWalking" moved from IntWalk_PWalking.cdl to IntWalk.cdl for correct building. Also several "*.cxx" files of this class merged to one ".cxx".
4) Generic class "Transfer_SimpleBinder" from "Transfer" package converted to the non-generic class and moved to the "TransferBRep" package. Name of this class was changed to "TransferBRep_BinderOfShape".
5) Generic class "Geom2dInt_CurveTool" from "Geom2dInt" package converted to the non-generic class "Geom2dInt_Geom2dCurveTool".
6) Generic class "MAT2d_BisectingLocus" from "MAT2d" package converted to the non-generic class and moved to the "BRepMAT2d" package. Name of this class was changed to "BRepMAT2d_BisectingLocus".
7) Generic class "MAT_Mat" from "MAT" package converted to the non-generic class and moved to the "MAT2d" package. Name of this class was changed to "MAT2d_Mat2d".
Public activity
10 archived notes
Participants are labeled by their role within this record.
Changes are ready for review in CR24727 branch.
Please change implementation of IntWalk_PWalking class to avoid #including several CXX files from one CXX, this is bad practice. I suggest you merge all CXX files in one, if it will become long (file _1.cxx is long, already). Besides, why you removed files IntWalk_IWalking*.gxx from FILES -- they seems to be still in use, aren't they?
Fixed. (CR24727 branch)
Igor, please review. From my point of view the change looks Ok now.
Ok
Dear Commenter 1,
Branch CR24727 (and products from GIT master) was compiled on Linux and Windows platforms and tested.
[revision removed]
There are compilation errors on Linux platform:
http://jenkins-test-02.nnov.opencascade.com:8080/user/mnt/my-views/view/CR24727/job/mnt-CR24727-master_build_occt_linux/2/parsed_console/?
In file included from ../../../../drv/Contap/Contap_TheIWalkingOfContour_0.cxx:92:
../../../../inc/IntWalk_IWalking.gxx:21:34: error: IntWalk_IWalking_1.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:22:34: error: IntWalk_IWalking_2.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:23:34: error: IntWalk_IWalking_3.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:24:34: error: IntWalk_IWalking_4.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:25:34: error: IntWalk_IWalking_5.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:26:34: error: IntWalk_IWalking_6.gxx: No such file or directory
http://jenkins-test-02.nnov.opencascade.com:8080/user/mnt/my-views/view/CR24727/job/mnt-CR24727-master_build_occt_windows/1/parsed_console/?
27>..\..\..\inc\IntWalk_IWalking.gxx(21) : fatal error C1083: Cannot open include file: 'IntWalk_IWalking_1.gxx': No such file or directory
...
Branch CR24727 (and products from GIT master) was compiled on Linux and Windows platforms and tested.
[revision removed]
There are compilation errors on Linux platform:
http://jenkins-test-02.nnov.opencascade.com:8080/user/mnt/my-views/view/CR24727/job/mnt-CR24727-master_build_occt_linux/2/parsed_console/?
In file included from ../../../../drv/Contap/Contap_TheIWalkingOfContour_0.cxx:92:
../../../../inc/IntWalk_IWalking.gxx:21:34: error: IntWalk_IWalking_1.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:22:34: error: IntWalk_IWalking_2.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:23:34: error: IntWalk_IWalking_3.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:24:34: error: IntWalk_IWalking_4.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:25:34: error: IntWalk_IWalking_5.gxx: No such file or directory
../../../../inc/IntWalk_IWalking.gxx:26:34: error: IntWalk_IWalking_6.gxx: No such file or directory
http://jenkins-test-02.nnov.opencascade.com:8080/user/mnt/my-views/view/CR24727/job/mnt-CR24727-master_build_occt_windows/1/parsed_console/?
27>..\..\..\inc\IntWalk_IWalking.gxx(21) : fatal error C1083: Cannot open include file: 'IntWalk_IWalking_1.gxx': No such file or directory
...
Test again this branch, please. I found a mistake and corrected it.
Dear Commenter 1,
Branch CR24727 (and products from GIT master) was compiled on Linux and Windows platforms and tested.
[revision removed]
Number of compiler warnings:
occt component :
Linux: 30 (30 on master)
Windows: 0 (0 on master)
products component :
Linux: 12 (12 on master)
Windows: 2 (2 on master)
Regressions/Differences:
No regressions/differences
Testing cases:
Not needed
Testing on Linux:
Total MEMORY difference: 384476676 / 385978040
Total CPU difference: 44266.769999999924 / 45153.70999999999
Testing on Windows:
Total MEMORY difference: 431565576 / 430651744
Total CPU difference: 32096.234375 / 33520.265625
There are following differences in images found by testdiff.
http://occt-tests/CR24727-master-occt/Debian60-64/diff-Debian60-64.html
http://occt-tests/CR24727-master-occt/Windows-32-VC9/diff-Windows-32-VC9.html
IMAGE v3d glsl phong_views: phong_views.png differs
IMAGE bugs vis bug61: bug6145_Driver1_Viewer1_View1.png differs
IMAGE bugs vis bug6145: bug6145_Driver1_Viewer1_View1.png differs
IMAGE bugs vis bug23670_1: bug23670_1_MyDriver_MyViewer_MyView.png differs
Branch CR24727 (and products from GIT master) was compiled on Linux and Windows platforms and tested.
[revision removed]
Number of compiler warnings:
occt component :
Linux: 30 (30 on master)
Windows: 0 (0 on master)
products component :
Linux: 12 (12 on master)
Windows: 2 (2 on master)
Regressions/Differences:
No regressions/differences
Testing cases:
Not needed
Testing on Linux:
Total MEMORY difference: 384476676 / 385978040
Total CPU difference: 44266.769999999924 / 45153.70999999999
Testing on Windows:
Total MEMORY difference: 431565576 / 430651744
Total CPU difference: 32096.234375 / 33520.265625
There are following differences in images found by testdiff.
http://occt-tests/CR24727-master-occt/Debian60-64/diff-Debian60-64.html
http://occt-tests/CR24727-master-occt/Windows-32-VC9/diff-Windows-32-VC9.html
IMAGE v3d glsl phong_views: phong_views.png differs
IMAGE bugs vis bug61: bug6145_Driver1_Viewer1_View1.png differs
IMAGE bugs vis bug6145: bug6145_Driver1_Viewer1_View1.png differs
IMAGE bugs vis bug23670_1: bug23670_1_MyDriver_MyViewer_MyView.png differs
Mikhail, branch CR24727 is based on previous state of master, please compare with it
Dear Commenter 1,
Branch CR24727 was recompared with IR-2014-03-06-IR-2014-03-06.
Regressions/Differences:
No regressions/differences
Testing on Linux:
Total MEMORY difference: 384450056 / 385720176
Total CPU difference: 44265.27999999992 / 43631.789999999986
Testing on Windows:
Total MEMORY difference: 431568860 / 430878452
Total CPU difference: 32096.078125 / 30425.953125
There are no differences in images found by testdiff.
Branch CR24727 was recompared with IR-2014-03-06-IR-2014-03-06.
Regressions/Differences:
No regressions/differences
Testing on Linux:
Total MEMORY difference: 384450056 / 385720176
Total CPU difference: 44265.27999999992 / 43631.789999999986
Testing on Windows:
Total MEMORY difference: 431568860 / 430878452
Total CPU difference: 32096.078125 / 30425.953125
There are no differences in images found by testdiff.
Related records