From d2cee56db11f0ee475e9f9dbdc8bfd03ad982e18 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 12 八月 2024 09:42:01 +0800
Subject: [PATCH] 报错
---
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index 691f631..489df8e 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -67,7 +67,9 @@
{
var hitInfo = this.tileNavPane.CalcHitInfo(e.Location);
if (hitInfo.InButton)
+ {
return;
+ }
this.DragMove();
}
}
@@ -117,7 +119,7 @@
}
//模型管理
- private void nbBimfaceMgr_ElementClick(object sender, NavElementEventArgs e)
+ private void nbModelMgr_ElementClick(object sender, NavElementEventArgs e)
{
var pt = this.tileNavPane.PointToClient(MousePosition);
var hitInfo = this.tileNavPane.CalcHitInfo(pt);
@@ -127,16 +129,53 @@
{
var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
{
+ new TilePeekItem()
+ {
+ Caption="水力场景",
+ SvgImage=svgImg32Model[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Hydro",
+ MoudingType=eMoudingType.Tab,
+ Function="SceneMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new Yw.WinFrmUI.HydroSceneMgrPage();
+ CreatePage(page,guid);
+ }
+ }
+ },
new TilePeekItem(){
- Caption="文件管理",
- SvgImage=svgImg32[0],
+ Caption="水力模型",
+ SvgImage=svgImg32Model[1],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Hydro",
+ MoudingType=eMoudingType.Tab,
+ Function="ModelMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new HStation.WinFrmUI.HydroModelMgrPage();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="三维模型",
+ SvgImage=svgImg32Model[2],
SvgImageSize=new Size(24,24),
Click=()=>{
this.flyoutPanel1.HideBeakForm();
var guid=new PageGuid(){
Modular="Bimface",
MoudingType=eMoudingType.Tab,
- Function="fileMgr",
+ Function="FileMgr",
};
if(!IsExistPage(guid,true))
{
@@ -144,16 +183,17 @@
CreatePage(page,guid);
}
}
- }
+ },
};
_bimfaceMgrBeakCtrl = peakItemList.CreatePeekCtrl();
- _bimfaceMgrBeakCtrl.Dock = DockStyle.Fill;
}
this.flyoutPanel1.Size = _bimfaceMgrBeakCtrl.Size;
this.flyoutPanelControl1.Controls.Clear();
this.flyoutPanelControl1.Controls.Add(_bimfaceMgrBeakCtrl);
- this.flyoutPanel1.ShowBeakForm(hitInfo.ButtonInfo.Bounds);
+ var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
+ this.flyoutPanel1.ShowBeakForm(rectangle);
}
+
}
private Control _bimfaceMgrBeakCtrl = null;//bimface管理弹出界面
@@ -171,7 +211,7 @@
{
new TilePeekItem(){
Caption="水泵管理",
- SvgImage=svgImg32[0],
+ SvgImage=svgImg32Model[0],
SvgImageSize=new Size(24,24),
Click=()=>{
this.flyoutPanel1.HideBeakForm();
@@ -189,7 +229,7 @@
},
new TilePeekItem(){
Caption="类型管理",
- SvgImage=svgImg32[0],
+ SvgImage=svgImg32Model[0],
SvgImageSize=new Size(24,24),
Click=()=>{
this.flyoutPanel1.HideBeakForm();
@@ -207,7 +247,7 @@
},
new TilePeekItem(){
Caption="分类管理",
- SvgImage=svgImg32[0],
+ SvgImage=svgImg32Model[0],
SvgImageSize=new Size(24,24),
Click=()=>{
this.flyoutPanel1.HideBeakForm();
@@ -224,7 +264,7 @@
}
}, new TilePeekItem(){
Caption="属性管理",
- SvgImage=svgImg32[0],
+ SvgImage=svgImg32Model[0],
SvgImageSize=new Size(24,24),
Click=()=>{
this.flyoutPanel1.HideBeakForm();
@@ -242,12 +282,12 @@
}
};
_SystemConfigBeakCtrl = peakItemList.CreatePeekCtrl();
- _SystemConfigBeakCtrl.Dock = DockStyle.Fill;
}
this.flyoutPanel1.Size = _SystemConfigBeakCtrl.Size;
this.flyoutPanelControl1.Controls.Clear();
this.flyoutPanelControl1.Controls.Add(_SystemConfigBeakCtrl);
- this.flyoutPanel1.ShowBeakForm(hitInfo.ButtonInfo.Bounds);
+ var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
+ this.flyoutPanel1.ShowBeakForm(rectangle);
}
}
--
Gitblit v1.9.3