diff -Nru opencamlib-11.10-2/debian/changelog opencamlib-11.10-2/debian/changelog --- opencamlib-11.10-2/debian/changelog 2020-07-16 22:16:59.000000000 +0000 +++ opencamlib-11.10-2/debian/changelog 2020-07-20 19:02:22.000000000 +0000 @@ -1,8 +1,8 @@ -opencamlib (11.10-2-1+git202007161738~ubuntu19.10.1) eoan; urgency=low +opencamlib (11.10-2-1+git202007201542~ubuntu19.10.1) eoan; urgency=low * Auto build. - -- neomilium Thu, 16 Jul 2020 22:16:59 +0000 + -- neomilium Mon, 20 Jul 2020 19:02:22 +0000 opencamlib (11.10-2) unstable; urgency=low diff -Nru opencamlib-11.10-2/debian/git-build-recipe.manifest opencamlib-11.10-2/debian/git-build-recipe.manifest --- opencamlib-11.10-2/debian/git-build-recipe.manifest 2020-07-16 22:16:59.000000000 +0000 +++ opencamlib-11.10-2/debian/git-build-recipe.manifest 2020-07-20 19:02:22.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debversion}-1+git202007161738 -lp:opencamlib git-commit:048b87b4b6f4dc1b36ebb94fbe5bd9a987170087 +# git-build-recipe format 0.4 deb-version {debversion}-1+git202007201542 +lp:opencamlib git-commit:d8bee38ccd9e4468937e320df2a46285e5088c36 nest packaging lp:~neomilium/opencamlib/+git/packaging debian git-commit:f950d73fd8725874505c0d3271cfef12057a6401 diff -Nru opencamlib-11.10-2/examples/python/drop-cutter/batchdropcutter_test_2.py opencamlib-11.10-2/examples/python/drop-cutter/batchdropcutter_test_2.py --- opencamlib-11.10-2/examples/python/drop-cutter/batchdropcutter_test_2.py 2020-07-16 22:16:57.000000000 +0000 +++ opencamlib-11.10-2/examples/python/drop-cutter/batchdropcutter_test_2.py 2020-07-20 19:02:21.000000000 +0000 @@ -9,7 +9,9 @@ if __name__ == "__main__": print(ocl.version()) myscreen = camvtk.VTKScreen() - stl = camvtk.STLSurf("../../stl/gnu_tux_mod.stl") + + # read STL file from disk + stl = camvtk.STLSurf("../../../stl/gnu_tux_mod.stl") #stl = camvtk.STLSurf("../stl/beet_mm.stl") #stl = camvtk.STLSurf("../stl/Blade.stl") myscreen.addActor(stl) @@ -20,6 +22,8 @@ s = ocl.STLSurf() camvtk.vtkPolyData2OCLSTL(polydata, s) print("STL surface read ", s.size(), " triangles") + + # Define a cutter length=5 cutter = ocl.BallCutter(1.4321, length) #cutter = ocl.CylCutter(1.123, length) @@ -27,12 +31,9 @@ #cutter = ocl.ConeCutter(0.43, math.pi/7, length) print(cutter) - minx=0 - dx=0.06 - maxx=9 - miny=0 - dy=1 - maxy=12 + # a grid of XY points where we run drop-cutter + minx, dx, maxx = 0, 0.006, 9 + miny, dy, maxy = 0, 0.1, 12 z=-5 clpoints = pyocl.CLPointGrid(minx,dx,maxx,miny,dy,maxy,z) print("generated grid with", len(clpoints)," CL-points") @@ -46,13 +47,14 @@ bdc1.appendPoint(p) t_before = time.time() - bdc1.run() + bdc1.run() # the actual drop-cutter run t_after = time.time() calctime = t_after-t_before - print(" done in ", calctime," s" ) + print(" done in %f s" % calctime ) + print(" time/point %g s" % (calctime/len(clpoints)) ) clpts = bdc1.getCLPoints() - print("rendering...",) + print("rendering...") camvtk.drawCLPointCloud(myscreen, clpts) print("done") diff -Nru opencamlib-11.10-2/.pc/.quilt_patches opencamlib-11.10-2/.pc/.quilt_patches --- opencamlib-11.10-2/.pc/.quilt_patches 2020-07-16 22:16:59.000000000 +0000 +++ opencamlib-11.10-2/.pc/.quilt_patches 2020-07-20 19:02:22.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-2608609/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-2611461/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru opencamlib-11.10-2/.pc/.quilt_series opencamlib-11.10-2/.pc/.quilt_series --- opencamlib-11.10-2/.pc/.quilt_series 2020-07-16 22:16:59.000000000 +0000 +++ opencamlib-11.10-2/.pc/.quilt_series 2020-07-20 19:02:22.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-2608609/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-2611461/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series diff -Nru opencamlib-11.10-2/src/deb/package_details.cmake opencamlib-11.10-2/src/deb/package_details.cmake --- opencamlib-11.10-2/src/deb/package_details.cmake 2020-07-16 22:16:57.000000000 +0000 +++ opencamlib-11.10-2/src/deb/package_details.cmake 2020-07-20 19:02:21.000000000 +0000 @@ -2,14 +2,14 @@ message(STATUS " called with SRC_DIR is = " ${SRC_DIR}) message(STATUS " called with version = " ${MY_VERSION}) -set(CPACK_GENERATOR "DEB" CACHE string "generator" ) +set(CPACK_GENERATOR "DEB" CACHE STRING "generator" ) set(CPACK_PACKAGE_CONTACT "Anders Wallin " CACHE STRING "email") set(CPACK_PACKAGE_NAME "opencamlib" CACHE STRING "name") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Computer aided manufacturing algorithms" CACHE STRING "descr") set(CPACK_PACKAGE_VENDOR https://github.com/aewallin/opencamlib CACHE STRING "web") set(CPACK_DEBIAN_PACKAGE_SECTION "science" CACHE STRING "sect") -set(DEBSRC_BUILD_DEPENDS debhelper python git cmake libboost-dev libboost-python-dev libgomp1 CACHE STRINGS "build-dep") +set(DEBSRC_BUILD_DEPENDS debhelper python git cmake libboost-dev libboost-python-dev libgomp1 CACHE STRING "build-dep") # we need to explicitly list the libboost-python versions here. why?? # precise has 1.48.0