Преглед на файлове

mxg:修改文件命令空间

mengxiangge преди 5 години
родител
ревизия
e74df55c26
променени са 40 файла, в които са добавени 57 реда и са изтрити 80 реда
  1. 1 0
      JBIM/JBIM/BimObject.cs
  2. 1 6
      JBIM/JBIM/Common/EnumExtensions.cs
  3. 1 5
      JBIM/JBIM/Common/PropertyCache.cs
  4. 1 0
      JBIM/JBIM/Common/TypeDefinitonAttribute.cs
  5. 1 0
      JBIM/JBIM/Common/TypeDefinitonUtil.cs
  6. 1 0
      JBIM/JBIM/Component/BoundarySegment.cs
  7. 1 0
      JBIM/JBIM/Component/Connector.cs
  8. 1 0
      JBIM/JBIM/Component/Duct.cs
  9. 1 0
      JBIM/JBIM/Component/MepSystem.cs
  10. 1 0
      JBIM/JBIM/Component/MepSystemType.cs
  11. 1 0
      JBIM/JBIM/Component/Pipe.cs
  12. 1 0
      JBIM/JBIM/Component/Space.cs
  13. 1 0
      JBIM/JBIM/Component/VisibleComponentObject.cs
  14. 1 7
      JBIM/JBIM/Definition/ConnectorShape.cs
  15. 1 5
      JBIM/JBIM/Definition/GeometryLocation.cs
  16. 1 6
      JBIM/JBIM/Definition/TypeDefinition.cs
  17. 1 5
      JBIM/JBIM/Definition/XYZ.cs
  18. 1 0
      JBIM/JBIM/Relationship/RelationshipBase.cs
  19. 1 6
      JBIM/RevitExport/Export/ElementWrapper.cs
  20. 1 4
      JBIM/RevitExport/Export/ExportInstance.cs
  21. 2 5
      JBIM/RevitExport/Parse/IParseElement.cs
  22. 2 6
      JBIM/RevitExport/Parse/ParseContext.cs
  23. 2 4
      JBIM/RevitExport/Parse/ParseInstance.cs
  24. BIN
      JBIM/RevitExport/bin/Debug/RevitExport.dll
  25. BIN
      JBIM/RevitExport/bin/Debug/RevitExport.pdb
  26. 1 0
      JBIM/RevitToJBim/Common/Converter.cs
  27. 2 0
      JBIM/RevitToJBim/ComponentParse/ParseBase.cs
  28. 3 0
      JBIM/RevitToJBim/ComponentParse/ParseConnector.cs
  29. 2 0
      JBIM/RevitToJBim/ComponentParse/ParseCore.cs
  30. 5 2
      JBIM/RevitToJBim/ComponentParse/ParseDuct.cs
  31. 1 0
      JBIM/RevitToJBim/ComponentParse/ParseMepSystem.cs
  32. 3 0
      JBIM/RevitToJBim/ComponentParse/ParsePipe.cs
  33. 3 0
      JBIM/RevitToJBim/ComponentParse/ParseSpace.cs
  34. 3 0
      JBIM/RevitToJBim/JBimParseContext.cs
  35. 1 0
      JBIM/RevitToJBim/JsonConverter/XYZConverter.cs
  36. 1 5
      JBIM/RevitToJBim/ParseData/ElementOneToManyRel.cs
  37. 1 7
      JBIM/RevitToJBim/ParseData/ElementOneToOneRel.cs
  38. 3 7
      JBIM/RevitToJBim/ParseData/ElementRelationShip.cs
  39. 1 0
      JBIM/RevitToJBim/RevitToJBimParser.cs
  40. 1 0
      JBIM/RevitToJBim/TestExport.cs

