Bläddra i källkod

mxg:修正数据检查RF标高识别错误问题

mengxiangge 6 år sedan
förälder
incheckning
f0b9d5e46d

+ 3 - 0
MBI/SAGA.DotNetUtils/WPF/UserControl/ComboboxTreeView/ComboBoxTreeView.cs

@@ -26,6 +26,7 @@ namespace SAGA.DotNetUtils.WPF.UserControl.ComboboxTreeView
 
         protected override void OnMouseWheel(MouseWheelEventArgs e)
         {
+            Console.WriteLine(e);
             //don't call the method of the base class
         }
 
@@ -34,6 +35,7 @@ namespace SAGA.DotNetUtils.WPF.UserControl.ComboboxTreeView
             base.OnApplyTemplate();
             
             _treeView = (ExtendedTreeView)this.GetTemplateChild("treeView");
+            if (_treeView == null) return;
             _treeView.OnHierarchyMouseUp += new MouseEventHandler(OnTreeViewHierarchyMouseUp);
             _contentPresenter = (ContentPresenter)this.GetTemplateChild("ContentPresenter");
 
@@ -53,6 +55,7 @@ namespace SAGA.DotNetUtils.WPF.UserControl.ComboboxTreeView
             this.SetSelectedItemToHeader();
         }
 
+       
         /// <summary>
         /// Handles clicks on any item in the tree view
         /// </summary>

+ 6 - 1
MBI/SAGA.DotNetUtils/WPF/UserControl/ComboboxTreeView/ExtendedTreeView.cs

@@ -12,7 +12,6 @@ namespace SAGA.DotNetUtils.WPF.UserControl.ComboboxTreeView
             var childItem = ExtendedTreeViewItem.CreateItemWithBinding();
 
             childItem.OnHierarchyMouseUp += OnChildItemMouseLeftButtonUp;
-
             return childItem;
         }
 
@@ -24,6 +23,12 @@ namespace SAGA.DotNetUtils.WPF.UserControl.ComboboxTreeView
             }
         }
 
+        protected override void OnMouseEnter(MouseEventArgs e)
+        {
+            base.OnMouseEnter(e);
+            this.Focus();
+        }
+
         public event MouseEventHandler OnHierarchyMouseUp;
     }
 

+ 2 - 2
MBI/SAGA.MBI/ToolsData/ModeCheck/SagaSignCheck.cs

@@ -104,11 +104,11 @@ namespace SAGA.MBI.ToolsData.ModeCheck
                     result.RPlanName = sagaPlanName;
                     result.HBase = sagaPlan.GenLevel.Elevation;
                     //打标记的楼层名称必需为指定格式;B1,B1M,F1,F1M,RFM,RF
-                    if (Regex.IsMatch(sagaPlanName, @"([BF][1-9]\d*M?|RFM?)-saga"))
+                    if (Regex.IsMatch(sagaPlanName, @"^([BF][1-9]\d*M?|RFM?)-saga$"))
                     {
 
                         result.RSequence = mFloor.Sequence;
-                        var rfLevel = document.GetLevels().FirstOrDefault(t => Regex.IsMatch(t.Name, @"RF(-saga)?"));
+                        var rfLevel = document.GetLevels().FirstOrDefault(t => System.Text.RegularExpressions.Regex.IsMatch(t.Name, @"^RF(-saga)?$"));
                         if (rfLevel == null)
                         {
                             result.IsRight = false;

+ 0 - 1
MBI/SAGA.Revit.sln

@@ -830,7 +830,6 @@ Global
 		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R16|x86.ActiveCfg = Release|Any CPU
 		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R16|x86.Build.0 = Release|Any CPU
 		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R17|Any CPU.ActiveCfg = Release|Any CPU
-		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R17|Any CPU.Build.0 = Release|Any CPU
 		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R17|x64.ActiveCfg = Release|Any CPU
 		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R17|x64.Build.0 = Release|Any CPU
 		{C14E2157-5E86-488A-89C9-31FB07D98D3C}.R17|x86.ActiveCfg = Release|Any CPU