Dirk Stoecker
7e8c62622a
- copy NOGIL patch from upstream - Add visualization18.patch to support visualization component OBS-URL: https://build.opensuse.org/request/show/650210 OBS-URL: https://build.opensuse.org/package/show/science/python-pcl?expand=0&rev=2
85 lines
5.2 KiB
Diff
85 lines
5.2 KiB
Diff
diff -wrBu -x '*180*' python-pcl-0.3.1_20180828_/pcl/pcl_visualization_defs.pxd python-pcl-0.3.1_20180828/pcl/pcl_visualization_defs.pxd
|
|
--- python-pcl-0.3.1_20180828_/pcl/pcl_visualization_defs.pxd 2018-08-13 09:01:55.000000000 +0300
|
|
+++ python-pcl-0.3.1_20180828/pcl/pcl_visualization_defs.pxd 2018-11-19 14:17:16.695255090 +0200
|
|
@@ -752,8 +752,8 @@
|
|
# param[in] scale the scale of the axes (default: 1)
|
|
# param[in] viewport the view port where the 3D axes should be added (default: all)
|
|
#
|
|
- # void addCoordinateSystem (double scale = 1.0, int viewport = 0);
|
|
- void addCoordinateSystem (double scale, int viewport)
|
|
+ # void addCoordinateSystem (double scale = 1.0, const string &id = "reference", int viewport = 0);
|
|
+ void addCoordinateSystem (double scale, const string &id, int viewport)
|
|
|
|
# brief Adds 3D axes describing a coordinate system to screen at x, y, z
|
|
# param[in] scale the scale of the axes (default: 1)
|
|
@@ -762,8 +762,8 @@
|
|
# param[in] z the Z position of the axes
|
|
# param[in] viewport the view port where the 3D axes should be added (default: all)
|
|
#
|
|
- # void addCoordinateSystem (double scale, float x, float y, float z, int viewport = 0);
|
|
- void addCoordinateSystem (double scale, float x, float y, float z, int viewport)
|
|
+ # void addCoordinateSystem (double scale, float x, float y, float z, const string &id = "reference", int viewport = 0);
|
|
+ void addCoordinateSystem (double scale, float x, float y, float z, const string &id, int viewport)
|
|
|
|
# brief Adds 3D axes describing a coordinate system to screen at x, y, z, Roll,Pitch,Yaw
|
|
# param[in] scale the scale of the axes (default: 1)
|
|
@@ -797,8 +797,8 @@
|
|
|
|
# brief Removes a previously added 3D axes (coordinate system)
|
|
# param[in] viewport view port where the 3D axes should be removed from (default: all)
|
|
- # bool removeCoordinateSystem (int viewport = 0);
|
|
- bool removeCoordinateSystem (int viewport)
|
|
+ # bool removeCoordinateSystem (const string &id = "reference", int viewport = 0);
|
|
+ bool removeCoordinateSystem(const string &id, int viewport)
|
|
|
|
# brief Removes a Point Cloud from screen, based on a given ID.
|
|
# param[in] id the point cloud object id (i.e., given on \a addPointCloud)
|
|
diff -wrBu -x '*180*' python-pcl-0.3.1_20180828_/pcl/pxi/Visualization/PCLVisualizering.pxi python-pcl-0.3.1_20180828/pcl/pxi/Visualization/PCLVisualizering.pxi
|
|
--- python-pcl-0.3.1_20180828_/pcl/pxi/Visualization/PCLVisualizering.pxi 2018-08-13 09:01:55.000000000 +0300
|
|
+++ python-pcl-0.3.1_20180828/pcl/pxi/Visualization/PCLVisualizering.pxi 2018-11-19 14:17:16.695255090 +0200
|
|
@@ -38,17 +38,17 @@
|
|
def SpinOnce(self, int millis_to_wait = 1, bool force_redraw = False):
|
|
self.thisptr().spinOnce (millis_to_wait, force_redraw)
|
|
|
|
- def AddCoordinateSystem(self, double scale = 1.0, int viewpoint = 0):
|
|
- self.thisptr().addCoordinateSystem(scale, viewpoint)
|
|
+ def AddCoordinateSystem(self, double scale = 1.0, const string &id = "reference", int viewpoint = 0):
|
|
+ self.thisptr().addCoordinateSystem(scale, id, viewpoint)
|
|
|
|
- def AddCoordinateSystem(self, double scale, float x, float y, float z, int viewpoint = 0):
|
|
- self.thisptr().addCoordinateSystem(scale, x, y, z, viewpoint)
|
|
+ def AddCoordinateSystem(self, double scale, float x, float y, float z, const string &id = "reference", int viewpoint = 0):
|
|
+ self.thisptr().addCoordinateSystem(scale, x, y, z, id, viewpoint)
|
|
|
|
# void addCoordinateSystem (double scale, const eigen3.Affine3f& t, int viewport)
|
|
|
|
# return bool
|
|
- def removeCoordinateSystem (self, int viewport):
|
|
- return self.thisptr().removeCoordinateSystem (viewport)
|
|
+ def removeCoordinateSystem (self, const string &id = "reference",int viewport = 0):
|
|
+ return self.thisptr().removeCoordinateSystem (id, viewport)
|
|
|
|
# return bool
|
|
def RemovePointCloud(self, string id, int viewport):
|
|
diff -wrBu -x '*180*' python-pcl-0.3.1_20180828_/setup.py python-pcl-0.3.1_20180828/setup.py
|
|
--- python-pcl-0.3.1_20180828_/setup.py 2018-08-13 09:01:55.000000000 +0300
|
|
+++ python-pcl-0.3.1_20180828/setup.py 2018-11-19 14:18:31.507146740 +0200
|
|
@@ -4,7 +4,7 @@
|
|
from Cython.Distutils import build_ext
|
|
from distutils.core import setup
|
|
from distutils.extension import Extension
|
|
-# from Cython.Build import cythonize # MacOS NG
|
|
+from Cython.Build import cythonize
|
|
from setuptools import setup, find_packages, Extension
|
|
|
|
import subprocess
|
|
@@ -628,7 +628,7 @@
|
|
]
|
|
elif pcl_version == '-1.8':
|
|
module = [Extension("pcl._pcl", ["pcl/_pcl_180.pyx", "pcl/minipcl.cpp", "pcl/ProjectInliers.cpp"], language="c++", **ext_args),
|
|
- # Extension("pcl.pcl_visualization", ["pcl/pcl_visualization.pyx"], language="c++", **ext_args),
|
|
+ Extension("pcl.pcl_visualization", ["pcl/pcl_visualization.pyx"], language="c++", extra_compile_args=['-std=c++11','-fno-strict-aliasing'], **ext_args),
|
|
# Extension("pcl.pcl_grabber", ["pcl/pcl_grabber.pyx", "pcl/grabber_callback.cpp"], language="c++", **ext_args),
|
|
# debug
|
|
# gdb_debug=True,
|