Merge remote-tracking branch 'origin/master' into examples-cleanup

releases/2015.02.md

@@ -1,40 +0,0 @@
-**Language Features:**
-* text() module
-* offset()
-* List comprehensions, let()
-* concat()
-* surface() can now take PNG images as input
-* min() and max() can now take a vector argument
-* 2D minkowski and holes
-* chr()
-
-**Program Features:**
-* Added --viewall cmd-line parameter
-* MDI
-* FIXME: Windows cmd-line fixes
-* Qt5, retina
-* SVG export
-* AMF export
-* Color schemes for viewer and editor can be user-edited
-* Improved editor
-* Splash screen
-* Docking of GUI components
-* Toolbars
-* More robust STL export
-
-**Bugfixes/improvements:**
-* Internal cavity fix
-* Performance: 2D (clipper), preview, hull, minkowski, surface, n-ary-union, transforms (polyset)
-* Performance: Reduce duplicate evaluation of identical expressions
-* STL export/import stability fixes
-* F6 stability fixes
-* Better recursion behavior
-* Reorganized examples a bit
-* improved search() behavior
-* Mac: Timestamps in output fixed
-
-**Deprecations:**
-* polyhedron triangles
-
-**Misc:**
-

releases/2015.03.md

@@ -0,0 +1,39 @@
+**Language Features:**
+* Added text() module for 2D text
+* Added offset() module for 2D offsets
+* Added list comprehensions and let()
+* Added concat() function
+* Added chr() function
+* surface() can now take PNG images as input
+* min() and max() can now take a vector argument
+* 2D minkowski can now handle polygons with holes
+* Variables can now be assigned in local blocks without using assign()
+
+**Program Features:**
+* Added Toolbar icons
+* New code editor based on QScintilla
+* Added Splash screen
+* Added SVG export
+* Added AMF export
+* Added --viewall and --autocenter cmd-line parameters
+* GUI is now translated into German, Czech, Spanish, French and Russian
+* MDI (Multiple Document Interface) is now available on all platforms
+* Color schemes for viewer and editor can be user-edited using JSON files
+* GUI components are now dockable
+* Added Tickmarks on axes
+
+**Bugfixes/improvements:**
+* Performance improvement: 2D (clipper), preview, hull, minkowski, surface
+* Performance improvement: Reduce duplicate evaluation of identical expressions
+* Better recursion behavior
+* STL export and import is noew more robust
+* Internal cavities are better supported
+* New examples
+* Windows cmd-line behaves better
+* Better mirror() and scale() behavior when using negative factors
+
+**Deprecations:**
+* polyhedron() now takes a faces= argument rather than triangles=
+
+**Misc:**
+* Support for Qt5 and retina displays

scripts/check-dependencies.sh

@@ -145,7 +145,7 @@ mpfr_sysver()
 
 gmp_sysver()
 {
-  gmppaths="`find $1 -name 'gmp.h' -o -name 'gmp-*.h' 2>/dev/null`"
+  gmppaths="`find $1/include -name 'gmp.h' -o -name 'gmp-*.h' 2>/dev/null`"
   if [ ! "$gmppaths" ]; then
     debug "gmp_sysver no gmp.h beneath $1"
     return
@@ -211,10 +211,14 @@ qscintilla2_sysver()
   elif [ "`command -v qmake-qt4`" ]; then
     QMAKE=qmake-qt4
   fi
-  
+  debug using qmake: $QMAKE
+
   qtincdir="`$QMAKE -query QT_INSTALL_HEADERS`"
   qscipath="$qtincdir/Qsci/qsciglobal.h"
+  debug using qtincdir: $qtincdir
+  debug using qscipath: $qscipath
   if [ ! -e $qscipath ]; then
+    debug qscipath doesnt exist. giving up on version.
     return
   fi
 
@@ -636,7 +640,7 @@ checkargs()
 
 main()
 {
-  deps="qt qscintilla2 cgal gmp mpfr boost opencsg glew eigen glib2 fontconfig freetype2 harfbuzz gcc bison flex make"
+  deps="qt qscintilla2 cgal gmp mpfr boost opencsg glew eigen glib2 fontconfig freetype2 harfbuzz bison flex make"
   #deps="$deps curl git" # not technically necessary for build
   #deps="$deps python cmake imagemagick" # only needed for tests
   #deps="cgal"

src/EventFilter.h

@@ -13,7 +13,7 @@ public:
 	EventFilter(QObject *parent) : QObject(parent) {}
 protected:
 	bool eventFilter(QObject *obj, QEvent *event) {
-		// Handle Apple event for opening files
+		// Handle Apple event for opening files, only available on OS X
 		if (event->type() == QEvent::FileOpen) {
 			QFileOpenEvent *foe = static_cast<QFileOpenEvent *>(event);
 			const QString &filename = foe->file();

src/mainwin.cc

@@ -173,12 +173,12 @@ bool MainWindow::reorderMode = false;
 QProgressDialog *MainWindow::fontCacheDialog = NULL;
 
 MainWindow::MainWindow(const QString &filename)
-	: root_inst("group"), library_info_dialog(NULL), font_list_dialog(NULL), tempFile(NULL), progresswidget(NULL), contentschanged(false)
+	: root_inst("group"), library_info_dialog(NULL), font_list_dialog(NULL), procevents(false), tempFile(NULL), progresswidget(NULL), contentschanged(false)
 {
 	setupUi(this);
 
 	editorDockTitleWidget = new QWidget();
-        consoleDockTitleWidget = new QWidget();
+	consoleDockTitleWidget = new QWidget();
 
 	this->editorDock->setConfigKey("view/hideEditor");
 	this->editorDock->setAction(this->viewActionHideEditor);
@@ -195,11 +195,10 @@ MainWindow::MainWindow(const QString &filename)
 #ifdef USE_SCINTILLA_EDITOR
 	if (useScintilla) {
 		 editor = new ScintillaEditor(editorDockContents);
-
 	}
 	else
 #endif
-	    editor = new LegacyEditor(editorDockContents);
+		editor = new LegacyEditor(editorDockContents);
 
 	Preferences::create(editor->colorSchemes());
 
@@ -783,7 +782,7 @@ void MainWindow::setFileName(const QString &filename)
 	} else {
 		QFileInfo fileinfo(filename);
 		this->fileName = fileinfo.exists() ? fileinfo.absoluteFilePath() : fileinfo.fileName();
-        QString fn =fileinfo.absoluteFilePath();
+		QString fn =fileinfo.absoluteFilePath();
 		setWindowFilePath(fn);
 
 		QDir::setCurrent(fileinfo.dir().absolutePath());
@@ -923,6 +922,7 @@ void MainWindow::compile(bool reload, bool forcedone)
 		if (this->root_module->hasIncludes() ||
 				this->root_module->usesLibraries()) {
 			this->waitAfterReloadTimer->start();
+			this->procevents = false;
 			return;
 		}
 	}