vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity
5,065 Commits
29 Branches
9 Tags
31 MiB
Commit Graph

5065 Commits (1ae9ed5ada72bb68a5065849ab648bdfd27170ad)

Author SHA1 Message Date
Marius Kintel 4eaf8797c2 Small refactoring: Split out Polyhedron-related functions to from cgalutils.cc to cgalutils-polyhedron.cc 2014-12-31 02:52:56 -05:00
Torsten Paul bebe08483f The WrapFlagInMargin value is only available in QScintilla 2.7 and later. 
This is a workaround for Debian 7 which has QScintilla 2.6.2. The "Margin"
setting is simply ignored and behaves as "None".
 2014-12-30 13:58:48 +01:00
Torsten Paul 8d4d83f168 Fix build with Qt4. 2014-12-30 13:03:51 +01:00
Marius Kintel bc30dca513 Merge pull request #1119 from openscad/scintilla-updates 
Scintilla updates
 2014-12-30 02:51:38 -05:00
Marius Kintel e69513fa2e #1119 Added missing slot to change tab key function 2014-12-30 02:49:47 -05:00
Tim Deagan 7a71e59f2d Fix layout of number 6 character & add comments 
The layout of the array that drives the 6 char was wrong.  Additional
commenting added
 2014-12-29 21:23:46 -06:00
Torsten Paul 9bcb38df48 Change settings handling to use Value objects. 2014-12-30 02:37:16 +01:00
Tim Deagan 1826aa98f7 Addition of header to support function to print scale marker position values on large axes. 
modified:   src/GLView.h
 2014-12-29 15:00:37 -06:00
Tim Deagan 4823f26706 Addition of function to generate scale maker numeric values on large axes. 
modified:   src/GLView.cc

The added function takes the length of the axis (l), the currrent position on the axis (i) and the size of the divisions between i and uses a variety of arrays to decode the characters of the position into GL_LINES, GL_LINE_STRIPs, GL_LINE_LOOPs as appropriate.  The various orientations required by the axis are handled by abstracting the line vertex sequences into arrays (set per axis.)
 2014-12-29 14:55:15 -06:00
Torsten Paul 2c89f562a3 Update GUI to make options a bit clearer for the user. 2014-12-29 03:49:45 +01:00
Torsten Paul 6f9c4f7f09 Integrate with QSettings. 2014-12-29 00:29:09 +01:00
Marius Kintel 03f63c1c40 Minor compile fix 2014-12-28 16:05:54 -05:00
Marius Kintel 89419f50a1 #1105 Added testcase 2014-12-28 16:05:33 -05:00
Marius Kintel 06e2fc7d9b #1105 Added example crashing CGAL 2014-12-28 15:32:57 -05:00
Marius Kintel 3f6a590a2f Added stand-alone 2D tesselator 2014-12-27 17:58:20 -05:00
Marius Kintel 3e2ff23c00 Merge pull request #1115 from openscad/quantizevertices 
Quantize vertices
 2014-12-27 00:25:18 -05:00
Tim Deagan b6dcea12d0 Merge remote-tracking branch 'upstream/master' into scalemarkers 
merging the upstream/master branch into my working branch prior to syncing with my fork
12/26/2014 22:07 CST tim deagan
 2014-12-26 22:07:03 -06:00
Tim Deagan 1068f61dc6 Add optional menu driven scaling tics to the large axes 
Tim Deagan 12/26/2014

While add-on rulers can be extremely useful, there are many times that a quick scaling marker would be handy. This feature generates tics every 10 units, driven off the log10 of the l variable defining axes length.  As you zoom in or out, the tics automatically re-scale themselves.  Every tenth tic is slightly larger.  A menu item is added to the view menu to enable or disable the feature.

I experimented with menu driven scaling (.01, .1, 1, 10, etc.), but using small increments when zoomed out brought the app to it's knees.  Adding a visual indicator of the current scaling might be nice, but I'm nto sure where to put it (possibly below the small axes,) since it changes as zooming and would clutter the console.

 Changes to be committed:
	new file:   images/scalemarkers.png
	modified:   openscad.qrc
	modified:   src/GLView.cc
	modified:   src/GLView.h
	modified:   src/MainWindow.h
	modified:   src/MainWindow.ui
	modified:   src/QGLView.h
	modified:   src/mainwin.cc
 2014-12-26 21:44:31 -06:00
