From 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:20 +0800
Subject: [PATCH] 泵曲线修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 464 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 260 insertions(+), 204 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
index bd30561..39fd51a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs
@@ -1,7 +1,5 @@
锘縰sing DevExpress.Utils;
using DevExpress.XtraTreeList;
-using HStation.WinFrmUI.Xhs;
-using Timer = System.Threading.Timer;
namespace HStation.WinFrmUI
{
@@ -13,7 +11,7 @@
this.treeList1.InitialMultiColSettings();
this.treeList1.Appearance.Row.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Default;
this.PageTitle.Caption = "椤圭洰绠＄悊";
- this.PageTitle.HeaderSvgImage = this.svgImg32[0];
+ this.PageTitle.HeaderSvgImage = XhsMainSvgImageHelper.Project;
this.PageTitle.SvgImageSize = new Size(24, 24);
this.Load += XhsProjectMgrPage_Load;
}
@@ -34,16 +32,15 @@
private List<XhsProjectMgrViewModel> _allBindingList = null;
- private BLL.XhsProjectExtensions _bll = null;
-
- private event Action ImportProjectCompletedEvent = null;
-
/// <summary>
/// 鍒濆鍖栨暟鎹簮
/// </summary>
public override void InitialDataSource()
{
base.InitialDataSource();
+ this.barBtnViewBimface.ImageOptions.SvgImage = Yw.WinFrmUI.BimfaceMainSvgImageHelper.Bimface;
+ this.barBtnViewHydro.ImageOptions.SvgImage = Yw.WinFrmUI.HydroMainSvgImageHelper.Hydro;
+ this.barBtnSetMap.ImageOptions.SvgImage = XhsMainSvgImageHelper.Map;
InitialData();
}
@@ -80,101 +77,126 @@
overlay.Close();
}
+ /// <summary>
+ /// 鍒锋柊鏁版嵁
+ /// </summary>
+ public override void RefreshData()
+ {
+ base.RefreshData();
+ InitialData();
+ }
+
#region 褰撳墠
//鑾峰彇褰撳墠
private XhsProjectMgrViewModel GetCurrentViewModel()
{
- //if (_allProjectList == null)
- //{
- // Yw.WinFrmUI.MessageBoxHelper.ShowError("鏁版嵁鍒濆鍖栭敊璇紒");
- // return null;
- //}
- //if (_allProjectList == null)
- //{
- // Yw.WinFrmUI.MessageBoxHelper.ShowInfo("鏃犳暟鎹�");
- // return null;
- //}
- //var vm = this.treeList1.GetCurrentViewModel(_allProjectList);
- //if (vm == null)
- //{
- // Yw.WinFrmUI.MessageBoxHelper.ShowInfo("璇烽�夋嫨鏁版嵁琛�!");
- // return null;
- //}
- //return vm;
- return default;
+ if (_allBindingList == null)
+ {
+ TipFormHelper.ShowError("鏁版嵁鍒濆鍖栭敊璇紒");
+ return null;
+ }
+ if (_allBindingList.Count < 1)
+ {
+ TipFormHelper.ShowWarn("鏃犳暟鎹紒");
+ return null;
+ }
+ var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
+ if (vm == null)
+ {
+ TipFormHelper.ShowWarn("璇烽�夋嫨鏁版嵁琛岋紒");
+ return null;
+ }
+ return vm;
}
- #endregion 褰撳墠
+ #endregion
#region 鍩虹鎿嶄綔
- //娣诲姞
- private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ //瀵煎叆椤圭洰
+ private void barBtnImport_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- //var dlg = new ImportXhsProjectDlg();
- //dlg.SetBindingData();
- //if (dlg.ShowDialog() == DialogResult.OK)
- //{
- // var prj = dlg.ViewModel;
- // if (prj.ProjectID == null)
- // return;
- // var vmo = await _bll.GetByID((long)prj.ProjectID);
- // if (vmo == null)
- // {
- // TipFormHelper.ShowError("瀵煎叆澶辫触!");
- // return;
- // }
- // else
- // {
- // TipFormHelper.ShowSucceed("瀵煎叆鎴愬姛!");
- // var mapinfo = await new Yw.BLL.MapInfo().Get(HStation.Xhs.DataType.XhsProject, (long)prj.ProjectID, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
- // var bimFile = await BimfaceFileStateHelper.IsHaveBimFace((long)prj.ProjectID);
- // if (bimFile != null)
- // {
- // _allProjectList.Add(new XhsProjectMgrViewModel(vmo, true, bimFile.FileStatus, mapinfo));
- // }
- // else
- // {
- // _allProjectList.Add(new XhsProjectMgrViewModel(vmo, false, 8, mapinfo));
- // }
- // this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
- // }
- //}
+ if (_allBindingList == null)
+ {
+ TipFormHelper.ShowError("鏁版嵁鍒濆鍖栧け璐ワ紒");
+ return;
+ }
+ var dlg = new ImportXhsProjectDlg();
+ dlg.SetBindingData();
+ if (dlg.ShowDialog() == DialogResult.OK)
+ {
+ var viewModel = dlg.ViewModel;
+ var vm = new XhsProjectMgrViewModel(viewModel.Project, viewModel.MapInfo, viewModel.BimfaceFile);
+ _allBindingList.Add(vm);
+ this.treeList1.RefreshDataSource();
+ }
+ }
+
+ //涓婁紶妯″瀷
+ private void barBtnUploadBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ if (vm.BimfaceFile != null)
+ {
+ TipFormHelper.ShowWarn("妯″瀷宸蹭笂浼狅紝涓嶈兘閲嶅涓婁紶锛�");
+ return;
+ }
+ var dlg = new ImportXhsProjectDlg();
+ dlg.SetBindingData(vm.Project, vm.MapInfo);
+ if (dlg.ShowDialog() == DialogResult.OK)
+ {
+ var viewModel = dlg.ViewModel;
+ var project = viewModel.Project;
+ if (project == null)
+ {
+ return;
+ }
+ if (project.ID < 1)
+ {
+ return;
+ }
+ var mapInfo = viewModel.MapInfo;
+ if (mapInfo != null)
+ {
+ if (mapInfo.ID < 1)
+ {
+ mapInfo = null;
+ }
+ }
+ var bimfaceFile = viewModel.BimfaceFile;
+ if (bimfaceFile != null)
+ {
+ if (bimfaceFile.ID < 1)
+ {
+ bimfaceFile = null;
+ }
+ }
+ vm.Reset(project, mapInfo, bimfaceFile);
+ this.treeList1.RefreshDataSource();
+ }
}
//缂栬緫
private void barBtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- //var currentVm = this.GetCurrentViewModel();
- //if (currentVm == null)
- //{
- // MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
- // return;
- //}
- //var dlg = new EditProjectDlg();
- //dlg.SetBindingData(currentVm.ID);
- //dlg.ReloadDataEvent += async (rhs, mapinfo) =>
- //{
- // if (await _bll.Update(rhs))
- // {
- // currentVm.Reset(rhs);
- // this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
- // if (mapinfo != null)
- // {
- // // mapinfo.ObjectID = id;
- // mapinfo.ObjectName = rhs.Name;
- // var bol = await new Yw.BLL.MapInfo().Update(mapinfo);
- // if (!bol)
- // {
- // TipFormHelper.ShowError("鍦板浘淇℃伅缂栬緫閿欒");
- // }
- // }
- // return true;
- // }
- // return false;
- //};
- //dlg.ShowDialog();
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ var dlg = new EditXhsProjectDlg();
+ dlg.ReloadDataEvent += (project) =>
+ {
+ vm.Reset(project, vm.MapInfo, vm.BimfaceFile);
+ this.treeList1.RefreshNode(this.treeList1.FocusedNode);
+ };
+ dlg.SetBindingData(vm.Project);
+ dlg.ShowDialog();
}
//鍒犻櫎
@@ -204,7 +226,7 @@
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, scheme.ID, HStation.Xhs.Purpose.Simulation);
if (schemeRelation != null)
{
- if (!await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.DeleteAllByID(schemeRelation.ID))
+ if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(schemeRelation.ModelID))
{
TipFormHelper.ShowError("椤圭洰鏂规妯″瀷鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
return;
@@ -231,7 +253,7 @@
.GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, projectSite.ID, HStation.Xhs.Purpose.Simulation);
if (hydroRelation != null)
{
- if (!await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.DeleteAllByID(hydroRelation.ID))
+ if (!await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.DeleteByID(hydroRelation.ModelID))
{
TipFormHelper.ShowError("椤圭洰妯″瀷鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
return;
@@ -266,49 +288,122 @@
TipFormHelper.ShowSucceed("椤圭洰鍒犻櫎鎴愬姛锛�");
}
+ //鍦板浘
+ private void barBtnSetMap_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ {
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ var dlg = new SetXhsProjectMapDlg();
+ dlg.ReloadDataEvent += (project, mapInfo) =>
+ {
+ vm.Reset(project, mapInfo, vm.BimfaceFile);
+ this.treeList1.RefreshNode(this.treeList1.FocusedNode);
+ };
+ dlg.SetBindingData(vm.Project, vm.MapInfo);
+ dlg.ShowDialog();
+ }
+
//璇︾粏淇℃伅
private void barBtnInfo_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ var dlg = new ViewXhsProjectDlg();
+ dlg.SetBindingData(vm.Project);
+ dlg.ShowDialog();
}
- #endregion 鍩虹鎿嶄綔
+ #endregion
- private void treeList1_CustomDrawRow(object sender, DevExpress.XtraTreeList.CustomDrawRowEventArgs e)
+ #region 妯″瀷
+
+ //鏌ョ湅bimface妯″瀷
+ private void barBtnViewBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var a = repositoryItemButtonEdit1.ReadOnly = true;
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ if (vm.BimfaceFile == null)
+ {
+ TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣滐紒");
+ return;
+ }
+ if (vm.ModelStatus < eXhsProjectStatus.UploadSucceed)
+ {
+ TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣滐紒");
+ return;
+ }
+ if (vm.ModelStatus < eXhsProjectStatus.ConvertSucceed)
+ {
+ TipFormHelper.ShowWarn("妯″瀷姝ｅ湪杞婚噺鍖栵紝璇风◢鍚庨噸璇曪紒");
+ return;
+ }
+
+ var guid = new PageGuid()
+ {
+ Modular = XhsFunctionHelper.Modular,
+ MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
+ Function = XhsFunctionHelper.ProjectBimfaceView,
+ TagName = $"{vm.ID}"
+ };
+
+ if (!IsExistPage(guid, true))
+ {
+ var page = new XhsProjectBimfaceViewPage();
+ page.SetBindingData(vm.Project);
+ CreatePage(page, guid);
+ }
}
- private async void treeList1_RowCellClick(object sender, RowCellClickEventArgs e)
+ //鏌ョ湅姘村姏妯″瀷
+ private void barBtnViewHydro_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- //if (_allProjectList == null || _allProjectList.Count < 1)
- // return;
- //var vm = GetCurrentViewModel();
- //if (vm == null)
- //{
- // return;
- //}
- //if (e.Column != this.ColViewBimface)
- // return;
- //if (!vm.IsHaveBimface)
- //{
- // TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣�!");
- // return;
- //}
- //var guid = new PageGuid()
- //{
- // Modular = Yw.WinFrmUI.PageModular.Bimface,
- // MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
- // Function = Yw.WinFrmUI.PageFunction.ViewSchemeMgr,
- // TagName = $"{vm.ID}"
- //};
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ if (vm.BimfaceFile == null)
+ {
+ TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣滐紒");
+ return;
+ }
+ if (vm.ModelStatus < eXhsProjectStatus.UploadSucceed)
+ {
+ TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣滐紒");
+ return;
+ }
+ if (vm.ModelStatus < eXhsProjectStatus.ConvertSucceed)
+ {
+ TipFormHelper.ShowWarn("妯″瀷姝ｅ湪杞婚噺鍖栵紝璇风◢鍚庨噸璇曪紒");
+ return;
+ }
- //if (!IsExistPage(guid, true))
- //{
- // var page = new XhsProjectSimulationMgrPage();
- // await page.SetBindingData(vm.ID);
- // CreatePage(page, guid);
- //}
+ var guid = new PageGuid()
+ {
+ Modular = XhsFunctionHelper.Modular,
+ MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
+ Function = XhsFunctionHelper.ProjectQ3dView,
+ TagName = $"{vm.ID}"
+ };
+
+ if (!IsExistPage(guid, true))
+ {
+ var page = new XhsProjectQ3dViewPage();
+ page.SetBindingData(vm.Project);
+ CreatePage(page, guid);
+ }
}
+
+ #endregion
#region 鏇村鎿嶄綔
@@ -341,99 +436,60 @@
//鍒锋柊
private void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- // this.SetBindingData();
+ this.RefreshData();
}
- #endregion 鏇村鎿嶄綔
+ #endregion
- //鏌ョ湅bimface妯″瀷
- private async void barBtnViewBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ #region 鏍戜簨浠�
+
+ //妯℃嫙
+ private void treeList1_RowCellClick(object sender, RowCellClickEventArgs e)
{
- //var vm = GetCurrentViewModel();
- //if (vm == null)
- //{
- // return;
- //}
- //if (!vm.IsHaveBimface)
- //{
- // TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣�!");
- // return;
- //}
- //var guid = new PageGuid()
- //{
- // Modular = Yw.WinFrmUI.PageModular.Bimface,
- // MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
- // Function = Yw.WinFrmUI.PageFunction.ViewBimface3d,
- // TagName = $"{vm.ID}"
- //};
+ if (e.Column != this.colSimulation)
+ {
+ return;
+ }
+ var vm = GetCurrentViewModel();
+ if (vm == null)
+ {
+ return;
+ }
+ if (vm.BimfaceFile == null)
+ {
+ TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣滐紒");
+ return;
+ }
+ if (vm.ModelStatus < eXhsProjectStatus.UploadSucceed)
+ {
+ TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣滐紒");
+ return;
+ }
+ if (vm.ModelStatus < eXhsProjectStatus.ConvertSucceed)
+ {
+ TipFormHelper.ShowWarn("妯″瀷姝ｅ湪杞婚噺鍖栵紝璇风◢鍚庨噸璇曪紒");
+ return;
+ }
+ var guid = new PageGuid()
+ {
+ Modular = XhsFunctionHelper.Modular,
+ MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
+ Function = XhsFunctionHelper.ProjectSimulation,
+ TagName = $"{vm.ID}"
+ };
- //if (!IsExistPage(guid, true))
- //{
- // var page = new ViewXhsProjectBimfacePage();
- // await page.SetBindingData(vm.ID);
- // CreatePage(page, guid);
- //}
+ if (!IsExistPage(guid, true))
+ {
+ var page = new XhsProjectSimulationMgrPage();
+ page.SetBindingData(vm.Project);
+ CreatePage(page, guid);
+ }
}
- //鏌ョ湅姘村姏妯″瀷
- private void barBtnViewHydro_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- //if (_allProjectList == null || _allProjectList.Count < 1)
- // return;
- //var vm = GetCurrentViewModel();
- //if (vm == null)
- //{
- // return;
- //}
- //if (!vm.IsHaveBimface)
- //{
- // TipFormHelper.ShowWarn("璇峰厛涓婁紶鏂囦欢鍐嶈繘琛屾搷浣�!");
- // return;
- //}
- //var guid = new PageGuid()
- //{
- // Modular = "Hydro",
- // MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
- // Function = "ViewModel",
- //};
- //if (!IsExistPage(guid, true))
- //{
- // var page = new HydroQ3dViewPage();
- // page.SetBindingData(vm.ID);
- // CreatePage(page, guid);
- // }
- }
+ #endregion
- //瀵煎叆鏂囦欢
- private void BtnAddBimfaceFile_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- //var currentVm = this.GetCurrentViewModel();
- //if (currentVm == null)
- //{
- // MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛�!");
- // return;
- //}
- //if (currentVm.ModelState != XhsProjectMgrViewModel.eFileStatus.Noupload)
- //{
- // MessageBoxHelper.ShowWarning("宸茬粡瀛樺湪妯″瀷鏂囦欢!");
- // return;
- //}
- //var dlg = new ImportXhsProjectFileDlg();
- //dlg.SetBindingData(currentVm.ID);
- //if (dlg.ShowDialog() == DialogResult.OK)
- //{
- // var prj = dlg.ViewModel;
- // if (prj.ProjectID == null)
- // return;
- // var mapinfo = await new Yw.BLL.MapInfo().Get(HStation.Xhs.DataType.XhsProject, (long)prj.ProjectID, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
- // var bimFile = await BimfaceFileStateHelper.IsHaveBimFace((long)prj.ProjectID);
- // if (bimFile != null)
- // {
- // currentVm.Reset(currentVm, bimFile.FileStatus);
- // this.xhsProjectMgrViewModelBindingSource.ResetBindings(false);
- // }
- //}
- }
+
+
}
--
Gitblit v1.9.3