Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Value io #126

Closed
wants to merge 78 commits into from

3 participants

Andrew Plumb Marius Kintel Jason Lewis
Andrew Plumb

I finally got around to figuring out how to add Value::POLYSET support and associated functions into the openscad:value refactoring.

See example024.scad for some simple examples.

Of note, there is now a dependency on ImageMagick++ for broader image data read support.

Magick++ API details can be found here: http://www.imagemagick.org/Magick++/Image.html

clothbot added some commits
Andrew Plumb clothbot Adding hooks for imagemagick import code 7145c2a
Andrew Plumb clothbot Added Value::POLYSET, polyset() primitive and read_* functions
Infrastructure for reading in DXF, STL and image data into a
pre-rendering Value::POLYSET type for processing and parameter passing
usage.
6a6e42e
Andrew Plumb clothbot Added example024 test
Exercises read_image() with ImageMagick dependencies.
af8b7a0
Andrew Plumb clothbot Excluding dumptest_example024
Forgot to exclude dumptest_example024 so all main tests pass.
4a49823
Marius Kintel
Owner

Sorry for late answer, I'm out traveling.
One question to imagemagick.pri:

Why do you change the QT include variable?
QMAKE_INCDIR_QT = $$IMAGEMAGICK_INCLUDEPATH $$QMAKE_INCDIR_QT

Would the standard method do the same job?:
QMAKE_INCDIR += $$IMAGEMAGICK_INCLUDEPATH

Andrew Plumb

I'll give it a try. I used eigen2.pri as my template since it uses a similar "include/eigen2" subdirectory to contain its .h files.

Marius Kintel
Owner

oh, I see - that's was probably a hack to ensure that the custom build version is preferred over any standard location which may be shared with other libraries. I suggest just leave it as it is then.

Marius Kintel
Owner

I feel these new feature need a bit of thinking to avoid complicating the language concept too much.
I'll comment on things here hoping to start clear up what I'm thinking:

1) (trivial) I think the read_* functions should not be explicitly named after which file format is read. Just like the import module imports any supported file format.

2) import modules vs. read functions. These fulfill the same task, except import returns an object into the object tree while read returns a value to be used later. Can these two be merged or in any other way be synchronized into one feature?

3) polyset() vs. surface() modules. These appear to do something very similar. Can we merge these? alternatively mark surface as obsolete and use the new module?

PS. You're also including polyutils.h from a number of files which don't use polyutils.

Andrew Plumb

Issue 1 is now taken care of. The "read()" function handles dxf, simple image and STL file reading. Since "read_rgb()" is still rather experimental I've kept it stand-alone.

I've cleaned up the unnecessary polyutils.h includes in the tests/*.cc files.

Re. Issue 2: I need to compare the code I re-used from the import modules (from a while back) against what's currently there. Once any/all recent changes are accounted for in the polyutils variant I'll swap in calls to those functions in the import code.

Re. Issue 3: A "read(.dat)" variant should do the trick. I also want to get a "read(.csv)" variant in there as well.

don bright and others added some commits
don bright fix aptitude package list for ubuntu build in README b960247
Jason Lewis jasonblewis added auto-loads to scad-mode.el so when it is installed via
elpa/marmalade it sets everything up for the user so they don't have
to edit their init.el file.

scad-mode should turn on automatically for any files that end in .scad
ac0b7f1
Marius Kintel kintel Merge pull request #140 from jasonblewis/feature-scad-mode-autoload
added auto-loads to scad-mode.el for emacs
875def8
Marius Kintel kintel Qt 4.8 requires explicit QMAKESPEC d8ca1de
Marius Kintel kintel Tweaks for Qt 4.8 and correct mpfr download link 38a4585
Don Bright features: build CGAL/OpenCSG alone. customize BASEDIR more easily b2c12d2
Don Bright script to auto-download/install dependency packages in OpenSUSE 631ac46
Don Bright make name match other build script names better 4440cb8
don bright rewrite to be compatible with ubuntu 'dash' shell bf22cef
don bright add build script for ubuntu that downloads binary packages too cb287b2
don bright update documentation. update glew version for ubuntu package d/l 54f6fb2
don bright update documentation c89ff6a
Don Bright create an easy build-script for fedora 17 154e2c7
don bright update README, add build-essentials and ubuntu version detection beac717
don bright detect debian version. give advice if too old. 3d94628
don bright fix bug in ubuntu script. tweak README to match MacOSX section. 2cf86fc
don bright check versions of libraries at compile time - warn users. fix FIXME i…
…n openscad.pro
018211a
don bright add reminder to env-var script to re-run qmake a872691
don bright detect cmake version. enable build_git a2a31e7
don bright improve wording of CGAL warning + env var warning e1fe9a3
Marius Kintel kintel Merge pull request #142 from openscad/opensuse
Opensuse
a7a8679
Marius Kintel kintel Merge branch 'master' into version_check 1395af1
Marius Kintel kintel Merge branch 'master' of github.com:openscad/openscad
Conflicts:
	scripts/linux-build-dependencies.sh
