From c0be7c001375f73e2c3b49a1b1d447b6fc297bdd Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 21 三月 2025 13:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/01-model-template/00-core/ModelTemplatePage.cs | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/01-model-template/00-core/ModelTemplatePage.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/01-model-template/00-core/ModelTemplatePage.cs
index a1e6962..f077da8 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/01-model-template/00-core/ModelTemplatePage.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/01-model-template/00-core/ModelTemplatePage.cs
@@ -1,4 +1,6 @@
-锘縰sing Hydro;
+锘縰sing DevExpress.Drawing.Internal.Fonts.Interop;
+using DevExpress.XtraPrinting.Native;
+using Hydro;
namespace PBS.WinFrmUI.Hydro
{
@@ -309,19 +311,7 @@
this.modelTemplateTreeListCtrl1.SaveModelTemplate(_modelTemplate);
}
- private void SetZoom()
- {
- if (_template != null)
- {
- if (_template.view == null) _template.view = new MapDimensions();
- _template.view.Center = _mapView.MapCenter;
- _template.view.zoom = _mapView.zoom;
- _template.view.rotation = _mapView.Rotation;
- _template.view.rotationF = _mapView.RotationF;
-
- }
-
- }
+
private void barBtnSaveModelTemplate_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -488,17 +478,21 @@
_mapView.閲嶇疆瑙嗚ToolStripMenuItem_Click(1, new EventArgs());
}
+ private void SetZoom()
+ {
+ if (_template == null) return;
+ _template.view ??= new MapDimensions();
+ _template.view.Center = _mapView.MapCenter;
+ _template.view.zoom = _mapView.zoom;
+ _template.view.rotation = _mapView.Rotation;
+ _template.view.rotationF = _mapView.RotationF;
+ }
+
+
private void SaveView()
{
- //if (_mapDimensions == null)
- // _mapDimensions = new MapDimensions();
- //_mapDimensions.Center = map.MapCenter;
- //_mapDimensions.zoom = map.zoom;
- //_mapDimensions.rotation = map.Rotation;
- //_mapDimensions.rotationF = map.RotationF;
-
if (_template == null) return;
- if (_template.view == null) _template.view = new MapDimensions();
+ _template.view ??= new MapDimensions();
_template.view.Center = _mapView.MapCenter;
_template.view.zoom = _mapView.zoom;
_template.view.rotation = _mapView.Rotation;
--
Gitblit v1.9.3