添加删除控制点数量

src/common/ClientConnection.ts

@@ -1333,6 +1333,7 @@ export default class ClientConnection {
     row: number,
     column: number,
     correction_type: number,
+    control_point_count: number,
     control_point: number,
     x: number,
     y: number
@@ -1342,6 +1343,7 @@ export default class ClientConnection {
         row,
         column,
         correction_type,
+        control_point_count,
         control_point,
         x,
         y
@@ -1440,6 +1442,7 @@ export default class ClientConnection {
   public async SetBlendingHorDensity(
     row: number,
     column: number,
+    control_point_count: number,
     control_point: number,
     value: number
   ) {
@@ -1447,6 +1450,7 @@ export default class ClientConnection {
       new Protocol.SetBlendingHorDensityRequestEntity(
         row,
         column,
+        control_point_count,
         control_point,
         value
       )
@@ -1456,6 +1460,7 @@ export default class ClientConnection {
   public async SetBlendingVerDensity(
     row: number,
     column: number,
+    control_point_count: number,
     control_point: number,
     value: number
   ) {
@@ -1463,6 +1468,7 @@ export default class ClientConnection {
       new Protocol.SetBlendingVerDensityRequestEntity(
         row,
         column,
+        control_point_count,
         control_point,
         value
       )
@@ -1505,6 +1511,18 @@ export default class ClientConnection {
     );
   }
 
+  public async AddBlendingCtrlPoint(type: string, row: number, column: number, count: number) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.AddBlendingCtrlPointRequestEntity(type, row, column, count)
+    );
+  }
+
+  public async DelBlendingCtrlPoint(type: string, row: number, column: number, count: number) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.DelBlendingCtrlPointRequestEntity(type, row, column, count)
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {

src/components/FusionSettings/DensityCorrection.vue

@@ -327,6 +327,7 @@ export default defineComponent({
 	  set?.SetBlendingVerDensity(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
+		  5,
           -1, 0
         );
     };
@@ -341,6 +342,7 @@ export default defineComponent({
 		  set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index - 5 + 1,
             Number(value[index].x)
           );
@@ -353,6 +355,7 @@ export default defineComponent({
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index + 1,
             Number(value[index].y)
           );
@@ -470,6 +473,7 @@ export default defineComponent({
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index+1,
             Number(value)
           );
@@ -478,6 +482,7 @@ export default defineComponent({
           set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index>4?index-4:index+1,
             Number(value)
           );

src/components/FusionSettings/FourPointCalibration.vue

@@ -310,7 +310,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             1,
             Number(newVal.x),
             Number(newVal.y)
@@ -338,7 +338,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             2,
             Number(newVal.x),
             Number(newVal.y)
@@ -366,7 +366,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             3,
             Number(newVal.x),
             Number(newVal.y)
@@ -396,7 +396,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             4,
             Number(newVal.x),
             Number(newVal.y)
@@ -500,7 +500,7 @@ export default defineComponent({
         set?.setBlendingCorrection(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          4,
+          4, 4,
           index + 1,
           Number(config.point4[index].def_x),
           Number(config.point4[index].def_y)
@@ -520,7 +520,7 @@ export default defineComponent({
       set?.setBlendingCorrection(
         $store.getters.GetTheCurrentlySelectedCamera[0],
         $store.getters.GetTheCurrentlySelectedCamera[1],
-        4, 0, 0, 0
+        4, 4, 0, 0, 0
       );
     };
 

src/components/FusionSettings/SurfaceCorrection.vue

@@ -543,7 +543,7 @@ export default defineComponent({
         set?.setBlendingCorrection(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          9,
+          9, 9,
           index + 1,
           Number(config.point9[index].def_x),
           Number(config.point9[index].def_y)
@@ -562,7 +562,7 @@ export default defineComponent({
       set?.setBlendingCorrection(
         $store.getters.GetTheCurrentlySelectedCamera[0],
         $store.getters.GetTheCurrentlySelectedCamera[1],
-        9, 0, 0, 0
+        9, 9, 0, 0, 0
       );
     };
     watch(
@@ -572,7 +572,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             1,
             Number(newVal.x),
             Number(newVal.y)
@@ -594,7 +594,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             2,
             Number(newVal.x),
             Number(newVal.y)
@@ -616,7 +616,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             3,
             Number(newVal.x),
             Number(newVal.y)
@@ -637,7 +637,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             4,
             Number(newVal.x),
             Number(newVal.y)
@@ -658,7 +658,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             5,
             Number(newVal.x),
             Number(newVal.y)
@@ -679,7 +679,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             6,
             Number(newVal.x),
             Number(newVal.y)
@@ -700,7 +700,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             7,
             Number(newVal.x),
             Number(newVal.y)
@@ -721,7 +721,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             8,
             Number(newVal.x),
             Number(newVal.y)
@@ -742,7 +742,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             9,
             Number(newVal.x),
             Number(newVal.y)

src/entities/WSProtocol.ts

@@ -535,6 +535,12 @@ export namespace Protocol {
     public static get kDeleteBlendingScene() {
       return Commands.PROTOCOL_PREFIX + "DeleteBlendingScene";
     }
+    public static get kAddBlendingCtrlPoint() {
+      return Commands.PROTOCOL_PREFIX + "AddBlendingCtrlPoint";
+    }
+    public static get kDelBlendingCtrlPoint() {
+      return Commands.PROTOCOL_PREFIX + "DelBlendingCtrlPoint";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -671,6 +677,8 @@ export namespace Protocol {
       Commands.kEnumBlendingScene,
       Commands.kApplyBlendingScene,
       Commands.kDeleteBlendingScene,
+      Commands.kAddBlendingCtrlPoint,
+      Commands.kDelBlendingCtrlPoint,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3242,6 +3250,7 @@ export namespace Protocol {
       row: number,
       column: number,
       correction_type: number,
+      control_point_count: number,
       control_point: number,
       x: number,
       y: number,
@@ -3256,12 +3265,14 @@ export namespace Protocol {
       this.y = y ?? 0;
       this.row = row ?? 0;
       this.column = column ?? 0;
-      this.correction_type = correction_type ?? 0;
+      this.correction_type = correction_type ?? 0;
+      this.control_point_count = control_point_count ?? 0;
       this.control_point = control_point ?? 0;
     }
     row = 0;
     column = 0;
-    correction_type = 0; //4：四点校正，9：曲面校正
+    correction_type = 0; //4：四点校正，9：曲面校正
+    control_point_count = 0;
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     x = 0;
     y = 0;
@@ -3432,7 +3443,8 @@ export namespace Protocol {
   export class SetBlendingHorDensityRequestEntity extends PacketEntity {
     constructor(
       row: number,
-      column: number,
+      column: number,
+      control_point_count: number,
       control_point: number,
       value: number,
       rpc_id = 0
@@ -3443,12 +3455,14 @@ export namespace Protocol {
       super.rpc_id = rpc_id;
 
       this.row = row ?? 0;
-      this.column = column ?? 0;
+      this.column = column ?? 0;
+      this.control_point_count = control_point_count ?? 0;
       this.control_point = control_point ?? 0;
       this.value = value ?? 0;
     }
     row = 0;
-    column = 0;
+    column = 0;
+    control_point_count = 0;
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     value = 0;
   }
@@ -3456,7 +3470,8 @@ export namespace Protocol {
   export class SetBlendingVerDensityRequestEntity extends PacketEntity {
     constructor(
       row: number,
-      column: number,
+      column: number,
+      control_point_count: number,
       control_point: number,
       value: number,
       rpc_id = 0
@@ -3467,12 +3482,14 @@ export namespace Protocol {
       super.rpc_id = rpc_id;
 
       this.row = row ?? 0;
-      this.column = column ?? 0;
+      this.column = column ?? 0;
+      this.control_point_count = control_point_count ?? 0;
       this.control_point = control_point ?? 0;
       this.value = value ?? 0;
     }
     row = 0;
-    column = 0;
+    column = 0;
+    control_point_count = 0;
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     value = 0;
   }
@@ -3555,4 +3572,52 @@ export namespace Protocol {
     }
     name;
   }
+
+  export class AddBlendingCtrlPointRequestEntity extends PacketEntity {
+    constructor(
+      type: string,
+      row: number,
+      column: number,
+      count: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kAddBlendingCtrlPoint;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.type = type ?? "";
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.count = count ?? 0;
+    }
+    type; //ver_density:垂直疏密，hor_density:水平疏密，9：曲面
+    row = 0;
+    column = 0;
+    count = 0; //控制点数量
+  }
+
+  export class DelBlendingCtrlPointRequestEntity extends PacketEntity {
+    constructor(
+      type: string,
+      row: number,
+      column: number,
+      count: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kDelBlendingCtrlPoint;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.type = type ?? "";
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.count = count ?? 0;
+    }
+    type; //ver_density:垂直疏密，hor_density:水平疏密，9：曲面
+    row = 0;
+    column = 0;
+    count = 0; //控制点数量
+  }
 }