[Scidavis-svn-log] SF.net SVN: scidavis:[1416] branches/development

[<hp...@us...>]

Revision: 1416
          http://sourceforge.net/p/scidavis/svn/1416
Author:   hpcoder
Date:     2014-02-14 23:35:24 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Brought up to date with 1.D5

Modified Paths:
--------------
    branches/development/Doxyversion
    branches/development/scidavis/src/ApplicationWindow.cpp
    branches/development/scidavis/src/ApplicationWindow.h
    branches/development/scidavis/src/version.cpp

Added Paths:
-----------
    branches/development/compileTest.sh

Modified: branches/development/Doxyversion
===================================================================
--- branches/development/Doxyversion	2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/Doxyversion	2014-02-14 23:35:24 UTC (rev 1416)
@@ -1 +1 @@
-PROJECT_NUMBER=1.D4
+PROJECT_NUMBER=1.D005

Added: branches/development/compileTest.sh
===================================================================
--- branches/development/compileTest.sh	                        (rev 0)
+++ branches/development/compileTest.sh	2014-02-14 23:35:24 UTC (rev 1416)
@@ -0,0 +1,12 @@
+# test that the code builds with different compile options The default
+# (aeb) build tests the default configuration (CONFIG=release, no
+# extras like Origin
+find . -name Makefile -exec rm {} \;
+qmake DEFINES=ORIGIN_IMPORT CONFIG=debug
+make clean
+make -j`grep processor /proc/cpuinfo|wc -l` 
+if [ $? -ne 0 ]; then 
+    echo "FAILED"
+    exit 1; 
+fi
+echo "PASSED"


Property changes on: branches/development/compileTest.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/development/scidavis/src/ApplicationWindow.cpp
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.cpp	2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/scidavis/src/ApplicationWindow.cpp	2014-02-14 23:35:24 UTC (rev 1416)
@@ -11583,9 +11583,9 @@
 	return g;
 }
 
-#ifdef ORIGIN_IMPORT
 ApplicationWindow* ApplicationWindow::importOPJ(const QString& filename)
 {
+#ifdef ORIGIN_IMPORT
     if (filename.endsWith(".opj", Qt::CaseInsensitive) || filename.endsWith(".ogg", Qt::CaseInsensitive))
     {
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -11613,8 +11613,10 @@
         return this;
     }
 	else return 0;
+#else
+    return NULL;
+#endif
 }
-#endif
 
 void ApplicationWindow::deleteFitTables()
 {

Modified: branches/development/scidavis/src/ApplicationWindow.h
===================================================================
--- branches/development/scidavis/src/ApplicationWindow.h	2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/scidavis/src/ApplicationWindow.h	2014-02-14 23:35:24 UTC (rev 1416)
@@ -164,9 +164,7 @@
 	 */
 	QFile * openCompressedFile(const QString& fn);
 	ApplicationWindow* openProject(const QString& fn);
-#ifdef ORIGIN_IMPORT
 	ApplicationWindow* importOPJ(const QString& filename);
-#endif
 	void showHistory();
 
 	/**

Modified: branches/development/scidavis/src/version.cpp
===================================================================
--- branches/development/scidavis/src/version.cpp	2014-02-13 22:14:55 UTC (rev 1415)
+++ branches/development/scidavis/src/version.cpp	2014-02-14 23:35:24 UTC (rev 1416)
@@ -1,4 +1,4 @@
 #include "globals.h"
-const int SciDAVis::scidavis_versionNo = 65540;
-const char* SciDAVis::scidavis_version = "1.D004";
-const char * SciDAVis::release_date = "Jan 25, 2014";
+const int SciDAVis::scidavis_versionNo = 65541;
+const char* SciDAVis::scidavis_version = "1.D005";
+const char * SciDAVis::release_date = "Feb 15, 2014";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.