Ignore:
Timestamp:
21/02/12 08:22:21 (8 years ago)
Author:
mnagni
Message:

The migration process now includes
1) deployment_data files
2) XML document hash
3) full Dojo support


Location:
mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema
Files:
100 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/directposition.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:31 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
     
    4040    def __init__(self): 
    4141 
     42        self._CRS_sc_singlecrs = None 
    4243        self._CRS_sc_compoundcrs = None 
    43         self._CRS_sc_singlecrs = None 
    4444        self.dimension = None 
    4545        self.coordinate = [] 
     
    4848    @property 
    4949    def CRS(self):       
     50        if(has_value(self._CRS_sc_singlecrs)): 
     51            return self._CRS_sc_singlecrs 
    5052        if(has_value(self._CRS_sc_compoundcrs)): 
    5153            return self._CRS_sc_compoundcrs 
    52         if(has_value(self._CRS_sc_singlecrs)): 
    53             return self._CRS_sc_singlecrs 
    5454        return  None 
    5555 
     
    5757    def CRS(self, value):        
    5858        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     59        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
     60            self._CRS_sc_singlecrs = value 
     61            self._CRS_sc_compoundcrs = None 
    5962        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
    6063            self._CRS_sc_compoundcrs = value 
    6164            self._CRS_sc_singlecrs = None 
    62         if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
    63             self._CRS_sc_singlecrs = value 
    64             self._CRS_sc_compoundcrs = None 
    6565 
    6666    def __key(self): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_affineplacement.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:37 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arc.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:12 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcbybulge.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstring.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstringbybulge.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bezier.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bicubicgrid.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bilineargrid.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinecurve.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurfaceform.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:27 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_unspecified = "unspecified"  
     38    cl_cylindrical = "cylindrical"  
     39    cl_planar = "planar"  
    3740    cl_conical = "conical"  
    38     cl_planar = "planar"  
    39     cl_cylindrical = "cylindrical"  
     41    cl_spherical = "spherical"  
    4042    cl_toroidal = "toroidal"  
    41     cl_unspecified = "unspecified"  
    42     cl_spherical = "spherical"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_circle.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_clothoid.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
     44        self.startParameter = None 
    4445        self.endParameter = None 
    45         self.startParameter = None 
    4646        self.numDerivativesAtEnd = None 
    4747        self.curve = None 
     
    9494 
    9595    def __key(self): 
    96         return (self.endParameter, self.startParameter, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
     96        return (self.startParameter, self.endParameter, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
    9797 
    9898    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cone.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_conic.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:04 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cubicspline.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:30 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    4848        self.numDerivativesAtStart = None 
    4949        self.degree = None 
     50        self.vectorAtEnd = [] 
    5051        self.vectorAtStart = [] 
    51         self.vectorAtEnd = [] 
    5252        self.numDerivativeInterior = None 
    5353        self.controlPoints = None 
     
    103103 
    104104    @property 
     105    def vectorAtEnd(self):       
     106        return self._gm_polynomialspline.vectorAtEnd 
     107 
     108    @vectorAtEnd.setter 
     109    def vectorAtEnd(self, value):        
     110            self._gm_polynomialspline.vectorAtEnd = value 
     111 
     112    @property 
    105113    def vectorAtStart(self):     
    106114        return self._gm_polynomialspline.vectorAtStart 
     
    109117    def vectorAtStart(self, value):      
    110118            self._gm_polynomialspline.vectorAtStart = value 
    111  
    112     @property 
    113     def vectorAtEnd(self):       
    114         return self._gm_polynomialspline.vectorAtEnd 
    115  
    116     @vectorAtEnd.setter 
    117     def vectorAtEnd(self, value):        
    118             self._gm_polynomialspline.vectorAtEnd = value 
    119119 
    120120    @property 
     
    135135 
    136136    def __key(self): 
    137         return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtStart, self.vectorAtEnd, self.numDerivativeInterior, self.controlPoints) 
     137        return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtEnd, self.vectorAtStart, self.numDerivativeInterior, self.controlPoints) 
    138138 
    139139    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cylinder.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_envelope.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:29 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericcurve.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:08 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericsurface.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:27 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_geodesic.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_geodesicstring.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_griddedsurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_knot.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:35 
     24Created on 16-Feb-2012 16:18:08 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_knottype.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_quasiuniform = "quasiUniform"  
     38    cl_piecewisebezier = "piecewiseBezier"  
    3739    cl_uniform = "uniform"  
    38     cl_piecewisebezier = "piecewiseBezier"  
    39     cl_quasiuniform = "quasiUniform"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_linesegment.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_linestring.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_offsetcurve.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:28 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
    44         self._baseCurve_gm_arcstringbybulge = None 
    45         self._baseCurve_gm_linestring = None 
     44        self._baseCurve_gm_splinecurve = None 
     45        self._baseCurve_gm_offsetcurve = None 
    4646        self._baseCurve_gm_arcstring = None 
    47         self._baseCurve_gm_clothoid = None 
    4847        self._baseCurve_gm_conic = None 
    4948        self._baseCurve_gm_geodesicstring = None 
    50         self._baseCurve_gm_offsetcurve = None 
    51         self._baseCurve_gm_splinecurve = None 
     49        self._baseCurve_gm_linestring = None 
     50        self._baseCurve_gm_arcstringbybulge = None 
     51        self._baseCurve_gm_clothoid = None 
    5252        self.refDirection = None 
    5353        self.numDerivativesAtEnd = None 
     
    6161    @property 
    6262    def baseCurve(self):         
    63         if(has_value(self._baseCurve_gm_arcstringbybulge)): 
    64             return self._baseCurve_gm_arcstringbybulge 
    65         if(has_value(self._baseCurve_gm_linestring)): 
    66             return self._baseCurve_gm_linestring 
     63        if(has_value(self._baseCurve_gm_splinecurve)): 
     64            return self._baseCurve_gm_splinecurve 
     65        if(has_value(self._baseCurve_gm_offsetcurve)): 
     66            return self._baseCurve_gm_offsetcurve 
    6767        if(has_value(self._baseCurve_gm_arcstring)): 
    6868            return self._baseCurve_gm_arcstring 
    69         if(has_value(self._baseCurve_gm_clothoid)): 
    70             return self._baseCurve_gm_clothoid 
    7169        if(has_value(self._baseCurve_gm_conic)): 
    7270            return self._baseCurve_gm_conic 
    7371        if(has_value(self._baseCurve_gm_geodesicstring)): 
    7472            return self._baseCurve_gm_geodesicstring 
    75         if(has_value(self._baseCurve_gm_offsetcurve)): 
    76             return self._baseCurve_gm_offsetcurve 
    77         if(has_value(self._baseCurve_gm_splinecurve)): 
    78             return self._baseCurve_gm_splinecurve 
     73        if(has_value(self._baseCurve_gm_linestring)): 
     74            return self._baseCurve_gm_linestring 
     75        if(has_value(self._baseCurve_gm_arcstringbybulge)): 
     76            return self._baseCurve_gm_arcstringbybulge 
     77        if(has_value(self._baseCurve_gm_clothoid)): 
     78            return self._baseCurve_gm_clothoid 
    7979        return  None 
    8080 
     
    8282    def baseCurve(self, value):  
    8383        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     84        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve.GM_SplineCurve": 
     85            self._baseCurve_gm_splinecurve = value 
     86            self._baseCurve_gm_offsetcurve = None 
     87            self._baseCurve_gm_arcstring = None 
     88            self._baseCurve_gm_conic = None 
     89            self._baseCurve_gm_geodesicstring = None 
     90            self._baseCurve_gm_linestring = None 
     91            self._baseCurve_gm_arcstringbybulge = None 
     92            self._baseCurve_gm_clothoid = None 
     93        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_offsetcurve.GM_OffsetCurve": 
     94            self._baseCurve_gm_offsetcurve = value 
     95            self._baseCurve_gm_splinecurve = None 
     96            self._baseCurve_gm_arcstring = None 
     97            self._baseCurve_gm_conic = None 
     98            self._baseCurve_gm_geodesicstring = None 
     99            self._baseCurve_gm_linestring = None 
     100            self._baseCurve_gm_arcstringbybulge = None 
     101            self._baseCurve_gm_clothoid = None 
     102        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring.GM_ArcString": 
     103            self._baseCurve_gm_arcstring = value 
     104            self._baseCurve_gm_splinecurve = None 
     105            self._baseCurve_gm_offsetcurve = None 
     106            self._baseCurve_gm_conic = None 
     107            self._baseCurve_gm_geodesicstring = None 
     108            self._baseCurve_gm_linestring = None 
     109            self._baseCurve_gm_arcstringbybulge = None 
     110            self._baseCurve_gm_clothoid = None 
     111        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_conic.GM_Conic": 
     112            self._baseCurve_gm_conic = value 
     113            self._baseCurve_gm_splinecurve = None 
     114            self._baseCurve_gm_offsetcurve = None 
     115            self._baseCurve_gm_arcstring = None 
     116            self._baseCurve_gm_geodesicstring = None 
     117            self._baseCurve_gm_linestring = None 
     118            self._baseCurve_gm_arcstringbybulge = None 
     119            self._baseCurve_gm_clothoid = None 
     120        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring.GM_GeodesicString": 
     121            self._baseCurve_gm_geodesicstring = value 
     122            self._baseCurve_gm_splinecurve = None 
     123            self._baseCurve_gm_offsetcurve = None 
     124            self._baseCurve_gm_arcstring = None 
     125            self._baseCurve_gm_conic = None 
     126            self._baseCurve_gm_linestring = None 
     127            self._baseCurve_gm_arcstringbybulge = None 
     128            self._baseCurve_gm_clothoid = None 
     129        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring.GM_LineString": 
     130            self._baseCurve_gm_linestring = value 
     131            self._baseCurve_gm_splinecurve = None 
     132            self._baseCurve_gm_offsetcurve = None 
     133            self._baseCurve_gm_arcstring = None 
     134            self._baseCurve_gm_conic = None 
     135            self._baseCurve_gm_geodesicstring = None 
     136            self._baseCurve_gm_arcstringbybulge = None 
     137            self._baseCurve_gm_clothoid = None 
    84138        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstringbybulge.GM_ArcStringByBulge": 
    85139            self._baseCurve_gm_arcstringbybulge = value 
    86             self._baseCurve_gm_linestring = None 
    87             self._baseCurve_gm_arcstring = None 
    88             self._baseCurve_gm_clothoid = None 
    89             self._baseCurve_gm_conic = None 
    90             self._baseCurve_gm_geodesicstring = None 
    91             self._baseCurve_gm_offsetcurve = None 
    92             self._baseCurve_gm_splinecurve = None 
    93         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring.GM_LineString": 
    94             self._baseCurve_gm_linestring = value 
    95             self._baseCurve_gm_arcstringbybulge = None 
    96             self._baseCurve_gm_arcstring = None 
    97             self._baseCurve_gm_clothoid = None 
    98             self._baseCurve_gm_conic = None 
    99             self._baseCurve_gm_geodesicstring = None 
    100             self._baseCurve_gm_offsetcurve = None 
    101             self._baseCurve_gm_splinecurve = None 
    102         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring.GM_ArcString": 
    103             self._baseCurve_gm_arcstring = value 
    104             self._baseCurve_gm_arcstringbybulge = None 
    105             self._baseCurve_gm_linestring = None 
    106             self._baseCurve_gm_clothoid = None 
    107             self._baseCurve_gm_conic = None 
    108             self._baseCurve_gm_geodesicstring = None 
    109             self._baseCurve_gm_offsetcurve = None 
    110             self._baseCurve_gm_splinecurve = None 
     140            self._baseCurve_gm_splinecurve = None 
     141            self._baseCurve_gm_offsetcurve = None 
     142            self._baseCurve_gm_arcstring = None 
     143            self._baseCurve_gm_conic = None 
     144            self._baseCurve_gm_geodesicstring = None 
     145            self._baseCurve_gm_linestring = None 
     146            self._baseCurve_gm_clothoid = None 
    111147        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_clothoid.GM_Clothoid": 
    112148            self._baseCurve_gm_clothoid = value 
    113             self._baseCurve_gm_arcstringbybulge = None 
    114             self._baseCurve_gm_linestring = None 
    115             self._baseCurve_gm_arcstring = None 
    116             self._baseCurve_gm_conic = None 
    117             self._baseCurve_gm_geodesicstring = None 
    118             self._baseCurve_gm_offsetcurve = None 
    119             self._baseCurve_gm_splinecurve = None 
    120         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_conic.GM_Conic": 
    121             self._baseCurve_gm_conic = value 
    122             self._baseCurve_gm_arcstringbybulge = None 
    123             self._baseCurve_gm_linestring = None 
    124             self._baseCurve_gm_arcstring = None 
    125             self._baseCurve_gm_clothoid = None 
    126             self._baseCurve_gm_geodesicstring = None 
    127             self._baseCurve_gm_offsetcurve = None 
    128             self._baseCurve_gm_splinecurve = None 
    129         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring.GM_GeodesicString": 
    130             self._baseCurve_gm_geodesicstring = value 
    131             self._baseCurve_gm_arcstringbybulge = None 
    132             self._baseCurve_gm_linestring = None 
    133             self._baseCurve_gm_arcstring = None 
    134             self._baseCurve_gm_clothoid = None 
    135             self._baseCurve_gm_conic = None 
    136             self._baseCurve_gm_offsetcurve = None 
    137             self._baseCurve_gm_splinecurve = None 
    138         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_offsetcurve.GM_OffsetCurve": 
    139             self._baseCurve_gm_offsetcurve = value 
    140             self._baseCurve_gm_arcstringbybulge = None 
    141             self._baseCurve_gm_linestring = None 
    142             self._baseCurve_gm_arcstring = None 
    143             self._baseCurve_gm_clothoid = None 
    144             self._baseCurve_gm_conic = None 
    145             self._baseCurve_gm_geodesicstring = None 
    146             self._baseCurve_gm_splinecurve = None 
    147         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve.GM_SplineCurve": 
    148             self._baseCurve_gm_splinecurve = value 
    149             self._baseCurve_gm_arcstringbybulge = None 
    150             self._baseCurve_gm_linestring = None 
    151             self._baseCurve_gm_arcstring = None 
    152             self._baseCurve_gm_clothoid = None 
    153             self._baseCurve_gm_conic = None 
    154             self._baseCurve_gm_geodesicstring = None 
    155             self._baseCurve_gm_offsetcurve = None 
     149            self._baseCurve_gm_splinecurve = None 
     150            self._baseCurve_gm_offsetcurve = None 
     151            self._baseCurve_gm_arcstring = None 
     152            self._baseCurve_gm_conic = None 
     153            self._baseCurve_gm_geodesicstring = None 
     154            self._baseCurve_gm_linestring = None 
     155            self._baseCurve_gm_arcstringbybulge = None 
    156156 
    157157    @property 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_parametriccurvesurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:04 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_placement.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:33 
     24Created on 16-Feb-2012 16:18:05 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_pointarray.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:30 
     24Created on 16-Feb-2012 16:18:11 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_pointgrid.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:37 
     24Created on 16-Feb-2012 16:18:08 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_pointref.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:36 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_polygon.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_polyhedralsurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:00 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_surface = GM_Surface()          
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self.orientation = None 
     60        self._patch_gm_polygon = [] 
    6061        self._patch_gm_parametriccurvesurface = [] 
    61         self._patch_gm_polygon = [] 
    6262        self.patch = [] 
    6363        self._proxy_gm_orientablesurface = None 
    6464        self._proxy_gm_orientablecurve = None 
     65        self._containingPrimitive_gm_orientableprimitive = [] 
    6566        self._containingPrimitive_gm_point = [] 
    66         self._containingPrimitive_gm_orientableprimitive = [] 
    6767        self._containingPrimitive_gm_solid = [] 
    6868        self.complex = [] 
     69        self._primitive_gm_orientableprimitive = None 
    6970        self._primitive_gm_point = None 
    70         self._primitive_gm_orientableprimitive = None 
    7171        self._primitive_gm_solid = None 
    7272        super(GM_PolyhedralSurface, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_polynomialspline.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    4848        self.numDerivativesAtStart = None 
    4949        self.degree = None 
     50        self.vectorAtEnd = [] 
    5051        self.vectorAtStart = [] 
    51         self.vectorAtEnd = [] 
    5252        self.numDerivativeInterior = None 
    5353        self.controlPoints = None 
     
    119119 
    120120    def __key(self): 
    121         return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtStart, self.vectorAtEnd, self.numDerivativeInterior, self.controlPoints) 
     121        return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtEnd, self.vectorAtStart, self.numDerivativeInterior, self.controlPoints) 
    122122 
    123123    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_position.py

    r8089 r8091  
    2525 
    2626''' 
    27 Created on 14-Feb-2012 17:19:28 
     27Created on 16-Feb-2012 16:18:11 
    2828 
    2929@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_sphere.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_splinecurve.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:04 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_splinecurveform.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_ellipticarc = "ellipticArc"  
     38    cl_hyperbolicarc = "hyperbolicArc"  
     39    cl_circulararc = "circularArc"  
    3740    cl_parabolicarc = "parabolicArc"  
    38     cl_hyperbolicarc = "hyperbolicArc"  
    3941    cl_polylineform = "polylineForm"  
    40     cl_ellipticarc = "ellipticArc"  
    41     cl_circulararc = "circularArc"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_tin.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_triangulatedsurface = GM_TriangulatedSurface()          
    4343 
     44        self._containedPrimitive_gm_orientableprimitive = [] 
    4445        self._containedPrimitive_gm_point = [] 
    45         self._containedPrimitive_gm_orientableprimitive = [] 
    4646        self._containedPrimitive_gm_solid = [] 
     47        self._composite_gm_compositecurve = [] 
     48        self._composite_gm_compositesolid = [] 
     49        self._composite_gm_compositesurface = [] 
    4750        self._composite_gm_compositepoint = [] 
    48         self._composite_gm_compositesolid = [] 
    49         self._composite_gm_compositecurve = [] 
    50         self._composite_gm_compositesurface = [] 
    5151        self.composite = [] 
    5252        self.orientation = None 
     53        self._containingPrimitive_gm_orientableprimitive = [] 
    5354        self._containingPrimitive_gm_point = [] 
    54         self._containingPrimitive_gm_orientableprimitive = [] 
    5555        self._containingPrimitive_gm_solid = [] 
     56        self._topology_tp_directedtopo = [] 
     57        self._topology_tp_edge = [] 
     58        self._topology_tp_node = [] 
     59        self._topology_tp_solid = [] 
    5660        self._topology_tp_face = [] 
    57         self._topology_tp_solid = [] 
    58         self._topology_tp_node = [] 
    59         self._topology_tp_edge = [] 
    60         self._topology_tp_directedtopo = [] 
    6161        self.stopLines = [] 
     62        self._CRS_sc_singlecrs = None 
    6263        self._CRS_sc_compoundcrs = None 
    63         self._CRS_sc_singlecrs = None 
    6464        self.patch = [] 
     65        self._patch_gm_polygon = [] 
    6566        self._patch_gm_parametriccurvesurface = [] 
    66         self._patch_gm_polygon = [] 
    6767        self._proxy_gm_orientablesurface = None 
    6868        self._proxy_gm_orientablecurve = None 
     69        self._primitive_gm_orientableprimitive = None 
    6970        self._primitive_gm_point = None 
    70         self._primitive_gm_orientableprimitive = None 
    7171        self._primitive_gm_solid = None 
    7272        self.complex = [] 
     73        self.controlPoint = [] 
    7374        self.breakLines = [] 
    74         self.controlPoint = [] 
    7575        self.maxLength = None 
    7676        super(GM_Tin, self).__init__() 
     
    173173 
    174174    def __key(self): 
    175         return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.topology, self.stopLines, self.CRS, self.patch, self.patch, self.proxy, self.primitive, self.complex, self.breakLines, self.controlPoint, self.maxLength) 
     175        return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.topology, self.stopLines, self.CRS, self.patch, self.patch, self.proxy, self.primitive, self.complex, self.controlPoint, self.breakLines, self.maxLength) 
    176176 
    177177    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_triangle.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_triangulatedsurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:00 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_polyhedralsurface = GM_PolyhedralSurface()      
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self.orientation = None 
     60        self._patch_gm_polygon = [] 
    6061        self._patch_gm_parametriccurvesurface = [] 
    61         self._patch_gm_polygon = [] 
    6262        self.patch = [] 
    6363        self._proxy_gm_orientablesurface = None 
    6464        self._proxy_gm_orientablecurve = None 
     65        self._containingPrimitive_gm_orientableprimitive = [] 
    6566        self._containingPrimitive_gm_point = [] 
    66         self._containingPrimitive_gm_orientableprimitive = [] 
    6767        self._containingPrimitive_gm_solid = [] 
    6868        self.complex = [] 
     69        self._primitive_gm_orientableprimitive = None 
    6970        self._primitive_gm_point = None 
    70         self._primitive_gm_orientableprimitive = None 
    7171        self._primitive_gm_solid = None 
    7272        super(GM_TriangulatedSurface, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_aggregates/gm_aggregate.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:12 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_object = GM_Object()    
    4343 
     44        self._CRS_sc_singlecrs = None 
    4445        self._CRS_sc_compoundcrs = None 
    45         self._CRS_sc_singlecrs = None 
     46        self._element_gm_complex = [] 
    4647        self._element_gm_primitive = [] 
    4748        self._element_gm_aggregate = [] 
    48         self._element_gm_complex = [] 
    4949        super(GM_Aggregate, self).__init__() 
    5050 
     
    6060    def element(self):   
    6161        ret = [] 
     62        for item in self._element_gm_complex: 
     63            ret.append(item) 
    6264        for item in self._element_gm_primitive: 
    6365            ret.append(item) 
    6466        for item in self._element_gm_aggregate: 
    65             ret.append(item) 
    66         for item in self._element_gm_complex: 
    6767            ret.append(item) 
    6868        return ret 
     
    7171    def element(self, value):    
    7272        if isinstance(value, list): 
     73            self._element_gm_complex[:] 
    7374            self._element_gm_primitive[:] 
    7475            self._element_gm_aggregate[:] 
    75             self._element_gm_complex[:] 
    7676            for item in value: 
    7777                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     78                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_complex.GM_Complex": 
     79                    self._element_gm_complex.append(item) 
     80                    continue 
    7881                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_primitive.GM_Primitive": 
    7982                    self._element_gm_primitive.append(item) 
     
    8184                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_aggregates.gm_aggregate.GM_Aggregate": 
    8285                    self._element_gm_aggregate.append(item) 
    83                     continue 
    84                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_complex.GM_Complex": 
    85                     self._element_gm_complex.append(item) 
    8686                    continue 
    8787 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_aggregates/gm_multicurve.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.length = None 
     45        self._CRS_sc_singlecrs = None 
    4546        self._CRS_sc_compoundcrs = None 
    46         self._CRS_sc_singlecrs = None 
     47        self._element_gm_complex = [] 
    4748        self._element_gm_primitive = [] 
    4849        self._element_gm_aggregate = [] 
    49         self._element_gm_complex = [] 
    5050        super(GM_MultiCurve, self).__init__() 
    5151 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_aggregates/gm_multipoint.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_multiprimitive = GM_MultiPrimitive()    
    4343 
     44        self._CRS_sc_singlecrs = None 
    4445        self._CRS_sc_compoundcrs = None 
    45         self._CRS_sc_singlecrs = None 
     46        self._element_gm_complex = [] 
    4647        self._element_gm_primitive = [] 
    4748        self._element_gm_aggregate = [] 
    48         self._element_gm_complex = [] 
    4949        self.position = [] 
    5050        super(GM_MultiPoint, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_aggregates/gm_multiprimitive.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_aggregate = GM_Aggregate()      
    4343 
     44        self._CRS_sc_singlecrs = None 
    4445        self._CRS_sc_compoundcrs = None 
    45         self._CRS_sc_singlecrs = None 
     46        self._element_gm_complex = [] 
    4647        self._element_gm_primitive = [] 
    4748        self._element_gm_aggregate = [] 
    48         self._element_gm_complex = [] 
    4949        super(GM_MultiPrimitive, self).__init__() 
    5050 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_aggregates/gm_multisolid.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_multiprimitive = GM_MultiPrimitive()    
    4343 
     44        self._CRS_sc_singlecrs = None 
    4445        self._CRS_sc_compoundcrs = None 
    45         self._CRS_sc_singlecrs = None 
    4646        self.area = None 
     47        self._element_gm_complex = [] 
    4748        self._element_gm_primitive = [] 
    4849        self._element_gm_aggregate = [] 
    49         self._element_gm_complex = [] 
    5050        self.volume = None 
    5151        super(GM_MultiSolid, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_aggregates/gm_multisurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.perimeter = None 
     45        self._CRS_sc_singlecrs = None 
    4546        self._CRS_sc_compoundcrs = None 
    46         self._CRS_sc_singlecrs = None 
    4747        self.area = None 
     48        self._element_gm_complex = [] 
    4849        self._element_gm_primitive = [] 
    4950        self._element_gm_aggregate = [] 
    50         self._element_gm_complex = [] 
    5151        super(GM_MultiSurface, self).__init__() 
    5252 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_complex.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:17:59 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.topology = None 
     45        self._CRS_sc_singlecrs = None 
    4546        self._CRS_sc_compoundcrs = None 
    46         self._CRS_sc_singlecrs = None 
     47        self.superComplex = [] 
    4748        self.subComplex = [] 
    48         self.superComplex = [] 
     49        self._element_gm_orientableprimitive = [] 
    4950        self._element_gm_point = [] 
    50         self._element_gm_orientableprimitive = [] 
    5151        self._element_gm_solid = [] 
    5252        super(GM_Complex, self).__init__() 
     
    6363    def element(self):   
    6464        ret = [] 
     65        for item in self._element_gm_orientableprimitive: 
     66            ret.append(item) 
    6567        for item in self._element_gm_point: 
    66             ret.append(item) 
    67         for item in self._element_gm_orientableprimitive: 
    6868            ret.append(item) 
    6969        for item in self._element_gm_solid: 
     
    7474    def element(self, value):    
    7575        if isinstance(value, list): 
     76            self._element_gm_orientableprimitive[:] 
    7677            self._element_gm_point[:] 
    77             self._element_gm_orientableprimitive[:] 
    7878            self._element_gm_solid[:] 
    7979            for item in value: 
    8080                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     81                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
     82                    self._element_gm_orientableprimitive.append(item) 
     83                    continue 
    8184                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_point.GM_Point": 
    8285                    self._element_gm_point.append(item) 
    83                     continue 
    84                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
    85                     self._element_gm_orientableprimitive.append(item) 
    8686                    continue 
    8787                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_solid.GM_Solid": 
     
    9090 
    9191    def __key(self): 
    92         return (self.topology, self.CRS, self.subComplex, self.superComplex, self.element) 
     92        return (self.topology, self.CRS, self.superComplex, self.subComplex, self.element) 
    9393 
    9494    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_complexboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_composite.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:28 
     25Created on 16-Feb-2012 16:18:01 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.topology = None 
     45        self._CRS_sc_singlecrs = None 
    4546        self._CRS_sc_compoundcrs = None 
    46         self._CRS_sc_singlecrs = None 
     47        self.superComplex = [] 
    4748        self.subComplex = [] 
    48         self.superComplex = [] 
     49        self._element_gm_orientableprimitive = [] 
    4950        self._element_gm_point = [] 
    50         self._element_gm_orientableprimitive = [] 
    5151        self._element_gm_solid = [] 
     52        self._generator_gm_orientableprimitive = [] 
    5253        self._generator_gm_point = [] 
    53         self._generator_gm_orientableprimitive = [] 
    5454        self._generator_gm_solid = [] 
    5555        super(GM_Composite, self).__init__() 
     
    7272 
    7373    @property 
     74    def superComplex(self):      
     75        return self._gm_complex.superComplex 
     76 
     77    @superComplex.setter 
     78    def superComplex(self, value):       
     79            self._gm_complex.superComplex = value 
     80 
     81    @property 
    7482    def subComplex(self):        
    7583        return self._gm_complex.subComplex 
     
    7886    def subComplex(self, value):         
    7987            self._gm_complex.subComplex = value 
    80  
    81     @property 
    82     def superComplex(self):      
    83         return self._gm_complex.superComplex 
    84  
    85     @superComplex.setter 
    86     def superComplex(self, value):       
    87             self._gm_complex.superComplex = value 
    8888 
    8989    @property 
     
    9898    def generator(self):         
    9999        ret = [] 
     100        for item in self._generator_gm_orientableprimitive: 
     101            ret.append(item) 
    100102        for item in self._generator_gm_point: 
    101             ret.append(item) 
    102         for item in self._generator_gm_orientableprimitive: 
    103103            ret.append(item) 
    104104        for item in self._generator_gm_solid: 
     
    109109    def generator(self, value):  
    110110        if isinstance(value, list): 
     111            self._generator_gm_orientableprimitive[:] 
    111112            self._generator_gm_point[:] 
    112             self._generator_gm_orientableprimitive[:] 
    113113            self._generator_gm_solid[:] 
    114114            for item in value: 
    115115                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     116                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
     117                    self._generator_gm_orientableprimitive.append(item) 
     118                    continue 
    116119                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_point.GM_Point": 
    117120                    self._generator_gm_point.append(item) 
    118                     continue 
    119                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
    120                     self._generator_gm_orientableprimitive.append(item) 
    121121                    continue 
    122122                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_solid.GM_Solid": 
     
    125125 
    126126    def __key(self): 
    127         return (self.topology, self.CRS, self.subComplex, self.superComplex, self.element, self.generator) 
     127        return (self.topology, self.CRS, self.superComplex, self.subComplex, self.element, self.generator) 
    128128 
    129129    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_compositecurve.py

    r8089 r8091  
    1919 
    2020 
     21from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientablecurve import  GM_OrientableCurve  
    2122from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_composite import  GM_Composite  
    22 from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientablecurve import  GM_OrientableCurve  
    2323from ascore.utils import has_value 
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:35 
     26Created on 16-Feb-2012 16:18:11 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class GM_CompositeCurve(GM_Composite,GM_OrientableCurve): 
     31class GM_CompositeCurve(GM_OrientableCurve,GM_Composite): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._gm_composite = GM_Composite()      
    4344        self._gm_orientablecurve = GM_OrientableCurve()          
    44         self._gm_composite = GM_Composite()      
    45  
     45 
     46        self._containedPrimitive_gm_orientableprimitive = [] 
    4647        self._containedPrimitive_gm_point = [] 
    47         self._containedPrimitive_gm_orientableprimitive = [] 
    4848        self._containedPrimitive_gm_solid = [] 
     49        self._composite_gm_compositecurve = [] 
     50        self._composite_gm_compositesolid = [] 
     51        self._composite_gm_compositesurface = [] 
     52        self._composite_gm_compositepoint = [] 
    4953        self.composite = [] 
    50         self._composite_gm_compositepoint = [] 
    51         self._composite_gm_compositesolid = [] 
    52         self._composite_gm_compositecurve = [] 
    53         self._composite_gm_compositesurface = [] 
    5454        self.orientation = None 
     55        self._containingPrimitive_gm_orientableprimitive = [] 
    5556        self._containingPrimitive_gm_point = [] 
    56         self._containingPrimitive_gm_orientableprimitive = [] 
    5757        self._containingPrimitive_gm_solid = [] 
     58        self._element_gm_orientableprimitive = [] 
    5859        self._element_gm_point = [] 
    59         self._element_gm_orientableprimitive = [] 
    6060        self._element_gm_solid = [] 
    6161        self._generator_gm_compositecurve = [] 
    6262        self._generator_gm_curve = [] 
    6363        self.topology = None 
     64        self._topology_tp_directedtopo = [] 
     65        self._topology_tp_edge = [] 
     66        self._topology_tp_node = [] 
     67        self._topology_tp_solid = [] 
    6468        self._topology_tp_face = [] 
    65         self._topology_tp_solid = [] 
    66         self._topology_tp_node = [] 
    67         self._topology_tp_edge = [] 
    68         self._topology_tp_directedtopo = [] 
     69        self._CRS_sc_singlecrs = None 
    6970        self._CRS_sc_compoundcrs = None 
    70         self._CRS_sc_singlecrs = None 
    7171        self.subComplex = [] 
     72        self.superComplex = [] 
    7273        self._proxy_gm_orientablesurface = None 
    7374        self._proxy_gm_orientablecurve = None 
    74         self.superComplex = [] 
     75        self._primitive_gm_orientableprimitive = None 
    7576        self._primitive_gm_point = None 
    76         self._primitive_gm_orientableprimitive = None 
    7777        self._primitive_gm_solid = None 
    7878        self.complex = [] 
     
    168168    @property 
    169169    def CRS(self):       
    170         return self._gm_orientablecurve.CRS 
     170        return self._gm_composite.CRS 
    171171 
    172172    @CRS.setter 
    173173    def CRS(self, value):        
    174             self._gm_orientablecurve.CRS = value 
     174            self._gm_composite.CRS = value 
    175175 
    176176    @property 
     
    183183 
    184184    @property 
     185    def superComplex(self):      
     186        return self._gm_composite.superComplex 
     187 
     188    @superComplex.setter 
     189    def superComplex(self, value):       
     190            self._gm_composite.superComplex = value 
     191 
     192    @property 
    185193    def proxy(self):     
    186194        return self._gm_orientablecurve.proxy 
     
    191199 
    192200    @property 
    193     def superComplex(self):      
    194         return self._gm_composite.superComplex 
    195  
    196     @superComplex.setter 
    197     def superComplex(self, value):       
    198             self._gm_composite.superComplex = value 
    199  
    200     @property 
    201201    def primitive(self):         
    202202        return self._gm_orientablecurve.primitive 
     
    215215 
    216216    def __key(self): 
    217         return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.proxy, self.superComplex, self.primitive, self.complex) 
     217        return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.superComplex, self.proxy, self.primitive, self.complex) 
    218218 
    219219    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_compositepoint.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:36 
     26Created on 16-Feb-2012 16:18:09 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class GM_CompositePoint(GM_Composite,GM_Point): 
     31class GM_CompositePoint(GM_Point,GM_Composite): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._gm_composite = GM_Composite()      
    4344        self._gm_point = GM_Point()      
    44         self._gm_composite = GM_Composite()      
    45  
     45 
     46        self._containedPrimitive_gm_orientableprimitive = [] 
    4647        self._containedPrimitive_gm_point = [] 
    47         self._containedPrimitive_gm_orientableprimitive = [] 
    4848        self._containedPrimitive_gm_solid = [] 
     49        self._composite_gm_compositecurve = [] 
     50        self._composite_gm_compositesolid = [] 
     51        self._composite_gm_compositesurface = [] 
     52        self._composite_gm_compositepoint = [] 
    4953        self.composite = [] 
    50         self._composite_gm_compositepoint = [] 
    51         self._composite_gm_compositesolid = [] 
    52         self._composite_gm_compositecurve = [] 
    53         self._composite_gm_compositesurface = [] 
     54        self._containingPrimitive_gm_orientableprimitive = [] 
    5455        self._containingPrimitive_gm_point = [] 
    55         self._containingPrimitive_gm_orientableprimitive = [] 
    5656        self._containingPrimitive_gm_solid = [] 
     57        self._element_gm_orientableprimitive = [] 
    5758        self._element_gm_point = [] 
    58         self._element_gm_orientableprimitive = [] 
    5959        self._element_gm_solid = [] 
    6060        self.generator = None 
     61        self._generator_gm_orientableprimitive = [] 
    6162        self._generator_gm_point = [] 
    62         self._generator_gm_orientableprimitive = [] 
    6363        self._generator_gm_solid = [] 
    6464        self.topology = None 
     65        self._topology_tp_directedtopo = [] 
     66        self._topology_tp_edge = [] 
     67        self._topology_tp_node = [] 
     68        self._topology_tp_solid = [] 
    6569        self._topology_tp_face = [] 
    66         self._topology_tp_solid = [] 
    67         self._topology_tp_node = [] 
    68         self._topology_tp_edge = [] 
    69         self._topology_tp_directedtopo = [] 
     70        self._CRS_sc_singlecrs = None 
    7071        self._CRS_sc_compoundcrs = None 
    71         self._CRS_sc_singlecrs = None 
    7272        self.gridPoint = [] 
    7373        self.subComplex = [] 
     74        self.superComplex = [] 
    7475        self._proxy_gm_orientablesurface = None 
    7576        self._proxy_gm_orientablecurve = None 
    76         self.superComplex = [] 
    7777        self.position = None 
    7878        self.complex = [] 
     
    145145    @property 
    146146    def CRS(self):       
    147         return self._gm_point.CRS 
     147        return self._gm_composite.CRS 
    148148 
    149149    @CRS.setter 
    150150    def CRS(self, value):        
    151             self._gm_point.CRS = value 
     151            self._gm_composite.CRS = value 
    152152 
    153153    @property 
     
    168168 
    169169    @property 
     170    def superComplex(self):      
     171        return self._gm_composite.superComplex 
     172 
     173    @superComplex.setter 
     174    def superComplex(self, value):       
     175            self._gm_composite.superComplex = value 
     176 
     177    @property 
    170178    def proxy(self):     
    171179        return self._gm_point.proxy 
     
    176184 
    177185    @property 
    178     def superComplex(self):      
    179         return self._gm_composite.superComplex 
    180  
    181     @superComplex.setter 
    182     def superComplex(self, value):       
    183             self._gm_composite.superComplex = value 
    184  
    185     @property 
    186186    def position(self):  
    187187        return self._gm_point.position 
     
    200200 
    201201    def __key(self): 
    202         return (self.containedPrimitive, self.composite, self.composite, self.containingPrimitive, self.element, self.generator, self.generator, self.topology, self.topology, self.CRS, self.gridPoint, self.subComplex, self.proxy, self.superComplex, self.position, self.complex) 
     202        return (self.containedPrimitive, self.composite, self.composite, self.containingPrimitive, self.element, self.generator, self.generator, self.topology, self.topology, self.CRS, self.gridPoint, self.subComplex, self.superComplex, self.proxy, self.position, self.complex) 
    203203 
    204204    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_compositesolid.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:31 
     26Created on 16-Feb-2012 16:18:08 
    2727 
    2828@author: mnagni 
     
    4444        self._gm_solid = GM_Solid()      
    4545 
     46        self._containedPrimitive_gm_orientableprimitive = [] 
    4647        self._containedPrimitive_gm_point = [] 
    47         self._containedPrimitive_gm_orientableprimitive = [] 
    4848        self._containedPrimitive_gm_solid = [] 
     49        self.composite = [] 
     50        self._composite_gm_compositecurve = [] 
     51        self._composite_gm_compositesolid = [] 
     52        self._composite_gm_compositesurface = [] 
    4953        self._composite_gm_compositepoint = [] 
    50         self._composite_gm_compositesolid = [] 
    51         self._composite_gm_compositecurve = [] 
    52         self._composite_gm_compositesurface = [] 
    53         self.composite = [] 
     54        self._containingPrimitive_gm_orientableprimitive = [] 
    5455        self._containingPrimitive_gm_point = [] 
    55         self._containingPrimitive_gm_orientableprimitive = [] 
    5656        self._containingPrimitive_gm_solid = [] 
     57        self._element_gm_orientableprimitive = [] 
    5758        self._element_gm_point = [] 
    58         self._element_gm_orientableprimitive = [] 
    5959        self._element_gm_solid = [] 
    6060        self.generator = [] 
     61        self._generator_gm_orientableprimitive = [] 
    6162        self._generator_gm_point = [] 
    62         self._generator_gm_orientableprimitive = [] 
    6363        self._generator_gm_solid = [] 
    6464        self.topology = None 
     65        self._topology_tp_directedtopo = [] 
     66        self._topology_tp_edge = [] 
     67        self._topology_tp_node = [] 
     68        self._topology_tp_solid = [] 
    6569        self._topology_tp_face = [] 
    66         self._topology_tp_solid = [] 
    67         self._topology_tp_node = [] 
    68         self._topology_tp_edge = [] 
    69         self._topology_tp_directedtopo = [] 
     70        self._CRS_sc_singlecrs = None 
    7071        self._CRS_sc_compoundcrs = None 
    71         self._CRS_sc_singlecrs = None 
     72        self.subComplex = [] 
    7273        self.superComplex = [] 
    73         self.subComplex = [] 
    7474        self._proxy_gm_orientablesurface = None 
    7575        self._proxy_gm_orientablecurve = None 
     
    150150 
    151151    @property 
     152    def subComplex(self):        
     153        return self._gm_composite.subComplex 
     154 
     155    @subComplex.setter 
     156    def subComplex(self, value):         
     157            self._gm_composite.subComplex = value 
     158 
     159    @property 
    152160    def superComplex(self):      
    153161        return self._gm_composite.superComplex 
     
    156164    def superComplex(self, value):       
    157165            self._gm_composite.superComplex = value 
    158  
    159     @property 
    160     def subComplex(self):        
    161         return self._gm_composite.subComplex 
    162  
    163     @subComplex.setter 
    164     def subComplex(self, value):         
    165             self._gm_composite.subComplex = value 
    166166 
    167167    @property 
     
    182182 
    183183    def __key(self): 
    184         return (self.containedPrimitive, self.composite, self.composite, self.containingPrimitive, self.element, self.generator, self.generator, self.topology, self.topology, self.CRS, self.superComplex, self.subComplex, self.proxy, self.complex) 
     184        return (self.containedPrimitive, self.composite, self.composite, self.containingPrimitive, self.element, self.generator, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.superComplex, self.proxy, self.complex) 
    185185 
    186186    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_complex/gm_compositesurface.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:36 
     26Created on 16-Feb-2012 16:18:05 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class GM_CompositeSurface(GM_Composite,GM_OrientableSurface): 
     31class GM_CompositeSurface(GM_OrientableSurface,GM_Composite): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._gm_composite = GM_Composite()      
    4344        self._gm_orientablesurface = GM_OrientableSurface()      
    44         self._gm_composite = GM_Composite()      
    45  
     45 
     46        self._containedPrimitive_gm_orientableprimitive = [] 
    4647        self._containedPrimitive_gm_point = [] 
    47         self._containedPrimitive_gm_orientableprimitive = [] 
    4848        self._containedPrimitive_gm_solid = [] 
     49        self._composite_gm_compositecurve = [] 
     50        self._composite_gm_compositesolid = [] 
     51        self._composite_gm_compositesurface = [] 
     52        self._composite_gm_compositepoint = [] 
    4953        self.composite = [] 
    50         self._composite_gm_compositepoint = [] 
    51         self._composite_gm_compositesolid = [] 
    52         self._composite_gm_compositecurve = [] 
    53         self._composite_gm_compositesurface = [] 
    5454        self.orientation = None 
     55        self._containingPrimitive_gm_orientableprimitive = [] 
    5556        self._containingPrimitive_gm_point = [] 
    56         self._containingPrimitive_gm_orientableprimitive = [] 
    5757        self._containingPrimitive_gm_solid = [] 
     58        self._element_gm_orientableprimitive = [] 
    5859        self._element_gm_point = [] 
    59         self._element_gm_orientableprimitive = [] 
    6060        self._element_gm_solid = [] 
    6161        self._generator_gm_compositesurface = [] 
    6262        self._generator_gm_surface = [] 
    6363        self.topology = None 
     64        self._topology_tp_directedtopo = [] 
     65        self._topology_tp_edge = [] 
     66        self._topology_tp_node = [] 
     67        self._topology_tp_solid = [] 
    6468        self._topology_tp_face = [] 
    65         self._topology_tp_solid = [] 
    66         self._topology_tp_node = [] 
    67         self._topology_tp_edge = [] 
    68         self._topology_tp_directedtopo = [] 
     69        self._CRS_sc_singlecrs = None 
    6970        self._CRS_sc_compoundcrs = None 
    70         self._CRS_sc_singlecrs = None 
    7171        self.subComplex = [] 
     72        self.superComplex = [] 
    7273        self._proxy_gm_orientablesurface = None 
    7374        self._proxy_gm_orientablecurve = None 
    74         self.superComplex = [] 
     75        self._primitive_gm_orientableprimitive = None 
    7576        self._primitive_gm_point = None 
    76         self._primitive_gm_orientableprimitive = None 
    7777        self._primitive_gm_solid = None 
    7878        self.complex = [] 
     
    168168    @property 
    169169    def CRS(self):       
    170         return self._gm_orientablesurface.CRS 
     170        return self._gm_composite.CRS 
    171171 
    172172    @CRS.setter 
    173173    def CRS(self, value):        
    174             self._gm_orientablesurface.CRS = value 
     174            self._gm_composite.CRS = value 
    175175 
    176176    @property 
     
    183183 
    184184    @property 
     185    def superComplex(self):      
     186        return self._gm_composite.superComplex 
     187 
     188    @superComplex.setter 
     189    def superComplex(self, value):       
     190            self._gm_composite.superComplex = value 
     191 
     192    @property 
    185193    def proxy(self):     
    186194        return self._gm_orientablesurface.proxy 
     
    191199 
    192200    @property 
    193     def superComplex(self):      
    194         return self._gm_composite.superComplex 
    195  
    196     @superComplex.setter 
    197     def superComplex(self, value):       
    198             self._gm_composite.superComplex = value 
    199  
    200     @property 
    201201    def primitive(self):         
    202202        return self._gm_orientablesurface.primitive 
     
    215215 
    216216    def __key(self): 
    217         return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.proxy, self.superComplex, self.primitive, self.complex) 
     217        return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.superComplex, self.proxy, self.primitive, self.complex) 
    218218 
    219219    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/bearing.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:35 
     24Created on 16-Feb-2012 16:18:08 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_curve.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_orientablecurve = GM_OrientableCurve()          
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
    49         self._segment_gm_arcstringbybulge = [] 
    50         self._segment_gm_linestring = [] 
     49        self._segment_gm_splinecurve = [] 
     50        self._segment_gm_offsetcurve = [] 
    5151        self._segment_gm_arcstring = [] 
    52         self._segment_gm_clothoid = [] 
    5352        self._segment_gm_conic = [] 
    5453        self._segment_gm_geodesicstring = [] 
    55         self._segment_gm_offsetcurve = [] 
    56         self._segment_gm_splinecurve = [] 
     54        self._segment_gm_linestring = [] 
     55        self._segment_gm_arcstringbybulge = [] 
     56        self._segment_gm_clothoid = [] 
     57        self._containedPrimitive_gm_orientableprimitive = [] 
    5758        self._containedPrimitive_gm_point = [] 
    58         self._containedPrimitive_gm_orientableprimitive = [] 
    5959        self._containedPrimitive_gm_solid = [] 
     60        self._composite_gm_compositecurve = [] 
     61        self._composite_gm_compositesolid = [] 
     62        self._composite_gm_compositesurface = [] 
    6063        self._composite_gm_compositepoint = [] 
    61         self._composite_gm_compositesolid = [] 
    62         self._composite_gm_compositecurve = [] 
    63         self._composite_gm_compositesurface = [] 
    6464        self.composite = [] 
     65        self._CRS_sc_singlecrs = None 
    6566        self._CRS_sc_compoundcrs = None 
    66         self._CRS_sc_singlecrs = None 
    6767        self.orientation = None 
    6868        self._proxy_gm_orientablesurface = None 
    6969        self._proxy_gm_orientablecurve = None 
     70        self._containingPrimitive_gm_orientableprimitive = [] 
    7071        self._containingPrimitive_gm_point = [] 
    71         self._containingPrimitive_gm_orientableprimitive = [] 
    7272        self._containingPrimitive_gm_solid = [] 
    7373        self.complex = [] 
     74        self._primitive_gm_orientableprimitive = None 
    7475        self._primitive_gm_point = None 
    75         self._primitive_gm_orientableprimitive = None 
    7676        self._primitive_gm_solid = None 
    7777        super(GM_Curve, self).__init__() 
     
    8888    def segment(self):   
    8989        ret = [] 
     90        for item in self._segment_gm_splinecurve: 
     91            ret.append(item) 
     92        for item in self._segment_gm_offsetcurve: 
     93            ret.append(item) 
     94        for item in self._segment_gm_arcstring: 
     95            ret.append(item) 
     96        for item in self._segment_gm_conic: 
     97            ret.append(item) 
     98        for item in self._segment_gm_geodesicstring: 
     99            ret.append(item) 
     100        for item in self._segment_gm_linestring: 
     101            ret.append(item) 
    90102        for item in self._segment_gm_arcstringbybulge: 
    91103            ret.append(item) 
    92         for item in self._segment_gm_linestring: 
    93             ret.append(item) 
    94         for item in self._segment_gm_arcstring: 
    95             ret.append(item) 
    96104        for item in self._segment_gm_clothoid: 
    97             ret.append(item) 
    98         for item in self._segment_gm_conic: 
    99             ret.append(item) 
    100         for item in self._segment_gm_geodesicstring: 
    101             ret.append(item) 
    102         for item in self._segment_gm_offsetcurve: 
    103             ret.append(item) 
    104         for item in self._segment_gm_splinecurve: 
    105105            ret.append(item) 
    106106        return ret 
     
    109109    def segment(self, value):    
    110110        if isinstance(value, list): 
    111             self._segment_gm_arcstringbybulge[:] 
    112             self._segment_gm_linestring[:] 
     111            self._segment_gm_splinecurve[:] 
     112            self._segment_gm_offsetcurve[:] 
    113113            self._segment_gm_arcstring[:] 
    114             self._segment_gm_clothoid[:] 
    115114            self._segment_gm_conic[:] 
    116115            self._segment_gm_geodesicstring[:] 
    117             self._segment_gm_offsetcurve[:] 
    118             self._segment_gm_splinecurve[:] 
     116            self._segment_gm_linestring[:] 
     117            self._segment_gm_arcstringbybulge[:] 
     118            self._segment_gm_clothoid[:] 
    119119            for item in value: 
    120120                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     121                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve.GM_SplineCurve": 
     122                    self._segment_gm_splinecurve.append(item) 
     123                    continue 
     124                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_offsetcurve.GM_OffsetCurve": 
     125                    self._segment_gm_offsetcurve.append(item) 
     126                    continue 
     127                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring.GM_ArcString": 
     128                    self._segment_gm_arcstring.append(item) 
     129                    continue 
     130                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_conic.GM_Conic": 
     131                    self._segment_gm_conic.append(item) 
     132                    continue 
     133                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring.GM_GeodesicString": 
     134                    self._segment_gm_geodesicstring.append(item) 
     135                    continue 
     136                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring.GM_LineString": 
     137                    self._segment_gm_linestring.append(item) 
     138                    continue 
    121139                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstringbybulge.GM_ArcStringByBulge": 
    122140                    self._segment_gm_arcstringbybulge.append(item) 
    123141                    continue 
    124                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring.GM_LineString": 
    125                     self._segment_gm_linestring.append(item) 
    126                     continue 
    127                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring.GM_ArcString": 
    128                     self._segment_gm_arcstring.append(item) 
    129                     continue 
    130142                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_clothoid.GM_Clothoid": 
    131143                    self._segment_gm_clothoid.append(item) 
    132                     continue 
    133                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_conic.GM_Conic": 
    134                     self._segment_gm_conic.append(item) 
    135                     continue 
    136                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring.GM_GeodesicString": 
    137                     self._segment_gm_geodesicstring.append(item) 
    138                     continue 
    139                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_offsetcurve.GM_OffsetCurve": 
    140                     self._segment_gm_offsetcurve.append(item) 
    141                     continue 
    142                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve.GM_SplineCurve": 
    143                     self._segment_gm_splinecurve.append(item) 
    144144                    continue 
    145145 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_curveboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:01 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_curveinterpolation.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_linear = "linear"  
    3738    cl_conic = "conic"  
     39    cl_circulararc3points = "circularArc3Points"  
    3840    cl_circulararc2pointwithbulge = "circularArc2PointWithBulge"  
     41    cl_geodesic = "geodesic"  
    3942    cl_cubicspline = "cubicSpline"  
    40     cl_circulararc3points = "circularArc3Points"  
    4143    cl_polynomialspline = "polynomialSpline"  
     44    cl_elliptical = "elliptical"  
    4245    cl_clothoid = "clothoid"  
    43     cl_linear = "linear"  
    4446    cl_rationalspline = "rationalSpline"  
    45     cl_elliptical = "elliptical"  
    46     cl_geodesic = "geodesic"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_curvesegment.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:37 
     24Created on 16-Feb-2012 16:18:03 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_orientablecurve.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:02 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_orientableprimitive = GM_OrientablePrimitive()          
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self.orientation = None 
    6060        self._proxy_gm_orientablesurface = None 
    6161        self._proxy_gm_orientablecurve = None 
     62        self._containingPrimitive_gm_orientableprimitive = [] 
    6263        self._containingPrimitive_gm_point = [] 
    63         self._containingPrimitive_gm_orientableprimitive = [] 
    6464        self._containingPrimitive_gm_solid = [] 
    6565        self.complex = [] 
     66        self._primitive_gm_orientableprimitive = None 
    6667        self._primitive_gm_point = None 
    67         self._primitive_gm_orientableprimitive = None 
    6868        self._primitive_gm_solid = None 
    6969        super(GM_OrientableCurve, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_orientableprimitive.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_primitive = GM_Primitive()      
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
     56        self._CRS_sc_singlecrs = None 
    5657        self._CRS_sc_compoundcrs = None 
    57         self._CRS_sc_singlecrs = None 
    5858        self.orientation = None 
    5959        self._proxy_gm_orientablesurface = None 
    6060        self._proxy_gm_orientablecurve = None 
     61        self._containingPrimitive_gm_orientableprimitive = [] 
    6162        self._containingPrimitive_gm_point = [] 
    62         self._containingPrimitive_gm_orientableprimitive = [] 
    6363        self._containingPrimitive_gm_solid = [] 
    6464        self.complex = [] 
     65        self._primitive_gm_orientableprimitive = None 
    6566        self._primitive_gm_point = None 
    66         self._primitive_gm_orientableprimitive = None 
    6767        self._primitive_gm_solid = None 
    6868        super(GM_OrientablePrimitive, self).__init__() 
     
    126126    @property 
    127127    def primitive(self):         
     128        if(has_value(self._primitive_gm_orientableprimitive)): 
     129            return self._primitive_gm_orientableprimitive 
    128130        if(has_value(self._primitive_gm_point)): 
    129131            return self._primitive_gm_point 
    130         if(has_value(self._primitive_gm_orientableprimitive)): 
    131             return self._primitive_gm_orientableprimitive 
    132132        if(has_value(self._primitive_gm_solid)): 
    133133            return self._primitive_gm_solid 
     
    137137    def primitive(self, value):  
    138138        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     139        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
     140            self._primitive_gm_orientableprimitive = value 
     141            self._primitive_gm_point = None 
     142            self._primitive_gm_solid = None 
    139143        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_point.GM_Point": 
    140144            self._primitive_gm_point = value 
    141145            self._primitive_gm_orientableprimitive = None 
    142146            self._primitive_gm_solid = None 
    143         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
    144             self._primitive_gm_orientableprimitive = value 
    145             self._primitive_gm_point = None 
    146             self._primitive_gm_solid = None 
    147147        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_solid.GM_Solid": 
    148148            self._primitive_gm_solid = value 
     149            self._primitive_gm_orientableprimitive = None 
    149150            self._primitive_gm_point = None 
    150             self._primitive_gm_orientableprimitive = None 
    151151 
    152152    def __key(self): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_orientablesurface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_orientableprimitive = GM_OrientablePrimitive()          
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self.orientation = None 
    6060        self._proxy_gm_orientablesurface = None 
    6161        self._proxy_gm_orientablecurve = None 
     62        self._containingPrimitive_gm_orientableprimitive = [] 
    6263        self._containingPrimitive_gm_point = [] 
    63         self._containingPrimitive_gm_orientableprimitive = [] 
    6464        self._containingPrimitive_gm_solid = [] 
    6565        self.complex = [] 
     66        self._primitive_gm_orientableprimitive = None 
    6667        self._primitive_gm_point = None 
    67         self._primitive_gm_orientableprimitive = None 
    6868        self._primitive_gm_solid = None 
    6969        super(GM_OrientableSurface, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_point.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:30 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_primitive = GM_Primitive()      
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self.gridPoint = [] 
    6060        self._proxy_gm_orientablesurface = None 
    6161        self._proxy_gm_orientablecurve = None 
     62        self._containingPrimitive_gm_orientableprimitive = [] 
    6263        self._containingPrimitive_gm_point = [] 
    63         self._containingPrimitive_gm_orientableprimitive = [] 
    6464        self._containingPrimitive_gm_solid = [] 
    6565        self.complex = [] 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_primitive.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:04 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_object = GM_Object()    
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
     56        self._CRS_sc_singlecrs = None 
    5657        self._CRS_sc_compoundcrs = None 
    57         self._CRS_sc_singlecrs = None 
    5858        self._proxy_gm_orientablesurface = None 
    5959        self._proxy_gm_orientablecurve = None 
     60        self._containingPrimitive_gm_orientableprimitive = [] 
    6061        self._containingPrimitive_gm_point = [] 
    61         self._containingPrimitive_gm_orientableprimitive = [] 
    6262        self._containingPrimitive_gm_solid = [] 
    6363        self.complex = [] 
     
    6767    def topology(self):  
    6868        ret = [] 
     69        for item in self._topology_tp_directedtopo: 
     70            ret.append(item) 
     71        for item in self._topology_tp_edge: 
     72            ret.append(item) 
     73        for item in self._topology_tp_node: 
     74            ret.append(item) 
     75        for item in self._topology_tp_solid: 
     76            ret.append(item) 
    6977        for item in self._topology_tp_face: 
    70             ret.append(item) 
    71         for item in self._topology_tp_solid: 
    72             ret.append(item) 
    73         for item in self._topology_tp_node: 
    74             ret.append(item) 
    75         for item in self._topology_tp_edge: 
    76             ret.append(item) 
    77         for item in self._topology_tp_directedtopo: 
    7878            ret.append(item) 
    7979        return ret 
     
    8282    def topology(self, value):   
    8383        if isinstance(value, list): 
     84            self._topology_tp_directedtopo[:] 
     85            self._topology_tp_edge[:] 
     86            self._topology_tp_node[:] 
     87            self._topology_tp_solid[:] 
    8488            self._topology_tp_face[:] 
    85             self._topology_tp_solid[:] 
    86             self._topology_tp_node[:] 
    87             self._topology_tp_edge[:] 
    88             self._topology_tp_directedtopo[:] 
    89             for item in value: 
    90                 valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     89            for item in value: 
     90                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     91                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
     92                    self._topology_tp_directedtopo.append(item) 
     93                    continue 
     94                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
     95                    self._topology_tp_edge.append(item) 
     96                    continue 
     97                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
     98                    self._topology_tp_node.append(item) 
     99                    continue 
     100                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
     101                    self._topology_tp_solid.append(item) 
     102                    continue 
    91103                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_face.TP_Face": 
    92104                    self._topology_tp_face.append(item) 
    93105                    continue 
    94                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
    95                     self._topology_tp_solid.append(item) 
    96                     continue 
    97                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
    98                     self._topology_tp_node.append(item) 
    99                     continue 
    100                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
    101                     self._topology_tp_edge.append(item) 
    102                     continue 
    103                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
    104                     self._topology_tp_directedtopo.append(item) 
    105                     continue 
    106106 
    107107    @property 
    108108    def containedPrimitive(self):        
    109109        ret = [] 
     110        for item in self._containedPrimitive_gm_orientableprimitive: 
     111            ret.append(item) 
    110112        for item in self._containedPrimitive_gm_point: 
    111             ret.append(item) 
    112         for item in self._containedPrimitive_gm_orientableprimitive: 
    113113            ret.append(item) 
    114114        for item in self._containedPrimitive_gm_solid: 
     
    119119    def containedPrimitive(self, value):         
    120120        if isinstance(value, list): 
     121            self._containedPrimitive_gm_orientableprimitive[:] 
    121122            self._containedPrimitive_gm_point[:] 
    122             self._containedPrimitive_gm_orientableprimitive[:] 
    123123            self._containedPrimitive_gm_solid[:] 
    124124            for item in value: 
    125125                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     126                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
     127                    self._containedPrimitive_gm_orientableprimitive.append(item) 
     128                    continue 
    126129                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_point.GM_Point": 
    127130                    self._containedPrimitive_gm_point.append(item) 
    128131                    continue 
    129                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
    130                     self._containedPrimitive_gm_orientableprimitive.append(item) 
    131                     continue 
    132132                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_solid.GM_Solid": 
    133133                    self._containedPrimitive_gm_solid.append(item) 
     
    137137    def composite(self):         
    138138        ret = [] 
     139        for item in self._composite_gm_compositecurve: 
     140            ret.append(item) 
     141        for item in self._composite_gm_compositesolid: 
     142            ret.append(item) 
     143        for item in self._composite_gm_compositesurface: 
     144            ret.append(item) 
    139145        for item in self._composite_gm_compositepoint: 
    140             ret.append(item) 
    141         for item in self._composite_gm_compositesolid: 
    142             ret.append(item) 
    143         for item in self._composite_gm_compositecurve: 
    144             ret.append(item) 
    145         for item in self._composite_gm_compositesurface: 
    146146            ret.append(item) 
    147147        return ret 
     
    150150    def composite(self, value):  
    151151        if isinstance(value, list): 
     152            self._composite_gm_compositecurve[:] 
     153            self._composite_gm_compositesolid[:] 
     154            self._composite_gm_compositesurface[:] 
    152155            self._composite_gm_compositepoint[:] 
    153             self._composite_gm_compositesolid[:] 
    154             self._composite_gm_compositecurve[:] 
    155             self._composite_gm_compositesurface[:] 
    156             for item in value: 
    157                 valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     156            for item in value: 
     157                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     158                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositecurve.GM_CompositeCurve": 
     159                    self._composite_gm_compositecurve.append(item) 
     160                    continue 
     161                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositesolid.GM_CompositeSolid": 
     162                    self._composite_gm_compositesolid.append(item) 
     163                    continue 
     164                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositesurface.GM_CompositeSurface": 
     165                    self._composite_gm_compositesurface.append(item) 
     166                    continue 
    158167                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositepoint.GM_CompositePoint": 
    159168                    self._composite_gm_compositepoint.append(item) 
    160                     continue 
    161                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositesolid.GM_CompositeSolid": 
    162                     self._composite_gm_compositesolid.append(item) 
    163                     continue 
    164                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositecurve.GM_CompositeCurve": 
    165                     self._composite_gm_compositecurve.append(item) 
    166                     continue 
    167                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_complex.gm_compositesurface.GM_CompositeSurface": 
    168                     self._composite_gm_compositesurface.append(item) 
    169169                    continue 
    170170 
     
    198198    def containingPrimitive(self):       
    199199        ret = [] 
     200        for item in self._containingPrimitive_gm_orientableprimitive: 
     201            ret.append(item) 
    200202        for item in self._containingPrimitive_gm_point: 
    201             ret.append(item) 
    202         for item in self._containingPrimitive_gm_orientableprimitive: 
    203203            ret.append(item) 
    204204        for item in self._containingPrimitive_gm_solid: 
     
    209209    def containingPrimitive(self, value):        
    210210        if isinstance(value, list): 
     211            self._containingPrimitive_gm_orientableprimitive[:] 
    211212            self._containingPrimitive_gm_point[:] 
    212             self._containingPrimitive_gm_orientableprimitive[:] 
    213213            self._containingPrimitive_gm_solid[:] 
    214214            for item in value: 
    215215                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     216                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
     217                    self._containingPrimitive_gm_orientableprimitive.append(item) 
     218                    continue 
    216219                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_point.GM_Point": 
    217220                    self._containingPrimitive_gm_point.append(item) 
    218                     continue 
    219                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
    220                     self._containingPrimitive_gm_orientableprimitive.append(item) 
    221221                    continue 
    222222                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_solid.GM_Solid": 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_primitiveboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:17:59 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_ring.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_compositecurve = GM_CompositeCurve()    
    4343 
     44        self._containedPrimitive_gm_orientableprimitive = [] 
    4445        self._containedPrimitive_gm_point = [] 
    45         self._containedPrimitive_gm_orientableprimitive = [] 
    4646        self._containedPrimitive_gm_solid = [] 
     47        self._composite_gm_compositecurve = [] 
     48        self._composite_gm_compositesolid = [] 
     49        self._composite_gm_compositesurface = [] 
     50        self._composite_gm_compositepoint = [] 
    4751        self.composite = [] 
    48         self._composite_gm_compositepoint = [] 
    49         self._composite_gm_compositesolid = [] 
    50         self._composite_gm_compositecurve = [] 
    51         self._composite_gm_compositesurface = [] 
    5252        self.orientation = None 
     53        self._containingPrimitive_gm_orientableprimitive = [] 
    5354        self._containingPrimitive_gm_point = [] 
    54         self._containingPrimitive_gm_orientableprimitive = [] 
    5555        self._containingPrimitive_gm_solid = [] 
     56        self._element_gm_orientableprimitive = [] 
    5657        self._element_gm_point = [] 
    57         self._element_gm_orientableprimitive = [] 
    5858        self._element_gm_solid = [] 
    5959        self._generator_gm_compositecurve = [] 
    6060        self._generator_gm_curve = [] 
    6161        self.topology = None 
     62        self._topology_tp_directedtopo = [] 
     63        self._topology_tp_edge = [] 
     64        self._topology_tp_node = [] 
     65        self._topology_tp_solid = [] 
    6266        self._topology_tp_face = [] 
    63         self._topology_tp_solid = [] 
    64         self._topology_tp_node = [] 
    65         self._topology_tp_edge = [] 
    66         self._topology_tp_directedtopo = [] 
     67        self._CRS_sc_singlecrs = None 
    6768        self._CRS_sc_compoundcrs = None 
    68         self._CRS_sc_singlecrs = None 
    6969        self.subComplex = [] 
     70        self.superComplex = [] 
    7071        self._proxy_gm_orientablesurface = None 
    7172        self._proxy_gm_orientablecurve = None 
    72         self.superComplex = [] 
     73        self._primitive_gm_orientableprimitive = None 
    7374        self._primitive_gm_point = None 
    74         self._primitive_gm_orientableprimitive = None 
    7575        self._primitive_gm_solid = None 
    7676        self.complex = [] 
     
    166166 
    167167    @property 
     168    def superComplex(self):      
     169        return self._gm_compositecurve.superComplex 
     170 
     171    @superComplex.setter 
     172    def superComplex(self, value):       
     173            self._gm_compositecurve.superComplex = value 
     174 
     175    @property 
    168176    def proxy(self):     
    169177        return self._gm_compositecurve.proxy 
     
    174182 
    175183    @property 
    176     def superComplex(self):      
    177         return self._gm_compositecurve.superComplex 
    178  
    179     @superComplex.setter 
    180     def superComplex(self, value):       
    181             self._gm_compositecurve.superComplex = value 
    182  
    183     @property 
    184184    def primitive(self):         
    185185        return self._gm_compositecurve.primitive 
     
    198198 
    199199    def __key(self): 
    200         return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.proxy, self.superComplex, self.primitive, self.complex) 
     200        return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.superComplex, self.proxy, self.primitive, self.complex) 
    201201 
    202202    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_shell.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_compositesurface = GM_CompositeSurface()        
    4343 
     44        self._containedPrimitive_gm_orientableprimitive = [] 
    4445        self._containedPrimitive_gm_point = [] 
    45         self._containedPrimitive_gm_orientableprimitive = [] 
    4646        self._containedPrimitive_gm_solid = [] 
     47        self._composite_gm_compositecurve = [] 
     48        self._composite_gm_compositesolid = [] 
     49        self._composite_gm_compositesurface = [] 
     50        self._composite_gm_compositepoint = [] 
    4751        self.composite = [] 
    48         self._composite_gm_compositepoint = [] 
    49         self._composite_gm_compositesolid = [] 
    50         self._composite_gm_compositecurve = [] 
    51         self._composite_gm_compositesurface = [] 
    5252        self.orientation = None 
     53        self._containingPrimitive_gm_orientableprimitive = [] 
    5354        self._containingPrimitive_gm_point = [] 
    54         self._containingPrimitive_gm_orientableprimitive = [] 
    5555        self._containingPrimitive_gm_solid = [] 
     56        self._element_gm_orientableprimitive = [] 
    5657        self._element_gm_point = [] 
    57         self._element_gm_orientableprimitive = [] 
    5858        self._element_gm_solid = [] 
    5959        self._generator_gm_compositesurface = [] 
    6060        self._generator_gm_surface = [] 
    6161        self.topology = None 
     62        self._topology_tp_directedtopo = [] 
     63        self._topology_tp_edge = [] 
     64        self._topology_tp_node = [] 
     65        self._topology_tp_solid = [] 
    6266        self._topology_tp_face = [] 
    63         self._topology_tp_solid = [] 
    64         self._topology_tp_node = [] 
    65         self._topology_tp_edge = [] 
    66         self._topology_tp_directedtopo = [] 
     67        self._CRS_sc_singlecrs = None 
    6768        self._CRS_sc_compoundcrs = None 
    68         self._CRS_sc_singlecrs = None 
    6969        self.subComplex = [] 
     70        self.superComplex = [] 
    7071        self._proxy_gm_orientablesurface = None 
    7172        self._proxy_gm_orientablecurve = None 
    72         self.superComplex = [] 
     73        self._primitive_gm_orientableprimitive = None 
    7374        self._primitive_gm_point = None 
    74         self._primitive_gm_orientableprimitive = None 
    7575        self._primitive_gm_solid = None 
    7676        self.complex = [] 
     
    166166 
    167167    @property 
     168    def superComplex(self):      
     169        return self._gm_compositesurface.superComplex 
     170 
     171    @superComplex.setter 
     172    def superComplex(self, value):       
     173            self._gm_compositesurface.superComplex = value 
     174 
     175    @property 
    168176    def proxy(self):     
    169177        return self._gm_compositesurface.proxy 
     
    174182 
    175183    @property 
    176     def superComplex(self):      
    177         return self._gm_compositesurface.superComplex 
    178  
    179     @superComplex.setter 
    180     def superComplex(self, value):       
    181             self._gm_compositesurface.superComplex = value 
    182  
    183     @property 
    184184    def primitive(self):         
    185185        return self._gm_compositesurface.primitive 
     
    198198 
    199199    def __key(self): 
    200         return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.proxy, self.superComplex, self.primitive, self.complex) 
     200        return (self.containedPrimitive, self.composite, self.composite, self.orientation, self.containingPrimitive, self.element, self.generator, self.topology, self.topology, self.CRS, self.subComplex, self.superComplex, self.proxy, self.primitive, self.complex) 
    201201 
    202202    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_solid.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_primitive = GM_Primitive()      
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self._proxy_gm_orientablesurface = None 
    6060        self._proxy_gm_orientablecurve = None 
     61        self._containingPrimitive_gm_orientableprimitive = [] 
    6162        self._containingPrimitive_gm_point = [] 
    62         self._containingPrimitive_gm_orientableprimitive = [] 
    6363        self._containingPrimitive_gm_solid = [] 
    6464        self.complex = [] 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_solidboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:28 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_surface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:05 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_orientablesurface = GM_OrientableSurface()      
    4343 
     44        self._topology_tp_directedtopo = [] 
     45        self._topology_tp_edge = [] 
     46        self._topology_tp_node = [] 
     47        self._topology_tp_solid = [] 
    4448        self._topology_tp_face = [] 
    45         self._topology_tp_solid = [] 
    46         self._topology_tp_node = [] 
    47         self._topology_tp_edge = [] 
    48         self._topology_tp_directedtopo = [] 
     49        self._containedPrimitive_gm_orientableprimitive = [] 
    4950        self._containedPrimitive_gm_point = [] 
    50         self._containedPrimitive_gm_orientableprimitive = [] 
    5151        self._containedPrimitive_gm_solid = [] 
     52        self._composite_gm_compositecurve = [] 
     53        self._composite_gm_compositesolid = [] 
     54        self._composite_gm_compositesurface = [] 
    5255        self._composite_gm_compositepoint = [] 
    53         self._composite_gm_compositesolid = [] 
    54         self._composite_gm_compositecurve = [] 
    55         self._composite_gm_compositesurface = [] 
    5656        self.composite = [] 
     57        self._CRS_sc_singlecrs = None 
    5758        self._CRS_sc_compoundcrs = None 
    58         self._CRS_sc_singlecrs = None 
    5959        self.orientation = None 
     60        self._patch_gm_polygon = [] 
    6061        self._patch_gm_parametriccurvesurface = [] 
    61         self._patch_gm_polygon = [] 
    6262        self._proxy_gm_orientablesurface = None 
    6363        self._proxy_gm_orientablecurve = None 
     64        self._containingPrimitive_gm_orientableprimitive = [] 
    6465        self._containingPrimitive_gm_point = [] 
    65         self._containingPrimitive_gm_orientableprimitive = [] 
    6666        self._containingPrimitive_gm_solid = [] 
    6767        self.complex = [] 
     68        self._primitive_gm_orientableprimitive = None 
    6869        self._primitive_gm_point = None 
    69         self._primitive_gm_orientableprimitive = None 
    7070        self._primitive_gm_solid = None 
    7171        super(GM_Surface, self).__init__() 
     
    122122    def patch(self):     
    123123        ret = [] 
     124        for item in self._patch_gm_polygon: 
     125            ret.append(item) 
    124126        for item in self._patch_gm_parametriccurvesurface: 
    125             ret.append(item) 
    126         for item in self._patch_gm_polygon: 
    127127            ret.append(item) 
    128128        return ret 
     
    131131    def patch(self, value):      
    132132        if isinstance(value, list): 
     133            self._patch_gm_polygon[:] 
    133134            self._patch_gm_parametriccurvesurface[:] 
    134             self._patch_gm_polygon[:] 
    135135            for item in value: 
    136136                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     137                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_polygon.GM_Polygon": 
     138                    self._patch_gm_polygon.append(item) 
     139                    continue 
    137140                if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_parametriccurvesurface.GM_ParametricCurveSurface": 
    138141                    self._patch_gm_parametriccurvesurface.append(item) 
    139                     continue 
    140                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_polygon.GM_Polygon": 
    141                     self._patch_gm_polygon.append(item) 
    142142                    continue 
    143143 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_surfaceboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_surfaceinterpolation.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:02 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_none = "none"  
     38    cl_elliptical = "elliptical"  
     39    cl_spherical = "spherical"  
     40    cl_rationalspline = "rationalSpline"  
    3741    cl_tin = "tin"  
     42    cl_triangulatedspline = "triangulatedSpline"  
     43    cl_parametriccurve = "parametricCurve"  
    3844    cl_planar = "planar"  
    39     cl_spherical = "spherical"  
    40     cl_parametriccurve = "parametricCurve"  
    41     cl_triangulatedspline = "triangulatedSpline"  
    4245    cl_conic = "conic"  
    43     cl_elliptical = "elliptical"  
    4446    cl_polynomialspline = "polynomialSpline"  
    45     cl_rationalspline = "rationalSpline"  
    46     cl_none = "none"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometric_primitive/gm_surfacepatch.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:38 
     24Created on 16-Feb-2012 16:18:08 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometry_root/gm_boundary.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:27 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/geometry_root/gm_object.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:36 
     24Created on 16-Feb-2012 16:18:01 
    2525 
    2626@author: mnagni 
     
    4040    def __init__(self): 
    4141 
     42        self._CRS_sc_singlecrs = None 
    4243        self._CRS_sc_compoundcrs = None 
    43         self._CRS_sc_singlecrs = None 
    4444        super(GM_Object, self).__init__() 
    4545 
    4646    @property 
    4747    def CRS(self):       
     48        if(has_value(self._CRS_sc_singlecrs)): 
     49            return self._CRS_sc_singlecrs 
    4850        if(has_value(self._CRS_sc_compoundcrs)): 
    4951            return self._CRS_sc_compoundcrs 
    50         if(has_value(self._CRS_sc_singlecrs)): 
    51             return self._CRS_sc_singlecrs 
    5252        return  None 
    5353 
     
    5555    def CRS(self, value):        
    5656        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     57        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
     58            self._CRS_sc_singlecrs = value 
     59            self._CRS_sc_compoundcrs = None 
    5760        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
    5861            self._CRS_sc_compoundcrs = value 
    5962            self._CRS_sc_singlecrs = None 
    60         if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
    61             self._CRS_sc_singlecrs = value 
    62             self._CRS_sc_compoundcrs = None 
    6363 
    6464    def __key(self): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_complex/tp_complex.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:38 
     24Created on 16-Feb-2012 16:18:09 
    2525 
    2626@author: mnagni 
     
    4141 
    4242        self.maximalComplex = None 
     43        self.superComplex = [] 
    4344        self.subComplex = [] 
    44         self.superComplex = [] 
    4545        self.geometry = None 
     46        self._element_tp_directedtopo = [] 
     47        self._element_tp_edge = [] 
     48        self._element_tp_node = [] 
     49        self._element_tp_solid = [] 
    4650        self._element_tp_face = [] 
    47         self._element_tp_solid = [] 
    48         self._element_tp_node = [] 
    49         self._element_tp_edge = [] 
    50         self._element_tp_directedtopo = [] 
    5151        super(TP_Complex, self).__init__() 
    5252 
     
    5454    def element(self):   
    5555        ret = [] 
    56         for item in self._element_tp_face: 
     56        for item in self._element_tp_directedtopo: 
     57            ret.append(item) 
     58        for item in self._element_tp_edge: 
     59            ret.append(item) 
     60        for item in self._element_tp_node: 
    5761            ret.append(item) 
    5862        for item in self._element_tp_solid: 
    5963            ret.append(item) 
    60         for item in self._element_tp_node: 
    61             ret.append(item) 
    62         for item in self._element_tp_edge: 
    63             ret.append(item) 
    64         for item in self._element_tp_directedtopo: 
     64        for item in self._element_tp_face: 
    6565            ret.append(item) 
    6666        return ret 
     
    6969    def element(self, value):    
    7070        if isinstance(value, list): 
     71            self._element_tp_directedtopo[:] 
     72            self._element_tp_edge[:] 
     73            self._element_tp_node[:] 
     74            self._element_tp_solid[:] 
    7175            self._element_tp_face[:] 
    72             self._element_tp_solid[:] 
    73             self._element_tp_node[:] 
    74             self._element_tp_edge[:] 
    75             self._element_tp_directedtopo[:] 
    7676            for item in value: 
    7777                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
    78                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_face.TP_Face": 
    79                     self._element_tp_face.append(item) 
     78                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
     79                    self._element_tp_directedtopo.append(item) 
     80                    continue 
     81                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
     82                    self._element_tp_edge.append(item) 
     83                    continue 
     84                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
     85                    self._element_tp_node.append(item) 
    8086                    continue 
    8187                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
    8288                    self._element_tp_solid.append(item) 
    8389                    continue 
    84                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
    85                     self._element_tp_node.append(item) 
    86                     continue 
    87                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
    88                     self._element_tp_edge.append(item) 
    89                     continue 
    90                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
    91                     self._element_tp_directedtopo.append(item) 
     90                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_face.TP_Face": 
     91                    self._element_tp_face.append(item) 
    9292                    continue 
    9393 
    9494    def __key(self): 
    95         return (self.maximalComplex, self.subComplex, self.superComplex, self.geometry, self.element) 
     95        return (self.maximalComplex, self.superComplex, self.subComplex, self.geometry, self.element) 
    9696 
    9797    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_boundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_complexboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:12 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_directededge.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:02 
    2626 
    2727@author: mnagni 
     
    4242        self._tp_directedtopo = TP_DirectedTopo()        
    4343 
     44        self._isolated_tp_directedtopo = [] 
     45        self._isolated_tp_edge = [] 
     46        self._isolated_tp_node = [] 
     47        self._isolated_tp_solid = [] 
    4448        self._isolated_tp_face = [] 
    45         self._isolated_tp_solid = [] 
    46         self._isolated_tp_node = [] 
    47         self._isolated_tp_edge = [] 
    48         self._isolated_tp_directedtopo = [] 
     49        self._topo_tp_directedtopo = None 
     50        self._topo_tp_edge = None 
     51        self._topo_tp_node = None 
     52        self._topo_tp_solid = None 
    4953        self._topo_tp_face = None 
    50         self._topo_tp_solid = None 
    51         self._topo_tp_node = None 
    52         self._topo_tp_edge = None 
    53         self._topo_tp_directedtopo = None 
    5454        self.topo = None 
    5555        self.maximalComplex = None 
    5656        self.orientation = None 
    5757        self.hub = None 
    58         self._proxy_tp_directededge = None 
     58        self._proxy_tp_directedface = None 
    5959        self._proxy_tp_directednode = None 
    6060        self._proxy_tp_directedsolid = None 
    61         self._proxy_tp_directedface = None 
     61        self._proxy_tp_directededge = None 
     62        self._geometry_gm_orientableprimitive = None 
    6263        self._geometry_gm_point = None 
    63         self._geometry_gm_orientableprimitive = None 
    6464        self._geometry_gm_solid = None 
    6565        self.complex = [] 
    6666        self.primitive = [] 
     67        self._container_tp_directedtopo = None 
     68        self._container_tp_edge = None 
     69        self._container_tp_node = None 
     70        self._container_tp_solid = None 
    6771        self._container_tp_face = None 
    68         self._container_tp_solid = None 
    69         self._container_tp_node = None 
    70         self._container_tp_edge = None 
    71         self._container_tp_directedtopo = None 
    7272        self.term = [] 
    7373        super(TP_DirectedEdge, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_directedface.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    4242        self._tp_directedtopo = TP_DirectedTopo()        
    4343 
     44        self._isolated_tp_directedtopo = [] 
     45        self._isolated_tp_edge = [] 
     46        self._isolated_tp_node = [] 
     47        self._isolated_tp_solid = [] 
    4448        self._isolated_tp_face = [] 
    45         self._isolated_tp_solid = [] 
    46         self._isolated_tp_node = [] 
    47         self._isolated_tp_edge = [] 
    48         self._isolated_tp_directedtopo = [] 
     49        self._topo_tp_directedtopo = None 
     50        self._topo_tp_edge = None 
     51        self._topo_tp_node = None 
     52        self._topo_tp_solid = None 
    4953        self._topo_tp_face = None 
    50         self._topo_tp_solid = None 
    51         self._topo_tp_node = None 
    52         self._topo_tp_edge = None 
    53         self._topo_tp_directedtopo = None 
    5454        self.topo = None 
    5555        self.maximalComplex = None 
    5656        self.orientation = None 
    5757        self.hub = [] 
    58         self._proxy_tp_directededge = None 
     58        self._proxy_tp_directedface = None 
    5959        self._proxy_tp_directednode = None 
    6060        self._proxy_tp_directedsolid = None 
    61         self._proxy_tp_directedface = None 
     61        self._proxy_tp_directededge = None 
     62        self._geometry_gm_orientableprimitive = None 
    6263        self._geometry_gm_point = None 
    63         self._geometry_gm_orientableprimitive = None 
    6464        self._geometry_gm_solid = None 
    6565        self.complex = [] 
    6666        self.primitive = [] 
     67        self._container_tp_directedtopo = None 
     68        self._container_tp_edge = None 
     69        self._container_tp_node = None 
     70        self._container_tp_solid = None 
    6771        self._container_tp_face = None 
    68         self._container_tp_solid = None 
    69         self._container_tp_node = None 
    70         self._container_tp_edge = None 
    71         self._container_tp_directedtopo = None 
    7272        self.term = [] 
    7373        super(TP_DirectedFace, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_directednode.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4242        self._tp_directedtopo = TP_DirectedTopo()        
    4343 
     44        self._isolated_tp_directedtopo = [] 
     45        self._isolated_tp_edge = [] 
     46        self._isolated_tp_node = [] 
     47        self._isolated_tp_solid = [] 
    4448        self._isolated_tp_face = [] 
    45         self._isolated_tp_solid = [] 
    46         self._isolated_tp_node = [] 
    47         self._isolated_tp_edge = [] 
    48         self._isolated_tp_directedtopo = [] 
     49        self._topo_tp_directedtopo = None 
     50        self._topo_tp_edge = None 
     51        self._topo_tp_node = None 
     52        self._topo_tp_solid = None 
    4953        self._topo_tp_face = None 
    50         self._topo_tp_solid = None 
    51         self._topo_tp_node = None 
    52         self._topo_tp_edge = None 
    53         self._topo_tp_directedtopo = None 
    5454        self.topo = None 
    5555        self.maximalComplex = None 
    5656        self.orientation = None 
    57         self._proxy_tp_directededge = None 
     57        self._proxy_tp_directedface = None 
    5858        self._proxy_tp_directednode = None 
    5959        self._proxy_tp_directedsolid = None 
    60         self._proxy_tp_directedface = None 
     60        self._proxy_tp_directededge = None 
     61        self._geometry_gm_orientableprimitive = None 
    6162        self._geometry_gm_point = None 
    62         self._geometry_gm_orientableprimitive = None 
    6363        self._geometry_gm_solid = None 
    6464        self.complex = [] 
    6565        self.primitive = [] 
     66        self._container_tp_directedtopo = None 
     67        self._container_tp_edge = None 
     68        self._container_tp_node = None 
     69        self._container_tp_solid = None 
    6670        self._container_tp_face = None 
    67         self._container_tp_solid = None 
    68         self._container_tp_node = None 
    69         self._container_tp_edge = None 
    70         self._container_tp_directedtopo = None 
    7171        self.term = [] 
    7272        super(TP_DirectedNode, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_directedsolid.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4242        self._tp_directedtopo = TP_DirectedTopo()        
    4343 
     44        self._isolated_tp_directedtopo = [] 
     45        self._isolated_tp_edge = [] 
     46        self._isolated_tp_node = [] 
     47        self._isolated_tp_solid = [] 
    4448        self._isolated_tp_face = [] 
    45         self._isolated_tp_solid = [] 
    46         self._isolated_tp_node = [] 
    47         self._isolated_tp_edge = [] 
    48         self._isolated_tp_directedtopo = [] 
     49        self._topo_tp_directedtopo = None 
     50        self._topo_tp_edge = None 
     51        self._topo_tp_node = None 
     52        self._topo_tp_solid = None 
    4953        self._topo_tp_face = None 
    50         self._topo_tp_solid = None 
    51         self._topo_tp_node = None 
    52         self._topo_tp_edge = None 
    53         self._topo_tp_directedtopo = None 
    5454        self.topo = None 
    5555        self.maximalComplex = None 
    5656        self.orientation = None 
    5757        self.hub = [] 
    58         self._proxy_tp_directededge = None 
     58        self._proxy_tp_directedface = None 
    5959        self._proxy_tp_directednode = None 
    6060        self._proxy_tp_directedsolid = None 
    61         self._proxy_tp_directedface = None 
     61        self._proxy_tp_directededge = None 
     62        self._geometry_gm_orientableprimitive = None 
    6263        self._geometry_gm_point = None 
    63         self._geometry_gm_orientableprimitive = None 
    6464        self._geometry_gm_solid = None 
    6565        self.complex = [] 
     66        self._container_tp_directedtopo = None 
     67        self._container_tp_edge = None 
     68        self._container_tp_node = None 
     69        self._container_tp_solid = None 
    6670        self._container_tp_face = None 
    67         self._container_tp_solid = None 
    68         self._container_tp_node = None 
    69         self._container_tp_edge = None 
    70         self._container_tp_directedtopo = None 
    7171        self.term = [] 
    7272        super(TP_DirectedSolid, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_directedtopo.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:05 
    2626 
    2727@author: mnagni 
     
    4242        self._tp_primitive = TP_Primitive()      
    4343 
     44        self._isolated_tp_directedtopo = [] 
     45        self._isolated_tp_edge = [] 
     46        self._isolated_tp_node = [] 
     47        self._isolated_tp_solid = [] 
    4448        self._isolated_tp_face = [] 
    45         self._isolated_tp_solid = [] 
    46         self._isolated_tp_node = [] 
    47         self._isolated_tp_edge = [] 
    48         self._isolated_tp_directedtopo = [] 
     49        self._topo_tp_directedtopo = None 
     50        self._topo_tp_edge = None 
     51        self._topo_tp_node = None 
     52        self._topo_tp_solid = None 
    4953        self._topo_tp_face = None 
    50         self._topo_tp_solid = None 
    51         self._topo_tp_node = None 
    52         self._topo_tp_edge = None 
    53         self._topo_tp_directedtopo = None 
    5454        self.maximalComplex = None 
    5555        self.orientation = None 
    56         self._proxy_tp_directededge = None 
     56        self._proxy_tp_directedface = None 
    5757        self._proxy_tp_directednode = None 
    5858        self._proxy_tp_directedsolid = None 
    59         self._proxy_tp_directedface = None 
     59        self._proxy_tp_directededge = None 
     60        self._geometry_gm_orientableprimitive = None 
    6061        self._geometry_gm_point = None 
    61         self._geometry_gm_orientableprimitive = None 
    6262        self._geometry_gm_solid = None 
    6363        self.complex = [] 
     64        self._container_tp_directedtopo = None 
     65        self._container_tp_edge = None 
     66        self._container_tp_node = None 
     67        self._container_tp_solid = None 
    6468        self._container_tp_face = None 
    65         self._container_tp_solid = None 
    66         self._container_tp_node = None 
    67         self._container_tp_edge = None 
    68         self._container_tp_directedtopo = None 
    6969        self.term = [] 
    7070        super(TP_DirectedTopo, self).__init__() 
     
    8080    @property 
    8181    def topo(self):      
     82        if(has_value(self._topo_tp_directedtopo)): 
     83            return self._topo_tp_directedtopo 
     84        if(has_value(self._topo_tp_edge)): 
     85            return self._topo_tp_edge 
     86        if(has_value(self._topo_tp_node)): 
     87            return self._topo_tp_node 
     88        if(has_value(self._topo_tp_solid)): 
     89            return self._topo_tp_solid 
    8290        if(has_value(self._topo_tp_face)): 
    8391            return self._topo_tp_face 
    84         if(has_value(self._topo_tp_solid)): 
    85             return self._topo_tp_solid 
    86         if(has_value(self._topo_tp_node)): 
    87             return self._topo_tp_node 
    88         if(has_value(self._topo_tp_edge)): 
    89             return self._topo_tp_edge 
    90         if(has_value(self._topo_tp_directedtopo)): 
    91             return self._topo_tp_directedtopo 
    9292        return  None 
    9393 
     
    9595    def topo(self, value):       
    9696        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     97        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
     98            self._topo_tp_directedtopo = value 
     99            self._topo_tp_edge = None 
     100            self._topo_tp_node = None 
     101            self._topo_tp_solid = None 
     102            self._topo_tp_face = None 
     103        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
     104            self._topo_tp_edge = value 
     105            self._topo_tp_directedtopo = None 
     106            self._topo_tp_node = None 
     107            self._topo_tp_solid = None 
     108            self._topo_tp_face = None 
     109        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
     110            self._topo_tp_node = value 
     111            self._topo_tp_directedtopo = None 
     112            self._topo_tp_edge = None 
     113            self._topo_tp_solid = None 
     114            self._topo_tp_face = None 
     115        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
     116            self._topo_tp_solid = value 
     117            self._topo_tp_directedtopo = None 
     118            self._topo_tp_edge = None 
     119            self._topo_tp_node = None 
     120            self._topo_tp_face = None 
    97121        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_face.TP_Face": 
    98122            self._topo_tp_face = value 
     123            self._topo_tp_directedtopo = None 
     124            self._topo_tp_edge = None 
     125            self._topo_tp_node = None 
    99126            self._topo_tp_solid = None 
    100             self._topo_tp_node = None 
    101             self._topo_tp_edge = None 
    102             self._topo_tp_directedtopo = None 
    103         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
    104             self._topo_tp_solid = value 
    105             self._topo_tp_face = None 
    106             self._topo_tp_node = None 
    107             self._topo_tp_edge = None 
    108             self._topo_tp_directedtopo = None 
    109         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
    110             self._topo_tp_node = value 
    111             self._topo_tp_face = None 
    112             self._topo_tp_solid = None 
    113             self._topo_tp_edge = None 
    114             self._topo_tp_directedtopo = None 
    115         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
    116             self._topo_tp_edge = value 
    117             self._topo_tp_face = None 
    118             self._topo_tp_solid = None 
    119             self._topo_tp_node = None 
    120             self._topo_tp_directedtopo = None 
    121         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
    122             self._topo_tp_directedtopo = value 
    123             self._topo_tp_face = None 
    124             self._topo_tp_solid = None 
    125             self._topo_tp_node = None 
    126             self._topo_tp_edge = None 
    127127 
    128128    @property 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_edge.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:29 
     26Created on 16-Feb-2012 16:18:10 
    2727 
    2828@author: mnagni 
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._tp_primitive = TP_Primitive()      
    4344        self._tp_directededge = TP_DirectedEdge()        
    44         self._tp_primitive = TP_Primitive()      
    4545 
     46        self._topo_tp_directedtopo = None 
     47        self._topo_tp_edge = None 
     48        self._topo_tp_node = None 
     49        self._topo_tp_solid = None 
     50        self._topo_tp_face = None 
    4651        self.topo = None 
    47         self._topo_tp_face = None 
    48         self._topo_tp_solid = None 
    49         self._topo_tp_node = None 
    50         self._topo_tp_edge = None 
    51         self._topo_tp_directedtopo = None 
    5252        self.maximalComplex = None 
    5353        self.orientation = None 
    5454        self.spoke = [] 
    5555        self.hub = None 
     56        self._isolated_tp_directedtopo = [] 
     57        self._isolated_tp_edge = [] 
     58        self._isolated_tp_node = [] 
     59        self._isolated_tp_solid = [] 
    5660        self._isolated_tp_face = [] 
    57         self._isolated_tp_solid = [] 
    58         self._isolated_tp_node = [] 
    59         self._isolated_tp_edge = [] 
    60         self._isolated_tp_directedtopo = [] 
    61         self._proxy_tp_directededge = None 
     61        self.proxy = None 
     62        self._proxy_tp_directedface = None 
    6263        self._proxy_tp_directednode = None 
    6364        self._proxy_tp_directedsolid = None 
    64         self._proxy_tp_directedface = None 
    65         self.proxy = None 
     65        self._proxy_tp_directededge = None 
     66        self._geometry_gm_orientableprimitive = None 
    6667        self._geometry_gm_point = None 
    67         self._geometry_gm_orientableprimitive = None 
    6868        self._geometry_gm_solid = None 
     69        self.complex = [] 
    6970        self.primitive = [] 
    70         self.complex = [] 
    7171        self.boundary = None 
     72        self._container_tp_directedtopo = None 
     73        self._container_tp_edge = None 
     74        self._container_tp_node = None 
     75        self._container_tp_solid = None 
    7276        self._container_tp_face = None 
    73         self._container_tp_solid = None 
    74         self._container_tp_node = None 
    75         self._container_tp_edge = None 
    76         self._container_tp_directedtopo = None 
    7777        self.term = [] 
    7878        super(TP_Edge, self).__init__() 
     
    9696    @property 
    9797    def maximalComplex(self):    
    98         return self._tp_directededge.maximalComplex 
     98        return self._tp_primitive.maximalComplex 
    9999 
    100100    @maximalComplex.setter 
    101101    def maximalComplex(self, value):     
    102             self._tp_directededge.maximalComplex = value 
     102            self._tp_primitive.maximalComplex = value 
    103103 
    104104    @property 
     
    120120    @property 
    121121    def isolated(self):  
    122         return self._tp_directededge.isolated 
     122        return self._tp_primitive.isolated 
    123123 
    124124    @isolated.setter 
    125125    def isolated(self, value):   
    126             self._tp_directededge.isolated = value 
     126            self._tp_primitive.isolated = value 
    127127 
    128128    @property 
    129129    def proxy(self):     
    130         return self._tp_directededge.proxy 
     130        return self._tp_primitive.proxy 
    131131 
    132132    @proxy.setter 
    133133    def proxy(self, value):      
    134             self._tp_directededge.proxy = value 
     134            self._tp_primitive.proxy = value 
    135135 
    136136    @property 
    137137    def geometry(self):  
    138         return self._tp_directededge.geometry 
     138        return self._tp_primitive.geometry 
    139139 
    140140    @geometry.setter 
    141141    def geometry(self, value):   
    142             self._tp_directededge.geometry = value 
     142            self._tp_primitive.geometry = value 
     143 
     144    @property 
     145    def complex(self):   
     146        return self._tp_primitive.complex 
     147 
     148    @complex.setter 
     149    def complex(self, value):    
     150            self._tp_primitive.complex = value 
    143151 
    144152    @property 
     
    151159 
    152160    @property 
    153     def complex(self):   
    154         return self._tp_directededge.complex 
    155  
    156     @complex.setter 
    157     def complex(self, value):    
    158             self._tp_directededge.complex = value 
    159  
    160     @property 
    161161    def container(self):         
    162         return self._tp_directededge.container 
     162        return self._tp_primitive.container 
    163163 
    164164    @container.setter 
    165165    def container(self, value):  
    166             self._tp_directededge.container = value 
     166            self._tp_primitive.container = value 
    167167 
    168168    @property 
     
    175175 
    176176    def __key(self): 
    177         return (self.topo, self.topo, self.maximalComplex, self.orientation, self.spoke, self.hub, self.isolated, self.proxy, self.proxy, self.geometry, self.primitive, self.complex, self.boundary, self.container, self.term) 
     177        return (self.topo, self.topo, self.maximalComplex, self.orientation, self.spoke, self.hub, self.isolated, self.proxy, self.proxy, self.geometry, self.complex, self.primitive, self.boundary, self.container, self.term) 
    178178 
    179179    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_edgeboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_expression.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:36 
     24Created on 16-Feb-2012 16:18:02 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_expressionterm.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:35 
     24Created on 16-Feb-2012 16:18:04 
    2525 
    2626@author: mnagni 
     
    4343        self._expression_tp_boundary = None 
    4444        self._expression_tp_ring = None 
    45         self._variable_tp_directededge = None 
     45        self.coefficient = None 
     46        self._variable_tp_directedface = None 
    4647        self._variable_tp_directednode = None 
    4748        self._variable_tp_directedsolid = None 
    48         self._variable_tp_directedface = None 
    49         self.coefficient = None 
     49        self._variable_tp_directededge = None 
    5050        super(TP_ExpressionTerm, self).__init__() 
    5151 
     
    7878    @property 
    7979    def variable(self):  
    80         if(has_value(self._variable_tp_directededge)): 
    81             return self._variable_tp_directededge 
     80        if(has_value(self._variable_tp_directedface)): 
     81            return self._variable_tp_directedface 
    8282        if(has_value(self._variable_tp_directednode)): 
    8383            return self._variable_tp_directednode 
    8484        if(has_value(self._variable_tp_directedsolid)): 
    8585            return self._variable_tp_directedsolid 
    86         if(has_value(self._variable_tp_directedface)): 
    87             return self._variable_tp_directedface 
     86        if(has_value(self._variable_tp_directededge)): 
     87            return self._variable_tp_directededge 
    8888        return  None 
    8989 
     
    9191    def variable(self, value):   
    9292        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     93        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedface.TP_DirectedFace": 
     94            self._variable_tp_directedface = value 
     95            self._variable_tp_directednode = None 
     96            self._variable_tp_directedsolid = None 
     97            self._variable_tp_directededge = None 
     98        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directednode.TP_DirectedNode": 
     99            self._variable_tp_directednode = value 
     100            self._variable_tp_directedface = None 
     101            self._variable_tp_directedsolid = None 
     102            self._variable_tp_directededge = None 
     103        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedsolid.TP_DirectedSolid": 
     104            self._variable_tp_directedsolid = value 
     105            self._variable_tp_directedface = None 
     106            self._variable_tp_directednode = None 
     107            self._variable_tp_directededge = None 
    93108        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directededge.TP_DirectedEdge": 
    94109            self._variable_tp_directededge = value 
    95             self._variable_tp_directednode = None 
    96             self._variable_tp_directedsolid = None 
    97110            self._variable_tp_directedface = None 
    98         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directednode.TP_DirectedNode": 
    99             self._variable_tp_directednode = value 
    100             self._variable_tp_directededge = None 
    101             self._variable_tp_directedsolid = None 
    102             self._variable_tp_directedface = None 
    103         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedsolid.TP_DirectedSolid": 
    104             self._variable_tp_directedsolid = value 
    105             self._variable_tp_directededge = None 
    106             self._variable_tp_directednode = None 
    107             self._variable_tp_directedface = None 
    108         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedface.TP_DirectedFace": 
    109             self._variable_tp_directedface = value 
    110             self._variable_tp_directededge = None 
    111111            self._variable_tp_directednode = None 
    112112            self._variable_tp_directedsolid = None 
    113113 
    114114    def __key(self): 
    115         return (self.expression, self.variable, self.coefficient) 
     115        return (self.expression, self.coefficient, self.variable) 
    116116 
    117117    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_face.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:38 
     26Created on 16-Feb-2012 16:18:01 
    2727 
    2828@author: mnagni 
     
    4545 
    4646        self.topo = None 
     47        self._topo_tp_directedtopo = None 
     48        self._topo_tp_edge = None 
     49        self._topo_tp_node = None 
     50        self._topo_tp_solid = None 
    4751        self._topo_tp_face = None 
    48         self._topo_tp_solid = None 
    49         self._topo_tp_node = None 
    50         self._topo_tp_edge = None 
    51         self._topo_tp_directedtopo = None 
    5252        self.maximalComplex = None 
    5353        self.orientation = None 
    5454        self.spoke = [] 
    5555        self.hub = [] 
     56        self._isolated_tp_directedtopo = [] 
     57        self._isolated_tp_edge = [] 
     58        self._isolated_tp_node = [] 
     59        self._isolated_tp_solid = [] 
    5660        self._isolated_tp_face = [] 
    57         self._isolated_tp_solid = [] 
    58         self._isolated_tp_node = [] 
    59         self._isolated_tp_edge = [] 
    60         self._isolated_tp_directedtopo = [] 
    61         self._proxy_tp_directededge = None 
     61        self.proxy = None 
     62        self._proxy_tp_directedface = None 
    6263        self._proxy_tp_directednode = None 
    6364        self._proxy_tp_directedsolid = None 
    64         self._proxy_tp_directedface = None 
    65         self.proxy = None 
     65        self._proxy_tp_directededge = None 
     66        self._geometry_gm_orientableprimitive = None 
    6667        self._geometry_gm_point = None 
    67         self._geometry_gm_orientableprimitive = None 
    6868        self._geometry_gm_solid = None 
    6969        self.primitive = [] 
    7070        self.complex = [] 
     71        self._container_tp_directedtopo = None 
     72        self._container_tp_edge = None 
     73        self._container_tp_node = None 
     74        self._container_tp_solid = None 
     75        self._container_tp_face = None 
    7176        self.boundary = [] 
    72         self._container_tp_face = None 
    73         self._container_tp_solid = None 
    74         self._container_tp_node = None 
    75         self._container_tp_edge = None 
    76         self._container_tp_directedtopo = None 
    7777        self.term = [] 
    7878        super(TP_Face, self).__init__() 
     
    175175 
    176176    def __key(self): 
    177         return (self.topo, self.topo, self.maximalComplex, self.orientation, self.spoke, self.hub, self.isolated, self.proxy, self.proxy, self.geometry, self.primitive, self.complex, self.boundary, self.container, self.term) 
     177        return (self.topo, self.topo, self.maximalComplex, self.orientation, self.spoke, self.hub, self.isolated, self.proxy, self.proxy, self.geometry, self.primitive, self.complex, self.container, self.boundary, self.term) 
    178178 
    179179    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_faceboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_node.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:36 
     26Created on 16-Feb-2012 16:18:07 
    2727 
    2828@author: mnagni 
     
    4545 
    4646        self.topo = None 
     47        self._topo_tp_directedtopo = None 
     48        self._topo_tp_edge = None 
     49        self._topo_tp_node = None 
     50        self._topo_tp_solid = None 
    4751        self._topo_tp_face = None 
    48         self._topo_tp_solid = None 
    49         self._topo_tp_node = None 
    50         self._topo_tp_edge = None 
    51         self._topo_tp_directedtopo = None 
    5252        self.orientation = None 
    5353        self.maximalComplex = None 
    5454        self.spoke = [] 
     55        self._isolated_tp_directedtopo = [] 
     56        self._isolated_tp_edge = [] 
     57        self._isolated_tp_node = [] 
     58        self._isolated_tp_solid = [] 
    5559        self._isolated_tp_face = [] 
    56         self._isolated_tp_solid = [] 
    57         self._isolated_tp_node = [] 
    58         self._isolated_tp_edge = [] 
    59         self._isolated_tp_directedtopo = [] 
    6060        self.proxy = None 
    61         self._proxy_tp_directededge = None 
     61        self._proxy_tp_directedface = None 
    6262        self._proxy_tp_directednode = None 
    6363        self._proxy_tp_directedsolid = None 
    64         self._proxy_tp_directedface = None 
     64        self._proxy_tp_directededge = None 
     65        self._geometry_gm_orientableprimitive = None 
    6566        self._geometry_gm_point = None 
    66         self._geometry_gm_orientableprimitive = None 
    6767        self._geometry_gm_solid = None 
    6868        self.primitive = [] 
    6969        self.complex = [] 
     70        self._container_tp_directedtopo = None 
     71        self._container_tp_edge = None 
     72        self._container_tp_node = None 
     73        self._container_tp_solid = None 
    7074        self._container_tp_face = None 
    71         self._container_tp_solid = None 
    72         self._container_tp_node = None 
    73         self._container_tp_edge = None 
    74         self._container_tp_directedtopo = None 
    7575        self.term = [] 
    7676        super(TP_Node, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_primitive.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:26 
     24Created on 16-Feb-2012 16:18:09 
    2525 
    2626@author: mnagni 
     
    4040    def __init__(self): 
    4141 
     42        self._isolated_tp_directedtopo = [] 
     43        self._isolated_tp_edge = [] 
     44        self._isolated_tp_node = [] 
     45        self._isolated_tp_solid = [] 
    4246        self._isolated_tp_face = [] 
    43         self._isolated_tp_solid = [] 
    44         self._isolated_tp_node = [] 
    45         self._isolated_tp_edge = [] 
    46         self._isolated_tp_directedtopo = [] 
    4747        self.maximalComplex = None 
    48         self._proxy_tp_directededge = None 
     48        self._proxy_tp_directedface = None 
    4949        self._proxy_tp_directednode = None 
    5050        self._proxy_tp_directedsolid = None 
    51         self._proxy_tp_directedface = None 
     51        self._proxy_tp_directededge = None 
     52        self._geometry_gm_orientableprimitive = None 
    5253        self._geometry_gm_point = None 
    53         self._geometry_gm_orientableprimitive = None 
    5454        self._geometry_gm_solid = None 
    5555        self.complex = [] 
     56        self._container_tp_directedtopo = None 
     57        self._container_tp_edge = None 
     58        self._container_tp_node = None 
     59        self._container_tp_solid = None 
    5660        self._container_tp_face = None 
    57         self._container_tp_solid = None 
    58         self._container_tp_node = None 
    59         self._container_tp_edge = None 
    60         self._container_tp_directedtopo = None 
    6161        super(TP_Primitive, self).__init__() 
    6262 
     
    6464    def isolated(self):  
    6565        ret = [] 
     66        for item in self._isolated_tp_directedtopo: 
     67            ret.append(item) 
     68        for item in self._isolated_tp_edge: 
     69            ret.append(item) 
     70        for item in self._isolated_tp_node: 
     71            ret.append(item) 
     72        for item in self._isolated_tp_solid: 
     73            ret.append(item) 
    6674        for item in self._isolated_tp_face: 
    67             ret.append(item) 
    68         for item in self._isolated_tp_solid: 
    69             ret.append(item) 
    70         for item in self._isolated_tp_node: 
    71             ret.append(item) 
    72         for item in self._isolated_tp_edge: 
    73             ret.append(item) 
    74         for item in self._isolated_tp_directedtopo: 
    7575            ret.append(item) 
    7676        return ret 
     
    7979    def isolated(self, value):   
    8080        if isinstance(value, list): 
     81            self._isolated_tp_directedtopo[:] 
     82            self._isolated_tp_edge[:] 
     83            self._isolated_tp_node[:] 
     84            self._isolated_tp_solid[:] 
    8185            self._isolated_tp_face[:] 
    82             self._isolated_tp_solid[:] 
    83             self._isolated_tp_node[:] 
    84             self._isolated_tp_edge[:] 
    85             self._isolated_tp_directedtopo[:] 
    8686            for item in value: 
    8787                valueClass = "%s.%s" % (type(item).__module__,type(item).__name__) 
     88                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
     89                    self._isolated_tp_directedtopo.append(item) 
     90                    continue 
     91                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
     92                    self._isolated_tp_edge.append(item) 
     93                    continue 
     94                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
     95                    self._isolated_tp_node.append(item) 
     96                    continue 
     97                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
     98                    self._isolated_tp_solid.append(item) 
     99                    continue 
    88100                if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_face.TP_Face": 
    89101                    self._isolated_tp_face.append(item) 
    90102                    continue 
    91                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
    92                     self._isolated_tp_solid.append(item) 
    93                     continue 
    94                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
    95                     self._isolated_tp_node.append(item) 
    96                     continue 
    97                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
    98                     self._isolated_tp_edge.append(item) 
    99                     continue 
    100                 if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
    101                     self._isolated_tp_directedtopo.append(item) 
    102                     continue 
    103103 
    104104    @property 
    105105    def proxy(self):     
    106         if(has_value(self._proxy_tp_directededge)): 
    107             return self._proxy_tp_directededge 
     106        if(has_value(self._proxy_tp_directedface)): 
     107            return self._proxy_tp_directedface 
    108108        if(has_value(self._proxy_tp_directednode)): 
    109109            return self._proxy_tp_directednode 
    110110        if(has_value(self._proxy_tp_directedsolid)): 
    111111            return self._proxy_tp_directedsolid 
    112         if(has_value(self._proxy_tp_directedface)): 
    113             return self._proxy_tp_directedface 
     112        if(has_value(self._proxy_tp_directededge)): 
     113            return self._proxy_tp_directededge 
    114114        return  None 
    115115 
     
    117117    def proxy(self, value):      
    118118        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     119        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedface.TP_DirectedFace": 
     120            self._proxy_tp_directedface = value 
     121            self._proxy_tp_directednode = None 
     122            self._proxy_tp_directedsolid = None 
     123            self._proxy_tp_directededge = None 
     124        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directednode.TP_DirectedNode": 
     125            self._proxy_tp_directednode = value 
     126            self._proxy_tp_directedface = None 
     127            self._proxy_tp_directedsolid = None 
     128            self._proxy_tp_directededge = None 
     129        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedsolid.TP_DirectedSolid": 
     130            self._proxy_tp_directedsolid = value 
     131            self._proxy_tp_directedface = None 
     132            self._proxy_tp_directednode = None 
     133            self._proxy_tp_directededge = None 
    119134        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directededge.TP_DirectedEdge": 
    120135            self._proxy_tp_directededge = value 
     136            self._proxy_tp_directedface = None 
    121137            self._proxy_tp_directednode = None 
    122138            self._proxy_tp_directedsolid = None 
    123             self._proxy_tp_directedface = None 
    124         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directednode.TP_DirectedNode": 
    125             self._proxy_tp_directednode = value 
    126             self._proxy_tp_directededge = None 
    127             self._proxy_tp_directedsolid = None 
    128             self._proxy_tp_directedface = None 
    129         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedsolid.TP_DirectedSolid": 
    130             self._proxy_tp_directedsolid = value 
    131             self._proxy_tp_directededge = None 
    132             self._proxy_tp_directednode = None 
    133             self._proxy_tp_directedface = None 
    134         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedface.TP_DirectedFace": 
    135             self._proxy_tp_directedface = value 
    136             self._proxy_tp_directededge = None 
    137             self._proxy_tp_directednode = None 
    138             self._proxy_tp_directedsolid = None 
    139139 
    140140    @property 
    141141    def geometry(self):  
     142        if(has_value(self._geometry_gm_orientableprimitive)): 
     143            return self._geometry_gm_orientableprimitive 
    142144        if(has_value(self._geometry_gm_point)): 
    143145            return self._geometry_gm_point 
    144         if(has_value(self._geometry_gm_orientableprimitive)): 
    145             return self._geometry_gm_orientableprimitive 
    146146        if(has_value(self._geometry_gm_solid)): 
    147147            return self._geometry_gm_solid 
     
    151151    def geometry(self, value):   
    152152        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     153        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
     154            self._geometry_gm_orientableprimitive = value 
     155            self._geometry_gm_point = None 
     156            self._geometry_gm_solid = None 
    153157        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_point.GM_Point": 
    154158            self._geometry_gm_point = value 
    155159            self._geometry_gm_orientableprimitive = None 
    156160            self._geometry_gm_solid = None 
    157         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_orientableprimitive.GM_OrientablePrimitive": 
    158             self._geometry_gm_orientableprimitive = value 
    159             self._geometry_gm_point = None 
    160             self._geometry_gm_solid = None 
    161161        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_solid.GM_Solid": 
    162162            self._geometry_gm_solid = value 
     163            self._geometry_gm_orientableprimitive = None 
    163164            self._geometry_gm_point = None 
    164             self._geometry_gm_orientableprimitive = None 
    165165 
    166166    @property 
    167167    def container(self):         
     168        if(has_value(self._container_tp_directedtopo)): 
     169            return self._container_tp_directedtopo 
     170        if(has_value(self._container_tp_edge)): 
     171            return self._container_tp_edge 
     172        if(has_value(self._container_tp_node)): 
     173            return self._container_tp_node 
     174        if(has_value(self._container_tp_solid)): 
     175            return self._container_tp_solid 
    168176        if(has_value(self._container_tp_face)): 
    169177            return self._container_tp_face 
    170         if(has_value(self._container_tp_solid)): 
    171             return self._container_tp_solid 
    172         if(has_value(self._container_tp_node)): 
    173             return self._container_tp_node 
    174         if(has_value(self._container_tp_edge)): 
    175             return self._container_tp_edge 
    176         if(has_value(self._container_tp_directedtopo)): 
    177             return self._container_tp_directedtopo 
    178178        return  None 
    179179 
     
    181181    def container(self, value):  
    182182        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     183        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
     184            self._container_tp_directedtopo = value 
     185            self._container_tp_edge = None 
     186            self._container_tp_node = None 
     187            self._container_tp_solid = None 
     188            self._container_tp_face = None 
     189        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
     190            self._container_tp_edge = value 
     191            self._container_tp_directedtopo = None 
     192            self._container_tp_node = None 
     193            self._container_tp_solid = None 
     194            self._container_tp_face = None 
     195        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
     196            self._container_tp_node = value 
     197            self._container_tp_directedtopo = None 
     198            self._container_tp_edge = None 
     199            self._container_tp_solid = None 
     200            self._container_tp_face = None 
     201        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
     202            self._container_tp_solid = value 
     203            self._container_tp_directedtopo = None 
     204            self._container_tp_edge = None 
     205            self._container_tp_node = None 
     206            self._container_tp_face = None 
    183207        if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_face.TP_Face": 
    184208            self._container_tp_face = value 
    185             self._container_tp_solid = None 
    186             self._container_tp_node = None 
    187             self._container_tp_edge = None 
    188             self._container_tp_directedtopo = None 
    189         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_solid.TP_Solid": 
    190             self._container_tp_solid = value 
    191             self._container_tp_face = None 
    192             self._container_tp_node = None 
    193             self._container_tp_edge = None 
    194             self._container_tp_directedtopo = None 
    195         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_node.TP_Node": 
    196             self._container_tp_node = value 
    197             self._container_tp_face = None 
    198             self._container_tp_solid = None 
    199             self._container_tp_edge = None 
    200             self._container_tp_directedtopo = None 
    201         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_edge.TP_Edge": 
    202             self._container_tp_edge = value 
    203             self._container_tp_face = None 
    204             self._container_tp_solid = None 
    205             self._container_tp_node = None 
    206             self._container_tp_directedtopo = None 
    207         if valueClass == "ea_model.iso_19107_2003_spatial_schema.topology.topological_primitive.tp_directedtopo.TP_DirectedTopo": 
    208             self._container_tp_directedtopo = value 
    209             self._container_tp_face = None 
    210             self._container_tp_solid = None 
    211             self._container_tp_node = None 
    212             self._container_tp_edge = None 
     209            self._container_tp_directedtopo = None 
     210            self._container_tp_edge = None 
     211            self._container_tp_node = None 
     212            self._container_tp_solid = None 
    213213 
    214214    def __key(self): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_primitiveboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:26 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_ring.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_shell.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:32 
     25Created on 16-Feb-2012 16:18:04 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_solid.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:32 
     26Created on 16-Feb-2012 16:18:03 
    2727 
    2828@author: mnagni 
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._tp_primitive = TP_Primitive()      
    4344        self._tp_directedsolid = TP_DirectedSolid()      
    44         self._tp_primitive = TP_Primitive()      
    4545 
    4646        self.topo = None 
     47        self._topo_tp_directedtopo = None 
     48        self._topo_tp_edge = None 
     49        self._topo_tp_node = None 
     50        self._topo_tp_solid = None 
    4751        self._topo_tp_face = None 
    48         self._topo_tp_solid = None 
    49         self._topo_tp_node = None 
    50         self._topo_tp_edge = None 
    51         self._topo_tp_directedtopo = None 
     52        self.maximalComplex = None 
    5253        self.orientation = None 
    53         self.maximalComplex = None 
    5454        self.hub = [] 
     55        self._isolated_tp_directedtopo = [] 
     56        self._isolated_tp_edge = [] 
     57        self._isolated_tp_node = [] 
     58        self._isolated_tp_solid = [] 
    5559        self._isolated_tp_face = [] 
    56         self._isolated_tp_solid = [] 
    57         self._isolated_tp_node = [] 
    58         self._isolated_tp_edge = [] 
    59         self._isolated_tp_directedtopo = [] 
    6060        self.proxy = None 
    61         self._proxy_tp_directededge = None 
     61        self._proxy_tp_directedface = None 
    6262        self._proxy_tp_directednode = None 
    6363        self._proxy_tp_directedsolid = None 
    64         self._proxy_tp_directedface = None 
     64        self._proxy_tp_directededge = None 
     65        self._geometry_gm_orientableprimitive = None 
    6566        self._geometry_gm_point = None 
    66         self._geometry_gm_orientableprimitive = None 
    6767        self._geometry_gm_solid = None 
    6868        self.complex = [] 
    6969        self.boundary = [] 
     70        self._container_tp_directedtopo = None 
     71        self._container_tp_edge = None 
     72        self._container_tp_node = None 
     73        self._container_tp_solid = None 
    7074        self._container_tp_face = None 
    71         self._container_tp_solid = None 
    72         self._container_tp_node = None 
    73         self._container_tp_edge = None 
    74         self._container_tp_directedtopo = None 
    7575        self.term = [] 
    7676        super(TP_Solid, self).__init__() 
     
    9393 
    9494    @property 
     95    def maximalComplex(self):    
     96        return self._tp_primitive.maximalComplex 
     97 
     98    @maximalComplex.setter 
     99    def maximalComplex(self, value):     
     100            self._tp_primitive.maximalComplex = value 
     101 
     102    @property 
    95103    def orientation(self):       
    96104        return self._tp_directedsolid.orientation 
     
    99107    def orientation(self, value):        
    100108            self._tp_directedsolid.orientation = value 
    101  
    102     @property 
    103     def maximalComplex(self):    
    104         return self._tp_directedsolid.maximalComplex 
    105  
    106     @maximalComplex.setter 
    107     def maximalComplex(self, value):     
    108             self._tp_directedsolid.maximalComplex = value 
    109109 
    110110    @property 
     
    118118    @property 
    119119    def isolated(self):  
    120         return self._tp_directedsolid.isolated 
     120        return self._tp_primitive.isolated 
    121121 
    122122    @isolated.setter 
    123123    def isolated(self, value):   
    124             self._tp_directedsolid.isolated = value 
     124            self._tp_primitive.isolated = value 
    125125 
    126126    @property 
    127127    def proxy(self):     
    128         return self._tp_directedsolid.proxy 
     128        return self._tp_primitive.proxy 
    129129 
    130130    @proxy.setter 
    131131    def proxy(self, value):      
    132             self._tp_directedsolid.proxy = value 
     132            self._tp_primitive.proxy = value 
    133133 
    134134    @property 
    135135    def geometry(self):  
    136         return self._tp_directedsolid.geometry 
     136        return self._tp_primitive.geometry 
    137137 
    138138    @geometry.setter 
    139139    def geometry(self, value):   
    140             self._tp_directedsolid.geometry = value 
     140            self._tp_primitive.geometry = value 
    141141 
    142142    @property 
    143143    def complex(self):   
    144         return self._tp_directedsolid.complex 
     144        return self._tp_primitive.complex 
    145145 
    146146    @complex.setter 
    147147    def complex(self, value):    
    148             self._tp_directedsolid.complex = value 
     148            self._tp_primitive.complex = value 
    149149 
    150150    @property 
    151151    def container(self):         
    152         return self._tp_directedsolid.container 
     152        return self._tp_primitive.container 
    153153 
    154154    @container.setter 
    155155    def container(self, value):  
    156             self._tp_directedsolid.container = value 
     156            self._tp_primitive.container = value 
    157157 
    158158    @property 
     
    165165 
    166166    def __key(self): 
    167         return (self.topo, self.topo, self.orientation, self.maximalComplex, self.hub, self.isolated, self.proxy, self.proxy, self.geometry, self.complex, self.boundary, self.container, self.term) 
     167        return (self.topo, self.topo, self.maximalComplex, self.orientation, self.hub, self.isolated, self.proxy, self.proxy, self.geometry, self.complex, self.boundary, self.container, self.term) 
    168168 
    169169    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topological_primitive/tp_solidboundary.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/topology/topology_root/tp_object.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:28 
     24Created on 16-Feb-2012 16:18:09 
    2525 
    2626@author: mnagni 
Note: See TracChangeset for help on using the changeset viewer.