Initial implementation of selection summary with measurements

Celemation · Dec 28, 2022 · e938a6a · e938a6a
1 parent 930dd9a
commit e938a6a
Show file tree

Hide file tree

Showing 7 changed files with 381 additions and 6 deletions.
diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp
@@ -115,7 +115,7 @@
 #include "Workbench.h"
 #include "WorkbenchManager.h"
 #include "WidgetFactory.h"
-
+#include "SelectionSummary.h"
 
 using namespace Gui;
 using namespace Gui::DockWnd;
@@ -322,6 +322,7 @@ struct PyMethodDef FreeCADGui_methods[] = {
 
 } // namespace Gui
 
+SelectionSummary* summary;
 Application::Application(bool GUIenabled)
 {
     //App::GetApplication().Attach(this);
@@ -484,6 +485,9 @@ Application::Application(bool GUIenabled)
         createStandardOperations();
         MacroCommand::load();
     }
+
+    // TODO find idiomatically correct way to trigger class instantation
+    summary = new SelectionSummary();
 }
 
 Application::~Application()

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -47,6 +47,7 @@ include_directories(
     ${XercesC_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${3DCONNEXION_INCLUDE_DIR}
+    ${OCC_INCLUDE_DIR}
 )
 
 if(MSVC)
@@ -1103,6 +1104,8 @@ SET(Selection_SRCS
     SelectionObject.cpp
     Selection.h
     Selection.cpp
+    SelectionSummary.h
+    SelectionSummary.cpp
     SelectionFilter.h
     SelectionFilter.cpp
     SelectionFilter.y
@@ -1259,7 +1262,7 @@ if (EIGEN3_NO_DEPRECATED_COPY)
 endif ()
 
 add_library(FreeCADGui SHARED ${FreeCADGui_SRCS})
-target_link_libraries(FreeCADGui ${FreeCADGui_LIBS})
+target_link_libraries(FreeCADGui ${FreeCADGui_LIBS} Part)
 
 SET_BIN_DIR(FreeCADGui FreeCADGui)
 

diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp
@@ -936,8 +936,9 @@ void SelectionSingleton::setPreselectCoord( float x, float y, float z)
                     ,pts[1].first, pts[1].second.c_str()
                     ,pts[2].first, pts[2].second.c_str());
 
-    if (getMainWindow())
-        getMainWindow()->showMessage(QString::fromUtf8(buf));
+
+    //if (getMainWindow())
+    //    getMainWindow()->showMessage(QString::fromUtf8(buf));
 }
 
 void SelectionSingleton::rmvPreselect(bool signal)