u

Author: aninggo

primitives.go

@@ -2290,6 +2290,45 @@ func CreateStubTubeWithPlace(params StubTubeParams, position Point3, normal Dir3
 	return s
 }
 
+type CableWireParams struct {
+	Points          []Point3 // 电缆路径点集
+	OutsideDiameter float32  // 电缆外径(mm)
+}
+
+func (p *CableWireParams) to_struct() C.cable_wire_params_t {
+	var c C.cable_wire_params_t
+	c.numPoints = C.int(len(p.Points))
+	c.outsideDiameter = C.double(p.OutsideDiameter)
+
+	if len(p.Points) > 0 {
+		c.points = (*C.pnt3d_t)(C.malloc(C.size_t(len(p.Points)) * C.sizeof_pnt3d_t))
+		for i, pt := range p.Points {
+			*(*C.pnt3d_t)(unsafe.Pointer(uintptr(unsafe.Pointer(c.points)) + uintptr(i)*C.sizeof_pnt3d_t)) = pt.val
+		}
+	}
+	return c
+}
+
+func CreateCableWire(params CableWireParams) *Shape {
+	cParams := params.to_struct()
+	defer C.free(unsafe.Pointer(cParams.points))
+
+	shp := C.create_cable_wire(cParams)
+	s := &Shape{inner: &innerShape{val: shp}}
+	runtime.SetFinalizer(s.inner, (*innerShape).free)
+	return s
+}
+
+func CreateCableWireWithPlace(params CableWireParams, position Point3, direction Dir3, upDirection Dir3) *Shape {
+	cParams := params.to_struct()
+	defer C.free(unsafe.Pointer(cParams.points))
+
+	shp := C.create_cable_wire_with_place(cParams, position.val, direction.val, upDirection.val)
+	s := &Shape{inner: &innerShape{val: shp}}
+	runtime.SetFinalizer(s.inner, (*innerShape).free)
+	return s
+}
+
 type PoleTowerNode struct {
 	ID       string
 	Position Point3

src/primitives.cc

@@ -7933,7 +7933,7 @@ TopoDS_Shape create_cable_wire(const cable_wire_params &params) {
   if (params.points.size() < 2) {
     throw Standard_ConstructionError("At least 2 points are required");
   }
-  if (params.outside_diameter <= 0.0) {
+  if (params.outsideDiameter <= 0.0) {
     throw Standard_ConstructionError("Outside diameter must be positive");
   }
 
@@ -7988,7 +7988,7 @@ TopoDS_Shape create_cable_wire(const cable_wire_params &params) {
   gp_Ax2 sectionAxes(gp::Origin(), initNormal, refDir);
 
   // 创建圆形截面（直径方向始终垂直于路径）
-  gp_Circ circle(sectionAxes, params.outside_diameter / 2);
+  gp_Circ circle(sectionAxes, params.outsideDiameter / 2);
   TopoDS_Wire profile =
       BRepBuilderAPI_MakeWire(BRepBuilderAPI_MakeEdge(circle).Edge()).Wire();
 

src/primitives.hh

@@ -1287,7 +1287,7 @@ TopoDS_Shape create_stub_tube(const stub_tube_params &params,
 
 struct cable_wire_params {
   std::vector<gp_Pnt> points; // 电缆路径点集
-  double outside_diameter;    // 电缆外径(mm)
+  double outsideDiameter;    // 电缆外径(mm)
 };
 
 TopoDS_Shape create_cable_wire(const cable_wire_params &params);

src/primitives_c_api.cc

@@ -2052,6 +2052,54 @@ create_stub_tube_with_place(stub_tube_params_t params, pnt3d_t position,
   }
 }
 
+PRIMCAPICALL topo_shape_t *create_cable_wire(cable_wire_params_t params) {
+  try {
+    // 将C数组转换为C++ vector
+    std::vector<gp_Pnt> points;
+    for (int i = 0; i < params.numPoints; ++i) {
+      points.push_back(
+          gp_Pnt(params.points[i].x, params.points[i].y, params.points[i].z));
+    }
+
+    // 创建C++参数结构
+    cable_wire_params cpp_params{.points = points,
+                                 .outsideDiameter = params.outsideDiameter};
+
+    return new topo_shape_t{
+        .shp = std::make_shared<shape>(create_cable_wire(cpp_params))};
+  } catch (...) {
+    return nullptr;
+  }
+}
+
+PRIMCAPICALL topo_shape_t *
+create_cable_wire_with_place(cable_wire_params_t params, pnt3d_t position,
+                             dir3d_t direction, dir3d_t upDirection) {
+  try {
+    // 将C数组转换为C++ vector
+    std::vector<gp_Pnt> points;
+    for (int i = 0; i < params.numPoints; ++i) {
+      points.push_back(
+          gp_Pnt(params.points[i].x, params.points[i].y, params.points[i].z));
+    }
+
+    // 创建C++参数结构
+    cable_wire_params cpp_params{.points = points,
+                                 .outsideDiameter = params.outsideDiameter};
+
+    // 转换位置和方向参数
+    gp_Pnt cpp_position(position.x, position.y, position.z);
+    gp_Dir cpp_direction(direction.x, direction.y, direction.z);
+    gp_Dir cpp_upDirection(upDirection.x, upDirection.y, upDirection.z);
+
+    return new topo_shape_t{
+        .shp = std::make_shared<shape>(create_cable_wire(
+            cpp_params, cpp_position, cpp_direction, cpp_upDirection))};
+  } catch (...) {
+    return nullptr;
+  }
+}
+
 PRIMCAPICALL topo_shape_t *create_pole_tower(pole_tower_params_t params) {
   pole_tower_params cpp_params;
 

src/primitives_c_api.h

@@ -1051,6 +1051,17 @@ PRIMCAPICALL topo_shape_t *
 create_stub_tube_with_place(stub_tube_params_t params, pnt3d_t position,
                             dir3d_t normal, dir3d_t xDir);
 
+typedef struct {
+  pnt3d_t *points;        // 电缆路径点集
+  int numPoints;          // 点数量
+  double outsideDiameter; // 电缆外径(mm)
+} cable_wire_params_t;
+
+PRIMCAPICALL topo_shape_t *create_cable_wire(cable_wire_params_t params);
+PRIMCAPICALL topo_shape_t *
+create_cable_wire_with_place(cable_wire_params_t params, pnt3d_t position,
+                             dir3d_t direction, dir3d_t upDirection);
+
 typedef enum {
   MEMBER_TYPE_ANGLE = 1,       // 角钢
   MEMBER_TYPE_TUBE = 2,        // 等径钢管

src/primitives_test.cc

@@ -2392,7 +2392,7 @@ void test_make_cable_wire() {
     std::vector<gp_Pnt> straightPoints = {gp_Pnt(0, 0, 0), gp_Pnt(100, 0, 0)};
 
     auto shp1 = create_cable_wire(
-        cable_wire_params{.points = straightPoints, .outside_diameter = 10.0});
+        cable_wire_params{.points = straightPoints, .outsideDiameter = 10.0});
 
     if (shp1.IsNull()) {
       std::cerr << "Error: Failed to create straight cable wire" << std::endl;
@@ -2406,7 +2406,7 @@ void test_make_cable_wire() {
                                         gp_Pnt(150, 0, 100)};
 
     auto shp2 = create_cable_wire(
-        cable_wire_params{.points = curvedPoints, .outside_diameter = 8.0});
+        cable_wire_params{.points = curvedPoints, .outsideDiameter = 8.0});
 
     if (shp2.IsNull()) {
       std::cerr << "Error: Failed to create curved cable wire" << std::endl;