+ 1 - 0
JBIM/JBIM/BimObject.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM
 {

+ 1 - 6
JBIM/JBIM/Common/EnumExtensions.cs

@@ -5,15 +5,10 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JBIM
+namespace JBIM.Common
 {
     public static class EnumExtensions
     {

+ 1 - 5
JBIM/JBIM/Common/PropertyCache.cs

@@ -5,14 +5,10 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JBIM
+namespace JBIM.Common
 {
     public static class PropertyCache
     {

+ 1 - 0
JBIM/JBIM/Common/TypeDefinitonAttribute.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using JBIM.Definition;
 
 namespace JBIM.Common
 {

+ 1 - 0
JBIM/JBIM/Common/TypeDefinitonUtil.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using JBIM.Definition;
 
 namespace JBIM.Common
 {

+ 1 - 0
JBIM/JBIM/Component/BoundarySegment.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/Connector.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/Duct.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/MepSystem.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/MepSystemType.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/Pipe.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/Space.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 0
JBIM/JBIM/Component/VisibleComponentObject.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using JBIM.Definition;
 
 namespace JBIM.Component
 {

+ 1 - 7
JBIM/JBIM/Definition/ConnectorShape.cs

@@ -5,13 +5,7 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JBIM
+namespace JBIM.Definition
 {
     /// <summary>
     /// 连接点形状

+ 1 - 5
JBIM/JBIM/Definition/GeometryLocation.cs

@@ -5,13 +5,9 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JBIM
+namespace JBIM.Definition
 {
     /// <summary>
     /// 定位类型

+ 1 - 6
JBIM/JBIM/Definition/TypeDefinition.cs

@@ -5,14 +5,9 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JBIM
+namespace JBIM.Definition
 {
     /*
       类型Id范围:[-10000,-19999)

+ 1 - 5
JBIM/JBIM/Definition/XYZ.cs

@@ -5,13 +5,9 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace JBIM
+namespace JBIM.Definition
 {
     public class XYZ
     {

+ 1 - 0
JBIM/JBIM/Relationship/RelationshipBase.cs

@@ -12,6 +12,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM.Common;
+using JBIM.Definition;
 
 namespace JBIM.Relationship
 {

+ 1 - 6
JBIM/RevitExport/Export/ElementWrapper.cs

@@ -1,11 +1,6 @@
 using Autodesk.Revit.DB;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RevitExport
+namespace RevitExport.Export
 {
     /// <summary>
     /// 元素包装

+ 1 - 4
JBIM/RevitExport/Export/ExportInstance.cs

@@ -7,11 +7,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RevitExport
+namespace RevitExport.Export
 {
     /*
      * 使用event形式,将Export和Parse关联断开

+ 2 - 5
JBIM/RevitExport/Parse/IParseElement.cs

@@ -5,13 +5,10 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using RevitExport.Export;
 
-namespace RevitExport
+namespace RevitExport.Parse
 {
     /// <summary>
     /// 解析元素类

+ 2 - 6
JBIM/RevitExport/Parse/ParseContext.cs

@@ -5,13 +5,9 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using RevitExport.Export;
 
-namespace RevitExport
+namespace RevitExport.Parse
 {
     /// <summary>
     /// 解析上下文信息

+ 2 - 4
JBIM/RevitExport/Parse/ParseInstance.cs

@@ -5,13 +5,11 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using RevitExport.Export;
 
-namespace RevitExport
+namespace RevitExport.Parse
 {
     /*
      * 最好由导出类控制,导出的开始和结束。这样有一个好处是可以挂接多个解析类。

BIN
JBIM/RevitExport/bin/Debug/RevitExport.dll


BIN
JBIM/RevitExport/bin/Debug/RevitExport.pdb


+ 1 - 0
JBIM/RevitToJBim/Common/Converter.cs

@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using JBIM.Definition;
 using SAGA.RevitUtils.Extends;
 
 namespace RevitToJBim.Common

+ 2 - 0
JBIM/RevitToJBim/ComponentParse/ParseBase.cs

@@ -12,6 +12,8 @@ using System.Text;
 using System.Threading.Tasks;
 using JBIM;
 using RevitExport;
+using RevitExport.Export;
+using RevitExport.Parse;
 using RevitToJBim.Common;
 
 namespace RevitToJBim.ComponentParse

+ 3 - 0
JBIM/RevitToJBim/ComponentParse/ParseConnector.cs

@@ -13,9 +13,12 @@ using System.Threading.Tasks;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Mechanical;
 using JBIM;
+using JBIM.Definition;
 using JBIM.Relationship;
 using RevitExport;
+using RevitExport.Export;
 using RevitToJBim.Common;
+using RevitToJBim.ParseData;
 using SAGA.RevitUtils.MEP;
 using JConnector = JBIM.Component.Connector;
 

+ 2 - 0
JBIM/RevitToJBim/ComponentParse/ParseCore.cs

@@ -14,7 +14,9 @@ using System.Threading.Tasks;
 using Autodesk.Revit.DB;
 using JBIM;
 using JBIM.Component;
+using JBIM.Definition;
 using RevitExport;
+using RevitExport.Export;
 using RevitToJBim.Common;
 using Connector = JBIM.Component.Connector;
 

+ 5 - 2
JBIM/RevitToJBim/ComponentParse/ParseDuct.cs

@@ -14,13 +14,16 @@ using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Mechanical;
 using Autodesk.Revit.DB.Plumbing;
 using JBIM;
+using JBIM.Definition;
 using RevitExport;
+using RevitExport.Export;
 using RevitToJBim.Common;
+using RevitToJBim.ParseData;
 using SAGA.RevitUtils.Extends;
 using SAGA.RevitUtils.MEP;
-using JDuctShape = JBIM.DuctShape;
+using JDuctShape = JBIM.Definition.DuctShape;
 using JDuct = JBIM.Component.Duct;
-using XYZ = JBIM.XYZ;
+using XYZ = JBIM.Definition.XYZ;
 
 namespace RevitToJBim.ComponentParse
 {

+ 1 - 0
JBIM/RevitToJBim/ComponentParse/ParseMepSystem.cs

@@ -15,6 +15,7 @@ using Autodesk.Revit.DB.Mechanical;
 using Autodesk.Revit.DB.Plumbing;
 using JBIM;
 using RevitExport;
+using RevitExport.Export;
 using JMepSystem = JBIM.Component.MepSystem;
 using JMepSystemType = JBIM.Component.MepSystemType;
 namespace RevitToJBim.ComponentParse

+ 3 - 0
JBIM/RevitToJBim/ComponentParse/ParsePipe.cs

@@ -12,8 +12,11 @@ using System.Text;
 using System.Threading.Tasks;
 using Autodesk.Revit.DB.Plumbing;
 using JBIM;
+using JBIM.Definition;
 using RevitExport;
+using RevitExport.Export;
 using RevitToJBim.Common;
+using RevitToJBim.ParseData;
 using SAGA.RevitUtils.Extends;
 using SAGA.RevitUtils.MEP;
 using JPipe=JBIM.Component.Pipe;

+ 3 - 0
JBIM/RevitToJBim/ComponentParse/ParseSpace.cs

@@ -18,6 +18,9 @@ using SAGA.RevitUtils.Extends;
 using JSpace = JBIM.Component.Space;
 using JBoundarySegment = JBIM.Component.BoundarySegment;
 using Autodesk.Revit.DB;
+using JBIM.Definition;
+using RevitExport.Export;
+using RevitToJBim.ParseData;
 
 namespace RevitToJBim.ComponentParse
 {

+ 3 - 0
JBIM/RevitToJBim/JBimParseContext.cs

@@ -12,8 +12,11 @@ using JBIM.Common;
 using JBIM.Component;
 using JBIM.Relationship;
 using RevitExport;
+using RevitExport.Export;
+using RevitExport.Parse;
 using RevitToJBim.ComponentParse;
 using RevitToJBim.JsonConverter;
+using RevitToJBim.ParseData;
 
 namespace RevitToJBim
 {

+ 1 - 0
JBIM/RevitToJBim/JsonConverter/XYZConverter.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using JBIM;
+using JBIM.Definition;
 using Newtonsoft.Json;
 
 namespace RevitToJBim.JsonConverter

+ 1 - 5
JBIM/RevitToJBim/ParseData/ElementOneToManyRel.cs

@@ -5,13 +5,9 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace RevitToJBim
+namespace RevitToJBim.ParseData
 {
     public class ElementOneToManyRel : ElementRelationShip
     {

+ 1 - 7
JBIM/RevitToJBim/ParseData/ElementOneToOneRel.cs

@@ -5,13 +5,7 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RevitToJBim
+namespace RevitToJBim.ParseData
 {
     public class ElementOneToOneRel : ElementRelationShip
     {

+ 3 - 7
JBIM/RevitToJBim/ParseData/ElementRelationShip.cs

@@ -5,14 +5,10 @@
  * 版本号:v1.0
  *  -------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JBIM;
+using JBIM.Common;
+using JBIM.Definition;
 
-namespace RevitToJBim
+namespace RevitToJBim.ParseData
 {
     public class ElementRelationShip
     {

+ 1 - 0
JBIM/RevitToJBim/RevitToJBimParser.cs

@@ -12,6 +12,7 @@ using System.Text;
 using System.Threading.Tasks;
 using JBIM;
 using RevitExport;
+using RevitExport.Parse;
 using RevitToJBim.ComponentParse;
 
 namespace RevitToJBim

+ 1 - 0
JBIM/RevitToJBim/TestExport.cs

@@ -17,6 +17,7 @@ using Autodesk.Revit.DB.Mechanical;
 using Autodesk.Revit.DB.Plumbing;
 using Autodesk.Revit.UI;
 using RevitExport;
+using RevitExport.Export;
 using RevitToJBim.ComponentParse;
 using SAGA.RevitUtils;
 using SAGA.RevitUtils.Extends;