Skip to content

Commit fcf4e6e

Browse files
tpaviottpaviot
authored
Merge pull request tpaviot#918 from tpaviot/review/port-to-occt750
Review/port to occt750
2 parents dffc813 + 99b0f8d commit fcf4e6e

File tree

307 files changed

+28608
-34520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+28608
-34520
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ if(DEFINED OCE_INCLUDE_PATH)
132132
# if OCE_INCLUDE_PATH is not passed at command line,
133133
# find OCE automatically
134134
else(OCE_INCLUDE_PATH)
135-
find_package(OpenCASCADE 7.4.0 REQUIRED)
135+
find_package(OpenCASCADE 7.5.0 REQUIRED)
136136

137137
include_directories(${OpenCASCADE_INCLUDE_DIR})
138138
if(OpenCASCADE_FOUND)

‎azure-pipelines.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242
py_min: 6
4343
conda_bld: 3.17
4444

45-
- template: conda-build.yml
46-
parameters:
47-
name: Windows_VS2019_python36_32
48-
vmImage: 'windows-2019'
49-
py_maj: 3
50-
py_min: 6
51-
conda_bld: 3.17
45+
# - template: conda-build.yml
46+
# parameters:
47+
# name: Windows_VS2019_python36_32
48+
# vmImage: 'windows-2019'
49+
# py_maj: 3
50+
# py_min: 6
51+
# conda_bld: 3.17
5252

5353
- template: conda-build.yml
5454
parameters:
@@ -79,10 +79,10 @@ jobs:
7979
py_min: 7
8080
conda_bld: 3.17
8181

82-
- template: conda-build.yml
83-
parameters:
84-
name: Windows_VS2019_python37_32
85-
vmImage: 'windows-2019'
86-
py_maj: 3
87-
py_min: 7
88-
conda_bld: 3.17
82+
# - template: conda-build.yml
83+
# parameters:
84+
# name: Windows_VS2019_python37_32
85+
# vmImage: 'windows-2019'
86+
# py_maj: 3
87+
# py_min: 7
88+
# conda_bld: 3.17

‎ci/conda/conda_build_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CONDA_BUILD_SYSROOT:
2-
- /opt/MacOSX10.9.sdk # [osx]
2+
- /Applications/Xcode_12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk # [osx]
33

44
c_compiler:
55
- vs2015 # [win]

‎ci/conda/meta.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@ requirements:
1818
- {{ cdt('libx11-devel') }} # [linux]
1919
- {{ cdt('xorg-x11-proto-devel') }} # [linux]
2020
- {{ cdt('mesa-libgl-devel') }} # [linux]
21+
- {{ cdt('libxi-devel') }} # [linux]
2122
- ninja
2223
- cmake
2324
- swig >=3.0.11
2425

2526
host:
2627
- python {{ python }}
27-
- opencascade ==7.4.0
28+
- occt ==7.5.0
2829

2930
run:
30-
- opencascade ==7.4.0
31+
- occt ==7.5.0
3132
- python
33+
- six
3234

3335
test:
3436
imports:
@@ -37,6 +39,7 @@ test:
3739
requires:
3840
- pyqt >=5
3941
- mypy
42+
- svgwrite
4043

4144
about:
4245
home: https://github.com/tpaviot/pythonocc-core

‎conda-build.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- ${{ if contains(parameters.vmImage, 'Ubuntu') }}:
2727
- bash: |
2828
sudo apt-get update && \
29-
sudo apt-get -q -y install libglu1-mesa-dev libgl1-mesa-dev
29+
sudo apt-get -q -y install libglu1-mesa-dev libgl1-mesa-dev libxmu-dev libxi-dev
3030
displayName: 'Install OpenGL headers'
3131
3232
# macOS ownership workaround and fix osx sdk
@@ -35,15 +35,16 @@ jobs:
3535
sudo chown -R $USER $CONDA && \
3636
curl -o MacOSX10.9.sdk.tar.xz -L https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX10.9.sdk.tar.xz && \
3737
tar xf MacOSX10.9.sdk.tar.xz && \
38-
sudo mv -v MacOSX10.9.sdk /opt/ && \
39-
ls /opt
38+
sudo mkdir -p /Applications/Xcode_12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs && \
39+
sudo mv -v MacOSX10.9.sdk /Applications/Xcode_12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ && \
40+
ls /Applications/Xcode_12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
4041
displayName: 'MacOS ownership workaround and installation of MacOSX10.9 sdk'
4142
4243
- bash: |
4344
conda config --set always_yes yes --set changeps1 no && \
4445
conda update -q conda && \
4546
conda info -a && \
46-
conda config --add channels https://conda.anaconda.org/dlr-sc
47+
conda config --add channels https://conda.anaconda.org/conda-forge
4748
displayName: 'Conda config and info'
4849
4950
# on windows, set arch if ever 32 is in the build name

