diff --git a/drawio/.$草图绘制逻辑.drawio.bkp b/drawio/.$草图绘制逻辑.drawio.bkp
new file mode 100644
index 00000000..13d03b2f
--- /dev/null
+++ b/drawio/.$草图绘制逻辑.drawio.bkp
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/drawio/草图绘制逻辑.drawio b/drawio/草图绘制逻辑.drawio
new file mode 100644
index 00000000..901bbed4
--- /dev/null
+++ b/drawio/草图绘制逻辑.drawio
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp b/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp
index c9e3e495..695b91a1 100644
--- a/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp
+++ b/entry/src/main/cpp/NativeEGLOCCT/NativeMgr.cpp
@@ -493,7 +493,6 @@ void NativeMgr::DispatchTouchEvent(OH_NativeXComponent* component, void* window)
//按下并移动,计算移动增量需要乘以灵敏度
if (touchEvent_.type == OH_NativeXComponent_TouchEventType::OH_NATIVEXCOMPONENT_MOVE) {
float dtx=(NativeMgr::x-touchEvent_.x)*0.1;
-
float dty=(NativeMgr::y-touchEvent_.y)*0.1;
renderThread->setRotation(dtx, dty);
OH_NativeXComponent_GetTouchEvent(component, window, &touchEvent_);
diff --git a/entry/src/main/cpp/NativeEGLOCCT/V3d/V3dCa/V3dCa.cpp b/entry/src/main/cpp/NativeEGLOCCT/V3d/V3dCa/V3dCa.cpp
index 7ed2dc92..0df66d92 100644
--- a/entry/src/main/cpp/NativeEGLOCCT/V3d/V3dCa/V3dCa.cpp
+++ b/entry/src/main/cpp/NativeEGLOCCT/V3d/V3dCa/V3dCa.cpp
@@ -45,14 +45,14 @@ void V3dCa::SetRotation(float xAngle, float yAngle) {
// 从 gp_Ax1 中提取方向向量 (gp_Dir -> gp_Vec)
gp_Vec xRotationAxis = camera->Direction().XYZ().Crossed(currentUp.XYZ()); // 叉积得到X旋转轴
if (xRotationAxis.Magnitude() > gp::Resolution()) { // 防止零向量导致的无效四元数
- rotX.SetVectorAndAngle(-xRotationAxis, xAngle * M_PI / 180.0);
+ rotX.SetVectorAndAngle(xRotationAxis, xAngle * M_PI / 180.0);
} else {
rotX.SetIdent(); // 如果叉积为零，则无旋转
}
// 从 gp_Ax1 中提取方向向量 (gp_Dir -> gp_Vec)
gp_Vec yRotationAxis = currentUp.XYZ(); // Y旋转轴就是当前的Up方向
if (yRotationAxis.Magnitude() > gp::Resolution()) {
- rotY.SetVectorAndAngle(-yRotationAxis, yAngle * M_PI / 180.0);
+ rotY.SetVectorAndAngle(yRotationAxis, yAngle * M_PI / 180.0);
} else {
rotY.SetIdent(); // 如果Up向量无效，则无旋转
}
diff --git a/entry/src/main/ets/pages/CustomController/Button.ets b/entry/src/main/ets/pages/CustomController/Button.ets
index e954a30f..fd743ad4 100644
--- a/entry/src/main/ets/pages/CustomController/Button.ets
+++ b/entry/src/main/ets/pages/CustomController/Button.ets
@@ -35,11 +35,11 @@ export struct EventBtn {
.width(ebWidth)
.height(ebHeigth)
.backgroundImage($r('app.media.' + this.eventBtn.eIcon))
- .backgroundImagePosition({ x: '5%', y: '5%' })
+ .backgroundImagePosition({ x: '10%', y: '10%' })
.backgroundColor(Color.Transparent)
.backgroundImageSize({
- width: '90%', // 图片宽度占满按钮
- height: '90%' // 图片高度占满按钮
+ width: '80%', // 图片宽度占满按钮
+ height: '80%' // 图片高度占满按钮
})
.onClick(()=>{
if(!this.eventBtnType){
@@ -66,6 +66,8 @@ export struct EventBtn {
.backgroundColor(Color.Transparent)
}
}.padding(1)
+ .borderWidth(2)
+ .borderColor(Color.White)
}
}
@@ -101,10 +103,10 @@ export struct MenuBtn {
.height(ebHeigth)
.backgroundColor(Color.Transparent)
.backgroundImage($r('app.media.' + this.menus[this.curtIndex].eIcon))
- .backgroundImagePosition({ x: '5%', y: '5%' })
+ .backgroundImagePosition({ x: '10%', y: '10%' })
.backgroundImageSize({
- width: '90%', // 图片宽度占满按钮
- height: '90%' // 图片高度占满按钮
+ width: '80%', // 图片宽度占满按钮
+ height: '80%' // 图片高度占满按钮
}).onClick(()=> {
ExecuteCommand((this.menus as Array)[this.curtIndex] as TitleButton);
})
@@ -118,13 +120,16 @@ export struct MenuBtn {
.textAlign(TextAlign.Center)
}.height('100%')
.align(Alignment.Center)
- }.constraintSize({ minWidth: ebWidth })
+ }
+ .constraintSize({ minWidth: ebWidth })
.height(mwInfo.width*0.01)
.backgroundColor(Color.Transparent)
.bindMenu(this.BaseMenu)
.type(ButtonType.Normal)
}
}.padding(1)
+ .borderWidth(2)
+ .borderColor(Color.White)
}
}
@@ -180,17 +185,24 @@ export struct SubColumnMenu {
Button(){
Row(){
Image($r('app.media.'+(this.icon!=undefined ? this.icon:(this.menus[this.curtIndex]as TitleButton).eIcon)))
- .width(mwInfo.width*0.013)
+ .width(mwInfo.width*0.012)
.scale({ centerX: '50%', centerY: '50%' })
+ .backgroundImagePosition({ x: '10%', y: '10%' })
+ .backgroundImageSize({
+ width: '80%', // 图片宽度占满按钮
+ height: '80%' // 图片高度占满按钮
+ })
if(this.name!=undefined){
Text(this.name)
.fontSize(16)
}
}.width('auto')
- }.constraintSize({ minWidth: mwInfo.width*0.013 })
+ }
+ .constraintSize({ minWidth: mwInfo.width*0.012 })
.backgroundColor(Color.Transparent)
.bindMenu(this.BaseMenu)
- .type(ButtonType.Normal)
- }
+ }.borderWidth(2)
+ .borderColor(Color.White)
+
}
}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/CustomController/ComboBox.ets b/entry/src/main/ets/pages/CustomController/ComboBox.ets
index bc34aadb..53a720d5 100644
--- a/entry/src/main/ets/pages/CustomController/ComboBox.ets
+++ b/entry/src/main/ets/pages/CustomController/ComboBox.ets
@@ -12,6 +12,8 @@ export struct TextComboBox {
@Param menu: Array = new Array;
@Local selectIndex:number=0;
@Param name:string|undefined=undefined;
+ @Param nWidth:string='0';
+ @Param mWidth:string='0';
@Builder
EventMenu() {
Menu() {
@@ -29,12 +31,14 @@ export struct TextComboBox {
Row({space:5}) {
Text(this.name!=undefined?this.name:'')
.fontSize(16)
+ .width(this.nWidth=='0'?'auto':this.nWidth)
Text(this.menu[this.selectIndex].eName)
- .height('90%')
.bindMenu(this.EventMenu)
.fontSize(16)
.backgroundColor($r('sys.color.search_container_focus_color'))
.borderRadius(8)
+ .width(this.mWidth=='0'?'auto':this.mWidth)
+ .height(this.mWidth=='0'?'90%':'100%')
}.justifyContent(FlexAlign.Start)
}
}
diff --git a/entry/src/main/ets/pages/CustomController/Dialog.ets b/entry/src/main/ets/pages/CustomController/Dialog.ets
index 7f428eb4..3027acd4 100644
--- a/entry/src/main/ets/pages/CustomController/Dialog.ets
+++ b/entry/src/main/ets/pages/CustomController/Dialog.ets
@@ -19,9 +19,10 @@ export struct ViewDialog {
Button()
.backgroundColor(Color.Transparent)
.backgroundImage($r('app.media.' + item.eIcon))
+ .backgroundImagePosition({ x: '10%', y: '10%' })
.backgroundImageSize({
- width: '100%', // 图片宽度占满按钮
- height: '100%' // 图片高度占满按钮
+ width: '80%', // 图片宽度占满按钮
+ height: '80%' // 图片高度占满按钮
}).width(ebWidth).height(ebWidth)
.onClick(()=>{
ExecuteCommand(item);
diff --git a/entry/src/main/ets/pages/CustomController/Menu.ets b/entry/src/main/ets/pages/CustomController/Menu.ets
index 8845e62e..f1837840 100644
--- a/entry/src/main/ets/pages/CustomController/Menu.ets
+++ b/entry/src/main/ets/pages/CustomController/Menu.ets
@@ -70,10 +70,10 @@ export struct GroupTextEventMenu {
.padding(1)
.backgroundColor(Color.Transparent)
.backgroundImage($r('app.media.base_seetings'))
- .backgroundImagePosition({ x: '5%', y: '5%' })
+ .backgroundImagePosition({ x: '10%', y: '10%' })
.backgroundImageSize({
- width: '90%', // 图片宽度占满按钮
- height: '90%' // 图片高度占满按钮
+ width: '80%', // 图片宽度占满按钮
+ height: '80%' // 图片高度占满按钮
})
.bindMenu(BaseMenu(this.argsMenu))
}
diff --git a/entry/src/main/ets/pages/EventSubWin/File/SWNewFile.ets b/entry/src/main/ets/pages/EventSubWin/File/SWNewFile.ets
index 5320cb20..f42d7b05 100644
--- a/entry/src/main/ets/pages/EventSubWin/File/SWNewFile.ets
+++ b/entry/src/main/ets/pages/EventSubWin/File/SWNewFile.ets
@@ -35,13 +35,15 @@ export struct SWNewFile {
build() {
Column({space:5}) {
Row({space:5}){
- TextComboBox({name:'创建文档模块:',menu:CreateModelType})
+ TextComboBox({name:'建模文档创建:',menu:CreateModelType,nWidth:'20%',mWidth:'80%'})
Blank().layoutWeight(1)
}.height('10%')
+
Row({space:5}){
- TextComboBox({name:'建模单位:',menu:DocUnitsType})
+ TextComboBox({name:'建模文档单位:',menu:DocUnitsType,nWidth:'20%',mWidth:'80%'})
Blank().layoutWeight(1)
}.height('10%')
+
Row({space:5}){
Text('保存目录:')
.width(mwInfo.width*this.scalingText)
diff --git a/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets b/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets
index 6dfdc6b8..71180ae7 100644
--- a/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets
+++ b/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets
@@ -52,13 +52,14 @@ export struct TitleColumnSub {
this.viewDialog=this.ViewDialog();
}
this.viewDialog.open();
- }).width(mwInfo.width*0.013)
- .height(mwInfo.width*0.013)
+ }).width(mwInfo.width*0.012)
+ .height(mwInfo.width*0.012)
.backgroundColor(Color.Transparent)
.backgroundImage($r('app.media.' + SwitchView[0].eIcon))
+ .backgroundImagePosition({ x: '10%', y: '10%' })
.backgroundImageSize({
- width: '100%', // 图片宽度占满按钮
- height: '100%' // 图片高度占满按钮
+ width: '80%', // 图片宽度占满按钮
+ height: '80%' // 图片高度占满按钮
})
SubColumnMenu({menus:DisplayMode})
}.width('100%')
diff --git a/entry/src/main/ets/pages/TitleLayout/TitleTab.ets b/entry/src/main/ets/pages/TitleLayout/TitleTab.ets
index 8ee7437d..4d75fa6a 100644
--- a/entry/src/main/ets/pages/TitleLayout/TitleTab.ets
+++ b/entry/src/main/ets/pages/TitleLayout/TitleTab.ets
@@ -86,5 +86,6 @@ export struct TitleTab {
.barHeight(0)
.barMode(BarMode.Fixed)
}.margin({ top:0, left: 0, bottom: 0, right: 0 })
+ .backgroundColor($r('sys.color.background_secondary'))
}
}
diff --git a/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets b/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets
index 6304d98d..e9d7b9dd 100644
--- a/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets
+++ b/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets
@@ -16,7 +16,7 @@ export struct TitleTabContent {
//迭代生成行容器
ForEach(this.curtLayout?.cmEvents, (row_items: Array|Array>, mIndex: number) => {
//行的按钮组容器
- Row({ space: 1 }){
+ Row({ space: 2 }){
ForEach(row_items, (row_item: TitleButton|Array|Array, index: number) => {
if(!Array.isArray(row_item)){//TitleButton
//单按钮
@@ -25,7 +25,7 @@ export struct TitleTabContent {
//功能组,迭代多个功能组
ForEach(row_item, (group_item: TitleGroup, index: number) =>{
Column({ space:5 }){
- Row({ space: 1 }){
+ Row({ space: 5 }){
ForEach(group_item.grpBtn, (btn_item: TitleButton|Array, index: number) =>{
if(this.curtLayout?.cmName=='应用模块'){
if(Array.isArray(btn_item)){