d88429d
Marius Kintel kintel Don't use grabMouse() and setFocus(). Attempt to fix #53 2aaccdc
Marius Kintel kintel Merge branch 'timestamp-cache' 13557f1
Marius Kintel kintel Merge branch 'master' of github.com:openscad/openscad 1b38030
don bright fix compilation and linking issues on mingw crossbuild 263901c
don bright put obj files in separate dir during mingw win32 cross compilation 14160d2
don bright allow NUMJOBS and NUMCPU + explanations. fix tabs. d3fd45b
don bright Merge branch 'winfix1' of github.com:openscad/openscad into mingwcross1 eb58394
don bright put .o files of cross into separate directory. handle git issue. cd81cec
don bright improve printout notices 5e2350d
don bright don't suggest paralell build by default, it can cause parser_yacc pro…
…blem
8e1fee3
don bright fix bugs in build 8cc4423
don bright Merge branch 'master' of github.com:openscad/openscad into mingwcross1
Conflicts:
	src/linearextrude.cc
10619bd
don bright dont use boost-chrono if not doing mingw build 293d66a
don bright fix documentation 06420a3
don bright cleanup be9c424
don bright cleanup2 7963c1c
don bright create dir if non-existant, bug rept by Brad Pitcher d7e40ae
don bright fix build bugs on fedora 64-bit d6ae963
don bright fix build bug on some DSO linux systems 9123ad8
don bright Merge branch 'master' of github.com:openscad/openscad 9044f7a
Marius Kintel kintel Merge pull request #146 from openscad/mingwcross1
Mingwcross1
3267ba2
Marius Kintel kintel sed parameter bug for build_glew(). Fixes #145 821c064
don bright create bsd build scripts for freebsd 9. d30775a
don bright indicate which freebsd tested on 8e3f310
don bright cgal 4.0.2 has a bugfix re clang and gcc 4.7 ( issue #117 ) eda7a41
don bright initial steps towards support of clang compiler dec26f8
don bright enable build of glew + opencsg with clang from script b22951a
don bright improve clang build of glew and opencsg 448bb14
don bright build opencsg properly 4e6e390
don bright fix bug dba4fda
don bright change back to original directory after opencsg build 924c9cc
don bright Merge branch 'cgal402' of github.com:openscad/openscad into clang ec01e7f
don bright fix OpenCSG Warning bug where slots were not connected 2551905
don bright improve usage on PCBSD e501bdd
don bright remove debug line 36d2515
don bright debugging and rearranging to find issue 3c7a85a
don bright remove debugging statements b33a02b
don bright on control + mousewheel, zoomin/zoomout text (like firefox, IE, etc) 86b5fc0
don bright clarify comment 7f64312
don bright add git clone info to README.md , for openscad and MCAD 354aa17
don bright remove opencsg code that belongs in another branch 1d40052
don bright remove code that belongs in another branch 54c7cb2
don bright update README.md lines to look better on github.com 54bf1cf
Marius Kintel kintel Merge pull request #157 from openscad/freebsdbuilders
Freebsdbuilders
23ad640
Marius Kintel kintel Merge pull request #156 from openscad/git_readme_update
Git readme update
9562565
Marius Kintel kintel Merge pull request #155 from openscad/fontsize_save
Fontsize save
dcb8c20
Marius Kintel kintel Merge branch 'master' of github.com:openscad/openscad
Conflicts:
	scripts/linux-build-dependencies.sh
f1634d5
don bright update version of CGAL in linux build script 12ff22c
Andrew Plumb clothbot Catching up changes. 0ca66f5
Marius Kintel kintel closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 7, 2012
  1. Andrew Plumb
Commits on Jun 10, 2012
  1. Andrew Plumb

    Added Value::POLYSET, polyset() primitive and read_* functions

    clothbot authored
    Infrastructure for reading in DXF, STL and image data into a
    pre-rendering Value::POLYSET type for processing and parameter passing
    usage.
  2. Andrew Plumb

    Added example024 test

    clothbot authored
    Exercises read_image() with ImageMagick dependencies.
  3. Andrew Plumb

    Excluding dumptest_example024

    clothbot authored
    Forgot to exclude dumptest_example024 so all main tests pass.
Commits on Jun 28, 2012
  1. Andrew Plumb
  2. Andrew Plumb
Commits on Jul 8, 2012
Commits on Jul 9, 2012
  1. Jason Lewis

    added auto-loads to scad-mode.el so when it is installed via

    jasonblewis authored
    elpa/marmalade it sets everything up for the user so they don't have
    to edit their init.el file.
    
    scad-mode should turn on automatically for any files that end in .scad
  2. Marius Kintel

    Merge pull request #140 from jasonblewis/feature-scad-mode-autoload

    kintel authored
    added auto-loads to scad-mode.el for emacs
  3. Marius Kintel
  4. Marius Kintel
Commits on Jul 11, 2012
  1. make name match other build script names better

    Don Bright authored
  2. rewrite to be compatible with ubuntu 'dash' shell

    don bright authored
  3. update documentation

    don bright authored
Commits on Jul 12, 2012
  1. create an easy build-script for fedora 17

    Don Bright authored
  2. detect debian version. give advice if too old.

    don bright authored
Commits on Jul 13, 2012
  1. check versions of libraries at compile time - warn users. fix FIXME i…

    don bright authored
    …n openscad.pro
  2. add reminder to env-var script to re-run qmake

    don bright authored
  3. detect cmake version. enable build_git

    don bright authored
  4. improve wording of CGAL warning + env var warning

    don bright authored
  5. Marius Kintel

    Merge pull request #142 from openscad/opensuse

    kintel authored
    Opensuse
  6. Marius Kintel
  7. Marius Kintel

    Merge branch 'master' of github.com:openscad/openscad

    kintel authored
    Conflicts:
    	scripts/linux-build-dependencies.sh
Commits on Jul 15, 2012
  1. Marius Kintel
  2. Marius Kintel

    Merge branch 'timestamp-cache'

    kintel authored
  3. Marius Kintel
  4. allow NUMJOBS and NUMCPU + explanations. fix tabs.

    don bright authored
  5. improve printout notices

    don bright authored
  6. fix bugs in build

    don bright authored
  7. Merge branch 'master' of github.com:openscad/openscad into mingwcross1

    don bright authored
    Conflicts:
    	src/linearextrude.cc
  8. dont use boost-chrono if not doing mingw build

    don bright authored
  9. fix documentation

    don bright authored
  10. cleanup

    don bright authored
  11. cleanup2

    don bright authored
  12. create dir if non-existant, bug rept by Brad Pitcher

    don bright authored
  13. fix build bugs on fedora 64-bit

    don bright authored
  14. fix build bug on some DSO linux systems

    don bright authored
Commits on Jul 17, 2012
  1. Marius Kintel

    Merge pull request #146 from openscad/mingwcross1

    kintel authored
    Mingwcross1
  2. Marius Kintel
Commits on Jul 18, 2012
  1. create bsd build scripts for freebsd 9.

    don bright authored
  2. indicate which freebsd tested on

    don bright authored
Commits on Jul 20, 2012
  1. initial steps towards support of clang compiler

    don bright authored
  2. improve clang build of glew and opencsg

    don bright authored
Commits on Jul 21, 2012
  1. build opencsg properly

    don bright authored
  2. fix bug

    don bright authored
Commits on Jul 22, 2012
  1. improve usage on PCBSD

    don bright authored
  2. remove debug line

    don bright authored
Commits on Jul 23, 2012
  1. debugging and rearranging to find issue

    don bright authored
  2. remove debugging statements

    don bright authored
  3. clarify comment

    don bright authored
  4. remove opencsg code that belongs in another branch

    don bright authored
  5. remove code that belongs in another branch

    don bright authored
  6. update README.md lines to look better on github.com

    don bright authored
Commits on Jul 24, 2012
  1. Marius Kintel

    Merge pull request #157 from openscad/freebsdbuilders

    kintel authored
    Freebsdbuilders
  2. Marius Kintel

    Merge pull request #156 from openscad/git_readme_update

    kintel authored
    Git readme update
  3. Marius Kintel

    Merge pull request #155 from openscad/fontsize_save

    kintel authored
    Fontsize save
  4. Marius Kintel

    Merge branch 'master' of github.com:openscad/openscad

    kintel authored
    Conflicts:
    	scripts/linux-build-dependencies.sh
Commits on Jul 25, 2012
  1. update version of CGAL in linux build script

    don bright authored
Commits on Jul 26, 2012
  1. Andrew Plumb

    Catching up changes.

    clothbot authored
Something went wrong with that request. Please try again.