Start

Common/CMakeLists.txt

@@ -12,50 +12,91 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/appinfo.cpp.in
                ${CMAKE_CURRENT_LIST_DIR}/appinfo.cpp)
 message(STATUS "appinfo.cpp is successfully generated...")
 
-file(GLOB_RECURSE HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/*.h")
-file(GLOB_RECURSE SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/*.cpp")
+configure_file(${CMAKE_CURRENT_LIST_DIR}/QtUtils/appdirs.h.in
+               ${CMAKE_CURRENT_LIST_DIR}/QtUtils//appdirs.h)
+message(STATUS "appdirs.h is successfully generated...")
 
-add_library(Common ${SOURCE_FILES} ${HEADER_FILES})
+file(GLOB HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/*.h" "${CMAKE_CURRENT_LIST_DIR}/json/*.h")
+file(GLOB SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/*.cpp"  "${CMAKE_CURRENT_LIST_DIR}/json/*.cpp")
+file(GLOB QT_UTILS_HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/QtUtils/*.h")
+file(GLOB QT_UTILS_SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/QtUtils/*.cpp")
+
+add_library(Common SHARED ${SOURCE_FILES} ${HEADER_FILES})
+add_library(CommonWithQt SHARED ${SOURCE_FILES} ${HEADER_FILES} ${QT_UTILS_HEADER_FILES} ${QT_UTILS_SOURCE_FILES})
 
 if(LINUX)
   target_link_libraries(Common PUBLIC ${_LIB_RT})
   target_link_options(Common PUBLIC -lrt)
+  target_link_libraries(CommonWithQt PUBLIC ${_LIB_RT})
+  target_link_options(CommonWithQt PUBLIC -lrt)
 endif()
 
 target_include_directories(
-	Common
-	PUBLIC # JASP
-	 # R
-	 ${R_INCLUDE_PATH}
-	 ${R_HOME_PATH}/include
-	 ${RCPP_PATH}/include
-	)
+    Common PUBLIC
+        # R
+        ${R_INCLUDE_PATH}
+        ${R_HOME_PATH}/include
+        ${RCPP_PATH}/include
+)
+
+target_include_directories(
+    CommonWithQt PUBLIC
+        # R
+        ${R_INCLUDE_PATH}
+        ${R_HOME_PATH}/include
+        ${RCPP_PATH}/include
+)
 
 target_link_libraries(
-	Common
-	PUBLIC
-	Boost::system
-	Boost::date_time
-	Boost::timer
-	Boost::chrono
-	$<$<BOOL:${WINDOWS}>:ntdll>
-	$<$<BOOL:${JASP_USES_QT_HERE}>:Qt::Core>
-  )
+    Common PUBLIC
+        Boost::system
+        Boost::date_time
+        Boost::timer
+        Boost::chrono
+        $<$<BOOL:${WINDOWS}>:ntdll>
+)
+
+target_link_libraries(
+    CommonWithQt PUBLIC
+        Boost::system
+        Boost::date_time
+        Boost::timer
+        Boost::chrono
+        $<$<BOOL:${WINDOWS}>:ntdll>
+        Qt::Core
+        Qt::Qml
+        Qt::Quick
+)
 
 target_compile_definitions(
-  Common PUBLIC $<$<BOOL:${JASP_USES_QT_HERE}>:JASP_USES_QT_HERE>
-                $<$<BOOL:${JASP_TIMER_USED}>:PROFILE_JASP>
-				JSONCPP_NO_LOCALE_SUPPORT	)
+    Common PUBLIC
+        $<$<BOOL:${JASP_TIMER_USED}>:PROFILE_JASP>
+        JSONCPP_NO_LOCALE_SUPPORT
+)
+
+target_compile_definitions(
+    CommonWithQt PUBLIC
+        $<$<BOOL:${JASP_USES_QT_HERE}>:JASP_USES_QT_HERE>
+        $<$<BOOL:${JASP_TIMER_USED}>:PROFILE_JASP>
+        JSONCPP_NO_LOCALE_SUPPORT
+)
 
 if(WINDOWS)
   target_compile_definitions(
-    Common
-    PUBLIC NOMINMAX
-           WIN32_LEAN_AND_MEAN)
+    Common PUBLIC
+        NOMINMAX
+        WIN32_LEAN_AND_MEAN
+  )
+  target_compile_definitions(
+    CommonWithQt PUBLIC
+        NOMINMAX
+        WIN32_LEAN_AND_MEAN
+  )
 endif()
 
 if(IWYU_EXECUTABLE AND RUN_IWYU)
   set_target_properties(Common PROPERTIES CXX_INCLUDE_WHAT_YOU_USE ${IWYU_EXECUTABLE})
+  set_target_properties(CommonWithQt PROPERTIES CXX_INCLUDE_WHAT_YOU_USE ${IWYU_EXECUTABLE})
 endif()
 
 list(POP_BACK CMAKE_MESSAGE_CONTEXT)

Common/QtUtils/appdirs.h

@@ -0,0 +1,61 @@
+//
+// Copyright (C) 2013-2018 University of Amsterdam
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public
+// License along with this program.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+
+//
+//	NOTICE:
+//		`appdirs.h` is generated from `appdirs.h.in` and you should edit 
+//		that file instead if you want your changes to reflect in the app
+//
+
+#ifndef APPDIRS_H
+#define APPDIRS_H
+
+#include <QString>
+#include <QDir>
+
+/// collector class with functions that make the locations of relevannt folders available
+/// Uses Qt so can't be used in R-Interface.
+class AppDirs
+{
+public:
+
+	static QString examples();
+	static QString help();
+	static QString analysisDefaultsDir();
+	static QString userRLibrary();
+	static QString userModulesDir();
+	static QString bundledModulesDir();
+	static QString documents();
+	static QString logDir();
+	static QString appData(bool roaming = true);
+	static QString rHome();
+	static QDir    programDir();
+	static QString renvRootLocation();
+	static QString renvCacheLocations();
+
+private:
+	static QString processPath(const QString & path);
+
+#ifdef linux
+	static QString rHomeDir() {
+		return QString("/Users/brunoboutin/JASP/source/build-jasp-desktop-Qt_6_5_2_for_macOS-Debug/Frameworks/R.framework/Versions/4.3-arm64/Resources");
+	} 
+#endif
+};
+
+#endif // APPDIRS_H

QMLComponents/utilities/dynamicruntimeinfo.cpp → Common/QtUtils/dynamicruntimeinfo.cpp

@@ -3,7 +3,7 @@
 #include "appinfo.h"
 #include "appdirs.h"
 #include "log.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 
 #include <fstream>
 #include <chrono>

QMLComponents/utilities/jsonutilities.h → Common/QtUtils/jsonutilities.h

@@ -4,10 +4,9 @@
 #include <json/json.h>
 #include <string>
 #include <set>
-#include "stringutils.h"
 #include <cmath>
-#include "qutils.h"
 #include "utils.h"
+#include "qutils.h"
 
 /// There are recurring needs when working with Json::Value etc and these are collected here.
 /// For instance converting from and to a std::vector<std::string> is useful and might as well be written here.

QMLComponents/knownissues.cpp → Common/QtUtils/knownissues.cpp

@@ -1,9 +1,9 @@
 #include "knownissues.h"
-#include "utilities/messageforwarder.h"
+//#include "messageforwarder.h"
 #include "appinfo.h"
-#include "utilities/jsonutilities.h"
+#include "jsonutilities.h"
 #include "log.h"
-#include "utilities/appdirs.h"
+#include "appdirs.h"
 #include "utils.h"
 #include <fstream>
 
@@ -36,7 +36,7 @@ void KnownIssues::loadJson(const std::string & jsonTxt,	bool saveIt)
 	{
 		Log::log() << "## " <<  tr("Problem loading known issues") << "\n" << tr("JASP ran into a problem downloading the known issues for this version, it probably could not connect to the server. Don't worry, JASP will work fine it just might not tell you about a few small known issues.")  << std::endl;
 #if JASP_DEBUG
-		MessageForwarder::showWarning("Known issues from server was empty!");
+//		MessageForwarder::showWarning("Known issues from server was empty!");
 #endif
 		return;
 	}
@@ -48,7 +48,7 @@ void KnownIssues::loadJson(const std::string & jsonTxt,	bool saveIt)
 	{
 		Log::log() << "## " << tr("Problem loading known issues") << "\n" << tr("JASP ran into a problem loading the known issues for this version, this isn't necessarily a problem but if it keeps occuring you could contact the JASP team for assistance.") << std::endl;
 #if JASP_DEBUG
-		MessageForwarder::showWarning("Known issues could not be parsed!");
+//		MessageForwarder::showWarning("Known issues could not be parsed!");
 #endif
 	}
 }
@@ -80,7 +80,7 @@ void KnownIssues::loadJson(const Json::Value & json, bool saveIt)
 	{
 		Log::log() << "## " << tr("Problem loading known issues") << "\n" << tr("JASP ran into a problem ('%1') loading the known issues for this version, this isn't necessarily a problem but if it keeps occuring you could contact the JASP team for assistance.").arg(e.what()) << std::endl;
 #if JASP_DEBUG
-		MessageForwarder::showWarning(QString("Loading known issues had exception: '%1'!").arg(e.what()));
+//		MessageForwarder::showWarning(QString("Loading known issues had exception: '%1'!").arg(e.what()));
 #endif
 	}
 

QMLComponents/knownissues.h → Common/QtUtils/knownissues.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <json/json.h>
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "stringutils.h"
 
 ///

Common/utils.cpp

@@ -34,6 +34,10 @@
 #include <iomanip>
 #include <chrono>
 
+#ifndef JASP_USES_QT_HERE
+#include <cmath>
+#endif
+
 using namespace std;
 
 Utils::FileType Utils::getTypeFromFileName(const std::string &path)

Desktop/CMakeLists.txt

@@ -28,7 +28,6 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/gui/preferencesmodel.cpp.in
 	           ${CMAKE_CURRENT_LIST_DIR}/gui/preferencesmodel.cpp)
 message(STATUS "preferencesmodel.cpp is successfully generated...")
 
-
 file(GLOB_RECURSE HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/*.h")
 file(GLOB_RECURSE SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/*.cpp")
 
@@ -94,6 +93,7 @@ target_include_directories(
     PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}
     ${PROJECT_SOURCE_DIR}/Common
+    ${PROJECT_SOURCE_DIR}/Common/QtUtils
     ${PROJECT_SOURCE_DIR}/CommonData
     ${PROJECT_SOURCE_DIR}/QMLComponents
     # ReadStat

Desktop/analysis/analyses.cpp

@@ -17,7 +17,7 @@
 //
 
 #include "analyses.h"
-#include "utilities/appdirs.h"
+#include "appdirs.h"
 #include "utilities/settings.h"
 #include "processinfo.h"
 #include "modules/ribbonmodel.h"

Desktop/analysis/analysis.cpp

@@ -22,7 +22,7 @@
 #include "dirs.h"
 #include "analyses.h"
 #include "analysisform.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "log.h"
 #include "utils.h"
 #include "utilities/settings.h"

Desktop/analysis/analysis.h

@@ -30,7 +30,7 @@
 #include "analysisbase.h"
 #include "modules/dynamicmodules.h"
 #include "data/datasetpackage.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "modules/upgrader/upgradechange.h"
 #include <QFileSystemWatcher>
 #include <QQuickItem>

Desktop/data/asyncloader.cpp

@@ -25,7 +25,7 @@
 
 #include <boost/bind.hpp>
 
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "utils.h"
 #include "osf/onlinedatamanager.h"
 #include "log.h"

Desktop/data/columnmodel.cpp

@@ -1,6 +1,6 @@
 #include "columnmodel.h"
 #include "jasptheme.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "datasettablemodel.h"
 #include "computedcolumnsmodel.h"
 

Desktop/data/columnsmodel.cpp

@@ -1,6 +1,6 @@
 #include "columnsmodel.h"
 #include "log.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "mainwindow.h"
 
 ColumnsModel * ColumnsModel::_singleton = nullptr;

Desktop/data/computedcolumnsmodel.cpp

@@ -1,6 +1,6 @@
 #include "computedcolumnsmodel.h"
-#include "utilities/jsonutilities.h"
-#include "utilities/qutils.h"
+#include "jsonutilities.h"
+#include "qutils.h"
 #include "columnencoder.h"
 #include "log.h"
 

Desktop/data/databaseconnectioninfo.cpp

@@ -1,5 +1,5 @@
 #include "databaseconnectioninfo.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include <QSqlDatabase>
 #include <QSqlError>
 #include "log.h"

Desktop/data/datasetpackage.cpp

@@ -17,13 +17,13 @@
 
 #include "datasetpackage.h"
 #include "log.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include <QThread>
 #include "engine/enginesync.h"
 #include "jasptheme.h"
 #include "columnencoder.h"
 #include "timers.h"
-#include "utilities/appdirs.h"
+#include "appdirs.h"
 #include "utils.h"
 #include "columnutils.h"
 #include "utilities/messageforwarder.h"

Desktop/data/datasettablemodel.cpp

@@ -17,7 +17,7 @@
 //
 
 #include "datasettablemodel.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include "log.h"
 
 DataSetTableModel::DataSetTableModel(bool showInactive) 

Desktop/data/exporters/jaspexporter.cpp

@@ -28,7 +28,7 @@
 #include "tempfiles.h"
 #include "log.h"
 #include "utilenums.h"
-#include "utilities/qutils.h"
+#include "qutils.h"
 #include <fstream>
 #include "appinfo.h"
 

Desktop/data/fileevent.cpp

@@ -22,7 +22,7 @@
 #include "exporters/jaspexporter.h"
 
 #include <QTimer>
-#include "utilities/appdirs.h"
+#include "appdirs.h"
 
 FileEvent::FileEvent(QObject *parent, FileEvent::FileMode fileMode)
 	: QObject(parent), _operation(fileMode)

Desktop/data/filtermodel.cpp

@@ -1,5 +1,5 @@
 #include "filtermodel.h"
-#include "utilities/jsonutilities.h"
+#include "jsonutilities.h"
 #include "columnencoder.h"
 
 FilterModel::FilterModel(labelFilterGenerator * labelFilterGenerator)