separate quarter as a separate library

src/3rdParty/CMakeLists.txt

@@ -12,4 +12,10 @@ if (BUILD_ASSEMBLY AND NOT FREECAD_USE_EXTERNAL_ONDSELSOLVER)
  git submodule update --init" )
  endif()
  add_subdirectory(OndselSolver)
-endif()
+endif()
+
+# not allow to use external quarter, because currently
+# Quarter is quite different from upstream
+if (BUILD_GUI)
+ add_subdirectory(Quarter)
+endif()

src/3rdParty/Quarter/CMakeLists.txt

@@ -0,0 +1,64 @@
+#quarter sources
+FILE(GLOB_RECURSE Quarter_CPP_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+FILE(GLOB_RECURSE Quarter_H_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
+
+SET(Quarter_MOC_HDR
+ src/Quarter/SignalThread.h
+ src/Quarter/InteractionMode.h
+ src/Quarter/SensorManager.h
+ src/Quarter/ContextMenu.h
+ include/Quarter/eventhandlers/FocusHandler.h
+ include/Quarter/eventhandlers/DragDropHandler.h
+ include/Quarter/eventhandlers/EventFilter.h
+ include/Quarter/QuarterWidget.h
+)
+
+qt_wrap_cpp(Quarter_MOC_SRCS ${Quarter_MOC_HDR})
+
+SET(Quarter_SRCS
+ ${Quarter_CPP_SRC}
+ ${Quarter_H_SRC}
+ ${Quarter_MOC_SRCS}
+)
+SOURCE_GROUP("Quarter" FILES ${Quarter_SRCS})
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+if(Spacenav_FOUND)
+ add_definitions(-DHAVE_SPACENAV_LIB)
+ include_directories(${Spacenav_INCLUDE_DIR})
+ set(Extra_libraries ${Spacenav_LIBRARIES} ${Spacenav_LIBRARY})
+endif()
+
+if( UNIX )
+ set( Quarter_BUILD_SHARED ON )
+ELSEIF ( APPLE )
+ set( Quarter_BUILD_SHARED ON )
+ELSE()
+ set( Quarter_BUILD_SHARED OFF )
+ENDIF ()
+
+if ( Quarter_BUILD_SHARED )
+ message( STATUS "[Quarter] Building shared library" )
+ add_library(Quarter SHARED)
+else()
+ message( STATUS "[Quarter] Building static library" )
+ add_library(Quarter STATIC)
+endif()
+
+target_sources(Quarter PRIVATE ${Quarter_SRCS})
+
+set_target_properties(Quarter PROPERTIES PUBLIC_HEADER "${Quarter_H_SRC}")
+
+target_include_directories(Quarter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${COIN3D_INCLUDE_DIRS} ${QtCore_INCLUDE_DIRS} ${QtWidgets_INCLUDE_DIRS})
+target_link_libraries(Quarter ${COIN3D_LIBRARIES} ${OPENGL_LIBRARIES} ${QtCore_LIBRARIES} ${QtWidgets_LIBRARIES} ${Extra_libraries})
+
+SET_BIN_DIR(Quarter Quarter)
+
+if(WIN32)
+add_definitions(-DQUARTER_INTERNAL -DQUARTER_MAKE_DLL -DCOIN_DLL)
+endif(WIN32)
+
+install(TARGETS Quarter DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/Gui/SoMouseWheelEvent.h → src/3rdParty/Quarter/include/Inventor/events/SoMouseWheelEvent.h

@@ -26,14 +26,14 @@
 
 #include <Inventor/events/SoEvent.h>
 #include <Inventor/events/SoSubEvent.h>
-#include <FCGlobal.h>
+#include "Quarter/Basic.h"
 
 /**
  * @brief The SoMouseWheelEvent class is a temporary replacement for
  * SoMouseWheelEvent from Coin, for until freecad stops using Coin version that
  * doesn't have one (coin v 4.0.0a doesn't have SoMouseWheelEvent).
  */
-class GuiExport SoMouseWheelEvent : public SoEvent {
+class QUARTER_DLL_API SoMouseWheelEvent : public SoEvent {
  SO_EVENT_HEADER();
 public: //methods
  static void initClass(){

src/Gui/Quarter/QtCoinCompatibility.h → src/3rdParty/Quarter/include/Quarter/QtCoinCompatibility.h

@@ -36,7 +36,7 @@
 class QImage;
 class SbImage;
 
-#include "Basic.h"
+#include <Quarter/Basic.h>
 
 
 namespace SIM { namespace Coin3D { namespace Quarter {

src/Gui/Quarter/Quarter.h → src/3rdParty/Quarter/include/Quarter/Quarter.h

@@ -33,7 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include "Basic.h"
+#include <Quarter/Basic.h>
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 

src/Gui/Quarter/QuarterWidget.h → src/3rdParty/Quarter/include/Quarter/QuarterWidget.h

@@ -37,11 +37,11 @@
 #include <Inventor/actions/SoGLRenderAction.h>
 
 #include <QColor>
-#include <QGraphicsView>
 #include <QUrl>
+#include <QGraphicsView>
 #include <QtOpenGL.h>
 
-#include "Basic.h"
+#include <Quarter/Basic.h>
 
 
 class QMenu;

src/Gui/Quarter/eventhandlers/DragDropHandler.h → src/3rdParty/Quarter/include/Quarter/eventhandlers/DragDropHandler.h

@@ -33,7 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <QtCore/QObject>
+#include <QObject>
 #include <Quarter/Basic.h>
 
 class QEvent;

src/Gui/Quarter/eventhandlers/EventFilter.h → src/3rdParty/Quarter/include/Quarter/eventhandlers/EventFilter.h

@@ -34,7 +34,7 @@
 \**************************************************************************/
 
 #include <Quarter/Basic.h>
-#include <QtCore/QObject>
+#include <QObject>
 
 class QEvent;
 class QPoint;

src/Gui/SoMouseWheelEvent.cpp → src/3rdParty/Quarter/src/Inventor/SoMouseWheelEvent.cpp

@@ -20,8 +20,6 @@
  * *
  ***************************************************************************/
 
-#include "PreCompiled.h"
-
-#include "SoMouseWheelEvent.h"
+#include "Inventor/events/SoMouseWheelEvent.h"
 
 SO_EVENT_SOURCE(SoMouseWheelEvent);

src/Gui/Quarter/ContextMenu.cpp → src/3rdParty/Quarter/src/Quarter/ContextMenu.cpp

@@ -31,11 +31,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
+#include "ContextMenu.h"
+
 #include <QActionGroup>
 #include <QMenu>
 
-#include "ContextMenu.h"
-#include "QuarterWidget.h"
+#include <Quarter/QuarterWidget.h>
 
 
 using namespace SIM::Coin3D::Quarter;

src/Gui/Quarter/ContextMenu.h → src/3rdParty/Quarter/src/Quarter/ContextMenu.h

@@ -33,7 +33,7 @@
 #ifndef QUARTER_CONTEXTMENUHANDLERP_H
 #define QUARTER_CONTEXTMENUHANDLERP_H
 
-#include <QtCore/QObject>
+#include <QObject>
 
 class QMenu;
 class QAction;

src/Gui/Quarter/DragDropHandler.cpp → src/3rdParty/Quarter/src/Quarter/DragDropHandler.cpp

@@ -37,18 +37,19 @@
  functionality to the QuarterWidget.
 */
 
+#include <Quarter/eventhandlers/DragDropHandler.h>
+
+#include <QUrl>
+#include <QFileInfo>
+#include <QStringList>
 #include <QDragEnterEvent>
 #include <QDropEvent>
-#include <QFileInfo>
 #include <QMimeData>
-#include <QStringList>
-#include <QUrl>
+
 #include <Inventor/SoInput.h>
 #include <Inventor/nodes/SoSeparator.h>
 
-#include "QuarterWidget.h"
-#include "eventhandlers/DragDropHandler.h"
-
+#include <Quarter/QuarterWidget.h>
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 

src/Gui/Quarter/EventFilter.cpp → src/3rdParty/Quarter/src/Quarter/EventFilter.cpp

@@ -34,14 +34,15 @@
 
 */
 
+#include <Quarter/eventhandlers/EventFilter.h>
+
 #include <QEvent>
 #include <QMouseEvent>
 
-#include "QuarterWidget.h"
-#include "devices/Keyboard.h"
-#include "devices/Mouse.h"
-#include "devices/SpaceNavigatorDevice.h"
-#include "eventhandlers/EventFilter.h"
+#include <Quarter/QuarterWidget.h>
+#include <Quarter/devices/Mouse.h>
+#include <Quarter/devices/Keyboard.h>
+#include <Quarter/devices/SpaceNavigatorDevice.h>
 
 
 namespace SIM { namespace Coin3D { namespace Quarter {

src/Gui/Quarter/FocusHandler.cpp → src/3rdParty/Quarter/src/Quarter/FocusHandler.cpp

@@ -37,13 +37,12 @@
  focus out events, if installed on QuarterWidget.
 */
 
-#include <QEvent>
+#include <Quarter/eventhandlers/FocusHandler.h>
+#include <Quarter/QuarterWidget.h>
+#include <QtCore/QEvent>
 #include <Inventor/SoEventManager.h>
 #include <Inventor/scxml/SoScXMLStateMachine.h>
 
-#include "QuarterWidget.h"
-#include "eventhandlers/FocusHandler.h"
-
 
 using namespace SIM::Coin3D::Quarter;
 

src/Gui/Quarter/ImageReader.cpp → src/3rdParty/Quarter/src/Quarter/ImageReader.cpp

@@ -30,11 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
+#include "ImageReader.h"
 #include <Inventor/SbImage.h>
 #include <QImage>
 
-#include "ImageReader.h"
-#include "QtCoinCompatibility.h"
+#include <Quarter/QtCoinCompatibility.h>
 
 
 using namespace SIM::Coin3D::Quarter;

src/Gui/Quarter/ImageReader.h → src/3rdParty/Quarter/src/Quarter/ImageReader.h

@@ -33,6 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
+#include <Inventor/SbBasic.h>
 
 class SbImage;
 class SbString;

src/Gui/Quarter/InputDevice.cpp → src/3rdParty/Quarter/src/Quarter/InputDevice.cpp

@@ -30,16 +30,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#ifdef _MSC_VER
-#pragma warning(disable : 4267)
-#endif
-
+#include <Quarter/devices/InputDevice.h>
 #include <QInputEvent>
 #include <Inventor/events/SoEvents.h>
 
-#include "devices/InputDevice.h"
-
-
 using namespace SIM::Coin3D::Quarter;
 
 /*!

src/Gui/Quarter/InteractionMode.cpp → src/3rdParty/Quarter/src/Quarter/InteractionMode.cpp

@@ -34,12 +34,11 @@
  Adjust how QuarterWidget reacts to alt key events
  */
 
+#include "InteractionMode.h"
 #include <QCoreApplication>
-#include <QFocusEvent>
 #include <QKeyEvent>
-
-#include "InteractionMode.h"
-#include "QuarterWidget.h"
+#include <QFocusEvent>
+#include <Quarter/QuarterWidget.h>
 
 
 using namespace SIM::Coin3D::Quarter;

src/Gui/Quarter/InteractionMode.h → src/3rdParty/Quarter/src/Quarter/InteractionMode.h

@@ -33,13 +33,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <QCursor>
 #include <QObject>
+#include <QCursor>
+#include <Quarter/Basic.h>
 #include <Inventor/SoEventManager.h>
 
-#include "Basic.h"
-
-
 class QEvent;
 class SoEvent;
 class QKeyEvent;

src/Gui/Quarter/Keyboard.cpp → src/3rdParty/Quarter/src/Quarter/Keyboard.cpp

@@ -37,17 +37,14 @@
  the QuarterWidget.
 */
 
-#ifdef _MSC_VER
-#pragma warning(disable : 4267)
-#endif
+#include <Quarter/devices/Keyboard.h>
 
 #include <QEvent>
 #include <QKeyEvent>
-#include <Inventor/events/SoEvent.h>
+#include <Inventor/events/SoEvents.h>
+#include <Inventor/events/SoKeyboardEvent.h>
 
 #include "KeyboardP.h"
-#include "devices/Keyboard.h"
-
 
 using namespace SIM::Coin3D::Quarter;
 

src/Gui/Quarter/KeyboardP.cpp → src/3rdParty/Quarter/src/Quarter/KeyboardP.cpp

@@ -30,11 +30,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
-#include <Inventor/errors/SoDebugError.h>
-
 #include "KeyboardP.h"
-#include "devices/Keyboard.h"
-
+#include <Quarter/devices/Keyboard.h>
+#include <QtCore/QMap>
+#include <Inventor/errors/SoDebugError.h>
 
 using namespace SIM::Coin3D::Quarter;
 

src/Gui/Quarter/Mouse.cpp → src/3rdParty/Quarter/src/Quarter/Mouse.cpp

@@ -37,24 +37,17 @@
  QuarterWidget.
 */
 
-#include "PreCompiled.h"
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4267)
-#endif
+#include <Quarter/devices/Mouse.h>
 
 #include <QEvent>
-#include <QMouseEvent>
+#include <QSize>
 #include <QWheelEvent>
+#include <Quarter/QuarterWidget.h>
 
-#include <Gui/SoMouseWheelEvent.h>
 #include <Inventor/SbVec2s.h>
-#include <Inventor/errors/SoDebugError.h>
 #include <Inventor/events/SoEvents.h>
-
-#include "QuarterWidget.h"
-#include "devices/Mouse.h"
-
+#include <Inventor/events/SoMouseWheelEvent.h>
+#include <Inventor/errors/SoDebugError.h>
 
 namespace SIM { namespace Coin3D { namespace Quarter {
 

src/Gui/Quarter/NativeEvent.h → src/3rdParty/Quarter/src/Quarter/NativeEvent.h

@@ -33,6 +33,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/
 
+#include <QObject>
 #include <QEvent>
 
 #ifdef HAVE_SPACENAV_LIB