Marius Kintel 27b6f5e3e7 Merge pull request #1112 from openscad/stipple-fix 
Enable GL_LINE_STIPPLE only for the block where a stipple pattern is used
 2014-12-26 22:33:48 -05:00
Torsten Paul 6c25d5ccb6 Add more settings (AutoIndent / TabIndents / IndentationsUseTabs). 2014-12-27 02:59:11 +01:00
Torsten Paul 0cb6b3267a Add editor settings. 2014-12-27 02:17:15 +01:00
Torsten Paul dde4575c88 Add class to handle settings. 2014-12-27 00:12:23 +01:00
Torsten Paul 3a5ee3a4c6 Add GUI controls for editor settings. 2014-12-27 00:12:17 +01:00
Marius Kintel cce016b97b Merge remote-tracking branch 'origin/master' into quantizevertices 2014-12-26 14:08:09 -05:00
Torsten Paul 7ccdb778fc Enable GL_LINE_STIPPLE only for the block where a stipple pattern is used (fixes #1111). 2014-12-26 19:20:11 +01:00
Marius Kintel 3f0b16dd75 Merge branch 'master' of github.com:openscad/openscad 2014-12-25 17:27:40 -05:00
Marius Kintel 641ac4a506 #1107 Correctly display validity for objects which didn't yet touch CGAL 2014-12-25 17:27:13 -05:00
shaina7837 1ba2216108 reset view icon added 2014-12-26 00:56:31 +05:30
shaina7837 295f257bf8 undo redo icons added 2014-12-26 00:35:13 +05:30
Torsten Paul 0bf2d4e286 No need to update translation in release-common.sh it's done by the build. 2014-12-25 19:18:55 +01:00
shaina7837 2654bf9575 unindent duplicate image removed 2014-12-25 23:44:41 +05:30
shaina7837 040aac5e8f Indent icon added 2014-12-25 23:34:28 +05:30
shaina7837 3bfa28c83d indent image name changed 2014-12-25 23:27:28 +05:30
Torsten Paul ec3f735d5c Need to specify openscad.pro for qmake now. 2014-12-25 18:56:30 +01:00
Torsten Paul 82c8c7405d Move readme to color scheme folder. 2014-12-25 18:54:16 +01:00
Torsten Paul 4cb7b42fb8 Add defines for MSYS2 build. 2014-12-25 18:52:20 +01:00
shaina7837 ed500abd39 indent unindent icons added 2014-12-25 23:12:32 +05:30
Torsten Paul d2af825640 Enable resource lookup for Windows build (needed for dev and MSYS2 package). 2014-12-25 18:22:51 +01:00
Torsten Paul fd4fe0816a Fix style sheet to remove borders from QStatusBar items. 2014-12-25 18:22:51 +01:00
Torsten Paul 40602c99bc Minor color scheme tweaks, mainly for brace matching colors. 2014-12-25 18:22:51 +01:00
Marius Kintel c2643d82ea #1069 Correctly fall back to CGAL minkowski if our convex decomposition-based minkowski fails. Fixes #1069 for now, but our convex-based minkowski should not fail 2014-12-23 22:50:38 -05:00
Marius Kintel 32c3e0d322 Merge pull request #1106 from openscad/gui-updates 
Gui updates
 2014-12-23 13:20:32 -05:00
Torsten Paul ef83c5c911 Remove duplicate definition. 2014-12-23 19:15:23 +01:00
Torsten Paul d296d93ddc Quit application when last main window is closed (fixes #1079). 2014-12-23 19:05:53 +01:00
Torsten Paul 0801fc432d Add background to the drag&drop pixmap to make it better readable. 2014-12-23 18:42:16 +01:00
Torsten Paul 481665f8a3 Change layout to allow longer version number text. 2014-12-23 18:28:16 +01:00
Torsten Paul c9a234a079 Add OK button, some Linux window managers do not add a close button to dialogs. 2014-12-23 18:27:39 +01:00
Marius Kintel 49ce79a633 Merge branch 'czech' of git://github.com/hroncok/openscad into hroncok-czech 
Conflicts:
	locale/cs.po
 2014-12-23 11:57:45 -05:00
Miro Hrončok 9445d1297a Minor corrections to Czech translation 2014-12-23 12:27:41 +01:00
Marius Kintel bc98089aca Mac release build fix 2014-12-23 01:18:27 -05:00