patch

Author: farleyrunkel

src/Iact/Workspace/SnapOnCurve2D.cxx

@@ -1,5 +1 @@
 #include "Iact/Workspace/SnapOnCurve2D.hxx"
-
-const std::shared_ptr<SnapInfoCurve2D> SnapInfoCurve2D::Empty =
-std::make_shared<SnapInfoCurve2D>(SnapMode::None, gp_Pnt2d(0, 0), 0);
-

src/Iact/Workspace/SnapOnCurve2D.hxx

@@ -1,21 +1,25 @@
 #ifndef IACT_SNAPPING_SnapOnCurve2D_HXX
 #define IACT_SNAPPING_SnapOnCurve2D_HXX
 
-#include <Standard_Handle.hxx>
-#include <gp_Pln.hxx>
-#include <gp_Pnt2d.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-#include <Geom_Curve.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom2dAPI_InterCurveCurve.hxx>
+#include <AIS_InteractiveContext.hxx>
+#include <AIS_InteractiveObject.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepLib.hxx>
+#include <Geom2d_Circle.hxx>
+#include <Geom2d_Line.hxx>
+#include <Geom2dAPI_InterCurveCurve.hxx>
 #include <GeomAPI.hxx>
+#include <gp_Dir2d.hxx>
+#include <gp_Pln.hxx>
+#include <gp_Pnt2d.hxx>
+#include <IntRes2d_IntersectionPoint.hxx>
+#include <ProjLib.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
 
 #include "Iact/InteractiveContext.hxx"
-#include "Iact/WorkspaceController.hxx"
 #include "Iact/Workspace/SnapBase.hxx"
+#include "Iact/WorkspaceController.hxx"
 
 class SnapInfoCurve2D
 {
@@ -31,60 +35,39 @@ public:
         : Mode(mode), Point(point), Parameter(param), TargetParameter(0)
     {}
 
-    static const std::shared_ptr<SnapInfoCurve2D> Empty;
+    SnapInfoCurve2D()
+        : SnapInfoCurve2D(SnapMode::None, gp_Pnt2d(0, 0), 0)
+    {}
 };
 
-// 2D曲线捕捉处理器，支持边捕捉
-class SnapOnCurve2D : public SnapBase
+class SnapOnCurve2D
 {
 public:
     // 构造函数
     SnapOnCurve2D()
-        : _SupportedModes(SnapMode::Edge)
+        : SupportedModes(SnapMode::Edge)
     {}
 
-    // 析构函数
     virtual ~SnapOnCurve2D() = default;
 
-    // 获取或设置捕捉平面
-    const gp_Pln& Plane() const
+    SnapInfoCurve2D Snap(const Handle(Geom2d_Curve)& curve,
+                         const Handle(MouseEventData)& mouseEvent)
     {
-        return _IsPlaneSet ? _Plane : GetWorkspaceController()->workspace()->WorkingPlane();
-    }
-
-    void SetPlane(const gp_Pln& plane)
-    {
-        _Plane = plane;
-        _IsPlaneSet = true;
-    }
-
-    // 执行捕捉，返回捕捉点
-    gp_Pnt2d Snap(const Handle(Geom2d_Curve)& curve, const Handle(MouseEventData)& mouseEvent)
-    {
-        return ProcessSnap(curve, {}/*mouseEvent->DetectedBrepShape()*/);
-    }
-
-protected:
-    // 清理资源
-    virtual void Cleanup() override
-    {
-        _IsPlaneSet = false;
-        SnapBase::Cleanup();
+        SnapInfoCurve2D snapInfo;
+        return snapInfo;
     }
 
 private:
-    // 处理边捕捉
-    gp_Pnt2d ProcessSnap(const Handle(Geom2d_Curve)& curve, const TopoDS_Shape& shapeToSnap)
+    SnapInfoCurve2D _Snap(const Handle(Geom2d_Curve)& curve,
+                          const TopoDS_Shape& shapeToSnap,
+                          const Handle(AIS_InteractiveObject)& aisObject)
     {
-        if(!InteractiveContext::Current()->GetEditorState()->IsSnappingEnabled() ||
-           !InteractiveContext::Current()->GetEditorState()->IsSnapToEdgeSelected())
-        {
-            return gp_Pnt2d(0.0, 0.0);
-        }
+        SnapInfoCurve2D snapInfo;
 
-        if(!shapeToSnap.IsNull() && shapeToSnap.ShapeType() == TopAbs_ShapeEnum::TopAbs_EDGE)
+        if(SupportedModes & SnapMode::Edge
+           && shapeToSnap.ShapeType() == TopAbs_ShapeEnum::TopAbs_EDGE)
         {
-            TopoDS_Edge edge = TopoDS::Edge(shapeToSnap);
+            auto edge = TopoDS::Edge(shapeToSnap);
             double umin, umax;
             Handle(Geom_Curve) edgeCurve = BRep_Tool::Curve(edge, umin, umax);
             if(edgeCurve.IsNull() && BRepLib::BuildCurve3d(edge))
@@ -94,22 +77,36 @@ private:
 
             if(!edgeCurve.IsNull())
             {
-                Handle(Geom2d_Curve) projected2dCurve = GeomAPI::To2d(edgeCurve, Plane());
+                Handle(Geom2d_Curve) projected2dCurve = GeomAPI::To2d(edgeCurve, _Plane);
                 Geom2dAPI_InterCurveCurve intersect(curve, projected2dCurve);
                 if(intersect.NbPoints() > 0)
                 {
-                    return intersect.Point(1);
+                    IntRes2d_IntersectionPoint Point1 = intersect.Intersector().Point(1);
+                    SnapInfoCurve2D result(SnapMode::Edge, intersect.Point(1), Point1.ParamOnFirst());
+                    result.TargetParameter = Point1.ParamOnSecond();
+                    result.TargetBrepShape = shapeToSnap;
+                    result.TargetAisObject = aisObject;
+                    return result;
                 }
             }
         }
 
-        return gp_Pnt2d(0.0, 0.0);
+        return snapInfo;
+    }
+
+    SnapInfoCurve2D _SnapGrid(const Handle(Geom2d_Curve)& curve,
+                              int screenPointX,
+                              int screenPointY)
+    {
+        SnapInfoCurve2D snapInfo;
+        double currentDistance = 10.0;
+        return snapInfo;
     }
 
 private:
     gp_Pln _Plane; // 捕捉平面
+    SnapModes SupportedModes; // 支持的捕捉模式
     bool _IsPlaneSet = false; // 标记平面是否被设置
-    SnapModes _SupportedModes; // 支持的捕捉模式
 };
 
 DEFINE_STANDARD_HANDLE(SnapOnCurve2D, SnapBase)

