瀏覽代碼

xls:上传缺失文件整理

xulisong 6 年之前
父節點
當前提交
5a5d17177d

+ 3 - 17
MBI/SAGA.GplotManage/GplotCommand.cs

@@ -13,10 +13,7 @@ using SAGA.GplotDrawData;
 using SAGA.GplotDrawData.View;
 using SAGA.GplotManage.UploadRelated;
 using SAGA.GplotRelationComputerManage;
-using SAGA.MBI.Common;
 using SAGA.Models;
-using SAGA.RevitUtils;
-using SAGA.RevitUtils.Extends;
 using SAGA.RevitUtils.Extends;
 
 namespace SAGA.GplotManage
@@ -69,14 +66,11 @@ namespace SAGA.GplotManage
     {
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
-            //RelationTypeManager.GetSystemRelationTypeNames() 
-            List<string> useRelations = RelationTypeManager.GetSystemRelationTypeNames();//new List<string>() { "ChillWaterLoop" };
+            List<string> useRelations = RelationTypeManager.GetSystemRelationTypeNames();
             SystemComputerHandler handler1 = new SystemComputerHandler();
             handler1.ComputerWidthCache(useRelations);
             WinSystem floorWin = new WinSystem(GplotShowType.ViewPlan);
             floorWin.Show();
-            //var space = GplotFactory.Create(GraphTypeEnum.ChillWaterLoop);
-            //space.Show(GplotShowType.Default);
             return Result.Succeeded;
         }
 
@@ -100,8 +94,6 @@ namespace SAGA.GplotManage
             handler1.ComputerWidthCache(useRelations);
             WinSystem floorWin = new WinSystem(GplotShowType.ViewPlan);
             floorWin.Show();
-            //var space = GplotFactory.Create(GraphTypeEnum.ChillWaterLoop);
-            //space.Show(GplotShowType.ViewPlan);
             return Result.Succeeded;
         }
 
@@ -125,8 +117,6 @@ namespace SAGA.GplotManage
             handler1.ComputerWidthCache(useRelations);
             WinSystem verticalWin = new WinSystem(GplotShowType.VerticalPlan);
             verticalWin.Show();
-            //var space = GplotFactory.Create(GraphTypeEnum.ChillWaterLoop);
-            //space.Show(GplotShowType.VerticalPlan);
             return Result.Succeeded;
 
         }
@@ -236,17 +226,13 @@ namespace SAGA.GplotManage
     {
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
-            //var relationType = RelationTypeManager.GetRelationTypeItem("ChillWaterLoop");
-            List<string> useRelations = new List<string>() { "ChillWaterLoop" };
+           // List<string> useRelations = new List<string>() { "ChillWaterLoop" };
+            List<string> useRelations = RelationTypeManager.GetSystemRelationTypeNames();
             SystemComputerHandler handler1 = new SystemComputerHandler();
             handler1.ComputerWidthCache(useRelations);
             WinMachineRoom room = new WinMachineRoom();
             room.Show();
             return Result.Succeeded;
-            RoomShowHandler handler = new RoomShowHandler("ChillWaterLoop");
-            handler.Show();
-            ;
-            return Result.Succeeded;
         }
 
         public override bool IsCommandAvailable(UIApplication applicationData, CategorySet selectedCategories)

+ 3 - 6
MBI/SAGA.GplotManage/SAGA.GplotManage.csproj

@@ -129,12 +129,6 @@
     <Compile Include="GplotManage\GplotView\GplotView.cs" />
     <Compile Include="Command\GplotUtil.cs" />
     <Compile Include="GraphTypeEnum.cs" />
-    <Compile Include="RelationManager\ElectricalRelationUploader.cs" />
-    <Compile Include="RelationManager\IRelationUploader.cs" />
-    <Compile Include="RelationManager\RelationDataManager.cs" />
-    <Compile Include="RelationManager\RelationUploader.cs" />
-    <Compile Include="RelationManager\SpaceRelationUploader.cs" />
-    <Compile Include="RelationManager\SystemRelationUploader.cs" />
     <Compile Include="SystemChecks\CheckSystemResultView.xaml.cs">
       <DependentUpon>CheckSystemResultView.xaml</DependentUpon>
     </Compile>
@@ -260,6 +254,9 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="RelationManager\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\MrAdvice.2.5.24\build\MrAdvice.targets" Condition="Exists('..\packages\MrAdvice.2.5.24\build\MrAdvice.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 1 - 1
MBI/SAGA.GplotRelationComputerManage/PowerDistribution/ComputerHandler/DistributionRelationshipHandler.cs

@@ -17,7 +17,7 @@ using MBIEquipItem = SAGA.Models.EquipmentItem;
 
 namespace SAGA.GplotRelationComputerManage
 {
-    public sealed class DistributionRelationshipHandler : IElectricalRelationHandler
+    public sealed class DistributionRelationshipHandler //: IElectricalRelationHandler
     {
         public string ElectricalRelationType
         {

+ 1 - 1
MBI/SAGA.GplotRelationComputerManage/PowerDistribution/ComputerHandler/EquipPowerRelationshipHandler.cs

@@ -16,7 +16,7 @@ using SAGA.Models;
 using MBIEquipItem = SAGA.Models.EquipmentItem;
 namespace SAGA.GplotRelationComputerManage
 {
-    public class EquipPowerRelationshipHandler : IElectricalRelationHandler
+    public class EquipPowerRelationshipHandler //: IElectricalRelationHandler
     {
         public string ElectricalRelationType
         {

+ 1 - 1
MBI/SAGA.GplotRelationComputerManage/PowerDistribution/ComputerHandler/ObjectControlRelationshipHandler.cs

@@ -17,7 +17,7 @@ using MBIEquipItem = SAGA.Models.EquipmentItem;
 
 namespace SAGA.GplotRelationComputerManage
 {
-    public class ObjectControlRelationshipHandler : IElectricalRelationHandler
+    public class ObjectControlRelationshipHandler //: IElectricalRelationHandler
     {
         public string ElectricalRelationType
         {

+ 0 - 1
MBI/SAGA.GplotRelationComputerManage/SAGA.GplotRelationComputerManage.csproj

@@ -132,7 +132,6 @@
     <Compile Include="PowerDistribution\Common\PowerComputerContext.cs" />
     <Compile Include="PowerDistribution\ComputerHandler\DistributionRelationshipHandler.cs" />
     <Compile Include="PowerDistribution\ComputerHandler\EquipPowerRelationshipHandler.cs" />
-    <Compile Include="PowerDistribution\ComputerHandler\IElectricalRelationHandler.cs" />
     <Compile Include="PowerDistribution\ComputerHandler\ObjectControlRelationshipHandler.cs" />
     <Compile Include="PumpEnd\DrawEnd.cs" />
     <Compile Include="PumpEnd\DuctTerminalBll.cs" />