1 files changed, 41 insertions, 41 deletions

diff --git a/src/mainwin.cc b/src/mainwin.cc
index ac75269..946bc2a 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -122,7 +122,7 @@ static char helptitle[] =
 #endif
 	"\nhttp://www.openscad.org\n\n";
 static char copyrighttext[] =
-	"Copyright (C) 2009-2013 Marius Kintel <marius@kintel.net> and Clifford Wolf <clifford@clifford.at>\n"
+	"Copyright (C) 2009-2013 The OpenSCAD Developers\n"
 	"\n"
 	"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 "
@@ -462,12 +462,11 @@ void MainWindow::showProgress()
 void MainWindow::report_func(const class AbstractNode*, void *vp, int mark)
 {
 	MainWindow *thisp = static_cast<MainWindow*>(vp);
-	int v = (int)((mark*100.0) / progress_report_count);
-	int percent = v < 100 ? v : 99; 
-	
-	if (percent > thisp->progresswidget->value()) {
+	int v = (int)((mark*1000.0) / progress_report_count);
+	int permille = v < 1000 ? v : 999; 
+	if (permille > thisp->progresswidget->value()) {
 		QMetaObject::invokeMethod(thisp->progresswidget, "setValue", Qt::QueuedConnection,
-															Q_ARG(int, percent));
+															Q_ARG(int, permille));
 		QApplication::processEvents();
 	}
 
@@ -493,12 +492,12 @@ void
 MainWindow::openFile(const QString &new_filename)
 {
 	QString actual_filename = new_filename;
+	QFileInfo fi(new_filename);
+	if (fi.suffix().toLower().contains(QRegExp("^(stl|off|dxf)$"))) {
+		actual_filename = QString();
+	}
 #ifdef ENABLE_MDI
 	if (!editor->toPlainText().isEmpty()) {
-		QFileInfo fi(new_filename);
-		if (fi.suffix().toLower().contains(QRegExp("^(stl|off|dxf)$"))) {
-			actual_filename = QString();
-		}
 		new MainWindow(actual_filename);
 		clearCurrentOutput();
 		return;
@@ -506,6 +505,7 @@ MainWindow::openFile(const QString &new_filename)
 #endif
 	setFileName(actual_filename);
 
+	fileChangedOnDisk(); // force cached autoReloadId to update
 	refreshDocument();
 	updateRecentFiles();
 	if (actual_filename.isEmpty()) {
@@ -691,8 +691,7 @@ void MainWindow::compileCSG(bool procevents)
 {
 	assert(this->root_node);
 	PRINT("Compiling design (CSG Products generation)...");
-	if (procevents)
-		QApplication::processEvents();
+	if (procevents) QApplication::processEvents();
 
 	// Main CSG evaluation
 	QTime t;
@@ -710,16 +709,16 @@ void MainWindow::compileCSG(bool procevents)
 		PolySetEvaluator psevaluator(this->tree);
 #endif
 		CSGTermEvaluator csgrenderer(this->tree, &psevaluator);
+		if (procevents) QApplication::processEvents();
 		this->root_raw_term = csgrenderer.evaluateCSGTerm(*root_node, highlight_terms, background_terms);
 		if (!root_raw_term) {
 			PRINT("ERROR: CSG generation failed! (no top level object found)");
-			if (procevents)
-				QApplication::processEvents();
 		}
 		PolySetCache::instance()->print();
 #ifdef ENABLE_CGAL
 		CGALCache::instance()->print();
 #endif
+		if (procevents) QApplication::processEvents();
 	}
 	catch (const ProgressCancelException &e) {
 		PRINT("CSG generation cancelled.");
@@ -731,8 +730,7 @@ void MainWindow::compileCSG(bool procevents)
 
 	if (root_raw_term) {
 		PRINT("Compiling design (CSG Products normalization)...");
-		if (procevents)
-			QApplication::processEvents();
+		if (procevents) QApplication::processEvents();
 		
 		size_t normalizelimit = 2 * Preferences::inst()->getValue("advanced/openCSGLimit").toUInt();
 		CSGTermNormalizer normalizer(normalizelimit);
@@ -744,15 +742,13 @@ void MainWindow::compileCSG(bool procevents)
 		else {
 			this->root_chain = NULL;
 			PRINT("WARNING: CSG normalization resulted in an empty tree");
-			if (procevents)
-				QApplication::processEvents();
+			if (procevents) QApplication::processEvents();
 		}
 		
 		if (highlight_terms.size() > 0)
 		{
 			PRINTB("Compiling highlights (%d CSG Trees)...", highlight_terms.size());
-			if (procevents)
-				QApplication::processEvents();
+			if (procevents) QApplication::processEvents();
 			
 			highlights_chain = new CSGChain();
 			for (unsigned int i = 0; i < highlight_terms.size(); i++) {
@@ -764,8 +760,7 @@ void MainWindow::compileCSG(bool procevents)
 		if (background_terms.size() > 0)
 		{
 			PRINTB("Compiling background (%d CSG Trees)...", background_terms.size());
-			if (procevents)
-				QApplication::processEvents();
+			if (procevents) QApplication::processEvents();
 			
 			background_chain = new CSGChain();
 			for (unsigned int i = 0; i < background_terms.size(); i++) {
@@ -794,8 +789,7 @@ void MainWindow::compileCSG(bool procevents)
 		PRINT("CSG generation finished.");
 		int s = t.elapsed() / 1000;
 		PRINTB("Total rendering time: %d hours, %d minutes, %d seconds", (s / (60*60)) % ((s / 60) % 60) % (s % 60));
-		if (procevents)
-			QApplication::processEvents();
+		if (procevents) QApplication::processEvents();
 	}
 }
 
@@ -973,7 +967,10 @@ void MainWindow::actionShowLibraryFolder()
 
 void MainWindow::actionReload()
 {
-	if (checkEditorModified()) refreshDocument();
+	if (checkEditorModified()) {
+		fileChangedOnDisk(); // force cached autoReloadId to update
+		refreshDocument();
+	}
 }
 
 void MainWindow::hideEditor()
@@ -1027,7 +1024,10 @@ bool MainWindow::fileChangedOnDisk()
 	if (!this->fileName.isEmpty()) {
 		struct stat st;
 		memset(&st, 0, sizeof(struct stat));
-		stat(this->fileName.toLocal8Bit(), &st);
+		bool valid = (stat(this->fileName.toLocal8Bit(), &st) == 0);
+		// If file isn't there, just return and use current editor text
+		if (!valid) return false;
+
 		std::string newid = str(boost::format("%x.%x") % st.st_mtime % st.st_size);
 
 		if (newid != this->autoReloadId) {
@@ -1038,16 +1038,6 @@ bool MainWindow::fileChangedOnDisk()
 	return false;
 }
 
-bool MainWindow::includesChanged()
-{
-	if (this->root_module) {
-		BOOST_FOREACH(const FileModule::IncludeContainer::value_type &item, this->root_module->includes) {
-			if (this->root_module->include_modified(item.second)) return true;
-		}
-	}
-	return false;
-}
-
 /*!
 	If reload is true, does a timestamp check on the document and tries to reload it.
 	Otherwise, just reparses the current document and any dependencies, updates the 
@@ -1059,11 +1049,22 @@ bool MainWindow::compileTopLevelDocument(bool reload)
 {
 	bool shouldcompiletoplevel = !reload;
 
-	if (includesChanged()) shouldcompiletoplevel = true;
-
-	if (reload && fileChangedOnDisk() && checkEditorModified()) {
+	if (this->root_module && this->root_module->includesChanged()) {
 		shouldcompiletoplevel = true;
-		refreshDocument();
+	}
+
+	if (reload) {	
+		// Refresh file if it has changed on disk
+	  if (fileChangedOnDisk() && checkEditorModified()) {
+			shouldcompiletoplevel = true;
+			refreshDocument();
+		}
+	  // If the file hasn't changed, we might still need to compile it
+	  // if we haven't yet compiled the current text.
+		else if (!editor->isContentModified()) {
+			QString current_doc = editor->toPlainText();
+			if (current_doc != last_compiled_doc) shouldcompiletoplevel = true;
+		}
 	}
 	
 	if (shouldcompiletoplevel) {
@@ -1116,7 +1117,6 @@ void MainWindow::autoReloadSet(bool on)
 	QSettings settings;
 	settings.setValue("design/autoReload",designActionAutoReload->isChecked());
 	if (on) {
-		autoReloadId = "";
 		autoReloadTimer->start(200);
 	} else {
 		autoReloadTimer->stop();