Merge pull request #396 from pskowronskiTDx/tdx-integration-pr

Integration with 3Dconnexion input devices
OpenChemistry · Sep 1, 2023 · 17b8ff9 · 17b8ff9
2 parents 87fc3e2 + fe01deb
commit 17b8ff9
Show file tree

Hide file tree

Showing 41 changed files with 9,421 additions and 2 deletions.
diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
@@ -162,6 +162,15 @@ elseif(WIN32)
   list(APPEND avogadro_srcs icons/avogadro.rc)
 endif()
 
+if(USE_3DCONNEXION AND (WIN32 OR APPLE))
+  list(APPEND avogadro_srcs icons/3dx_pivot.png)
+  list(APPEND avogadro_srcs tdxcontroller.cpp) 
+  list(APPEND avogadro_srcs "${AvogadroApp_SOURCE_DIR}/thirdparty/3DConnexion/src/navlib_load.cpp") 
+  list(APPEND avogadro_srcs "${AvogadroApp_SOURCE_DIR}/thirdparty/3DConnexion/src/navlib_stub.c") 
+  set_source_files_properties(icons/3dx_pivot.png PROPERTIES
+  MACOSX_PACKAGE_LOCATION Resources)
+endif()
+
 add_executable(avogadro WIN32 MACOSX_BUNDLE
   ${avogadro_srcs} ${ui_srcs} ${rcc_srcs})
 target_link_libraries(avogadro Qt::Widgets Qt::Network Qt::Concurrent)
@@ -188,6 +197,18 @@ endif()
 if(QT_VERSION EQUAL 6)
   target_link_libraries(avogadro Qt6::Core5Compat)
 endif()
+
+if(USE_3DCONNEXION AND (WIN32 OR APPLE))
+  target_compile_definitions(avogadro PUBLIC _3DCONNEXION)
+  target_include_directories(avogadro PUBLIC "${AvogadroApp_SOURCE_DIR}/thirdparty/3DConnexion/inc")
+	if(APPLE)
+		target_compile_definitions(avogadro PUBLIC __APPLE__)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdeclspec")
+	elseif(WIN32)
+		install(FILES "icons/3dx_pivot.png" DESTINATION "${CMAKE_INSTALL_BINDIR}/img")
+	endif()
+endif()  
+
 install(TARGETS avogadro
   RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
   BUNDLE DESTINATION .

diff --git a/avogadro/icons/3dx_pivot.png b/avogadro/icons/3dx_pivot.png
diff --git a/avogadro/mainwindow.cpp b/avogadro/mainwindow.cpp
@@ -12,6 +12,7 @@
 #include "renderingdialog.h"
 #include "tooltipfilter.h"
 #include "viewfactory.h"
+#include "tdxcontroller.h"
 
 #include <avogadro/core/elements.h>
 #include <avogadro/io/cjsonformat.h>
@@ -245,6 +246,9 @@ MainWindow::MainWindow(const QStringList& fileNames, bool disableSettings)
   , m_redo(nullptr)
   , m_copyImage(nullptr)
   , m_viewFactory(new ViewFactory)
+#ifdef _3DCONNEXION
+  , m_TDxController(nullptr)
+#endif
 {
   // If disable settings, ensure we create a cleared QSettings object.
   if (disableSettings) {
@@ -312,10 +316,35 @@ MainWindow::MainWindow(const QStringList& fileNames, bool disableSettings)
   statusBar()->showMessage(tr("Ready…"), 2000);
 
   updateWindowTitle();
+
+#ifdef _3DCONNEXION
+  GLWidget* glWidget =
+    qobject_cast<GLWidget*>(m_multiViewWidget->activeWidget());
+
+  m_TDxController = new TDxController(this, glWidget);
+
+  connect(this, &MainWindow::moleculeChanged, m_TDxController,
+          &TDxController::updateMolecule);
+
+  m_TDxController->enableController();
+
+  QMap<QString, QList<QAction*>> actionsMap = m_menuBuilder->getMenuActions();
+  QList<QAction*> toolActions;
+
+  for (auto tool : m_tools)
+    toolActions.push_back(tool->activateAction());
+
+  actionsMap.insert("Toolbox", toolActions);
+
+  m_TDxController->exportCommands(actionsMap);
+#endif
 }
 
 MainWindow::~MainWindow()
 {
+#ifdef _3DCONNEXION
+  m_TDxController->disableController();
+#endif
   writeSettings();
   delete m_molecule;
   delete m_menuBuilder;
@@ -1810,7 +1839,7 @@ void MainWindow::buildMenu()
   m_menuBuilder->addAction(path, action, 960);
   m_fileToolBar->addAction(action);
   connect(action, SIGNAL(triggered()), SLOT(saveFileAs()));
-
+  
   // Export
   QStringList exportPath = path;
   exportPath << tr("&Export");

diff --git a/avogadro/mainwindow.h b/avogadro/mainwindow.h
@@ -33,7 +33,7 @@ namespace QtOpenGL {
 class GLWidget;
 }
 
-namespace Io {
+namespace Io { 
 class FileFormat;
 }
 
@@ -48,6 +48,9 @@ class RWMolecule;
 class LayerModel;
 }
 
+#ifdef _3DCONNEXION
+class TDxController;
+#endif
 /**
  * @class MainWindow
  * @author Marcus D. Hanwell
@@ -404,6 +407,9 @@ private slots:
   ViewFactory* m_viewFactory;
 
   QNetworkAccessManager* m_network = nullptr;
+#ifdef _3DCONNEXION
+  TDxController* m_TDxController;
+#endif
 
 #ifdef QTTESTING
   pqTestUtility* m_testUtility;

diff --git a/avogadro/menubuilder.h b/avogadro/menubuilder.h
@@ -62,6 +62,14 @@ class MenuBuilder : public QObject
    */
   void print();
 
+  /**
+   * @brief Get the map of string to action lists.
+   */
+  const QMap<QString, QList<QAction*>>& getMenuActions() const
+  {
+    return m_menuActions;
+  };
+
 private:
   /** A map of string to action lists. */
   QMap<QString, QList<QAction*>> m_menuActions;