Merge remote branch 'upstream/visitortests' into visitortests

13 files changed, 223 insertions, 16 deletions

diff --git a/cgal.pri b/cgal.pri
index 36afa48..05ec6f4 100644
--- a/cgal.pri
+++ b/cgal.pri
@@ -17,6 +17,7 @@ cgal {
     LIBS += $$CGAL_DIR/auxiliary/gmp/lib/libmpfr-4.lib -lCGAL-vc90-mt-s
   } else {
     LIBS += -lgmp -lmpfr -lCGAL
+    # FIXME: We should put this back for the Windows gcc-build 
     QMAKE_CXXFLAGS += -frounding-math # visual C++ doesn't have this
   }
 
diff --git a/doc/TODO.txt b/doc/TODO.txt
index 65534b8..2202792 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -116,6 +116,7 @@ o Misc
     (e.g Preview, Render)
   - If trying to export STL/DXF but source is newer than the CGAL rendering, ask
     for confirmation.
+  - Go through keyboard shortcuts and make them more conformant to platform standards
 o Cmd-line
   - Add verbose option (PRINT command from mainwin.cc and progress output)
 
diff --git a/openscad.pro b/openscad.pro
index 49553ad..994a527 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -55,8 +55,7 @@ win32:QMAKE_CXXFLAGS += -wd4800
 win32:QMAKE_CXXFLAGS += -wd4100
 
 # disable Eigen SIMD optimizations for non-Mac OSX
-win32:QMAKE_CXXFLAGS += -DEIGEN_DONT_ALIGN
-unix:QMAKE_CXXFLAGS += -DEIGEN_DONT_ALIGN
+!macx:QMAKE_CXXFLAGS += -DEIGEN_DONT_ALIGN
 
 TEMPLATE = app
 RESOURCES = openscad.qrc
diff --git a/src/func.cc b/src/func.cc
index 75e90df..b011a27 100644
--- a/src/func.cc
+++ b/src/func.cc
@@ -34,7 +34,6 @@
 #include <algorithm>
 #include "stl-utils.h"
 #include <boost/foreach.hpp>
