Explorar o código

Merge branch 'master' of https://git.dev.tencent.com/xuhuo1234/saga

mengxiangge %!s(int64=5) %!d(string=hai) anos
pai
achega
cbf4f56063

+ 0 - 4
MBI/MBIResource/RevitEvents/RevitEvents.xml

@@ -8,10 +8,6 @@
     <DllName>OutputDll\SAGA.MBI.exe</DllName>
     <ClassName>SAGA.MBI.Interaction.MBIGplotChanged</ClassName>
 </IDocumentChanged>
-<IUpdaterRegister>
-    <DllName>OutputDll\SAGA.MBI.exe</DllName>
-    <ClassName>SAGA.MBI.Interaction.MBILocalNameTrigger</ClassName>
-</IUpdaterRegister>
 </RevitEvents>
 
 

+ 1 - 0
MBI/SAGA.Revit.sln.DotSettings.user

@@ -5,4 +5,5 @@
   &lt;Assembly Path="D:\SVNCode\MBI\Dlls\FirmLibDll\FWindSoft.Wpf.dll" /&gt;&#xD;
   &lt;Assembly Path="D:\MBI\Revit\SAGA.MBI\SAGA.MBI\MBI\Dlls\RevitRefDll\AdWindows.dll" /&gt;&#xD;
   &lt;Assembly Path="D:\MBI\Revit\SAGA.MBI\SAGA.MBI\MBI\packages\log4net.2.0.8\lib\net45-full\log4net.dll" /&gt;&#xD;
+  &lt;Assembly Path="D:\SAGA\MBI\saga\MBI\Dlls\ICSharpCode.SharpZipLib.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

+ 10 - 6
MBI/ToolCommand/RoomToSpaceUtils.cs

@@ -121,10 +121,6 @@ namespace ToolCommand
             {
                 var relationItem = new RoomRelationItem() { RoomId = room.Id.ToString() };
                 relations.Add(relationItem);
-                if (2165067 == room.Id.IntegerValue)
-                {
-
-                }
                 using (SubTransaction subTran = new SubTransaction(doc))
                 {
                     Space useSpcae = null;
@@ -135,7 +131,7 @@ namespace ToolCommand
                         if (location == null)
                         {
                             //|| room.Area.IsEqual(0)
-                            relationItem.Messages.Add("房间信息无效");
+                            relationItem.Messages.Add("房间信息无效,定位点为空");
                             continue;
                         }
                         useSpcae = doc.GetSpaceAtPoint(location.Add(offset));
@@ -150,7 +146,15 @@ namespace ToolCommand
                         //成功
                         handledSpaces.Add(useSpcae.Id.IntegerValue);
                         relationItem.SpaceId = useSpcae.Id.ToString();
-                        relationItem.IsSuccess = true;
+                        if (room.Area.IsEqual(0))
+                        {
+                            relationItem.Messages.Add("房间面积为0");
+                        }
+                        else
+                        {
+                            relationItem.IsSuccess = true;
+                        }
+                     
                     }
                     catch (Exception ex)
                     {

+ 1 - 1
MBI/ToolCommand/WinRoomDataTrans.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ToolCommand"
              mc:Ignorable="d" 
-             Width="300" SizeToContent="Height" WindowStartupLocation="CenterOwner">
+             Title="房间转换" Width="300" SizeToContent="Height" WindowStartupLocation="CenterOwner">
     <Grid Margin="5">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"></RowDefinition>