src/Occt/OcctHelper/AisHelper.hxx

@@ -15,6 +15,57 @@ class AisHelper
 public:
 	static void DisableGlobalClipPlanes(const Handle(PrsMgr_PresentableObject)& object);
 	static TopoDS_Shape GetShapeFromEntityOwner(const Handle(SelectMgr_EntityOwner) owner);
+
+    // 静态函数：从选择器中获取拾取的交互对象和形状
+    static int GetPickedFromSelector(const Handle(StdSelect_ViewerSelector3d)& selector,
+                                     std::vector<Handle(AIS_InteractiveObject)>& interactives,
+                                     std::vector<TopoDS_Shape>& shapes)
+    {
+        int count = 0;
+        bool doInteractives = !interactives.empty();
+        bool doShapes = !shapes.empty();
+
+        // 清空输出向量
+        interactives.clear();
+        shapes.clear();
+
+        // 遍历拾取结果
+        for(Standard_Integer aPickIter = 1; aPickIter <= selector->NbPicked(); ++aPickIter)
+        {
+            Handle(SelectMgr_EntityOwner) owner = selector->Picked(aPickIter);
+            if(owner.IsNull() || !owner->HasSelectable())
+            {
+                continue;
+            }
+
+            count++;
+
+            // 处理交互对象
+            if(doInteractives)
+            {
+                Handle(AIS_InteractiveObject) interactive =
+                    Handle(AIS_InteractiveObject)::DownCast(owner->Selectable());
+                interactives.push_back(interactive); // 空 Handle 表示 nullptr
+            }
+
+            // 处理形状
+            if(doShapes)
+            {
+                Handle(StdSelect_BRepOwner) brepOwner =
+                    Handle(StdSelect_BRepOwner)::DownCast(owner);
+                if(!brepOwner.IsNull() && brepOwner->HasShape())
+                {
+                    shapes.push_back(brepOwner->Shape());
+                }
+                else
+                {
+                    shapes.push_back(TopoDS_Shape()); // 空形状表示 nullptr
+                }
+            }
+        }
+
+        return count;
+    }
 };
 
 #endif  // OCCT_OCCTHELPER_AISHELPER_H_