Ignore:
Timestamp:
06/02/12 16:49:57 (8 years ago)
Author:
mnagni
Message:

Imported a new DB library which fixes the MO_ObservationColleciton <--> CEDA_ObservationCollection problem

Location:
mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry
Files:
44 edited

Legend:

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

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:11 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 
     
    3637    def __init__(self): 
    3738 
     39        self._CRS_sc_compoundcrs = None 
    3840        self._CRS_sc_singlecrs = None 
    39         self._CRS_sc_compoundcrs = None 
    4041        self.dimension = None 
    4142        self.coordinate = [] 
     
    4445    @property 
    4546    def CRS(self): 
    46         if(self._CRS_sc_singlecrs is not None): 
     47        if(has_value(self._CRS_sc_compoundcrs)): 
     48            return self._CRS_sc_compoundcrs 
     49        if(has_value(self._CRS_sc_singlecrs)): 
    4750            return self._CRS_sc_singlecrs 
    48         if(self._CRS_sc_compoundcrs is not None): 
    49             return self._CRS_sc_compoundcrs 
    50         return None 
     51        return  None 
    5152 
    5253    @CRS.setter 
    5354    def CRS(self, value): 
    5455        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     56        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
     57            self._CRS_sc_compoundcrs = value 
     58            self._CRS_sc_singlecrs = None 
    5559        if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_singlecrs.SC_SingleCRS": 
    5660            self._CRS_sc_singlecrs = value 
    5761            self._CRS_sc_compoundcrs = None 
    58         if valueClass == "ea_model.iso_19111_referencing_by_coordinates.coordinate_reference_systems.sc_compoundcrs.SC_CompoundCRS": 
    59             self._CRS_sc_compoundcrs = value 
    60             self._CRS_sc_singlecrs = None 
    6162 
    6263 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_affineplacement.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:39 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arc.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring import  GM_ArcString  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_arcstring = GM_ArcString()      
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4849 
    4950    @property 
     51    def curve(self): 
     52        return self._gm_arcstring.curve 
     53 
     54    @curve.setter 
     55    def curve(self, value): 
     56            self._gm_arcstring.curve = value 
     57 
     58    @property 
    5059    def numDerivativesAtEnd(self): 
    5160        return self._gm_arcstring.numDerivativesAtEnd 
     
    5463    def numDerivativesAtEnd(self, value): 
    5564            self._gm_arcstring.numDerivativesAtEnd = value 
    56  
    57     @property 
    58     def curve(self): 
    59         return self._gm_arcstring.curve 
    60  
    61     @curve.setter 
    62     def curve(self, value): 
    63             self._gm_arcstring.curve = value 
    6465 
    6566    @property 
     
    104105 
    105106    def __key(self): 
    106         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     107        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    107108 
    108109    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcbybulge.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstringbybulge import  GM_ArcStringByBulge  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:12 
     22Created on 06-Feb-2012 15:59:38 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_arcstringbybulge = GM_ArcStringByBulge()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.normal = [] 
    4344        self.interpolation = None 
     
    4950 
    5051    @property 
     52    def curve(self): 
     53        return self._gm_arcstringbybulge.curve 
     54 
     55    @curve.setter 
     56    def curve(self, value): 
     57            self._gm_arcstringbybulge.curve = value 
     58 
     59    @property 
    5160    def numDerivativesAtEnd(self): 
    5261        return self._gm_arcstringbybulge.numDerivativesAtEnd 
     
    5564    def numDerivativesAtEnd(self, value): 
    5665            self._gm_arcstringbybulge.numDerivativesAtEnd = value 
    57  
    58     @property 
    59     def curve(self): 
    60         return self._gm_arcstringbybulge.curve 
    61  
    62     @curve.setter 
    63     def curve(self, value): 
    64             self._gm_arcstringbybulge.curve = value 
    6566 
    6667    @property 
     
    113114 
    114115    def __key(self): 
    115         return (self.numDerivativesAtEnd, self.curve, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
     116        return (self.curve, self.numDerivativesAtEnd, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
    116117 
    117118    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstring.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4849 
    4950    @property 
     51    def curve(self): 
     52        return self._gm_curvesegment.curve 
     53 
     54    @curve.setter 
     55    def curve(self, value): 
     56            self._gm_curvesegment.curve = value 
     57 
     58    @property 
    5059    def numDerivativesAtEnd(self): 
    5160        return self._gm_curvesegment.numDerivativesAtEnd 
     
    5463    def numDerivativesAtEnd(self, value): 
    5564            self._gm_curvesegment.numDerivativesAtEnd = value 
    56  
    57     @property 
    58     def curve(self): 
    59         return self._gm_curvesegment.curve 
    60  
    61     @curve.setter 
    62     def curve(self, value): 
    63             self._gm_curvesegment.curve = value 
    6465 
    6566    @property 
     
    9293 
    9394    def __key(self): 
    94         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     95        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    9596 
    9697    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstringbybulge.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:36 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.normal = [] 
    4344        self.interpolation = None 
     
    4950 
    5051    @property 
     52    def curve(self): 
     53        return self._gm_curvesegment.curve 
     54 
     55    @curve.setter 
     56    def curve(self, value): 
     57            self._gm_curvesegment.curve = value 
     58 
     59    @property 
    5160    def numDerivativesAtEnd(self): 
    5261        return self._gm_curvesegment.numDerivativesAtEnd 
     
    5564    def numDerivativesAtEnd(self, value): 
    5665            self._gm_curvesegment.numDerivativesAtEnd = value 
    57  
    58     @property 
    59     def curve(self): 
    60         return self._gm_curvesegment.curve 
    61  
    62     @curve.setter 
    63     def curve(self, value): 
    64             self._gm_curvesegment.curve = value 
    6566 
    6667 
     
    9596 
    9697    def __key(self): 
    97         return (self.numDerivativesAtEnd, self.curve, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
     98        return (self.curve, self.numDerivativesAtEnd, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
    9899 
    99100    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bezier.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_bsplinecurve import  GM_BSplineCurve  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
     
    3940 
    4041        self.curveForm = None 
     42        self.curve = None 
    4143        self.numDerivativesAtEnd = None 
    42         self.curve = None 
    4344        self.knot = [] 
    4445        self.interpolation = None 
     
    6061 
    6162    @property 
     63    def curve(self): 
     64        return self._gm_bsplinecurve.curve 
     65 
     66    @curve.setter 
     67    def curve(self, value): 
     68            self._gm_bsplinecurve.curve = value 
     69 
     70    @property 
    6271    def numDerivativesAtEnd(self): 
    6372        return self._gm_bsplinecurve.numDerivativesAtEnd 
     
    6675    def numDerivativesAtEnd(self, value): 
    6776            self._gm_bsplinecurve.numDerivativesAtEnd = value 
    68  
    69     @property 
    70     def curve(self): 
    71         return self._gm_bsplinecurve.curve 
    72  
    73     @curve.setter 
    74     def curve(self, value): 
    75             self._gm_bsplinecurve.curve = value 
    7677 
    7778    @property 
     
    140141 
    141142    def __key(self): 
    142         return (self.curveForm, self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
     143        return (self.curveForm, self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
    143144 
    144145    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bicubicgrid.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:36 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bilineargrid.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:09 
     22Created on 06-Feb-2012 15:59:43 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinecurve.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve import  GM_SplineCurve  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
     
    3940 
    4041        self.curveForm = None 
     42        self.curve = None 
    4143        self.numDerivativesAtEnd = None 
    42         self.curve = None 
    4344        self.knot = [] 
    4445        self.interpolation = None 
     
    5455 
    5556    @property 
     57    def curve(self): 
     58        return self._gm_splinecurve.curve 
     59 
     60    @curve.setter 
     61    def curve(self, value): 
     62            self._gm_splinecurve.curve = value 
     63 
     64    @property 
    5665    def numDerivativesAtEnd(self): 
    5766        return self._gm_splinecurve.numDerivativesAtEnd 
     
    6069    def numDerivativesAtEnd(self, value): 
    6170            self._gm_splinecurve.numDerivativesAtEnd = value 
    62  
    63     @property 
    64     def curve(self): 
    65         return self._gm_splinecurve.curve 
    66  
    67     @curve.setter 
    68     def curve(self, value): 
    69             self._gm_splinecurve.curve = value 
    7071 
    7172    @property 
     
    122123 
    123124    def __key(self): 
    124         return (self.curveForm, self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
     125        return (self.curveForm, self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
    125126 
    126127    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurface.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurfaceform.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
     
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    cl_toroidal = "toroidal"  
     35    cl_spherical = "spherical"  
     36    cl_unspecified = "unspecified"  
    3337    cl_cylindrical = "cylindrical"  
    34     cl_toroidal = "toroidal"  
    3538    cl_conical = "conical"  
    3639    cl_planar = "planar"  
    37     cl_unspecified = "unspecified"  
    38     cl_spherical = "spherical"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_circle.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arc import  GM_Arc  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_arc = GM_Arc()          
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4849 
    4950    @property 
     51    def curve(self): 
     52        return self._gm_arc.curve 
     53 
     54    @curve.setter 
     55    def curve(self, value): 
     56            self._gm_arc.curve = value 
     57 
     58    @property 
    5059    def numDerivativesAtEnd(self): 
    5160        return self._gm_arc.numDerivativesAtEnd 
     
    5463    def numDerivativesAtEnd(self, value): 
    5564            self._gm_arc.numDerivativesAtEnd = value 
    56  
    57     @property 
    58     def curve(self): 
    59         return self._gm_arc.curve 
    60  
    61     @curve.setter 
    62     def curve(self, value): 
    63             self._gm_arc.curve = value 
    6465 
    6566    @property 
     
    104105 
    105106    def __key(self): 
    106         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     107        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    107108 
    108109    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_clothoid.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:40 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.endParameter = None 
    4042        self.startParameter = None 
    41         self.endParameter = None 
     43        self.curve = None 
    4244        self.numDerivativesAtEnd = None 
    43         self.curve = None 
    4445        self.interpolation = None 
    4546        self.numDerivativesAtStart = None 
     
    5455 
    5556    @property 
     57    def curve(self): 
     58        return self._gm_curvesegment.curve 
     59 
     60    @curve.setter 
     61    def curve(self, value): 
     62            self._gm_curvesegment.curve = value 
     63 
     64    @property 
    5665    def numDerivativesAtEnd(self): 
    5766        return self._gm_curvesegment.numDerivativesAtEnd 
     
    6069    def numDerivativesAtEnd(self, value): 
    6170            self._gm_curvesegment.numDerivativesAtEnd = value 
    62  
    63     @property 
    64     def curve(self): 
    65         return self._gm_curvesegment.curve 
    66  
    67     @curve.setter 
    68     def curve(self, value): 
    69             self._gm_curvesegment.curve = value 
    7071 
    7172    @property 
     
    9899 
    99100    def __key(self): 
    100         return (self.startParameter, self.endParameter, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
     101        return (self.endParameter, self.startParameter, self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
    101102 
    102103    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cone.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:46 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_conic.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:42 
    2223 
    2324@author: mnagni 
     
    3940 
    4041        self.startConstrParam = None 
     42        self.curve = None 
    4143        self.numDerivativesAtEnd = None 
    42         self.curve = None 
    4344        self.interpolation = None 
    4445        self.numDerivativesAtStart = None 
     
    5455 
    5556    @property 
     57    def curve(self): 
     58        return self._gm_curvesegment.curve 
     59 
     60    @curve.setter 
     61    def curve(self, value): 
     62            self._gm_curvesegment.curve = value 
     63 
     64    @property 
    5665    def numDerivativesAtEnd(self): 
    5766        return self._gm_curvesegment.numDerivativesAtEnd 
     
    6069    def numDerivativesAtEnd(self, value): 
    6170            self._gm_curvesegment.numDerivativesAtEnd = value 
    62  
    63     @property 
    64     def curve(self): 
    65         return self._gm_curvesegment.curve 
    66  
    67     @curve.setter 
    68     def curve(self, value): 
    69             self._gm_curvesegment.curve = value 
    7071 
    7172    @property 
     
    104105 
    105106    def __key(self): 
    106         return (self.startConstrParam, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.endConstrParam, self.numDerivativeInterior, self.shifted, self.position, self.semiLatusRectum, self.eccentricity) 
     107        return (self.startConstrParam, self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.endConstrParam, self.numDerivativeInterior, self.shifted, self.position, self.semiLatusRectum, self.eccentricity) 
    107108 
    108109    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cubicspline.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_polynomialspline import  GM_PolynomialSpline  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:49 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_polynomialspline = GM_PolynomialSpline()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.knot = [] 
    4344        self.interpolation = None 
    4445        self.numDerivativesAtStart = None 
    4546        self.degree = None 
     47        self.vectorAtStart = [] 
    4648        self.vectorAtEnd = [] 
    47         self.vectorAtStart = [] 
    4849        self.numDerivativeInterior = None 
    4950        self.controlPoints = None 
    5051        super(GM_CubicSpline, self).__init__() 
     52 
     53    @property 
     54    def curve(self): 
     55        return self._gm_polynomialspline.curve 
     56 
     57    @curve.setter 
     58    def curve(self, value): 
     59            self._gm_polynomialspline.curve = value 
    5160 
    5261    @property 
     
    5766    def numDerivativesAtEnd(self, value): 
    5867            self._gm_polynomialspline.numDerivativesAtEnd = value 
    59  
    60     @property 
    61     def curve(self): 
    62         return self._gm_polynomialspline.curve 
    63  
    64     @curve.setter 
    65     def curve(self, value): 
    66             self._gm_polynomialspline.curve = value 
    6768 
    6869    @property 
     
    99100 
    100101    @property 
     102    def vectorAtStart(self): 
     103        return self._gm_polynomialspline.vectorAtStart 
     104 
     105    @vectorAtStart.setter 
     106    def vectorAtStart(self, value): 
     107            self._gm_polynomialspline.vectorAtStart = value 
     108 
     109    @property 
    101110    def vectorAtEnd(self): 
    102111        return self._gm_polynomialspline.vectorAtEnd 
     
    105114    def vectorAtEnd(self, value): 
    106115            self._gm_polynomialspline.vectorAtEnd = value 
    107  
    108     @property 
    109     def vectorAtStart(self): 
    110         return self._gm_polynomialspline.vectorAtStart 
    111  
    112     @vectorAtStart.setter 
    113     def vectorAtStart(self, value): 
    114             self._gm_polynomialspline.vectorAtStart = value 
    115116 
    116117    @property 
     
    131132 
    132133    def __key(self): 
    133         return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtEnd, self.vectorAtStart, self.numDerivativeInterior, self.controlPoints) 
     134        return (self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtStart, self.vectorAtEnd, self.numDerivativeInterior, self.controlPoints) 
    134135 
    135136    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cylinder.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_envelope.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericcurve.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:11 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericsurface.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:17 
     21Created on 06-Feb-2012 15:59:49 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_geodesic.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring import  GM_GeodesicString  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:41 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_geodesicstring = GM_GeodesicString()    
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4546        self.controlPoint = None 
    4647        super(GM_Geodesic, self).__init__() 
     48 
     49    @property 
     50    def curve(self): 
     51        return self._gm_geodesicstring.curve 
     52 
     53    @curve.setter 
     54    def curve(self, value): 
     55            self._gm_geodesicstring.curve = value 
    4756 
    4857    @property 
     
    5362    def numDerivativesAtEnd(self, value): 
    5463            self._gm_geodesicstring.numDerivativesAtEnd = value 
    55  
    56     @property 
    57     def curve(self): 
    58         return self._gm_geodesicstring.curve 
    59  
    60     @curve.setter 
    61     def curve(self, value): 
    62             self._gm_geodesicstring.curve = value 
    6364 
    6465    @property 
     
    9596 
    9697    def __key(self): 
    97         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     98        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    9899 
    99100    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_geodesicstring.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:16 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4546        self.controlPoint = None 
    4647        super(GM_GeodesicString, self).__init__() 
     48 
     49    @property 
     50    def curve(self): 
     51        return self._gm_curvesegment.curve 
     52 
     53    @curve.setter 
     54    def curve(self, value): 
     55            self._gm_curvesegment.curve = value 
    4756 
    4857    @property 
     
    5362    def numDerivativesAtEnd(self, value): 
    5463            self._gm_curvesegment.numDerivativesAtEnd = value 
    55  
    56     @property 
    57     def curve(self): 
    58         return self._gm_curvesegment.curve 
    59  
    60     @curve.setter 
    61     def curve(self, value): 
    62             self._gm_curvesegment.curve = value 
    6364 
    6465    @property 
     
    8990 
    9091    def __key(self): 
    91         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     92        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    9293 
    9394    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_griddedsurface.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_parametriccurvesurface import  GM_ParametricCurveSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:36 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_knot.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_knottype.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:40 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_linesegment.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring import  GM_LineString  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_linestring = GM_LineString()    
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4546        self.controlPoint = None 
    4647        super(GM_LineSegment, self).__init__() 
     48 
     49    @property 
     50    def curve(self): 
     51        return self._gm_linestring.curve 
     52 
     53    @curve.setter 
     54    def curve(self, value): 
     55            self._gm_linestring.curve = value 
    4756 
    4857    @property 
     
    5362    def numDerivativesAtEnd(self, value): 
    5463            self._gm_linestring.numDerivativesAtEnd = value 
    55  
    56     @property 
    57     def curve(self): 
    58         return self._gm_linestring.curve 
    59  
    60     @curve.setter 
    61     def curve(self, value): 
    62             self._gm_linestring.curve = value 
    6364 
    6465    @property 
     
    9596 
    9697    def __key(self): 
    97         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     98        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    9899 
    99100    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_linestring.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:11 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.interpolation = None 
    4344        self.numDerivativesAtStart = None 
     
    4546        self.controlPoint = None 
    4647        super(GM_LineString, self).__init__() 
     48 
     49    @property 
     50    def curve(self): 
     51        return self._gm_curvesegment.curve 
     52 
     53    @curve.setter 
     54    def curve(self, value): 
     55            self._gm_curvesegment.curve = value 
    4756 
    4857    @property 
     
    5362    def numDerivativesAtEnd(self, value): 
    5463            self._gm_curvesegment.numDerivativesAtEnd = value 
    55  
    56     @property 
    57     def curve(self): 
    58         return self._gm_curvesegment.curve 
    59  
    60     @curve.setter 
    61     def curve(self, value): 
    62             self._gm_curvesegment.curve = value 
    6364 
    6465    @property 
     
    8990 
    9091    def __key(self): 
    91         return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     92        return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    9293 
    9394    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_offsetcurve.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:40 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
    40         self._baseCurve_gm_geodesicstring = None 
     41        self._baseCurve_gm_offsetcurve = None 
    4142        self._baseCurve_gm_linestring = None 
    4243        self._baseCurve_gm_splinecurve = None 
     44        self._baseCurve_gm_geodesicstring = None 
     45        self._baseCurve_gm_clothoid = None 
     46        self._baseCurve_gm_conic = None 
    4347        self._baseCurve_gm_arcstring = None 
    44         self._baseCurve_gm_conic = None 
    45         self._baseCurve_gm_offsetcurve = None 
    46         self._baseCurve_gm_clothoid = None 
    4748        self._baseCurve_gm_arcstringbybulge = None 
    4849        self.refDirection = None 
     50        self.curve = None 
    4951        self.numDerivativesAtEnd = None 
    50         self.curve = None 
    5152        self.distance = None 
    5253        self.interpolation = None 
     
    5758    @property 
    5859    def baseCurve(self): 
    59         if(self._baseCurve_gm_geodesicstring is not None): 
     60        if(has_value(self._baseCurve_gm_offsetcurve)): 
     61            return self._baseCurve_gm_offsetcurve 
     62        if(has_value(self._baseCurve_gm_linestring)): 
     63            return self._baseCurve_gm_linestring 
     64        if(has_value(self._baseCurve_gm_splinecurve)): 
     65            return self._baseCurve_gm_splinecurve 
     66        if(has_value(self._baseCurve_gm_geodesicstring)): 
    6067            return self._baseCurve_gm_geodesicstring 
    61         if(self._baseCurve_gm_linestring is not None): 
    62             return self._baseCurve_gm_linestring 
    63         if(self._baseCurve_gm_splinecurve is not None): 
    64             return self._baseCurve_gm_splinecurve 
    65         if(self._baseCurve_gm_arcstring is not None): 
     68        if(has_value(self._baseCurve_gm_clothoid)): 
     69            return self._baseCurve_gm_clothoid 
     70        if(has_value(self._baseCurve_gm_conic)): 
     71            return self._baseCurve_gm_conic 
     72        if(has_value(self._baseCurve_gm_arcstring)): 
    6673            return self._baseCurve_gm_arcstring 
    67         if(self._baseCurve_gm_conic is not None): 
    68             return self._baseCurve_gm_conic 
    69         if(self._baseCurve_gm_offsetcurve is not None): 
    70             return self._baseCurve_gm_offsetcurve 
    71         if(self._baseCurve_gm_clothoid is not None): 
    72             return self._baseCurve_gm_clothoid 
    73         if(self._baseCurve_gm_arcstringbybulge is not None): 
     74        if(has_value(self._baseCurve_gm_arcstringbybulge)): 
    7475            return self._baseCurve_gm_arcstringbybulge 
    75         return None 
     76        return  None 
    7677 
    7778    @baseCurve.setter 
    7879    def baseCurve(self, value): 
    7980        valueClass = "%s.%s" % (type(value).__module__,type(value).__name__) 
     81        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_offsetcurve.GM_OffsetCurve": 
     82            self._baseCurve_gm_offsetcurve = value 
     83            self._baseCurve_gm_linestring = None 
     84            self._baseCurve_gm_splinecurve = None 
     85            self._baseCurve_gm_geodesicstring = None 
     86            self._baseCurve_gm_clothoid = None 
     87            self._baseCurve_gm_conic = None 
     88            self._baseCurve_gm_arcstring = None 
     89            self._baseCurve_gm_arcstringbybulge = None 
     90        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring.GM_LineString": 
     91            self._baseCurve_gm_linestring = value 
     92            self._baseCurve_gm_offsetcurve = None 
     93            self._baseCurve_gm_splinecurve = None 
     94            self._baseCurve_gm_geodesicstring = None 
     95            self._baseCurve_gm_clothoid = None 
     96            self._baseCurve_gm_conic = None 
     97            self._baseCurve_gm_arcstring = None 
     98            self._baseCurve_gm_arcstringbybulge = None 
     99        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve.GM_SplineCurve": 
     100            self._baseCurve_gm_splinecurve = value 
     101            self._baseCurve_gm_offsetcurve = None 
     102            self._baseCurve_gm_linestring = None 
     103            self._baseCurve_gm_geodesicstring = None 
     104            self._baseCurve_gm_clothoid = None 
     105            self._baseCurve_gm_conic = None 
     106            self._baseCurve_gm_arcstring = None 
     107            self._baseCurve_gm_arcstringbybulge = None 
    80108        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_geodesicstring.GM_GeodesicString": 
    81109            self._baseCurve_gm_geodesicstring = value 
    82             self._baseCurve_gm_linestring = None 
    83             self._baseCurve_gm_splinecurve = None 
    84             self._baseCurve_gm_arcstring = None 
    85             self._baseCurve_gm_conic = None 
    86             self._baseCurve_gm_offsetcurve = None 
    87             self._baseCurve_gm_clothoid = None 
    88             self._baseCurve_gm_arcstringbybulge = None 
    89         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_linestring.GM_LineString": 
    90             self._baseCurve_gm_linestring = value 
    91             self._baseCurve_gm_geodesicstring = None 
    92             self._baseCurve_gm_splinecurve = None 
    93             self._baseCurve_gm_arcstring = None 
    94             self._baseCurve_gm_conic = None 
    95             self._baseCurve_gm_offsetcurve = None 
    96             self._baseCurve_gm_clothoid = None 
    97             self._baseCurve_gm_arcstringbybulge = None 
    98         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve.GM_SplineCurve": 
    99             self._baseCurve_gm_splinecurve = value 
    100             self._baseCurve_gm_geodesicstring = None 
    101             self._baseCurve_gm_linestring = None 
    102             self._baseCurve_gm_arcstring = None 
    103             self._baseCurve_gm_conic = None 
    104             self._baseCurve_gm_offsetcurve = None 
    105             self._baseCurve_gm_clothoid = None 
     110            self._baseCurve_gm_offsetcurve = None 
     111            self._baseCurve_gm_linestring = None 
     112            self._baseCurve_gm_splinecurve = None 
     113            self._baseCurve_gm_clothoid = None 
     114            self._baseCurve_gm_conic = None 
     115            self._baseCurve_gm_arcstring = None 
     116            self._baseCurve_gm_arcstringbybulge = None 
     117        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_clothoid.GM_Clothoid": 
     118            self._baseCurve_gm_clothoid = value 
     119            self._baseCurve_gm_offsetcurve = None 
     120            self._baseCurve_gm_linestring = None 
     121            self._baseCurve_gm_splinecurve = None 
     122            self._baseCurve_gm_geodesicstring = None 
     123            self._baseCurve_gm_conic = None 
     124            self._baseCurve_gm_arcstring = None 
     125            self._baseCurve_gm_arcstringbybulge = None 
     126        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_conic.GM_Conic": 
     127            self._baseCurve_gm_conic = value 
     128            self._baseCurve_gm_offsetcurve = None 
     129            self._baseCurve_gm_linestring = None 
     130            self._baseCurve_gm_splinecurve = None 
     131            self._baseCurve_gm_geodesicstring = None 
     132            self._baseCurve_gm_clothoid = None 
     133            self._baseCurve_gm_arcstring = None 
    106134            self._baseCurve_gm_arcstringbybulge = None 
    107135        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstring.GM_ArcString": 
    108136            self._baseCurve_gm_arcstring = value 
    109             self._baseCurve_gm_geodesicstring = None 
    110             self._baseCurve_gm_linestring = None 
    111             self._baseCurve_gm_splinecurve = None 
    112             self._baseCurve_gm_conic = None 
    113             self._baseCurve_gm_offsetcurve = None 
    114             self._baseCurve_gm_clothoid = None 
    115             self._baseCurve_gm_arcstringbybulge = None 
    116         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_conic.GM_Conic": 
    117             self._baseCurve_gm_conic = value 
    118             self._baseCurve_gm_geodesicstring = None 
    119             self._baseCurve_gm_linestring = None 
    120             self._baseCurve_gm_splinecurve = None 
    121             self._baseCurve_gm_arcstring = None 
    122             self._baseCurve_gm_offsetcurve = None 
    123             self._baseCurve_gm_clothoid = None 
    124             self._baseCurve_gm_arcstringbybulge = None 
    125         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_offsetcurve.GM_OffsetCurve": 
    126             self._baseCurve_gm_offsetcurve = value 
    127             self._baseCurve_gm_geodesicstring = None 
    128             self._baseCurve_gm_linestring = None 
    129             self._baseCurve_gm_splinecurve = None 
    130             self._baseCurve_gm_arcstring = None 
    131             self._baseCurve_gm_conic = None 
    132             self._baseCurve_gm_clothoid = None 
    133             self._baseCurve_gm_arcstringbybulge = None 
    134         if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_clothoid.GM_Clothoid": 
    135             self._baseCurve_gm_clothoid = value 
    136             self._baseCurve_gm_geodesicstring = None 
    137             self._baseCurve_gm_linestring = None 
    138             self._baseCurve_gm_splinecurve = None 
    139             self._baseCurve_gm_arcstring = None 
    140             self._baseCurve_gm_conic = None 
    141             self._baseCurve_gm_offsetcurve = None 
     137            self._baseCurve_gm_offsetcurve = None 
     138            self._baseCurve_gm_linestring = None 
     139            self._baseCurve_gm_splinecurve = None 
     140            self._baseCurve_gm_geodesicstring = None 
     141            self._baseCurve_gm_clothoid = None 
     142            self._baseCurve_gm_conic = None 
    142143            self._baseCurve_gm_arcstringbybulge = None 
    143144        if valueClass == "ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_arcstringbybulge.GM_ArcStringByBulge": 
    144145            self._baseCurve_gm_arcstringbybulge = value 
    145             self._baseCurve_gm_geodesicstring = None 
    146             self._baseCurve_gm_linestring = None 
    147             self._baseCurve_gm_splinecurve = None 
    148             self._baseCurve_gm_arcstring = None 
    149             self._baseCurve_gm_conic = None 
    150             self._baseCurve_gm_offsetcurve = None 
    151             self._baseCurve_gm_clothoid = None 
    152  
    153  
     146            self._baseCurve_gm_offsetcurve = None 
     147            self._baseCurve_gm_linestring = None 
     148            self._baseCurve_gm_splinecurve = None 
     149            self._baseCurve_gm_geodesicstring = None 
     150            self._baseCurve_gm_clothoid = None 
     151            self._baseCurve_gm_conic = None 
     152            self._baseCurve_gm_arcstring = None 
     153 
     154 
     155 
     156    @property 
     157    def curve(self): 
     158        return self._gm_curvesegment.curve 
     159 
     160    @curve.setter 
     161    def curve(self, value): 
     162            self._gm_curvesegment.curve = value 
    154163 
    155164    @property 
     
    161170            self._gm_curvesegment.numDerivativesAtEnd = value 
    162171 
    163     @property 
    164     def curve(self): 
    165         return self._gm_curvesegment.curve 
    166  
    167     @curve.setter 
    168     def curve(self, value): 
    169             self._gm_curvesegment.curve = value 
    170  
    171172 
    172173 
     
    196197 
    197198    def __key(self): 
    198         return (self.baseCurve, self.refDirection, self.numDerivativesAtEnd, self.curve, self.distance, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior) 
     199        return (self.baseCurve, self.refDirection, self.curve, self.numDerivativesAtEnd, self.distance, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior) 
    199200 
    200201    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_parametriccurvesurface.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_surfacepatch import  GM_SurfacePatch  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_placement.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:43 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_pointarray.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:16 
     21Created on 06-Feb-2012 15:59:37 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_pointgrid.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:15 
     21Created on 06-Feb-2012 15:59:45 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_pointref.py

    r8086 r8087  
    1616 
    1717 
     18from ascore.utils import has_value 
    1819 
    1920''' 
    20 Created on 03-Feb-2012 10:41:12 
     21Created on 06-Feb-2012 15:59:44 
    2122 
    2223@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_polygon.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_surfacepatch import  GM_SurfacePatch  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:38 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_polyhedralsurface.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_surface import  GM_Surface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:49 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_surface = GM_Surface()          
    3940 
     41        self._topology_tp_edge = [] 
     42        self._topology_tp_node = [] 
     43        self._topology_tp_directedtopo = [] 
     44        self._topology_tp_solid = [] 
    4045        self._topology_tp_face = [] 
    41         self._topology_tp_solid = [] 
    42         self._topology_tp_node = [] 
    43         self._topology_tp_edge = [] 
    44         self._topology_tp_directedtopo = [] 
    45         self._containedPrimitive_gm_point = [] 
    4646        self._containedPrimitive_gm_orientableprimitive = [] 
    4747        self._containedPrimitive_gm_solid = [] 
    48         self._composite_gm_compositesurface = [] 
     48        self._containedPrimitive_gm_point = [] 
    4949        self._composite_gm_compositecurve = [] 
    5050        self._composite_gm_compositepoint = [] 
     51        self._composite_gm_compositesurface = [] 
    5152        self._composite_gm_compositesolid = [] 
    5253        self.composite = [] 
     54        self._CRS_sc_compoundcrs = None 
    5355        self._CRS_sc_singlecrs = None 
    54         self._CRS_sc_compoundcrs = None 
    5556        self.orientation = None 
     57        self._patch_gm_parametriccurvesurface = [] 
    5658        self._patch_gm_polygon = [] 
    57         self._patch_gm_parametriccurvesurface = [] 
    5859        self.patch = [] 
    5960        self._proxy_gm_orientablecurve = None 
    6061        self._proxy_gm_orientablesurface = None 
    61         self._containingPrimitive_gm_point = [] 
    6262        self._containingPrimitive_gm_orientableprimitive = [] 
    6363        self._containingPrimitive_gm_solid = [] 
     64        self._containingPrimitive_gm_point = [] 
    6465        self.complex = [] 
    65         self._primitive_gm_point = None 
    6666        self._primitive_gm_orientableprimitive = None 
    6767        self._primitive_gm_solid = None 
     68        self._primitive_gm_point = None 
    6869        super(GM_PolyhedralSurface, self).__init__() 
    6970 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_polynomialspline.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_splinecurve import  GM_SplineCurve  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:38 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_splinecurve = GM_SplineCurve()          
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.knot = [] 
    4344        self.interpolation = None 
    4445        self.numDerivativesAtStart = None 
    4546        self.degree = None 
     47        self.vectorAtStart = [] 
    4648        self.vectorAtEnd = [] 
    47         self.vectorAtStart = [] 
    4849        self.numDerivativeInterior = None 
    4950        self.controlPoints = None 
    5051        super(GM_PolynomialSpline, self).__init__() 
     52 
     53    @property 
     54    def curve(self): 
     55        return self._gm_splinecurve.curve 
     56 
     57    @curve.setter 
     58    def curve(self, value): 
     59            self._gm_splinecurve.curve = value 
    5160 
    5261    @property 
     
    5766    def numDerivativesAtEnd(self, value): 
    5867            self._gm_splinecurve.numDerivativesAtEnd = value 
    59  
    60     @property 
    61     def curve(self): 
    62         return self._gm_splinecurve.curve 
    63  
    64     @curve.setter 
    65     def curve(self, value): 
    66             self._gm_splinecurve.curve = value 
    6768 
    6869    @property 
     
    119120 
    120121    def __key(self): 
    121         return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtEnd, self.vectorAtStart, self.numDerivativeInterior, self.controlPoints) 
     122        return (self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.vectorAtStart, self.vectorAtEnd, self.numDerivativeInterior, self.controlPoints) 
    122123 
    123124    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_position.py

    r8086 r8087  
    1919from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.directposition import  DirectPosition  
    2020from ascore.asunion import  ASUnion  
     21from ascore.utils import has_value 
    2122 
    2223''' 
    23 Created on 03-Feb-2012 10:41:18 
     24Created on 06-Feb-2012 15:59:40 
    2425 
    2526@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_sphere.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_griddedsurface import  GM_GriddedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:47 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_splinecurve.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.geometric_primitive.gm_curvesegment import  GM_CurveSegment  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:17 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_curvesegment = GM_CurveSegment()        
    3940 
     41        self.curve = None 
    4042        self.numDerivativesAtEnd = None 
    41         self.curve = None 
    4243        self.knot = [] 
    4344        self.interpolation = None 
     
    4950 
    5051    @property 
     52    def curve(self): 
     53        return self._gm_curvesegment.curve 
     54 
     55    @curve.setter 
     56    def curve(self, value): 
     57            self._gm_curvesegment.curve = value 
     58 
     59    @property 
    5160    def numDerivativesAtEnd(self): 
    5261        return self._gm_curvesegment.numDerivativesAtEnd 
     
    5564    def numDerivativesAtEnd(self, value): 
    5665            self._gm_curvesegment.numDerivativesAtEnd = value 
    57  
    58     @property 
    59     def curve(self): 
    60         return self._gm_curvesegment.curve 
    61  
    62     @curve.setter 
    63     def curve(self, value): 
    64             self._gm_curvesegment.curve = value 
    6566 
    6667 
     
    9596 
    9697    def __key(self): 
    97         return (self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.controlPoints) 
     98        return (self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.controlPoints) 
    9899 
    99100    def __eq__(x, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_splinecurveform.py

    r8086 r8087  
    1717 
    1818from ascore.ascodelist import  ASCodeList  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:15 
     22Created on 06-Feb-2012 15:59:39 
    2223 
    2324@author: mnagni 
     
    3132        This class has been genererated automatically using the Apache Velocity project. 
    3233    ''' 
     34    cl_polylineform = "polylineForm"  
     35    cl_hyperbolicarc = "hyperbolicArc"  
     36    cl_circulararc = "circularArc"  
     37    cl_ellipticarc = "ellipticArc"  
    3338    cl_parabolicarc = "parabolicArc"  
    34     cl_polylineform = "polylineForm"  
    35     cl_circulararc = "circularArc"  
    36     cl_hyperbolicarc = "hyperbolicArc"  
    37     cl_ellipticarc = "ellipticArc"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_tin.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_triangulatedsurface import  GM_TriangulatedSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:18 
     22Created on 06-Feb-2012 15:59:44 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_triangulatedsurface = GM_TriangulatedSurface()          
    3940 
    40         self._containedPrimitive_gm_point = [] 
    4141        self._containedPrimitive_gm_orientableprimitive = [] 
    4242        self._containedPrimitive_gm_solid = [] 
    43         self._composite_gm_compositesurface = [] 
     43        self._containedPrimitive_gm_point = [] 
     44        self.composite = [] 
    4445        self._composite_gm_compositecurve = [] 
    4546        self._composite_gm_compositepoint = [] 
     47        self._composite_gm_compositesurface = [] 
    4648        self._composite_gm_compositesolid = [] 
    47         self.composite = [] 
    4849        self.orientation = None 
    49         self._containingPrimitive_gm_point = [] 
    5050        self._containingPrimitive_gm_orientableprimitive = [] 
    5151        self._containingPrimitive_gm_solid = [] 
     52        self._containingPrimitive_gm_point = [] 
     53        self._topology_tp_edge = [] 
     54        self._topology_tp_node = [] 
     55        self._topology_tp_directedtopo = [] 
     56        self._topology_tp_solid = [] 
    5257        self._topology_tp_face = [] 
    53         self._topology_tp_solid = [] 
    54         self._topology_tp_node = [] 
    55         self._topology_tp_edge = [] 
    56         self._topology_tp_directedtopo = [] 
    5758        self.stopLines = [] 
     59        self._CRS_sc_compoundcrs = None 
    5860        self._CRS_sc_singlecrs = None 
    59         self._CRS_sc_compoundcrs = None 
    6061        self.patch = [] 
     62        self._patch_gm_parametriccurvesurface = [] 
    6163        self._patch_gm_polygon = [] 
    62         self._patch_gm_parametriccurvesurface = [] 
    6364        self._proxy_gm_orientablecurve = None 
    6465        self._proxy_gm_orientablesurface = None 
    65         self._primitive_gm_point = None 
    6666        self._primitive_gm_orientableprimitive = None 
    6767        self._primitive_gm_solid = None 
     68        self._primitive_gm_point = None 
    6869        self.complex = [] 
    6970        self.controlPoint = [] 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_triangle.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_polygon import  GM_Polygon  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:14 
     22Created on 06-Feb-2012 15:59:37 
    2223 
    2324@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_triangulatedsurface.py

    r8086 r8087  
    1717 
    1818from ea_model.iso_19107_2003_spatial_schema.geometry.coordinate_geometry.gm_polyhedralsurface import  GM_PolyhedralSurface  
     19from ascore.utils import has_value 
    1920 
    2021''' 
    21 Created on 03-Feb-2012 10:41:13 
     22Created on 06-Feb-2012 15:59:45 
    2223 
    2324@author: mnagni 
     
    3839        self._gm_polyhedralsurface = GM_PolyhedralSurface()      
    3940 
     41        self._topology_tp_edge = [] 
     42        self._topology_tp_node = [] 
     43        self._topology_tp_directedtopo = [] 
     44        self._topology_tp_solid = [] 
    4045        self._topology_tp_face = [] 
    41         self._topology_tp_solid = [] 
    42         self._topology_tp_node = [] 
    43         self._topology_tp_edge = [] 
    44         self._topology_tp_directedtopo = [] 
    45         self._containedPrimitive_gm_point = [] 
    4646        self._containedPrimitive_gm_orientableprimitive = [] 
    4747        self._containedPrimitive_gm_solid = [] 
    48         self._composite_gm_compositesurface = [] 
     48        self._containedPrimitive_gm_point = [] 
    4949        self._composite_gm_compositecurve = [] 
    5050        self._composite_gm_compositepoint = [] 
     51        self._composite_gm_compositesurface = [] 
    5152        self._composite_gm_compositesolid = [] 
    5253        self.composite = [] 
     54        self._CRS_sc_compoundcrs = None 
    5355        self._CRS_sc_singlecrs = None 
    54         self._CRS_sc_compoundcrs = None 
    5556        self.orientation = None 
     57        self._patch_gm_parametriccurvesurface = [] 
    5658        self._patch_gm_polygon = [] 
    57         self._patch_gm_parametriccurvesurface = [] 
    5859        self.patch = [] 
    5960        self._proxy_gm_orientablecurve = None 
    6061        self._proxy_gm_orientablesurface = None 
    61         self._containingPrimitive_gm_point = [] 
    6262        self._containingPrimitive_gm_orientableprimitive = [] 
    6363        self._containingPrimitive_gm_solid = [] 
     64        self._containingPrimitive_gm_point = [] 
    6465        self.complex = [] 
    65         self._primitive_gm_point = None 
    6666        self._primitive_gm_orientableprimitive = None 
    6767        self._primitive_gm_solid = None 
     68        self._primitive_gm_point = None 
    6869        super(GM_TriangulatedSurface, self).__init__() 
    6970 
Note: See TracChangeset for help on using the changeset viewer.