diff --git a/entry/src/main/ets/pages/CustomStyle/Button.ets b/entry/src/main/ets/pages/CustomStyle/Button.ets index cc874b64..d750f37d 100644 --- a/entry/src/main/ets/pages/CustomStyle/Button.ets +++ b/entry/src/main/ets/pages/CustomStyle/Button.ets @@ -28,11 +28,16 @@ export struct EventBtn { OCCTLoadModel(undefined,undefined) } }) + Text() + .width('50vp') + .height('7vp') + .backgroundColor(Color.Transparent) Text(this.eventBtn.eName) - .fontSize('10fp') - .width('45vp') + .fontSize('8fp') + .width('50vp') .height('10vp') .textAlign(TextAlign.Center) + .backgroundColor(Color.Transparent) } } .height('50vp') diff --git a/entry/src/main/ets/pages/CustomStyle/Menu.ets b/entry/src/main/ets/pages/CustomStyle/Menu.ets index c09941df..a4956600 100644 --- a/entry/src/main/ets/pages/CustomStyle/Menu.ets +++ b/entry/src/main/ets/pages/CustomStyle/Menu.ets @@ -55,7 +55,7 @@ export struct GroupTextEventMenu { export struct MenuBtn { @Param menuBtn: Array | undefined = undefined; @Param iconState: boolean = false; - + @Local curtIndex:number=0; @Builder EventMenu() { Menu() { @@ -68,6 +68,9 @@ export struct MenuBtn { bottom: 0, right: 0 }) + .onClick(()=>{ + this.curtIndex=index; + }) }) } } @@ -79,18 +82,26 @@ export struct MenuBtn { .bindMenu(this.EventMenu) .width('35vp') .height('35vp') - .backgroundImage($r('app.media.' + this.menuBtn[0].eIcon)) + .backgroundImage($r('app.media.' + this.menuBtn[this.curtIndex].eIcon)) .backgroundImagePosition({ x: '10%', y: '10%' }) .backgroundColor(Color.Transparent) .backgroundImageSize({ width: '80%', // 图片宽度占满按钮 height: '80%' // 图片高度占满按钮 }) - Text(this.menuBtn[0].eName) - .fontSize('10fp') - .width('45vp') + Button() + .bindMenu(this.EventMenu) + .width('50vp') + .height('7vp') + .backgroundImage($r('app.media.base_chevron_down')) + .backgroundImagePosition({ x: '35%', y: '-50%' }) + .backgroundColor(Color.Transparent) + Text(this.menuBtn[this.curtIndex].eName) + .fontSize('8fp') + .width('50vp') .height('10vp') .textAlign(TextAlign.Center) + } } .height('50vp') diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets index 10957c3d..214b366c 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets @@ -12,45 +12,45 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'构建',grpBtn:[ - {eModel:[ModelType.BASE],eName:"草图",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"草图",eNamed:"",eIcon:"sketch",eTips:"",eEvent:""}, [ - {eModel:[ModelType.BASE],eName:"基准平面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准轴",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准坐标系",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准平面栅格",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"调整基准坐标系大小",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"打印坐标系",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准平面",eNamed:"",eIcon:"standard_datumplane",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准轴",eNamed:"",eIcon:"standard_datumaxis",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准坐标系",eNamed:"",eIcon:"standard_datumcsys",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准平面栅格",eNamed:"",eIcon:"standard_datum_plane_grid_nonwkpt",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"调整基准坐标系大小",eNamed:"",eIcon:"standard_resize_datum_plane",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"打印坐标系",eNamed:"",eIcon:"standard_print_csys",eTips:"",eEvent:""}, ], [ - {eModel:[ModelType.BASE],eName:"点",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"直线",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆弧/圆",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"样条",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"艺术样条",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"文本",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"点集",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"参考点云",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""} + {eModel:[ModelType.BASE],eName:"点",eNamed:"",eIcon:"sketch_point",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"直线",eNamed:"",eIcon:"sketch_line",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"圆弧/圆",eNamed:"",eIcon:"sketch_arc",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"样条",eNamed:"",eIcon:"sketch_spline",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"艺术样条",eNamed:"",eIcon:"sketch_spline",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"文本",eNamed:"",eIcon:"sketch_styler_label",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"点集",eNamed:"",eIcon:"sketch_point_set",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"参考点云",eNamed:"",eIcon:"sketch_reference_point_cloud",eTips:"",eEvent:""} ] ],grpMenu:GroupOption}] as Array, [{grpName:'基本',grpBtn:[ [ - {eModel:[ModelType.BASE],eName:"拉伸",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"旋转",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"拉伸",eNamed:"",eIcon:"modeling_extrude",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"旋转",eNamed:"",eIcon:"modeling_revolution",eTips:"",eEvent:""}, ], [ - {eModel:[ModelType.BASE],eName:"合并",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"减去",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"求交",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"合并",eNamed:"",eIcon:"modeling_booleanunite",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"减去",eNamed:"",eIcon:"modeling_booleansubtract",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"求交",eNamed:"",eIcon:"modeling_booleanintersect",eTips:"",eEvent:""}, ], [ - {eModel:[ModelType.BASE],eName:"凸起",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"凸起体",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"凸起",eNamed:"",eIcon:"modeling_emboss",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"凸起体",eNamed:"",eIcon:"modeling_emboss_body",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"组合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"缝合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"补片",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"缝合",eNamed:"",eIcon:"modeling_sew",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"补片",eNamed:"",eIcon:"modeling_patch",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"拼合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"偏置凸起",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"装配切割",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"装配切割",eNamed:"",eIcon:"modeling_assembly_cut",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"取消缝合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"连接面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"构造实体",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, diff --git a/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets b/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets index a5e3628b..c292d00b 100644 --- a/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets +++ b/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets @@ -19,6 +19,14 @@ export struct TitleTab { @Local titleBarDefaultFocusIndex: number = 0; //模块Bar栏 @Provider('curtModel') curtModel:Array|undefined= TitleData.mModels.get(this.titleBarFocusIndex) + + @Local indicatorColor: Color = Color.Blue; + @Local indicatorWidth: number = 40; + @Local indicatorHeight: number = 5; + @Local indicatorBorderRadius: number = 5; + @Local indicatorSpace: number = 10; + @Local subTabBorderRadius: number = 20; + @Local selectedMode: SelectedMode = SelectedMode.INDICATOR; @Builder FileMenu(menus: Array) { Menu() { @@ -52,7 +60,7 @@ export struct TitleTab { .width(60) .padding(5) .type(ButtonType.Normal) - .backgroundColor(Color.Brown) + .backgroundColor(index === this.titleBarFocusIndex ? Color.Blue : Color.Brown) .onClick(() => { this.titleBarTabs.changeIndex(index); this.titleBarFocusIndex = index; @@ -75,7 +83,7 @@ export struct TitleTab { .margin({ top: 0,left:0,bottom:0,right:0}) }) }.scrollable(false) - .barHeight(0) + .barHeight(0) .margin({ top: 0,left:0,bottom:0,right:0}) .height('auto') .barMode(BarMode.Fixed) diff --git a/entry/src/main/resources/base/media/base_chevron_down.png b/entry/src/main/resources/base/media/base_chevron_down.png new file mode 100644 index 00000000..fc4f6555 Binary files /dev/null and b/entry/src/main/resources/base/media/base_chevron_down.png differ diff --git a/entry/src/main/resources/base/media/modeling_assembly_cut.bmp b/entry/src/main/resources/base/media/modeling_assembly_cut.bmp new file mode 100644 index 00000000..ba05cde7 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_assembly_cut.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_block.bmp b/entry/src/main/resources/base/media/modeling_block.bmp new file mode 100644 index 00000000..2c268737 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_block.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_booleanintersect.bmp b/entry/src/main/resources/base/media/modeling_booleanintersect.bmp new file mode 100644 index 00000000..dcde6932 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_booleanintersect.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_booleansubtract.bmp b/entry/src/main/resources/base/media/modeling_booleansubtract.bmp new file mode 100644 index 00000000..46333532 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_booleansubtract.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_booleanunite.bmp b/entry/src/main/resources/base/media/modeling_booleanunite.bmp new file mode 100644 index 00000000..b70d81c6 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_booleanunite.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_cone.bmp b/entry/src/main/resources/base/media/modeling_cone.bmp new file mode 100644 index 00000000..9daba275 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_cone.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_cylinder.bmp b/entry/src/main/resources/base/media/modeling_cylinder.bmp new file mode 100644 index 00000000..ea2ef3d6 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_cylinder.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_emboss.bmp b/entry/src/main/resources/base/media/modeling_emboss.bmp new file mode 100644 index 00000000..a08ea9f7 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_emboss.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_emboss_body.bmp b/entry/src/main/resources/base/media/modeling_emboss_body.bmp new file mode 100644 index 00000000..e5832e80 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_emboss_body.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_extrude.bmp b/entry/src/main/resources/base/media/modeling_extrude.bmp new file mode 100644 index 00000000..e8f400b8 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_extrude.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_patch.bmp b/entry/src/main/resources/base/media/modeling_patch.bmp new file mode 100644 index 00000000..17f8db33 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_patch.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_revolution.bmp b/entry/src/main/resources/base/media/modeling_revolution.bmp new file mode 100644 index 00000000..00d1acbf Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_revolution.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_sew.bmp b/entry/src/main/resources/base/media/modeling_sew.bmp new file mode 100644 index 00000000..84f2f41f Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_sew.bmp differ diff --git a/entry/src/main/resources/base/media/modeling_sphere.bmp b/entry/src/main/resources/base/media/modeling_sphere.bmp new file mode 100644 index 00000000..ef942aa8 Binary files /dev/null and b/entry/src/main/resources/base/media/modeling_sphere.bmp differ diff --git a/entry/src/main/resources/base/media/sketch.bmp b/entry/src/main/resources/base/media/sketch.bmp new file mode 100644 index 00000000..c60cdc51 Binary files /dev/null and b/entry/src/main/resources/base/media/sketch.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_arc.bmp b/entry/src/main/resources/base/media/sketch_arc.bmp new file mode 100644 index 00000000..c4ffff13 Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_arc.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_line.bmp b/entry/src/main/resources/base/media/sketch_line.bmp new file mode 100644 index 00000000..0d9770b4 Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_line.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_point.bmp b/entry/src/main/resources/base/media/sketch_point.bmp new file mode 100644 index 00000000..8cbaeb95 Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_point.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_point_set.bmp b/entry/src/main/resources/base/media/sketch_point_set.bmp new file mode 100644 index 00000000..6cdfcacf Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_point_set.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_reference_point_cloud.bmp b/entry/src/main/resources/base/media/sketch_reference_point_cloud.bmp new file mode 100644 index 00000000..f06d04a6 Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_reference_point_cloud.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_spline.bmp b/entry/src/main/resources/base/media/sketch_spline.bmp new file mode 100644 index 00000000..3b7e5db4 Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_spline.bmp differ diff --git a/entry/src/main/resources/base/media/sketch_styler_label.bmp b/entry/src/main/resources/base/media/sketch_styler_label.bmp new file mode 100644 index 00000000..c78fe55f Binary files /dev/null and b/entry/src/main/resources/base/media/sketch_styler_label.bmp differ diff --git a/entry/src/main/resources/base/media/standard_datum_plane_grid_nonwkpt.bmp b/entry/src/main/resources/base/media/standard_datum_plane_grid_nonwkpt.bmp new file mode 100644 index 00000000..ac32ee3f Binary files /dev/null and b/entry/src/main/resources/base/media/standard_datum_plane_grid_nonwkpt.bmp differ diff --git a/entry/src/main/resources/base/media/standard_datumaxis.bmp b/entry/src/main/resources/base/media/standard_datumaxis.bmp new file mode 100644 index 00000000..3cbc335e Binary files /dev/null and b/entry/src/main/resources/base/media/standard_datumaxis.bmp differ diff --git a/entry/src/main/resources/base/media/standard_datumcsys.bmp b/entry/src/main/resources/base/media/standard_datumcsys.bmp new file mode 100644 index 00000000..07f752cf Binary files /dev/null and b/entry/src/main/resources/base/media/standard_datumcsys.bmp differ diff --git a/entry/src/main/resources/base/media/standard_datumplane.bmp b/entry/src/main/resources/base/media/standard_datumplane.bmp new file mode 100644 index 00000000..8605dc95 Binary files /dev/null and b/entry/src/main/resources/base/media/standard_datumplane.bmp differ diff --git a/entry/src/main/resources/base/media/standard_print_csys.bmp b/entry/src/main/resources/base/media/standard_print_csys.bmp new file mode 100644 index 00000000..6a44fea7 Binary files /dev/null and b/entry/src/main/resources/base/media/standard_print_csys.bmp differ diff --git a/entry/src/main/resources/base/media/standard_resize_datum_plane.bmp b/entry/src/main/resources/base/media/standard_resize_datum_plane.bmp new file mode 100644 index 00000000..e42f4cea Binary files /dev/null and b/entry/src/main/resources/base/media/standard_resize_datum_plane.bmp differ