‎src/Display/OCCViewer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ class OffscreenRenderer(Viewer3d):
638638
each time it is called.
639639
"""
640640
def __init__(self, screen_size=(640, 480)):
641-
Viewer3d.__init__(self, None)
641+
Viewer3d.__init__(self)
642642
# create the renderer
643643
self.Create()
644644
self.SetSize(screen_size[0], screen_size[1])

‎src/PkgBase/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PYTHONOCC_VERSION_MAJOR = 7
2-
PYTHONOCC_VERSION_MINOR = 4
3-
PYTHONOCC_VERSION_PATCH = 1
2+
PYTHONOCC_VERSION_MINOR = 5
3+
PYTHONOCC_VERSION_PATCH = 0
44

55
# Empty for official releases, set to -dev, -rc1, etc for development releases
66
PYTHONOCC_VERSION_DEVEL = '-dev'

‎src/SWIG_files/headers/AIS_module.hxx‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
4848
#include<AIS_DiameterDimension.hxx>
4949
#include<AIS_Dimension.hxx>
5050
#include<AIS_DimensionOwner.hxx>
51-
#include<AIS_DimensionSelectionMode.hxx>
5251
#include<AIS_DisplayMode.hxx>
53-
#include<AIS_DisplaySpecialSymbol.hxx>
5452
#include<AIS_DisplayStatus.hxx>
5553
#include<AIS_DragAction.hxx>
5654
#include<AIS_EllipseRadiusDimension.hxx>
@@ -64,11 +62,7 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
6462
#include<AIS_IndexedDataMapOfOwnerPrs.hxx>
6563
#include<AIS_InteractiveContext.hxx>
6664
#include<AIS_InteractiveObject.hxx>
67-
#include<AIS_KindOfDimension.hxx>
6865
#include<AIS_KindOfInteractive.hxx>
69-
#include<AIS_KindOfRelation.hxx>
70-
#include<AIS_KindOfSurface.hxx>
71-
#include<AIS_KindOfUnit.hxx>
7266
#include<AIS_LengthDimension.hxx>
7367
#include<AIS_Line.hxx>
7468
#include<AIS_ListIteratorOfListOfInteractive.hxx>
@@ -100,11 +94,9 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
10094
#include<AIS_SelectStatus.hxx>
10195
#include<AIS_Selection.hxx>
10296
#include<AIS_SelectionModesConcurrency.hxx>
103-
#include<AIS_SequenceOfDimension.hxx>
10497
#include<AIS_SequenceOfInteractive.hxx>
10598
#include<AIS_Shape.hxx>
10699
#include<AIS_SignatureFilter.hxx>
107-
#include<AIS_StandardDatum.hxx>
108100
#include<AIS_StatusOfDetection.hxx>
109101
#include<AIS_StatusOfPick.hxx>
110102
#include<AIS_SymmetricRelation.hxx>
@@ -116,16 +108,14 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
116108
#include<AIS_TrihedronOwner.hxx>
117109
#include<AIS_TrihedronSelectionMode.hxx>
118110
#include<AIS_TypeFilter.hxx>
119-
#include<AIS_TypeOfAngle.hxx>
120-
#include<AIS_TypeOfAngleArrowVisibility.hxx>
121111
#include<AIS_TypeOfAttribute.hxx>
122112
#include<AIS_TypeOfAxis.hxx>
123-
#include<AIS_TypeOfDist.hxx>
124113
#include<AIS_TypeOfIso.hxx>
125114
#include<AIS_TypeOfPlane.hxx>
126115
#include<AIS_ViewController.hxx>
127116
#include<AIS_ViewCube.hxx>
128117
#include<AIS_ViewInputBuffer.hxx>
129118
#include<AIS_WalkDelta.hxx>
119+
#include<AIS_XRTrackedDevice.hxx>
130120

131121
#endif // AIS_HXX

‎src/SWIG_files/headers/Aspect_module.hxx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,21 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
2424
#include<Aspect_AspectMarkerDefinitionError.hxx>
2525
#include<Aspect_Background.hxx>
2626
#include<Aspect_CircularGrid.hxx>
27+
#include<Aspect_ColorSpace.hxx>
2728
#include<Aspect_Convert.hxx>
2829
#include<Aspect_Display.hxx>
2930
#include<Aspect_DisplayConnection.hxx>
3031
#include<Aspect_DisplayConnectionDefinitionError.hxx>
3132
#include<Aspect_Drawable.hxx>
33+
#include<Aspect_Eye.hxx>
3234
#include<Aspect_FBConfig.hxx>
3335
#include<Aspect_FillMethod.hxx>
36+
#include<Aspect_FrustumLRBT.hxx>
3437
#include<Aspect_GenId.hxx>
3538
#include<Aspect_GradientBackground.hxx>
3639
#include<Aspect_GradientFillMethod.hxx>
3740
#include<Aspect_GraphicDeviceDefinitionError.hxx>
41+
#include<Aspect_GraphicsLibrary.hxx>
3842
#include<Aspect_Grid.hxx>
3943
#include<Aspect_GridDrawMode.hxx>
4044
#include<Aspect_GridType.hxx>
@@ -43,13 +47,15 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
4347
#include<Aspect_IdentDefinitionError.hxx>
4448
#include<Aspect_InteriorStyle.hxx>
4549
#include<Aspect_NeutralWindow.hxx>
50+
#include<Aspect_OpenVRSession.hxx>
4651
#include<Aspect_PolygonOffsetMode.hxx>
4752
#include<Aspect_RectangularGrid.hxx>
4853
#include<Aspect_RenderingContext.hxx>
4954
#include<Aspect_ScrollDelta.hxx>
5055
#include<Aspect_SequenceOfColor.hxx>
5156
#include<Aspect_Touch.hxx>
5257
#include<Aspect_TouchMap.hxx>
58+
#include<Aspect_TrackedDevicePose.hxx>
5359
#include<Aspect_TypeOfColorScaleData.hxx>
5460
#include<Aspect_TypeOfColorScaleOrientation.hxx>
5561
#include<Aspect_TypeOfColorScalePosition.hxx>
@@ -70,5 +76,15 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
7076
#include<Aspect_WindowDefinitionError.hxx>
7177
#include<Aspect_WindowError.hxx>
7278
#include<Aspect_XAtom.hxx>
79+
#include<Aspect_XRAction.hxx>
80+
#include<Aspect_XRActionSet.hxx>
81+
#include<Aspect_XRActionType.hxx>
82+
#include<Aspect_XRAnalogActionData.hxx>
83+
#include<Aspect_XRDigitalActionData.hxx>
84+
#include<Aspect_XRGenericAction.hxx>
85+
#include<Aspect_XRHapticActionData.hxx>
86+
#include<Aspect_XRPoseActionData.hxx>
87+
#include<Aspect_XRSession.hxx>
88+
#include<Aspect_XRTrackedDeviceRole.hxx>
7389

7490
#endif // ASPECT_HXX

‎src/SWIG_files/headers/BRepMesh_module.hxx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ along with pythonOCC. If not, see <http://www.gnu.org/licenses/>.
3131
#include<BRepMesh_DataStructureOfDelaun.hxx>
3232
#include<BRepMesh_Deflection.hxx>
3333
#include<BRepMesh_DegreeOfFreedom.hxx>
34+
#include<BRepMesh_DelabellaBaseMeshAlgo.hxx>
35+
#include<BRepMesh_DelabellaMeshAlgoFactory.hxx>
3436
#include<BRepMesh_Delaun.hxx>
3537
#include<BRepMesh_DelaunayBaseMeshAlgo.hxx>
3638
#include<BRepMesh_DelaunayDeflectionControlMeshAlgo.hxx>

0 commit comments

Comments
 (0)