[Fmsystem-commits] [6825] Made changes to unit loading

[Petur Thorsteinsson]

Revision: 6825
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6825
Author:   peturbjorn
Date:     2011-01-21 13:49:47 +0000 (Fri, 21 Jan 2011)
Log Message:
-----------
Made changes to unit loading

Modified Paths:
--------------
    thirdparty/BIM_converter/trunk/src/no/bimfm/ifc/v2x3/object/Project.java

Modified: 
thirdparty/BIM_converter/trunk/src/no/bimfm/ifc/v2x3/object/Project.java
===================================================================
--- thirdparty/BIM_converter/trunk/src/no/bimfm/ifc/v2x3/object/Project.java    
2011-01-21 12:32:36 UTC (rev 6824)
+++ thirdparty/BIM_converter/trunk/src/no/bimfm/ifc/v2x3/object/Project.java    
2011-01-21 13:49:47 UTC (rev 6825)
@@ -23,6 +23,10 @@
 import no.bimfm.jaxb.Units;
 import jsdai.SIfc2x3.AIfcunit;
 import jsdai.SIfc2x3.EIfcbuilding;
+import jsdai.SIfc2x3.EIfccurrencyenum;
+import jsdai.SIfc2x3.EIfcderivedunit;
+import jsdai.SIfc2x3.EIfcderivedunitenum;
+import jsdai.SIfc2x3.EIfcmonetaryunit;
 import jsdai.SIfc2x3.EIfcnamedunit;
 import jsdai.SIfc2x3.EIfcobjectdefinition;
 import jsdai.SIfc2x3.EIfcproject;
@@ -174,10 +178,27 @@
                SdaiIterator unitsIterator = units.createIterator();
                while(unitsIterator.next()) {
                        EEntity member = units.getCurrentMember(unitsIterator);
-                       unit = (EIfcnamedunit) member;
-                       String unitType = 
EIfcunitenum.toString(unit.getUnittype(null));
-                       String unitName = extractUnitName();
-                       this.units.addElement(unitType, unitName);              
        
+                       if(member.isKindOf(EIfcnamedunit.class)) {
+                               unit = (EIfcnamedunit) member;
+                               String unitType = 
EIfcunitenum.toString(unit.getUnittype(null));
+                               String unitName = extractUnitName();
+                               this.units.addElement(unitType, unitName);
+                       } else if (member.isKindOf(EIfcderivedunit.class)) {
+                               //TODO  - complete derived unit handling!
+                               EIfcderivedunit unit = (EIfcderivedunit) member;
+                               String unitType = 
EIfcderivedunitenum.toString(unit.getUnittype(null));
+                               String unitName = "Derived unit";
+                               if(unit.testUserdefinedtype(null)) {
+                                       unitName = unitName + ": " + 
unit.getUserdefinedtype(null);
+                               }
+                               this.units.addElement(unitType, unitName);
+                       } else if (member.isKindOf(EIfcmonetaryunit.class)) {
+                               EIfcmonetaryunit unit = (EIfcmonetaryunit) 
member;
+                               String unitType = "IfcMonetaryUnit";
+                               String unitName = 
EIfccurrencyenum.toString(unit.getCurrency(null));
+                               this.units.addElement(unitType, unitName);
+                       }
+                               
                }
        }