!2091 新增:格子抽绘制界面，增加板件纹路选项 #159

src/Add-on/LatticeDrawer/LatticeDrawerTool.ts

@@ -8,7 +8,7 @@ import { Board } from "../../DatabaseServices/Entity/Board";
 import { Polyline } from "../../DatabaseServices/Entity/Polyline";
 import { AsVector2, equalv3, isParallelTo, XAxis, YAxis } from "../../Geometry/GeUtils";
 import { ISpaceParse } from "../../Geometry/SpaceParse/ISpaceParse";
-import { BoardType, DrillType, IHighSealedItem, LinesType } from "../../UI/Store/BoardInterface";
+import { BoardType, DrillType, IHighSealedItem } from "../../UI/Store/BoardInterface";
 import { ELatticeArrayType, ILatticeOption } from "../../UI/Store/LatticeInterface";
 
 export class DrawLatticeDrawerTool extends Singleton
@@ -282,7 +282,7 @@ export class DrawLatticeDrawerTool extends Singleton
         br.BoardProcessOption.sealedRight = config.rightSealed.toString();
         br.BoardProcessOption.drillType = DrillType.None;
         br.BoardProcessOption.highDrill.fill(DrillType.None);
-        br.BoardProcessOption[EBoardKeyList.Lines] = LinesType.Reverse;  //生成的板设置为反纹
+        br.BoardProcessOption[EBoardKeyList.Lines] = config.linesType;  //纹路
     }
     protected ParseHighSealing(br: Board, leftSealed: number, rightSealed: number, topSealed: number, downSealed: number, isHor: boolean)
     {

src/DatabaseServices/Template/ProgramTempate/TemplateLatticeRecord.ts

@@ -114,11 +114,15 @@ export class TemplateLatticeRecord extends TemplateRecord
         this.option.upCut = file.Read();
         this.option.downCut = file.Read();
 
+        if (ver > 1)
+        {
+            this.option.linesType = file.Read();
+        }
     }
     //对象将自身数据写入到文件.
     WriteFile(file: CADFiler)
     {
-        file.Write(1);
+        file.Write(2);
         super.WriteFile(file);
         file.Write(this.option.arrayType);
         file.Write(this.option.gripWidth);
@@ -142,6 +146,8 @@ export class TemplateLatticeRecord extends TemplateRecord
         file.Write(this.option.isOpenCut);
         file.Write(this.option.upCut);
         file.Write(this.option.downCut);
+
+        file.Write(this.option.linesType);
     }
     //#endregion
 }

src/Editor/DefaultConfig.ts

@@ -379,7 +379,7 @@ export const DefaultBoardFindOption: IBoardFindOption = {
 Object.freeze(DefaultBoardFindOption);
 
 export const DefaultLatticOption: ILatticeOption = {
-    version: 1,
+    version: 2,
     arrayType: ELatticeArrayType.ByWidth,
     gripWidth: 100,
     gripDepth: 100,
@@ -400,6 +400,7 @@ export const DefaultLatticOption: ILatticeOption = {
     isOpenCut: false,
     upCut: 0,
     downCut: 4,
+    linesType: LinesType.Reverse,
 };
 Object.freeze(DefaultLatticOption);
 
@@ -534,6 +535,7 @@ export const DefaultLatticeConfig: ILatticeOption = {
     isOpenCut: false,
     upCut: 0,
     downCut: 4,
+    linesType: LinesType.Reverse,
 };
 Object.freeze(DefaultLatticeConfig);
 

src/UI/Components/LatticeDrawer.tsx

@@ -1,4 +1,4 @@
-import { Button, Checkbox, Classes, H5, Intent, Radio, RadioGroup } from '@blueprintjs/core';
+import { Button, Checkbox, Classes, H5, HTMLSelect, Intent, Radio, RadioGroup } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { inject, observer } from 'mobx-react';
 import * as React from 'react';
@@ -7,6 +7,7 @@ import { app } from '../../ApplicationServices/Application';
 import { CheckObjectType } from '../../Common/CheckoutVaildValue';
 import { CommandNames } from '../../Common/CommandNames';
 import { KeyBoard } from '../../Common/KeyEnum';
+import { LinesType } from '../Store/BoardInterface';
 import { LatticeDrawerStore } from '../Store/LatticeDrawerStore';
 import { ELatticeArrayType } from '../Store/LatticeInterface';
 import { Input5Or4Component, SetBoardDataBlock, SetBoardDataItem } from './Board/BoardCommon';
@@ -83,7 +84,7 @@ export class LatticeDrawer extends React.Component<{ store?: LatticeDrawerStore;
                     </>
                 }
             >
-                <div>
+                <div style={{ marginRight: 15 }}>
                     <H5>阵列方式</H5>
                     <RadioGroup
                         inline={true}
@@ -130,6 +131,20 @@ export class LatticeDrawer extends React.Component<{ store?: LatticeDrawerStore;
                             })
                         }
                     </div>
+                    <div className='linesType'>
+                        <span>纹路:</span>
+                        <HTMLSelect
+                            value={m_Option.linesType}
+                            options={
+                                [
+                                    { label: "正纹", value: LinesType.Positive },
+                                    { label: "反纹", value: LinesType.Reverse },
+                                    { label: "可翻转", value: LinesType.CanReversal },
+                                ]
+                            }
+                            onChange={e => store.m_Option.linesType = parseInt(e.target.value)}
+                        />
+                    </div>
                     <Checkbox
                         checked={m_Option.isChange}
                         label="左右侧板跟随变化"

src/UI/Components/Modal/ModalStyle/WineRack.less

@@ -22,4 +22,16 @@
             margin-left: 10px;
         }
     }
+
+    .linesType{
+        width          : 120px;
+        display        : flex;
+        justify-content: space-between;
+        margin-bottom  : 5px;
+
+        .bp3-html-select{
+            width     : 81px;
+            margin-top: -1px;
+        }
+    }
 }

src/UI/Store/LatticeDrawerStore.ts

@@ -23,9 +23,17 @@ export class LatticeDrawerStore extends BoardStore
     }
     UpdateOption(cof: IConfigOption)
     {
+        let ver = cof.option.version;
+        if (ver < 2)
+        {
+            cof.option.version = 2;
+            cof.option.linesType = DefaultLatticOption.linesType;
+        }
+
         Object.assign(this.m_Option, cof.option);
         if (this.m_UiOption)
             Object.assign(this.m_UiOption, DataAdapter.ConvertUIData(cof.option));
+
     }
     HasInvailValue()
     {

src/UI/Store/LatticeInterface.ts

@@ -28,4 +28,5 @@ export interface ILatticeOption extends IBaseOption
     isOpenCut: boolean;
     upCut: number;
     downCut: number;
+    linesType: number; //纹路
 }