-#include "openscad.h" //M_PI
 
 AbstractFunction::~AbstractFunction()
 {
diff --git a/src/openscad.h b/src/openscad.h
index e6b9b9f..61aec0e 100644
--- a/src/openscad.h
+++ b/src/openscad.h
@@ -27,12 +27,6 @@
 #ifndef OPENSCAD_H
 #define OPENSCAD_H
 
-// for win32 and maybe others..
-#ifndef M_PI
-#  define M_PI 3.14159265358979323846
-#endif
-
-
 extern class AbstractModule *parse(const char *text, const char *path, int debug);
 extern int get_fragments_from_r(double r, double fn, double fs, double fa);
 
diff --git a/src/value.cc b/src/value.cc
index 685bf81..6685594 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -352,19 +352,19 @@ std::string Value::toString() const
 		stream << ']';
 		break;
 	case RANGE:
-		stream	<< "[ "
+		stream	<< '['
 			<< this->range_begin
 			<< " : "
 			<< this->range_step
 			<< " : "
 			<< this->range_end
-			<< " ]";
+			<< ']';
 		break;
 	case NUMBER:
 		stream << this->num;
 		break;
 	case BOOL:
-		stream << this->b;
+		stream << (this->b ? "true" : "false");
 		break;
 	default:
 		stream << "undef";
diff --git a/testdata/scad/features/echo-tests.scad b/testdata/scad/features/echo-tests.scad
new file mode 100644
index 0000000..b07d444
--- /dev/null
+++ b/testdata/scad/features/echo-tests.scad
@@ -0,0 +1,12 @@
+echo(undef);
+echo("string");
+s = "stringvar";
+echo(s);
+echo(a = 1, b = 2.0, true, c = false);
+v = [1, "vecstr", 2.34, false];
+echo(v);
+r = [1:2:10];
+echo(r);
+
+echo(vec = [1,2,3]);
+echo(range = [0:2]);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 35818de..c4d1b7f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
+# Explicitly use new include policy to avoid globally shadowing included modules
+# http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0017
+cmake_policy(SET CMP0017 NEW)
 project(tests)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
@@ -37,6 +40,8 @@ if(WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100")
   # fopen_s advertisement
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_DEPRECATE")
+  # M_PI
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES")
 endif()
 
 # Debugging - if you uncomment, use nmake -f Makefile > log.txt (the log is big)
@@ -135,11 +140,10 @@ include_directories(../src)
 
 add_definitions(-DOPENSCAD_VERSION=test -DOPENSCAD_YEAR=2011 -DOPENSCAD_MONTH=10)
 
-set(COMMON_SOURCES
+set(CORE_SOURCES
   ../src/mathc99.cc
   ../src/handle_dep.cc 
   ../src/qhash.cc
-  ../src/export.cc 
   ../src/value.cc 
   ../src/expr.cc 
   ../src/func.cc 
@@ -165,6 +169,12 @@ set(COMMON_SOURCES
   ../src/rotateextrude.cc 
   ../src/printutils.cc 
   ../src/progress.cc 
+  ${FLEX_OpenSCADlexer_OUTPUTS}
+  ${BISON_OpenSCADparser_OUTPUTS})
+
+set(COMMON_SOURCES
+  ${CORE_SOURCES}
+  ../src/export.cc 
   ../src/nodedumper.cc 
   ../src/traverser.cc 
   ../src/PolySetEvaluator.cc 
@@ -175,6 +185,24 @@ set(COMMON_SOURCES
   ${BISON_OpenSCADparser_OUTPUTS})
 
 #
+# echotest
+#
+add_executable(echotest echotest.cc ${CORE_SOURCES})
+target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+
+#
+# echotest
+#
+add_executable(echotest echotest.cc ${CORE_SOURCES})
+target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+
+#
+# echotest
+#
+add_executable(echotest echotest.cc ${CORE_SOURCES})
+target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+
+#
 # Offscreen OpenGL context source code
 #
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -290,6 +318,12 @@ file(GLOB FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/*.scad)
 file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad)
 file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad)
 
+list(APPEND ECHO_FILES
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/echo.scad
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/features/echo-tests.scad)
+
+# Add echotest tests to CTest
+add_cmdline_test(echotest txt ${ECHO_FILES})
 # Add dumptest tests to CTest
 add_cmdline_test(dumptest txt ${MINIMAL_FILES})
 # Add csgtexttest tests to CTest
diff --git a/tests/echotest.cc b/tests/echotest.cc
new file mode 100644
index 0000000..c53e47f
--- /dev/null
+++ b/tests/echotest.cc
@@ -0,0 +1,157 @@
+/*
+ *  OpenSCAD (www.openscad.org)
+ *  Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and
+ *                          Marius Kintel <marius@kintel.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  As a special exception, you have permission to link this program
+ *  with the CGAL library and distribute executables, as long as you
+ *  follow the requirements of the GNU GPL in regard to all of the
+ *  software in the executable aside from CGAL.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "openscad.h"
+#include "handle_dep.h"
+#include "node.h"
+#include "module.h"
+#include "context.h"
+#include "value.h"
+#include "builtin.h"
+#include "printutils.h"
+
+#include <QApplication>
+#include <QFile>
+#include <QDir>
+#include <QSet>
+#include <getopt.h>
+#include <assert.h>
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+using std::string;
+
+std::string commandline_commands;
+QString currentdir;
+QString examplesdir;
+QString librarydir;
+
+static void outfile_handler(const QString &msg, void *userdata) {
+	std::ostream *str = static_cast<std::ostream*>(userdata);
+	*str << msg.toUtf8().data() << std::endl;
+}
+
+int main(int argc, char **argv)
+{
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s <file.scad> <output.txt>\n", argv[0]);
+		exit(1);
+	}
+
+	const char *filename = argv[1];
+	const char *outfile = argv[2];
+
+	int rc = 0;
+
+	std::ofstream ofile(outfile);
+	if (!ofile.good()) {
+		std::cerr << "Unable to open output file\n";
+		return 0;
+	}
+	set_output_handler(&outfile_handler, &ofile);
+
+	initialize_builtin_functions();
+	initialize_builtin_modules();
+
+	QApplication app(argc, argv, false);
+	QDir original_path = QDir::current();
+
+	currentdir = QDir::currentPath();
+
+	QDir libdir(QApplication::instance()->applicationDirPath());
+#ifdef Q_WS_MAC
+	libdir.cd("../Resources"); // Libraries can be bundled
+	if (!libdir.exists("libraries")) libdir.cd("../../..");
+#elif defined(Q_OS_UNIX)
+	if (libdir.cd("../share/openscad/libraries")) {
+		librarydir = libdir.path();
+	} else
+	if (libdir.cd("../../share/openscad/libraries")) {
+		librarydir = libdir.path();
+	} else
+	if (libdir.cd("../../libraries")) {
+		librarydir = libdir.path();
+	} else
+#endif
+	if (libdir.cd("libraries")) {
+		librarydir = libdir.path();
+	}
+
+	Context root_ctx;
+	root_ctx.functions_p = &builtin_functions;
+	root_ctx.modules_p = &builtin_modules;
+	root_ctx.set_variable("$fn", Value(0.0));
+	root_ctx.set_variable("$fs", Value(1.0));
+	root_ctx.set_variable("$fa", Value(12.0));
+	root_ctx.set_variable("$t", Value(0.0));
+
+	Value zero3;
+	zero3.type = Value::VECTOR;
+	zero3.append(new Value(0.0));
+	zero3.append(new Value(0.0));
+	zero3.append(new Value(0.0));
+	root_ctx.set_variable("$vpt", zero3);
+	root_ctx.set_variable("$vpr", zero3);
+
+
+	AbstractModule *root_module;
+	ModuleInstantiation root_inst;
+	AbstractNode *root_node;
+
+	QFileInfo fileInfo(filename);
+	handle_dep(filename);
+	FILE *fp = fopen(filename, "rt");
+	if (!fp) {
+		fprintf(stderr, "Can't open input file `%s'!\n", filename);
+		exit(1);
+	} else {
+		std::stringstream text;
+		char buffer[513];
+		int ret;
+		while ((ret = fread(buffer, 1, 512, fp)) > 0) {
+			buffer[ret] = 0;
+			text << buffer;
+		}
+		fclose(fp);
+		text << commandline_commands;
+		root_module = parse(text.str().c_str(), fileInfo.absolutePath().toLocal8Bit(), false);
+		if (!root_module) {
+			exit(1);
+		}
+	}
+
+	QDir::setCurrent(fileInfo.absolutePath());
+
+	AbstractNode::resetIndexCounter();
+	root_node = root_module->evaluate(&root_ctx, &root_inst);
+
+	destroy_builtin_functions();
+	destroy_builtin_modules();
+
+	ofile.close();
+	return rc;
+}
diff --git a/tests/imageutils-macosx.cc b/tests/imageutils-macosx.cc
index 358bdcf..404052f 100644
--- a/tests/imageutils-macosx.cc
+++ b/tests/imageutils-macosx.cc
@@ -4,7 +4,8 @@
 bool write_png(const char *filename, unsigned char *pixels, int width, int height)
 {
   size_t rowBytes = width * 4;
-  CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+//  CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
   CGBitmapInfo bitmapInfo = kCGImageAlphaNoneSkipLast | kCGBitmapByteOrder32Big; // BGRA
   int bitsPerComponent = 8;
   CGContextRef contextRef = CGBitmapContextCreate(pixels, width, height, 
diff --git a/tests/regression/echotest/echo-expected.txt b/tests/regression/echotest/echo-expected.txt
new file mode 100644
index 0000000..8fc094e
--- /dev/null
+++ b/tests/regression/echotest/echo-expected.txt
@@ -0,0 +1 @@
+ECHO: 
diff --git a/tests/regression/echotest/echo-tests-expected.txt b/tests/regression/echotest/echo-tests-expected.txt
new file mode 100644
index 0000000..cc548f6
--- /dev/null
+++ b/tests/regression/echotest/echo-tests-expected.txt
@@ -0,0 +1,8 @@
+ECHO: undef
+ECHO: "string"
+ECHO: "stringvar"
+ECHO: a = 1, b = 2, true, c = false
+ECHO: [1, "vecstr", 2.34, false]
+ECHO: [1 : 2 : 10]
+ECHO: vec = [1, 2, 3]
+ECHO: range = [0 : 1 : 2]
diff --git a/tests/test_cmdline_tool.py b/tests/test_cmdline_tool.py
index e6a84cf..b6afbec 100755
--- a/tests/test_cmdline_tool.py
+++ b/tests/test_cmdline_tool.py
@@ -117,7 +117,7 @@ def compare_png(resultfilename):
         print >> sys.stderr, "Error: OpenSCAD did not generate an image"
         return False
     print >> sys.stderr, 'Yee image compare: ', expectedfilename, ' ', resultfilename
-    if execute_and_redirect("./yee_compare", [expectedfilename, resultfilename, "-downsample", "2"], sys.stderr) != 0:
+    if execute_and_redirect("./yee_compare", [expectedfilename, resultfilename, "-downsample", "2", "-threshold", "200"], sys.stderr) != 0:
 	append_html_output(expectedfilename, resultfilename)
         return False
     return True