xulisong 6 years ago
parent
commit
81731d3ed7

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

@@ -65,7 +65,7 @@ namespace SAGA.GplotManage
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
             //RelationTypeManager.GetSystemRelationTypeNames() 
-            List<string> useRelations =new List<string>() { "ChillWaterLoop" };
+            List<string> useRelations = RelationTypeManager.GetSystemRelationTypeNames();//new List<string>() { "ChillWaterLoop" };
             SystemComputerHandler handler1 = new SystemComputerHandler();
             handler1.ComputerWidthCache(useRelations);
             WinSystem floorWin = new WinSystem(GplotShowType.ViewPlan);
@@ -90,7 +90,7 @@ namespace SAGA.GplotManage
     {
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
-            List<string> useRelations = new List<string>() { "ChillWaterLoop" };
+            List<string> useRelations = RelationTypeManager.GetSystemRelationTypeNames(); 
             SystemComputerHandler handler1 = new SystemComputerHandler();
             handler1.ComputerWidthCache(useRelations);
             WinSystem floorWin = new WinSystem(GplotShowType.ViewPlan);
@@ -115,7 +115,7 @@ namespace SAGA.GplotManage
     {
         public override Result Execute(ExternalCommandData commandData, ref string message, ElementSet elements)
         {
-            List<string> useRelations = new List<string>() { "ChillWaterLoop" };
+            List<string> useRelations = RelationTypeManager.GetSystemRelationTypeNames(); 
             SystemComputerHandler handler1 = new SystemComputerHandler();
             handler1.ComputerWidthCache(useRelations);
             WinSystem verticalWin = new WinSystem(GplotShowType.VerticalPlan);

+ 1 - 0
MBI/SAGA.GplotRelationComputerManage/RelationType/RelationTypeManager.cs

@@ -227,6 +227,7 @@ namespace SAGA.GplotRelationComputerManage
         /// <returns></returns>
         public static List<string> GetSystemRelationTypeNames()
         {
+            return new List<string>() { "ChillWaterLoop" };
             return GetSystemRelationTypes().Select(r => r.Type).ToList() ;
         }
     }

+ 4 - 4
MBI/SAGA.GplotRelationComputerManage/SystemRelation/SystemComputerHandler.cs

@@ -31,10 +31,10 @@ namespace SAGA.GplotRelationComputerManage
             {
                 if (File.Exists(fileInfo))
                 {
-                    if (testFiles.All(f=>!fileInfo.Contains(f)))
-                    {
-                        continue;
-                    }
+                    //if (testFiles.All(f=>!fileInfo.Contains(f)))
+                    //{
+                    //    continue;
+                    //}
                     FloorSystemItem floorItems = context.FloorItems.GetItem(fileInfo);
                     floorItems.Parse(context);
                     floorItems.Document.CloseDocSimple();