From b6f84233ce512c9f0f65d550b3892f4ba6c8afa5 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 23 八月 2024 10:01:10 +0800
Subject: [PATCH] 提交代码
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs | 13
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 1
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs | 25 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs | 46 +++-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs | 1
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs | 42 +---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.resx | 25 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 142 ++++++++++---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.Designer.cs | 16
WinFrmUI/Yw.WinFrmUI.Core/06-document/PageFunction.cs | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs | 29 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/02-bimface/ViewXhsProjectBimfacePage.cs | 3
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/BimfaceFileStateHelper.cs | 29 ++
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyViewModel.cs | 46 ---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs | 49 ++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs | 113 +++++++---
16 files changed, 353 insertions(+), 232 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
index 5412f67..13da69e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
@@ -179,21 +179,28 @@
TextEditNo.Text = string.Empty;
TextEditProductCode.Text = string.Empty;
var bll = new Yw.BLL.SysPropStruct();
- var catlog = await bll.GetByCatalogID(_catalogID);
- if (catlog == null)
+ try
{
- this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
- return;
- }
- _proplist.Clear();
- foreach (var item in catlog)
- {
- foreach (var prop in item.PropList)
+ var catlog = await bll.GetByCatalogID(_catalogID);
+ if (catlog == null)
{
- _proplist.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, Value = prop.DefaultValue });
+ this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
+ return;
}
+ _proplist.Clear();
+ foreach (var item in catlog)
+ {
+ foreach (var prop in item.PropList)
+ {
+ _proplist.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, Value = prop.DefaultValue });
+ }
+ }
+ this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
}
- this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
+ catch
+ {
+
+ }
}
// 鍒犻櫎浜у搧
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/BimfaceFileStateHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/BimfaceFileStateHelper.cs
new file mode 100644
index 0000000..dd323fd
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/BimfaceFileStateHelper.cs
@@ -0,0 +1,29 @@
+锘縰sing Yw.Dto;
+
+namespace HStation.WinFrmUI
+{
+ public class BimfaceFileStateHelper
+ {
+ //鏌ユ壘椤圭洰鏄惁瀛樺湪妯″瀷
+ public static async Task<BimfaceFileStdDto> IsHaveBimFace(long ProjectID)
+ {
+ var projectSite = await new BLL.XhsProjectSiteStd().GetDefaultByProjectID(ProjectID);
+ if (projectSite == null)
+ {
+ return null;
+ }
+ var relation = await new Yw.BLL.BimfaceFileRelationStd()
+ .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, projectSite.ID, Yw.Bimface.Purpose.Simulation);
+ if (relation == null)
+ {
+ return null;
+ }
+ var bimfaceFile = await new Yw.BLL.BimfaceFileStd().GetByID(relation.BimfaceFileID);
+ if (bimfaceFile == null)
+ {
+ return null;
+ }
+ return bimfaceFile;
+ }
+ }
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs
index cfbad35..2d1842b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs
@@ -102,6 +102,7 @@
propertyGridControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
propertyGridControl1.Location = new Point(2, 2);
propertyGridControl1.Name = "propertyGridControl1";
+ propertyGridControl1.OptionsBehavior.Editable = false;
propertyGridControl1.OptionsBehavior.PropertySort = DevExpress.XtraVerticalGrid.PropertySort.NoSort;
propertyGridControl1.OptionsHint.ShowRowHeaderHints = false;
propertyGridControl1.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.True;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyViewModel.cs
index 8df097d..33d96a1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/03-property/HomeXhsProjectPropertyViewModel.cs
@@ -1,18 +1,19 @@
锘縩amespace HStation.WinFrmUI
{
/// <summary>
- ///
+ ///
/// </summary>
[TypeConverter(typeof(PropertySorter))]
public class HomeXhsProjectPropertyViewModel
{
/// <summary>
- ///
+ ///
/// </summary>
- public HomeXhsProjectPropertyViewModel() { }
+ public HomeXhsProjectPropertyViewModel()
+ { }
/// <summary>
- ///
+ ///
/// </summary>
public HomeXhsProjectPropertyViewModel(XhsProjectStdDto rhs)
{
@@ -44,25 +45,6 @@
[PropertyOrder(2)]
[Browsable(true)]
public string Name { get; set; }
-
- /// <summary>
- /// 鐢熸晥鏃堕棿
- /// </summary>
- [DisplayName("鐢熸晥鏃堕棿")]
- [Category("鍩烘湰淇℃伅")]
- [PropertyOrder(3)]
- [Browsable(true)]
- public string StartTime { get; set; }
-
- /// <summary>
- /// 澶辨晥鏃堕棿
- /// </summary>
- [DisplayName("澶辨晥鏃堕棿")]
- [Category("鍩烘湰淇℃伅")]
- [PropertyOrder(4)]
- [Browsable(true)]
- public string EndTime { get; set; }
-
/// <summary>
/// 璇︾粏鍦板潃
@@ -112,23 +94,9 @@
public string Description { get; set; }
/// <summary>
- ///
+ ///
/// </summary>
[Browsable(false)]
public XhsProjectStdDto Project { get; set; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
}
-}
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
index 7599e9b..98f9fd6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs
@@ -101,20 +101,42 @@
//璺宠浆浜嬩欢
private async void homeXhsProjectPropertyCtrl1_JumpDirectEvent(XhsProjectStdDto obj)
{
- var guid = new PageGuid()
+ var bimfacefile = await BimfaceFileStateHelper.IsHaveBimFace(obj.ID);
+ if (bimfacefile == null)
{
- Modular = Yw.WinFrmUI.PageModular.Bimface,
- MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
- Function = Yw.WinFrmUI.PageFunction.ViewBimface3d,
- TagName = $"{obj.ID}"
- };
+ if (!MessageBoxHelper.IsClickOk("褰撳墠椤圭洰鏈笂浼犳枃浠�,鏄惁鍓嶅幓涓婁紶妯″瀷鏂囦欢?"))
+ {
+ var Prjguid = new PageGuid()
+ {
+ Modular = "Xhs",
+ MoudingType = eMoudingType.Tab,
+ Function = "ProjectMgr",
+ };
+ if (!IsExistPage(Prjguid, true))
+ {
+ var page = new XhsProjectMgrPage();
+ CreatePage(page, Prjguid);
+ }
+ }
+ return;
+ }
+ else
+ {
+ var guid = new PageGuid()
+ {
+ Modular = Yw.WinFrmUI.PageModular.Bimface,
+ MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
+ Function = Yw.WinFrmUI.PageFunction.ViewBimface3d,
+ TagName = $"{obj.ID}"
+ };
- if (!IsExistPage(guid, true))
- {
- var page = new XhsSchemeMultiMgrPage();
- await page.SetBindingData(obj.ID);
- //var page = new XhsProjectSimulationMgrPage();
- CreatePage(page, guid);
+ if (!IsExistPage(guid, true))
+ {
+ var page = new XhsSchemeMultiMgrPage();
+ await page.SetBindingData(obj.ID);
+ //var page = new XhsProjectSimulationMgrPage();
+ CreatePage(page, guid);
+ }
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
index 31dc1ca..a0e3f02 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.Designer.cs
@@ -43,9 +43,8 @@
setXhsProjectMapLocationWizardPage = new SetXhsProjectMapLocationWizardPage();
navPageGenerateProject = new DevExpress.XtraBars.Navigation.NavigationPage();
generateXhsProjectWizardPage = new GenerateXhsProjectWizardPage();
- navPageImportCompleted = new DevExpress.XtraBars.Navigation.NavigationPage();
- importXhsProjectCompletedWizardPage = new ImportXhsProjectCompletedCtrl();
navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
+ projectResultShowPanel1 = new Xhs.ProjectResultShowPanel();
stepProgressBar1 = new DevExpress.XtraEditors.StepProgressBar();
stepPbSelectModelFile = new DevExpress.XtraEditors.StepProgressBarItem();
stepPbSetMapLocation = new DevExpress.XtraEditors.StepProgressBarItem();
@@ -57,7 +56,6 @@
itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
- projectResultShowPanel1 = new Xhs.ProjectResultShowPanel();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)navigationFrame1).BeginInit();
@@ -65,7 +63,6 @@
navPageInputProjectInfo.SuspendLayout();
navPageSetMapLocation.SuspendLayout();
navPageGenerateProject.SuspendLayout();
- navPageImportCompleted.SuspendLayout();
navigationPage1.SuspendLayout();
((ISupportInitialize)stepProgressBar1).BeginInit();
((ISupportInitialize)Root).BeginInit();
@@ -148,11 +145,10 @@
navigationFrame1.Controls.Add(navPageInputProjectInfo);
navigationFrame1.Controls.Add(navPageSetMapLocation);
navigationFrame1.Controls.Add(navPageGenerateProject);
- navigationFrame1.Controls.Add(navPageImportCompleted);
navigationFrame1.Controls.Add(navigationPage1);
navigationFrame1.Location = new Point(12, 120);
navigationFrame1.Name = "navigationFrame1";
- navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navPageImportCompleted, navigationPage1 });
+ navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navPageInputProjectInfo, navPageSetMapLocation, navPageGenerateProject, navigationPage1 });
navigationFrame1.SelectedPage = navPageInputProjectInfo;
navigationFrame1.Size = new Size(1089, 537);
navigationFrame1.TabIndex = 5;
@@ -205,27 +201,20 @@
generateXhsProjectWizardPage.Size = new Size(1089, 537);
generateXhsProjectWizardPage.TabIndex = 0;
//
- // navPageImportCompleted
- //
- navPageImportCompleted.Caption = "navPageImportCompleted";
- navPageImportCompleted.Controls.Add(importXhsProjectCompletedWizardPage);
- navPageImportCompleted.Name = "navPageImportCompleted";
- navPageImportCompleted.Size = new Size(1089, 537);
- //
- // importXhsProjectCompletedWizardPage
- //
- importXhsProjectCompletedWizardPage.Dock = DockStyle.Fill;
- importXhsProjectCompletedWizardPage.Location = new Point(0, 0);
- importXhsProjectCompletedWizardPage.Name = "importXhsProjectCompletedWizardPage";
- importXhsProjectCompletedWizardPage.Size = new Size(1089, 537);
- importXhsProjectCompletedWizardPage.TabIndex = 0;
- //
// navigationPage1
//
navigationPage1.Caption = "navigationPage1";
navigationPage1.Controls.Add(projectResultShowPanel1);
navigationPage1.Name = "navigationPage1";
navigationPage1.Size = new Size(1089, 537);
+ //
+ // projectResultShowPanel1
+ //
+ projectResultShowPanel1.Dock = DockStyle.Fill;
+ projectResultShowPanel1.Location = new Point(0, 0);
+ projectResultShowPanel1.Name = "projectResultShowPanel1";
+ projectResultShowPanel1.Size = new Size(1089, 537);
+ projectResultShowPanel1.TabIndex = 0;
//
// stepProgressBar1
//
@@ -341,14 +330,6 @@
itemForComplete.TextSize = new Size(0, 0);
itemForComplete.TextVisible = false;
//
- // projectResultShowPanel1
- //
- projectResultShowPanel1.Dock = DockStyle.Fill;
- projectResultShowPanel1.Location = new Point(0, 0);
- projectResultShowPanel1.Name = "projectResultShowPanel1";
- projectResultShowPanel1.Size = new Size(1089, 537);
- projectResultShowPanel1.TabIndex = 0;
- //
// ImportXhsProjectDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -366,7 +347,6 @@
navPageInputProjectInfo.ResumeLayout(false);
navPageSetMapLocation.ResumeLayout(false);
navPageGenerateProject.ResumeLayout(false);
- navPageImportCompleted.ResumeLayout(false);
navigationPage1.ResumeLayout(false);
((ISupportInitialize)stepProgressBar1).EndInit();
((ISupportInitialize)Root).EndInit();
@@ -400,11 +380,9 @@
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraBars.Navigation.NavigationPage navPageSetMapLocation;
private DevExpress.XtraBars.Navigation.NavigationPage navPageGenerateProject;
- private DevExpress.XtraBars.Navigation.NavigationPage navPageImportCompleted;
private InputXhsProjectInfoWizardPage inputXhsProjectInfoWizardPage;
private SetXhsProjectMapLocationWizardPage setXhsProjectMapLocationWizardPage;
private GenerateXhsProjectWizardPage generateXhsProjectWizardPage;
- private ImportXhsProjectCompletedCtrl importXhsProjectCompletedWizardPage;
private DevExpress.XtraEditors.SimpleButton btnComplete;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs
index 5155937..1a5684a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectDlg.cs
@@ -39,8 +39,7 @@
this.inputXhsProjectInfoWizardPage,
this.setXhsProjectMapLocationWizardPage,
this.generateXhsProjectWizardPage,
- this.importXhsProjectCompletedWizardPage,
- this.projectResultShowPanel1
+ this.projectResultShowPanel1
});
}
@@ -58,16 +57,16 @@
stepPbInputProjectInfo.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("productquickshippments");
stepPbInputProjectInfo.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("productquickshippments");
stepPbInputProjectInfo.ContentBlock2.Caption = "鑷姩鐢熸垚椤圭洰";
- StepProgressBarItem stepPbImportComleted = new StepProgressBarItem();
- stepPbImportComleted.ContentBlock2.Caption = "椤圭洰瀵煎叆瀹屾垚";
- stepPbImportComleted.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("check");
- stepPbImportComleted.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("check");
+ /* StepProgressBarItem stepPbImportComleted = new StepProgressBarItem();
+ stepPbImportComleted.ContentBlock2.Caption = "椤圭洰瀵煎叆瀹屾垚";
+ stepPbImportComleted.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("check");
+ stepPbImportComleted.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("check");
+ */
StepProgressBarItem stepGenerateProject = new StepProgressBarItem();
stepGenerateProject.ContentBlock1.ActiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("showallfieldresults");
stepGenerateProject.ContentBlock1.InactiveStateImageOptions.SvgImage = DevExpress.Images.ImageResourceCache.Default.GetSvgImageById("showallfieldresults");
stepGenerateProject.ContentBlock2.Caption = "椤圭洰灞曠ず缁撴灉";
this.stepProgressBar1.Items.Add(stepPbInputProjectInfo);
- this.stepProgressBar1.Items.Add(stepPbImportComleted);
this.stepProgressBar1.Items.Add(stepGenerateProject);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.Designer.cs
index ba13aab..dc21192 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.Designer.cs
@@ -30,16 +30,16 @@
{
components = new Container();
btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
- dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
- ((ISupportInitialize)dxErrorProvider1).BeginInit();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// btnEditSelectModelFile
@@ -48,15 +48,11 @@
btnEditSelectModelFile.Location = new Point(66, 2);
btnEditSelectModelFile.Name = "btnEditSelectModelFile";
btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
- btnEditSelectModelFile.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ btnEditSelectModelFile.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
btnEditSelectModelFile.Size = new Size(249, 20);
btnEditSelectModelFile.StyleController = layoutControl1;
btnEditSelectModelFile.TabIndex = 4;
btnEditSelectModelFile.ButtonClick += btnEditSelectModelFile_ButtonClick;
- //
- // dxErrorProvider1
- //
- dxErrorProvider1.ContainerControl = this;
//
// layoutControl1
//
@@ -88,6 +84,10 @@
layoutControlItem1.Text = "閫夋嫨鏂囦欢:";
layoutControlItem1.TextSize = new Size(52, 14);
//
+ // dxErrorProvider1
+ //
+ dxErrorProvider1.ContainerControl = this;
+ //
// SelectXhsProjectModelFileWizardPage
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -96,11 +96,11 @@
Name = "SelectXhsProjectModelFileWizardPage";
Size = new Size(317, 25);
((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
- ((ISupportInitialize)dxErrorProvider1).EndInit();
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
index e5e5a0a..89c049c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs
@@ -38,11 +38,11 @@
btnEditSelectModelFile = new DevExpress.XtraEditors.ButtonEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
@@ -53,11 +53,11 @@
((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
+ ((ISupportInitialize)layoutControlItem6).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
@@ -123,6 +123,7 @@
btnEditSelectModelFile.Location = new Point(113, 60);
btnEditSelectModelFile.Name = "btnEditSelectModelFile";
btnEditSelectModelFile.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
+ btnEditSelectModelFile.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
btnEditSelectModelFile.Size = new Size(734, 20);
btnEditSelectModelFile.StyleController = layoutControl1;
btnEditSelectModelFile.TabIndex = 6;
@@ -148,24 +149,6 @@
layoutControlItem2.Size = new Size(419, 24);
layoutControlItem2.Text = "<color=red>*</color>鍚嶇О锛�";
layoutControlItem2.TextSize = new Size(89, 14);
- //
- // layoutControlItem3
- //
- layoutControlItem3.Control = txtCustomer;
- layoutControlItem3.Location = new Point(419, 0);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(420, 24);
- layoutControlItem3.Text = "瀹㈡埛锛�";
- layoutControlItem3.TextSize = new Size(89, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = txtTagNme;
- layoutControlItem6.Location = new Point(419, 24);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(420, 24);
- layoutControlItem6.Text = "鏍囧織锛�";
- layoutControlItem6.TextSize = new Size(89, 14);
//
// layoutControlItem7
//
@@ -196,6 +179,24 @@
layoutControlItem8.Text = "閫夋嫨妯″瀷鏂囦欢:";
layoutControlItem8.TextSize = new Size(89, 17);
//
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = txtTagNme;
+ layoutControlItem6.Location = new Point(419, 24);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(420, 24);
+ layoutControlItem6.Text = "鏍囧織锛�";
+ layoutControlItem6.TextSize = new Size(89, 14);
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = txtCustomer;
+ layoutControlItem3.Location = new Point(419, 0);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(420, 24);
+ layoutControlItem3.Text = "瀹㈡埛锛�";
+ layoutControlItem3.TextSize = new Size(89, 14);
+ //
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
@@ -216,11 +217,11 @@
((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
+ ((ISupportInitialize)layoutControlItem6).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/02-bimface/ViewXhsProjectBimfacePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/02-bimface/ViewXhsProjectBimfacePage.cs
index e5f75d1..b30e077 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/02-bimface/ViewXhsProjectBimfacePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/02-bimface/ViewXhsProjectBimfacePage.cs
@@ -77,7 +77,6 @@
return;
}
await this.bimfaceInterop3dContainer1.LoadView(viewToken);
-
}
}
-}
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
index 43df956..dfef177 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.Designer.cs
@@ -30,11 +30,22 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectMgrPage));
+ DevExpress.XtraTreeList.StyleFormatConditions.TreeListFormatRule treeListFormatRule1 = new DevExpress.XtraTreeList.StyleFormatConditions.TreeListFormatRule();
+ DevExpress.XtraEditors.FormatConditionRuleIconSet formatConditionRuleIconSet1 = new DevExpress.XtraEditors.FormatConditionRuleIconSet();
+ DevExpress.XtraEditors.FormatConditionIconSet formatConditionIconSet1 = new DevExpress.XtraEditors.FormatConditionIconSet();
+ DevExpress.XtraEditors.FormatConditionIconSetIcon formatConditionIconSetIcon1 = new DevExpress.XtraEditors.FormatConditionIconSetIcon();
+ DevExpress.XtraEditors.FormatConditionIconSetIcon formatConditionIconSetIcon2 = new DevExpress.XtraEditors.FormatConditionIconSetIcon();
+ DevExpress.XtraEditors.FormatConditionIconSetIcon formatConditionIconSetIcon3 = new DevExpress.XtraEditors.FormatConditionIconSetIcon();
+ DevExpress.XtraEditors.FormatConditionIconSetIcon formatConditionIconSetIcon4 = new DevExpress.XtraEditors.FormatConditionIconSetIcon();
+ DevExpress.XtraEditors.FormatConditionIconSetIcon formatConditionIconSetIcon5 = new DevExpress.XtraEditors.FormatConditionIconSetIcon();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ ColModelState = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+ repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
+ svgImageCollection1 = new DevExpress.Utils.SvgImageCollection(components);
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -58,19 +69,18 @@
treeList1 = new DevExpress.XtraTreeList.TreeList();
colNO = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- colStartTime = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- colEndTime = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colAddress = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colCustomer = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colFlags = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colTagName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
colDescription = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- ColModelState = new DevExpress.XtraTreeList.Columns.TreeListColumn();
ColViewBimface = new DevExpress.XtraTreeList.Columns.TreeListColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
xhsProjectMgrViewModelBindingSource = new BindingSource(components);
panelControl1 = new DevExpress.XtraEditors.PanelControl();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
+ ((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
+ ((ISupportInitialize)svgImageCollection1).BeginInit();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)treeList1).BeginInit();
((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
@@ -79,6 +89,30 @@
panelControl1.SuspendLayout();
((ISupportInitialize)svgImg32).BeginInit();
SuspendLayout();
+ //
+ // ColModelState
+ //
+ ColModelState.Caption = "妯″瀷鐘舵��";
+ ColModelState.ColumnEdit = repositoryItemImageComboBox1;
+ ColModelState.FieldName = "ModelState";
+ ColModelState.Name = "ColModelState";
+ ColModelState.Visible = true;
+ ColModelState.VisibleIndex = 7;
+ //
+ // repositoryItemImageComboBox1
+ //
+ repositoryItemImageComboBox1.AutoHeight = false;
+ repositoryItemImageComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton() });
+ repositoryItemImageComboBox1.HtmlImages = svgImageCollection1;
+ repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
+ repositoryItemImageComboBox1.SmallImages = svgImageCollection1;
+ //
+ // svgImageCollection1
+ //
+ svgImageCollection1.Add("bo_security_permission", "image://svgimages/business objects/bo_security_permission.svg");
+ svgImageCollection1.Add("alignverticalleft", "image://svgimages/align/alignverticalleft.svg");
+ svgImageCollection1.Add("up", "image://svgimages/actions/up.svg");
+ svgImageCollection1.Add("productquickcomparisons", "image://svgimages/outlook inspired/productquickcomparisons.svg");
//
// ribbonControl1
//
@@ -128,6 +162,7 @@
barBtnInfo.Id = 4;
barBtnInfo.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnInfo.ImageOptions.SvgImage");
barBtnInfo.Name = "barBtnInfo";
+ barBtnInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
barBtnInfo.ItemClick += barBtnInfo_ItemClick;
//
// barBtnViewHydro
@@ -136,6 +171,7 @@
barBtnViewHydro.Id = 5;
barBtnViewHydro.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnViewHydro.ImageOptions.SvgImage");
barBtnViewHydro.Name = "barBtnViewHydro";
+ barBtnViewHydro.ItemClick += barBtnViewHydro_ItemClick;
//
// barBtnViewBimface
//
@@ -249,14 +285,42 @@
treeList1.Appearance.HeaderPanel.Options.UseTextOptions = true;
treeList1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colNO, colName, colStartTime, colEndTime, colAddress, colCustomer, colFlags, colTagName, colDescription, ColModelState, ColViewBimface });
+ treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colNO, colName, colAddress, colCustomer, colFlags, colTagName, colDescription, ColModelState, ColViewBimface });
treeList1.DataSource = xhsProjectMgrViewModelBindingSource;
treeList1.Dock = DockStyle.Fill;
+ treeListFormatRule1.Column = ColModelState;
+ treeListFormatRule1.Name = "Format0";
+ formatConditionRuleIconSet1.AllowAnimation = DevExpress.Utils.DefaultBoolean.False;
+ formatConditionIconSet1.CategoryName = "Ratings";
+ formatConditionIconSetIcon1.PredefinedName = "Rating5_1.png";
+ formatConditionIconSetIcon1.Value = new decimal(new int[] { 80, 0, 0, 0 });
+ formatConditionIconSetIcon1.ValueComparison = DevExpress.XtraEditors.FormatConditionComparisonType.GreaterOrEqual;
+ formatConditionIconSetIcon2.PredefinedName = "Rating5_2.png";
+ formatConditionIconSetIcon2.Value = new decimal(new int[] { 60, 0, 0, 0 });
+ formatConditionIconSetIcon2.ValueComparison = DevExpress.XtraEditors.FormatConditionComparisonType.GreaterOrEqual;
+ formatConditionIconSetIcon3.PredefinedName = "Rating5_3.png";
+ formatConditionIconSetIcon3.Value = new decimal(new int[] { 40, 0, 0, 0 });
+ formatConditionIconSetIcon3.ValueComparison = DevExpress.XtraEditors.FormatConditionComparisonType.GreaterOrEqual;
+ formatConditionIconSetIcon4.PredefinedName = "Rating5_4.png";
+ formatConditionIconSetIcon4.Value = new decimal(new int[] { 20, 0, 0, 0 });
+ formatConditionIconSetIcon4.ValueComparison = DevExpress.XtraEditors.FormatConditionComparisonType.GreaterOrEqual;
+ formatConditionIconSetIcon5.PredefinedName = "Rating5_5.png";
+ formatConditionIconSetIcon5.ValueComparison = DevExpress.XtraEditors.FormatConditionComparisonType.GreaterOrEqual;
+ formatConditionIconSet1.Icons.Add(formatConditionIconSetIcon1);
+ formatConditionIconSet1.Icons.Add(formatConditionIconSetIcon2);
+ formatConditionIconSet1.Icons.Add(formatConditionIconSetIcon3);
+ formatConditionIconSet1.Icons.Add(formatConditionIconSetIcon4);
+ formatConditionIconSet1.Icons.Add(formatConditionIconSetIcon5);
+ formatConditionIconSet1.Name = "Ratings5";
+ formatConditionIconSet1.ValueType = DevExpress.XtraEditors.FormatConditionValueType.Percent;
+ formatConditionRuleIconSet1.IconSet = formatConditionIconSet1;
+ treeListFormatRule1.Rule = formatConditionRuleIconSet1;
+ treeList1.FormatRules.Add(treeListFormatRule1);
treeList1.Location = new Point(0, 1);
treeList1.MenuManager = ribbonControl1;
treeList1.Name = "treeList1";
treeList1.OptionsBehavior.PopulateServiceColumns = true;
- treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
+ treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1, repositoryItemImageComboBox1 });
treeList1.Size = new Size(998, 568);
treeList1.TabIndex = 1;
treeList1.RowCellClick += treeList1_RowCellClick;
@@ -280,26 +344,12 @@
colName.Visible = true;
colName.VisibleIndex = 1;
//
- // colStartTime
- //
- colStartTime.FieldName = "StartTime";
- colStartTime.Name = "colStartTime";
- colStartTime.Visible = true;
- colStartTime.VisibleIndex = 2;
- //
- // colEndTime
- //
- colEndTime.FieldName = "EndTime";
- colEndTime.Name = "colEndTime";
- colEndTime.Visible = true;
- colEndTime.VisibleIndex = 3;
- //
// colAddress
//
colAddress.FieldName = "Address";
colAddress.Name = "colAddress";
colAddress.Visible = true;
- colAddress.VisibleIndex = 4;
+ colAddress.VisibleIndex = 2;
//
// colCustomer
//
@@ -313,37 +363,30 @@
colFlags.FieldName = "Flags";
colFlags.Name = "colFlags";
colFlags.Visible = true;
- colFlags.VisibleIndex = 6;
+ colFlags.VisibleIndex = 3;
//
// colTagName
//
colTagName.FieldName = "TagName";
colTagName.Name = "colTagName";
colTagName.Visible = true;
- colTagName.VisibleIndex = 7;
+ colTagName.VisibleIndex = 4;
//
// colDescription
//
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 9;
- //
- // ColModelState
- //
- ColModelState.Caption = "妯″瀷鐘舵��";
- ColModelState.Name = "ColModelState";
- ColModelState.Visible = true;
- ColModelState.VisibleIndex = 8;
+ colDescription.VisibleIndex = 6;
//
// ColViewBimface
//
- ColViewBimface.Caption = "鏌ョ湅涓夌淮妯″瀷";
+ ColViewBimface.Caption = "鏌ョ湅鏂规绠＄悊";
ColViewBimface.ColumnEdit = repositoryItemButtonEdit1;
ColViewBimface.Name = "ColViewBimface";
ColViewBimface.OptionsColumn.AllowEdit = false;
ColViewBimface.Visible = true;
- ColViewBimface.VisibleIndex = 10;
+ ColViewBimface.VisibleIndex = 8;
//
// repositoryItemButtonEdit1
//
@@ -384,6 +427,8 @@
Controls.Add(ribbonControl1);
Name = "XhsProjectMgrPage";
Size = new Size(998, 670);
+ ((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
+ ((ISupportInitialize)svgImageCollection1).EndInit();
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)treeList1).EndInit();
((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
@@ -411,8 +456,6 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribPageGroupBimface;
private DevExpress.XtraTreeList.Columns.TreeListColumn colNO;
private DevExpress.XtraTreeList.Columns.TreeListColumn colName;
- private DevExpress.XtraTreeList.Columns.TreeListColumn colStartTime;
- private DevExpress.XtraTreeList.Columns.TreeListColumn colEndTime;
private DevExpress.XtraTreeList.Columns.TreeListColumn colAddress;
private DevExpress.XtraTreeList.Columns.TreeListColumn colCustomer;
private DevExpress.XtraTreeList.Columns.TreeListColumn colFlags;
@@ -433,5 +476,7 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn ColModelState;
private DevExpress.XtraTreeList.Columns.TreeListColumn ColViewBimface;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
+ private DevExpress.Utils.SvgImageCollection svgImageCollection1;
}
}
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 7099e1d..b4bcdad 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
@@ -2,7 +2,9 @@
using DevExpress.Utils;
using DevExpress.XtraTreeList;
using HStation.WinFrmUI.Xhs;
-using System.Data;
+using NetTaste;
+using System;
+using Timer = System.Threading.Timer;
namespace HStation.WinFrmUI
{
@@ -15,6 +17,16 @@
this.PageTitle.Caption = "椤圭洰绠＄悊";
this.PageTitle.HeaderSvgImage = this.svgImg32[0];
this.PageTitle.SvgImageSize = new Size(24, 24);
+ repositoryItemImageComboBox1.Items.AddEnum(typeof(Yw.WinFrmUI.Bimface.eFileStatus));
+ var a = typeof(Yw.WinFrmUI.Bimface.eFileStatus);
+ repositoryItemImageComboBox1.Items[0].ImageIndex = 0;
+ repositoryItemImageComboBox1.Items[1].ImageIndex = 1;
+ repositoryItemImageComboBox1.Items[2].ImageIndex = 2;
+ repositoryItemImageComboBox1.Items[3].ImageIndex = 3;
+ repositoryItemImageComboBox1.Items[4].ImageIndex = 4;
+ repositoryItemImageComboBox1.Items[5].ImageIndex = 5;
+ repositoryItemImageComboBox1.Items[6].ImageIndex = 6;
+ repositoryItemImageComboBox1.Items[7].ImageIndex = 7;
}
private List<XhsProjectMgrViewModel> _allProjectList = null;
@@ -39,9 +51,18 @@
{
foreach (var project in allProjectList)
{
- if (await IsHaveBimFace(project.ID))
+ var bimFile = await BimfaceFileStateHelper.IsHaveBimFace(project.ID);
+ if (bimFile != null)
{
- var vm = new XhsProjectMgrViewModel(project, true);
+ //濡傛灉鏂囦欢鐘舵�佷负涓婁紶涓垯杩涜瀹氭椂璇锋眰鍒锋柊鐘舵��
+ if (bimFile.FileStatus == 0)
+ {
+ Task.Factory.StartNew(() =>
+ {
+ StartTimer(300, bimFile.ID);
+ });
+ }
+ var vm = new XhsProjectMgrViewModel(project, true, bimFile.FileStatus);
_allProjectList.Add(vm);
}
else
@@ -54,49 +75,34 @@
this.xhsProjectMgrViewModelBindingSource.DataSource = _allProjectList;
}
- //鏌ユ壘椤圭洰鏄惁瀛樺湪妯″瀷
- private async Task<bool> IsHaveBimFace(long ProjectID)
+ //璁℃椂鍣�(鍒锋柊涓婁紶鐘舵��)
+ public void StartTimer(int intervalMilliseconds, long ID)
{
- var projectSite = await new BLL.XhsProjectSiteStd().GetDefaultByProjectID(ProjectID);
- if (projectSite == null)
- {
- return false;
- }
- var relation = await new Yw.BLL.BimfaceFileRelationStd()
- .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, projectSite.ID, Yw.Bimface.Purpose.Simulation);
- if (relation == null)
- {
- return false;
- }
- var bimfaceFile = await new Yw.BLL.BimfaceFileStd().GetByID(relation.BimfaceFileID);
- if (bimfaceFile == null)
- {
- return false;
- }
- return true;
+ // 鍒涘缓涓�涓� Timer锛屽畠灏嗗湪缁欏畾鐨勬椂闂撮棿闅斿悗瑙﹀彂鍥炶皟鏂规硶
+ var timer = new System.Threading.Timer(TimerCallback, ID, Timeout.Infinite, intervalMilliseconds);
+ // 鍚姩 Timer
+ timer.Change(intervalMilliseconds, intervalMilliseconds);
}
- //鏌ョ湅bimface妯″瀷
- private async void barBtnViewBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private async void TimerCallback(object state)
{
- var vm = GetCurrentViewModel();
- if (vm == null)
+ var tupleState = (Tuple<long, Timer>)state;
+ long iD = tupleState.Item1;
+ Timer timer = tupleState.Item2;
+ try
{
- return;
+ var stateResult = await BimfaceHelper.GetFileTranslateStatus(iD);
+ if (stateResult == 0)
+ {
+ this.SetBindingData();
+ }
+ else
+ {
+ timer.Dispose();
+ }
}
- var guid = new PageGuid()
+ catch (Exception ex)
{
- Modular = Yw.WinFrmUI.PageModular.Bimface,
- MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
- Function = Yw.WinFrmUI.PageFunction.ViewBimface3d,
- TagName = $"{vm.ID}"
- };
-
- if (!IsExistPage(guid, true))
- {
- var page = new ViewXhsProjectBimfacePage();
- await page.SetBindingData(vm.ID);
- CreatePage(page, guid);
}
}
@@ -277,6 +283,35 @@
{
Modular = Yw.WinFrmUI.PageModular.Bimface,
MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab,
+ Function = Yw.WinFrmUI.PageFunction.ViewSchemeMgr,
+ TagName = $"{vm.ID}"
+ };
+
+ if (!IsExistPage(guid, true))
+ {
+ var page = new XhsSchemeMultiMgrPage();
+ await page.SetBindingData(vm.ID);
+ CreatePage(page, guid);
+ }
+ }
+
+ //鏌ョ湅bimface妯″瀷
+ private async void barBtnViewBimface_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs 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}"
};
@@ -288,5 +323,34 @@
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);
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.resx
index 197d058..b687254 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.resx
@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="svgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>417, 17</value>
+ </metadata>
<assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="barBtnAdd.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -392,24 +395,18 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPADAAAC77u/
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsCAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
- WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
- MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
- bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
- Pg0KICA8ZyBpZD0iQiI+DQogICAgPHBhdGggZD0iTTE2LjQsMTMuN2gtMS4zdi0zLjRoMS4xYzEuNCww
- LDIuMSwwLjUsMi4xLDEuNmMwLDAuNS0wLjIsMC45LTAuNSwxLjNDMTcuNCwxMy41LDE2LjksMTMuNywx
- Ni40LDEzLjd6ICAgIE0xNi43LDE2aC0xLjZ2My43aDEuNmMwLjcsMCwxLjItMC4yLDEuNS0wLjVjMC40
- LTAuMywwLjUtMC44LDAuNS0xLjRjMC0wLjYtMC4yLTEtMC42LTEuM0MxNy44LDE2LjEsMTcuMywxNiwx
- Ni43LDE2eiBNMzAsMTYgICBjMCw3LjctNi4zLDE0LTE0LDE0UzIsMjMuNywyLDE2UzguMywyLDE2LDJT
- MzAsOC4zLDMwLDE2eiBNMjIsMTcuOGMwLTAuOC0wLjMtMS42LTAuOS0yLjJzLTEuMy0xLTIuMi0xLjF2
- MCAgIGMwLjgtMC4yLDEuNC0wLjYsMS45LTEuMWMwLjUtMC42LDAuNy0xLjIsMC43LTJDMjEuNSw5LjEs
- MjAsOCwxNi45LDhIMTJ2MTRoNS4yYzEuNSwwLDIuNy0wLjQsMy42LTEuMUMyMS42LDIwLjEsMjIsMTku
- MSwyMiwxNy44eiAgICIgY2xhc3M9IlJlZCIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHRWaWV3Ij4NCiAgICA8cGF0aCBkPSJNMTYs
+ MkM4LjMsMiwyLDguMywyLDE2czYuMywxNCwxNCwxNHMxNC02LjMsMTQtMTRTMjMuNywyLDE2LDJ6IE0x
+ NiwyNHYtNkg4di00aDhWOGw4LDhMMTYsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+
+ Cw==
</value>
</data>
<metadata name="xhsProjectMgrViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs
index d6d40ab..fb78010 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs
@@ -30,15 +30,24 @@
this.SortCode = project.SortCode;
this.Description = project.Description;
this.IsHaveBimface = IsHaveBimface;
+ this.ModelState = Yw.WinFrmUI.Bimface.eFileStatus.ConvertSucceed;
}
- /* /// <summary>
- ///
- /// </summary>
- public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool hasLocation) : this(project)
- {
- this.HasLocation = hasLocation;
- }*/
+ public XhsProjectMgrViewModel(Vmo.Xhs.XhsProjectExtensions project, bool IsHaveBimface, int BimfaceState)
+ {
+ this.ID = project.ID;
+ this.ParentID = project.ParentID;
+ this.NO = project.NO;
+ this.Name = project.Name;
+ this.Address = project.Address;
+ this.Customer = project.Customer;
+ this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags);
+ this.TagName = project.TagName;
+ this.SortCode = project.SortCode;
+ this.Description = project.Description;
+ this.IsHaveBimface = IsHaveBimface;
+ this.ModelState = (Yw.WinFrmUI.Bimface.eFileStatus)BimfaceState;
+ }
public void Reset(Vmo.Xhs.XhsProjectExtensions project)
{
@@ -112,7 +121,7 @@
/// 妯″瀷鐘舵��
/// </summary>
[Display(Name = "妯″瀷鐘舵��")]
- public int ModelState { get; set; }
+ public Yw.WinFrmUI.Bimface.eFileStatus ModelState { get; set; }
/// <summary>
/// 鏍囩
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 69041c2..e4239e6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -52,7 +52,6 @@
<ItemGroup>
<Folder Include="map\gaode\css\" />
- <Folder Include="00-core\" />
<Folder Include="Resources\" />
</ItemGroup>
diff --git a/WinFrmUI/Yw.WinFrmUI.Core/06-document/PageFunction.cs b/WinFrmUI/Yw.WinFrmUI.Core/06-document/PageFunction.cs
index 4f62bad..b33ca5c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/06-document/PageFunction.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Core/06-document/PageFunction.cs
@@ -9,5 +9,8 @@
/// 鏌ョ湅 Bimface 3d 瑙嗗浘
/// </summary>
public const string ViewBimface3d = "view-bimface-3d";
+
+ //鏌ョ湅鏂规绠＄悊鐣岄潰
+ public const string ViewSchemeMgr = "view-SchemeMgr";
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3