From 9490957edfc694a0378ee52af47e921b8ac44e7a Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 04 六月 2024 09:12:11 +0800
Subject: [PATCH] 冲突
---
Hydraulic/Hydro.MapView/Common/MapDimensions.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
index 2406228..c856579 100644
--- a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
+++ b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
@@ -13,24 +13,24 @@
{
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("涓績")]
[Browsable(true)]
public PointF Center { get; set; }
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("缂╂斁")]
[Browsable(true)]
public float zoom { get; set; } = 0.1f;
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("鏃嬭浆瑙掑害")]
[Browsable(true)]
public double rotation { get; set; } = 0;
private double _rotationF;
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("淇瑙掑害")]
[Browsable(true)]
public double rotationF
@@ -47,19 +47,22 @@
}
}
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("鏄剧ず妤煎眰")]
[Browsable(true)]
public int ShowFloor { get; set; } = int.MinValue;
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("鏄剧ず鑳屾櫙")]
[Browsable(true)]
public bool isShowPic { get; set; } = true;
+
+
public bool isAutoBackgroundImage = false;
- [Category("瑙嗚")]
+
+ [Category("4銆佽瑙�")]
[DisplayName("鏄剧ず鏈�涓嶅埄鐐�")]
[Browsable(true)]
public bool isShowUnfavor { get; set; } = true;
@@ -70,7 +73,7 @@
//[Browsable(false)]
//public int LinkColourIndex { get; set; } = 0;
- [Category("瑙嗚")]
+ [Category("4銆佽瑙�")]
[DisplayName("閿佸畾骞抽潰瑙嗚")]
[Browsable(true)]
public bool Lock2DView { get; set; } = false;
--
Gitblit v1.9.3