[Measure] Add features, viewproviders and preferences for unified measurement facility

src/Mod/Measure/App/AppMeasure.cpp

@@ -22,14 +22,38 @@
 
 #include "PreCompiled.h"
 
+#include <App/MeasureManager.h>
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 
+#include <Mod/Part/App/MeasureInfo.h>
+#include <Mod/Part/App/MeasureClient.h>
+
 #include "Measurement.h"
 #include "MeasurementPy.h"
 
+// unified measurement facility
+#include "MeasureBase.h"
+#include "MeasureBasePy.h"
+
+#include "MeasureAngle.h"
+#include "MeasureDistance.h"
+#include "MeasurePosition.h"
+#include "MeasureLength.h"
+#include "MeasureArea.h"
+#include "MeasureRadius.h"
 
 namespace Measure {
+
+// explicit template instantiations
+template class MeasureExport MeasureBaseExtendable<Part::MeasureAngleInfo>;
+template class MeasureExport MeasureBaseExtendable<Part::MeasureAreaInfo>;
+template class MeasureExport MeasureBaseExtendable<Part::MeasureDistanceInfo>;
+template class MeasureExport MeasureBaseExtendable<Part::MeasureLengthInfo>;
+template class MeasureExport MeasureBaseExtendable<Part::MeasurePositionInfo>;
+template class MeasureExport MeasureBaseExtendable<Part::MeasureRadiusInfo>;
+
+
 class Module : public Py::ExtensionModule<Module>
 {
 public:
@@ -48,6 +72,7 @@ PyObject* initModule()
 
 } // namespace Measure
 
+using namespace Measure;
 
 /* Python entry */
 PyMOD_INIT_FUNC(Measure)
@@ -62,14 +87,103 @@ PyMOD_INIT_FUNC(Measure)
     }
     PyObject* mod = Measure::initModule();
     // Add Types to module
-    Base::Interpreter().addType(&Measure::MeasurementPy      ::Type,mod,"Measurement");
-    Base::Console().Log("Loading Inspection module... done\n");
-    Measure::Measurement         ::init();
+    Base::Interpreter().addType(&Measure::MeasurementPy::Type, mod, "Measurement");
+    Base::Interpreter().addType(&Measure::MeasureBasePy::Type, mod, "MeasureBase");
+
+    Measure::Measurement            ::init();
+
+    // umf classes
+    Measure::MeasureBase            ::init();
+    Measure::MeasurePython          ::init();
+    Measure::MeasureAngle           ::init();
+    Measure::MeasureDistance        ::init();
+    Measure::MeasurePosition        ::init();
+    Measure::MeasureLength          ::init();
+    Measure::MeasureArea            ::init();
+    Measure::MeasureRadius          ::init();
+
+    // Add fundamental umf Measure Types
+
+    App::MeasureManager::addMeasureType("DISTANCE",
+                       "Distance",
+                       "Measure::MeasureDistance",
+                       MeasureDistance::isValidSelection,
+                       MeasureDistance::isPrioritizedSelection
+        );
+
+    App::MeasureManager::addMeasureType(
+            "ANGLE",
+            "Angle",
+            "Measure::MeasureAngle",
+            MeasureAngle::isValidSelection,
+            MeasureAngle::isPrioritizedSelection
+        );
+        
+    App::MeasureManager::addMeasureType(
+            "LENGTH",
+            "Length",
+            "Measure::MeasureLength",
+            MeasureLength::isValidSelection,
+            nullptr
+        );
+
+    App::MeasureManager::addMeasureType(
+            "POSITION",
+            "Position",
+            "Measure::MeasurePosition",
+            MeasurePosition::isValidSelection,
+            nullptr
+        );
+
+    App::MeasureManager::addMeasureType(
+            "AREA",
+            "Area",
+            "Measure::MeasureArea",
+            MeasureArea::isValidSelection,
+            nullptr
+        );
+        
+    App::MeasureManager::addMeasureType(
+            "RADIUS",
+            "Radius",
+            "Measure::MeasureRadius",
+            MeasureRadius::isValidSelection,
+            MeasureRadius::isPrioritizedSelection
+        );
+
+    // load measure callbacks from Part module
+    auto lengthList = Part::MeasureClient::reportLengthCB();
+    for (auto& entry : lengthList) {
+        MeasureBaseExtendable<Part::MeasureLengthInfo>::addGeometryHandler(entry.m_module, entry.m_callback);
+    }
+    auto angleList = Part::MeasureClient::reportAngleCB();
+    for (auto& entry : angleList) {
+        MeasureBaseExtendable<Part::MeasureAngleInfo>::addGeometryHandler(entry.m_module, entry.m_callback);
+    }
+    auto areaList =  Part::MeasureClient::reportAreaCB();
+    for (auto& entry : areaList) {
+        MeasureBaseExtendable<Part::MeasureAreaInfo>::addGeometryHandler(entry.m_module, entry.m_callback);
+    }
+    auto distanceList = Part::MeasureClient::reportDistanceCB();
+    for (auto& entry : distanceList) {
+        MeasureBaseExtendable<Part::MeasureDistanceInfo>::addGeometryHandler(entry.m_module, entry.m_callback);
+    }
+    auto positionList = Part::MeasureClient::reportPositionCB();
+    for (auto& entry : positionList) {
+        MeasureBaseExtendable<Part::MeasurePositionInfo>::addGeometryHandler(entry.m_module, entry.m_callback);
+    }
+    auto radiusList = Part::MeasureClient::reportRadiusCB();
+        for (auto& entry : radiusList) {
+        MeasureBaseExtendable<Part::MeasureRadiusInfo>::addGeometryHandler(entry.m_module, entry.m_callback);
+    }
+
+
+    Base::Console().Log("Loading Measure module... done\n");
     PyMOD_Return(mod);
 }
 
 // debug print for sketchsolv 
-void debugprint(const std::string& s)
+void debugprint(const std::string& text)
 {
-    Base::Console().Log("%s", s.c_str());
+    Base::Console().Log("%s", text.c_str());
 }