Standard_Boolean AddTorusSurface(gp_Pnt^ sp, gp_Vec^ normal, double MajorRadius, double MinorRadius)
{
    ::gp_Dir dir(*(normal->ObjRef()));
    ::gp_Ax3 ax3(*(sp->ObjRef()), dir);
    //::gp_Torus torus(ax3, MajorRadius, MinorRadius);
    Handle(Geom_ToroidalSurface) torus = new Geom_ToroidalSurface(ax3, MajorRadius, MinorRadius);
    return m_Impl->AddShape(MakeFace(torus));
}

Handle(TopTools_HSequenceOfShape) ConnectEdgesToWires(bool isVoid)
{
    double tolerance = 0.001;
    bool shared = false;
    Handle(TopTools_HSequenceOfShape) Wires = new TopTools_HSequenceOfShape();
    Handle(TopTools_HSequenceOfShape) Edges = new TopTools_HSequenceOfShape();
    if (isVoid)
    {
        for (::TopoDS_Edge edge : *listOfVoidEdge)
        {
            Edges->Append(edge);
        }
        listOfVoidEdge->Clear();
        ShapeAnalysis_FreeBounds::ConnectEdgesToWires(Edges, tolerance, shared, Wires);
    }
    else
    {
        for (::TopoDS_Edge edge : *listOfEdge)
        {
            Edges->Append(edge);
        }
        listOfEdge->Clear();
        ShapeAnalysis_FreeBounds::ConnectEdgesToWires(Edges, tolerance, shared, Wires);
    }
    return Wires;
}

::TopoDS_Face ShapeFixFace(BRepBuilderAPI_MakeFace face)
{
    ShapeFix_Face aFaceFixer;
    aFaceFixer.FixWireMode() = 1;
    aFaceFixer.FixOrientationMode() = 1;
    aFaceFixer.FixSplitFaceMode() = 1;
    Handle(ShapeFix_Wire) aWireFixer = aFaceFixer.FixWireTool();
    aWireFixer->FixConnectedMode() = 1;
    aWireFixer->ClosedWireMode() = Standard_True;
    Handle(ShapeBuild_ReShape) aContext = new ShapeBuild_ReShape();
    aFaceFixer.SetContext(aContext);
    aFaceFixer.Init(face);
    aFaceFixer.Perform();
    return TopoDS::Face(aFaceFixer.Result());
}

::TopoDS_Shape MakeFace(const Handle(Geom_Surface) S)
{
    Handle(TopTools_HSequenceOfShape) Wires = ConnectEdgesToWires(false);
    BRepBuilderAPI_MakeFace region;
    if (Wires->Length() > 0)
    {
        BRepBuilderAPI_MakeFace F = BRepBuilderAPI_MakeFace(S, TopoDS::Wire(Wires->Value(1)));
        if (Wires->Length() > 1)
        {
            region = BRepBuilderAPI_MakeFace(F.Face(), TopoDS::Wire(Wires->Value(Wires->Length())));
        }
        else
        {
            region = F;
        }
    }
    else
    {
        region.Init(S, true, 1e-5);
    }
    Handle(TopTools_HSequenceOfShape) WiresVoid = ConnectEdgesToWires(true);
    for (int i = 1; i <= WiresVoid->Length(); i++)
    {
        region.Add(TopoDS::Wire(WiresVoid->Value(i)));
    }

    ::TopoDS_Shape shape = ShapeFixFace(region);
    GProp_GProps prop;
    BRepGProp::SurfaceProperties(shape, prop);
    if (prop.Mass() < 0)
    {
        BRepBuilderAPI_MakeFace R;
        BRepBuilderAPI_MakeFace F(S, TopoDS::Wire(Wires->Value(1)));
        if (Wires->Length() > 1)
        {
            R = BRepBuilderAPI_MakeFace(ShapeFixFace(BRepBuilderAPI_MakeFace(F.Face(), TopoDS::Wire(Wires->Value(Wires->Length())))));
        }
        else
        {
            R = BRepBuilderAPI_MakeFace(ShapeFixFace(F));
        }
        for (int i = 1; i <= WiresVoid->Length(); i++)
        {
            R.Add(TopoDS::Wire(WiresVoid->Value(i)));
        }
        if (WiresVoid->Length() > 0)
        {
            shape = ShapeFixFace(R);
        }
    }
    WiresVoid->Clear();
    Wires->Clear();
    return shape;
}