Changeset 8091


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
Files:
1 deleted
816 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/static/js/cedaObservation.js

    r8089 r8091  
    44        console.log("loads the page") 
    55        require(['dojo/ready', 'dojo/parser', 'dijit/registry', 'dojo/_base/json', 'dojo/store/Memory', 
    6                  'dijit/Tree'], function(ready, parser, registry, Tree){ 
     6                 'dijit/Tree', 'dijit/form/Button'], function(ready, parser, registry, Tree){ 
    77                 ready(function () { 
     8                          
     9                         //---------------------------------------------- 
     10                         //----- Initializes the necessary widgets ------ 
     11                         //---------------------------------------------- 
     12                         //var obs_id = new dijit.form.TextBox({ 
     13                        //       value: '' /* no or empty value! */ 
     14                         //}, 'obs_id'); 
     15                         //obs_id.startup(); 
     16                          
     17                         var button = new dijit.form.Button({ 
     18                                 type: "submit", 
     19                         label: "Search", 
     20                         onClick: function(){ console.log("First button was clicked!"); } 
     21                     }, "search_obs"); 
     22                     button.startup(); 
     23                          
     24                         var records_dataLineage = new dijit.form.TextBox({ 
     25                                 value: "" 
     26                         }, "records_dataLineage"); 
     27                         records_dataLineage.startup();  
     28                          
     29                         var title_id = new dijit.form.TextBox({ 
     30                                 value: "" 
     31                         }, "title_id"); 
     32                         title_id.startup(); 
     33                          
     34                         var citation_id = new dijit.form.TextBox({ 
     35                                 value: "" 
     36                         }, "citation_id"); 
     37                         citation_id.startup(); 
     38 
     39                         var keywords_id = new dijit.form.TextBox({ 
     40                                 value: "" 
     41                         }, "keywords_id"); 
     42                         keywords_id.startup(); 
     43                          
     44                         var description_id = new dijit.form.TextBox({ 
     45                                 value: "" 
     46                         }, "description_id"); 
     47                         description_id.startup();                        
     48                          
    849                         var json = dojo.byId('coObs_id').value; 
    950                                 var coObs = dojo.fromJson(json); 
    1051                                 console.log(coObs) 
    1152                                 dojo.attr("records_dataLineage", 'value', coObs.dataLineage); 
     53                                 dojo.attr("description_id", 'value', coObs.description); 
    1254                                  
    1355                                 rp = new dojo.store.Memory(coObs.relatedParty); 
     
    1557                                  
    1658                                 console.log(rp) 
    17                                  var rpModel = new dijit.tree.ForestStoreModel({ 
    18                                             store: rp, 
    19                                             query: {type: 'continent'}, 
    20                                             rootLabel: "The World", 
    21                                             onNewItem: function(item, parentInfo){ 
    22                                                 if(this.store.getValue(item, 'type') == 'continent'){ 
    23                                                     this._requeryTop(); 
    24                                                 } 
    25                                                 this.inherited(arguments); 
    26                                             }                                        
    27                                  }); 
    28                                   
    29                                  var tree = new dijit.Tree({ 
    30                                             model: rpModel 
    31                                         }, 'relatedParty'); 
    32                                   
    33                                  tree.startup(); 
    3459                 });                                       
    3560        }); 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

    r8090 r8091  
    2626  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/960/text.css"  /> 
    2727  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/ceda.css"  /> 
    28  
     28  <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.6/dijit/themes/claro/claro.css"> 
     29         
    2930        <script type="text/javascript"> 
    3031                console.log("load dojoConfig"); 
     
    4041                console.log(dojoConfig); 
    4142    </script> 
    42          
     43        <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"> 
     44        </script> 
    4345   
    4446    {% block extra_head %}{% endblock %} 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html

    r8090 r8091  
    1111          <p>Use the search function below to locate your CEDA Observation record</p> 
    1212 
    13 <div> 
     13<div class="claro"> 
    1414        <script type="text/javascript"> 
    15         require(['dijit/form/TextBox', 'ceda/cedaObservation']); 
     15        require(['dijit/form/Form', 'dijit/form/TextBox', 'ceda/cedaObservation']); 
    1616</script> 
    1717 
    1818<input type="hidden" name="coObs" id="coObs_id" value="{{ coObs }}" /> 
    1919 
    20 <form action="." method="post"> 
     20<div data-dojo-type="dijit.form.Form" id="myForm" data-dojo-id="myForm" 
     21        encType="multipart/form-data" action="." method="POST"> 
     22 
     23    <script type="dojo/method" data-dojo-event="onSubmit"> 
     24        if(this.validate()){ 
     25            return confirm('Form is valid, press OK to submit'); 
     26        }else{ 
     27            alert('Form contains invalid data.  Please correct first'); 
     28            return false; 
     29        } 
     30        return true; 
     31    </script> 
     32 
    2133        {% csrf_token %} 
    2234 
     
    2739                data-dojo-props="trim:true, propercase:true" id="obs_id"/> 
    2840        </div> 
    29         <input type="submit" value="Submit" /> 
     41        <button id="search_obs" type="submit"></button> 
     42</div> 
    3043 
    31 </div> 
    32 <div = id"upper_grid"> 
     44<div id = "upper_grid"> 
    3345 
    3446  <h4>Search Results</h4> 
    3547  <div class="grid_2 alpha cedaObs"> 
    36   </div> 
    3748  <div class="grid_8 "> 
    3849         
    3950        <div class="grid_8 alpha cedaObs"> 
    4051                <div id="cedaObs.title" > 
    41                         <label for="id_title">Title</label> {{ coObs.identifier }} <br /> 
     52                        <label for="id_title">Title</label>     <div id="title_id"></div> <br /> 
    4253                </div> 
    4354                <div id="cedaObs.Citation"> 
    44                         <label for="id_citation">Citation</label> {{ coObs.citation }} <br /> 
     55                        <label for="id_citation">Citation</label> <div id="citation_id"></div> <br /> 
    4556                </div> 
    4657 
    4758                <div id="cedaObs.keywords"> 
    48                         <label for="id_keywords">Keywords</label> <br /> 
    49                                 {% for word in coObs.keywords %} 
    50                                             {{ word }} | 
    51                                 {% endfor %} 
     59                        <label for="id_keywords">Keywords</label> 
     60                        <div id="keywords_id"></div> <br /> 
    5261                </div> <!-- end cedaObs keywords -->             
    5362        </div> 
     
    5766         <div class="grid_8 alpha cedaObs"> 
    5867         
    59         <label for="id_description">Description</label> <br /> 
    60                                 <p>{{ coObs.description }}</p> 
     68        <label for="id_description">Description</label> 
     69                <div id="description_id"></div> <br /> 
    6170        </div> 
    62      
     71  </div>     
    6372  </div> 
    6473  </div class="grid_2"> 
    6574        <label for="id_geographicExtent">Geographic Extent</label> {{ coObs.geographicExtent }} <br /> 
    66         <label for="id_resolution">Resolution</label> {{ coObs.resolution }} <br /> 
    67          
     75        <label for="id_resolution">Resolution</label> {{ coObs.resolution }} <br />      
    6876</div> 
    6977  
    7078 
    7179<div id="lower_tab1" class="grid_7 alpha cedaObs "> 
    72                 <label for="id_dataLineage">dataLineage</label> <input type="text" name="dataLineage" value= "" 
    73         data-dojo-type="dijit.form.TextBox" 
    74         data-dojo-props="trim:true, propercase:true" id="records_dataLineage"/> <br /> 
     80                <label for="id_dataLineage">dataLineage</label>  
     81                <div id="records_dataLineage"></div> <br /> <br /> 
    7582                <label for="id_relatedParty">relatedParty</label><br /> 
    7683                <ol>{% for par in coObs.relatedParty %} 
  • mauRepo/MolesManager/trunk/src/MolesManager/views/cedaObservationView.py

    r8089 r8091  
    1212 
    1313 
    14 def __getSample(request, objectId, c): 
     14def __getSample(request, c): 
    1515    ''' 
    1616    @param request: an HttpRequest 
     
    2323def coView(request): 
    2424    c = {} 
    25     objectId = ObjectById(request.POST or None) 
    26     __getSample(request, objectId, c) 
     25    __getSample(request, c) 
    2726    if c.has_key('records'): 
    2827        c['coObs'] = DJEncoder().encode(c['records']) 
    2928        print c['coObs']  
    30     c['objId'] = objectId 
    3129     
    3230    c.update(csrf(request)) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_acquisition.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:32 
     26Created on 16-Feb-2012 16:18:11 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_Acquisition(CEDA_Process,MO_Acquisition): 
     31class CEDA_Acquisition(MO_Acquisition, CEDA_Process): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    5353        self.description = None 
    5454        self.instrumentPlatformPair = [] 
     55        self._generatedObservation_om_discretecoverageobservation = [] 
     56        self._generatedObservation_om_temporalobservation = [] 
    5557        self._generatedObservation_om_measurement = [] 
     58        self._generatedObservation_mo_observation = [] 
     59        self._generatedObservation_om_truthobservation = [] 
     60        self._generatedObservation_om_countobservation = [] 
     61        self._generatedObservation_om_categoryobservation = [] 
     62        self._generatedObservation_om_geometryobservation = [] 
    5663        self._generatedObservation_om_complexobservation = [] 
    57         self._generatedObservation_om_countobservation = [] 
    58         self._generatedObservation_om_temporalobservation = [] 
    59         self._generatedObservation_mo_observation = [] 
    60         self._generatedObservation_om_geometryobservation = [] 
    61         self._generatedObservation_om_truthobservation = [] 
    62         self._generatedObservation_om_categoryobservation = [] 
    63         self._generatedObservation_om_discretecoverageobservation = [] 
    6464        self.realatedParty = [] 
    6565        super(CEDA_Acquisition, self).__init__() 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_instrument.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_operation.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 
     
    4646        self.status = None 
    4747        self.review = [] 
     48        self._operationTime_tm_primitive = None 
    4849        self._operationTime_tm_complex = None 
    49         self._operationTime_tm_primitive = None 
    5050        self.documentation = [] 
    5151        self.location = None 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_platform.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:02 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_computation/ceda_processing.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:38 
     26Created on 16-Feb-2012 16:18:05 
    2727 
    2828@author: mnagni 
     
    4949        self.review = [] 
    5050        self.algorithm = [] 
     51        self.documentation = [] 
    5152        self.processingInput = [] 
    52         self.documentation = [] 
    5353        self.description = None 
    5454        self.processingOutput = None 
     55        self._generatedObservation_om_discretecoverageobservation = [] 
     56        self._generatedObservation_om_temporalobservation = [] 
    5557        self._generatedObservation_om_measurement = [] 
     58        self._generatedObservation_mo_observation = [] 
     59        self._generatedObservation_om_truthobservation = [] 
     60        self._generatedObservation_om_countobservation = [] 
     61        self._generatedObservation_om_categoryobservation = [] 
     62        self._generatedObservation_om_geometryobservation = [] 
    5663        self._generatedObservation_om_complexobservation = [] 
    57         self._generatedObservation_om_countobservation = [] 
    58         self._generatedObservation_om_temporalobservation = [] 
    59         self._generatedObservation_mo_observation = [] 
    60         self._generatedObservation_om_geometryobservation = [] 
    61         self._generatedObservation_om_truthobservation = [] 
    62         self._generatedObservation_om_categoryobservation = [] 
    63         self._generatedObservation_om_discretecoverageobservation = [] 
    6464        super(CEDA_Processing, self).__init__() 
    6565 
     
    9797 
    9898    @property 
     99    def documentation(self):     
     100        return self._mo_processing.documentation 
     101 
     102    @documentation.setter 
     103    def documentation(self, value):      
     104            self._mo_processing.documentation = value 
     105 
     106    @property 
    99107    def processingInput(self):   
    100108        return self._mo_processing.processingInput 
     
    103111    def processingInput(self, value):    
    104112            self._mo_processing.processingInput = value 
    105  
    106     @property 
    107     def documentation(self):     
    108         return self._mo_processing.documentation 
    109  
    110     @documentation.setter 
    111     def documentation(self, value):      
    112             self._mo_processing.documentation = value 
    113113 
    114114    @property 
     
    137137 
    138138    def __key(self): 
    139         return (self.identifier, self.softwareReference, self.relatedParty, self.review, self.algorithm, self.processingInput, self.documentation, self.description, self.processingOutput, self.generatedObservation) 
     139        return (self.identifier, self.softwareReference, self.relatedParty, self.review, self.algorithm, self.documentation, self.processingInput, self.description, self.processingOutput, self.generatedObservation) 
    140140 
    141141    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observation/ceda_citation.py

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

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:04 
    2626 
    2727@author: mnagni 
     
    4747        self._geographicExtent_ex_geographicboundingbox = [] 
    4848        self.relatedParty = [] 
     49        self._permission_md_securityconstraints = None 
    4950        self._permission_md_legalconstraints = None 
    50         self._permission_md_securityconstraints = None 
    5151        self.resultTime = None 
    5252        self.resultAccumulation = None 
     53        self._observedProperty_gf_attributetype = None 
    5354        self._observedProperty_gf_associationrole = None 
    54         self._observedProperty_gf_attributetype = None 
    5555        self._observedProperty_gf_operation = None 
    5656        self.parameter = [] 
    57         self.metadata = None 
    5857        self.publicationState = None 
    5958        self.identifier = [] 
     59        self.metadata = None 
    6060        self.dataLineage = None 
     61        self._phenomenonTime_tm_primitive = None 
    6162        self._phenomenonTime_tm_complex = None 
    62         self._phenomenonTime_tm_primitive = None 
    6363        self.documentation = [] 
    64         self._resultQuality_dq_completeness = [] 
    65         self._resultQuality_qe_usability = [] 
    66         self._resultQuality_dq_temporalaccuracy = [] 
     64        self.validTime = None 
    6765        self._resultQuality_dq_logicalconsistency = [] 
    6866        self._resultQuality_dq_thematicaccuracy = [] 
     67        self._resultQuality_qe_usability = [] 
     68        self._resultQuality_dq_completeness = [] 
    6969        self._resultQuality_dq_positionalaccuracy = [] 
    70         self.validTime = None 
     70        self._resultQuality_dq_temporalaccuracy = [] 
     71        self._procedure_ceda_compositeprocess = None 
    7172        self._procedure_ceda_acquisition = None 
    7273        self._procedure_ceda_processing = None 
    73         self._procedure_ceda_compositeprocess = None 
    7474        self.result = None 
    7575        self.verticalExtent = [] 
    7676        self.inSupportOf = None 
     77        self.citation = [] 
    7778        self.internalReview = [] 
    78         self.citation = [] 
     79        self._featureOfInterest_sf_samplingfeature = None 
    7980        self._featureOfInterest_mo_featureofinterest = None 
    80         self._featureOfInterest_sf_samplingfeature = None 
    8181        self._featureOfInterest_gfi_domainfeature = None 
    8282        self.status = None 
    8383        self.keywords = [] 
     84        self._relatedObservation_om_discretecoverageobservation = [] 
     85        self._relatedObservation_om_temporalobservation = [] 
    8486        self._relatedObservation_om_measurement = [] 
     87        self._relatedObservation_mo_observation = [] 
     88        self._relatedObservation_om_truthobservation = [] 
     89        self._relatedObservation_om_countobservation = [] 
     90        self._relatedObservation_om_categoryobservation = [] 
     91        self._relatedObservation_om_geometryobservation = [] 
    8592        self._relatedObservation_om_complexobservation = [] 
    86         self._relatedObservation_om_countobservation = [] 
    87         self._relatedObservation_om_temporalobservation = [] 
    88         self._relatedObservation_mo_observation = [] 
    89         self._relatedObservation_om_geometryobservation = [] 
    90         self._relatedObservation_om_truthobservation = [] 
    91         self._relatedObservation_om_categoryobservation = [] 
    92         self._relatedObservation_om_discretecoverageobservation = [] 
    9393        self.description = None 
    9494        super(CEDA_Observation, self).__init__() 
     
    159159 
    160160    @property 
     161    def publicationState(self):  
     162        return self._mo_observation.publicationState 
     163 
     164    @publicationState.setter 
     165    def publicationState(self, value):   
     166            self._mo_observation.publicationState = value 
     167 
     168    @property 
     169    def identifier(self):        
     170        return self._mo_observation.identifier 
     171 
     172    @identifier.setter 
     173    def identifier(self, value):         
     174            self._mo_observation.identifier = value 
     175 
     176    @property 
    161177    def metadata(self):  
    162178        return self._mo_observation.metadata 
     
    167183 
    168184    @property 
    169     def publicationState(self):  
    170         return self._mo_observation.publicationState 
    171  
    172     @publicationState.setter 
    173     def publicationState(self, value):   
    174             self._mo_observation.publicationState = value 
    175  
    176     @property 
    177     def identifier(self):        
    178         return self._mo_observation.identifier 
    179  
    180     @identifier.setter 
    181     def identifier(self, value):         
    182             self._mo_observation.identifier = value 
    183  
    184     @property 
    185185    def phenomenonTime(self):    
    186186        return self._mo_observation.phenomenonTime 
     
    199199 
    200200    @property 
     201    def validTime(self):         
     202        return self._mo_observation.validTime 
     203 
     204    @validTime.setter 
     205    def validTime(self, value):  
     206            self._mo_observation.validTime = value 
     207 
     208    @property 
    201209    def resultQuality(self):     
    202210        return self._mo_observation.resultQuality 
     
    207215 
    208216    @property 
    209     def validTime(self):         
    210         return self._mo_observation.validTime 
    211  
    212     @validTime.setter 
    213     def validTime(self, value):  
    214             self._mo_observation.validTime = value 
    215  
    216     @property 
    217217    def procedure(self):         
    218218        return self._mo_observation.procedure 
     
    223223 
    224224    @property 
    225     def procedure(self):         
    226         return self._mo_observation.procedure 
    227  
    228     @procedure.setter 
    229     def procedure(self, value):  
    230             self._mo_observation.procedure = value 
    231  
    232     @property 
    233225    def result(self):    
    234226        return self._mo_observation.result 
     
    287279 
    288280    def __key(self): 
    289         return (self.resolution, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.resultAccumulation, self.observedProperty, self.parameter, self.metadata, self.publicationState, self.identifier, self.dataLineage, self.phenomenonTime, self.documentation, self.resultQuality, self.validTime, self.procedure, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.internalReview, self.citation, self.featureOfInterest, self.status, self.keywords, self.relatedObservation, self.description) 
     281        return (self.resolution, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.resultAccumulation, self.observedProperty, self.parameter, self.publicationState, self.identifier, self.metadata, self.dataLineage, self.phenomenonTime, self.documentation, self.validTime, self.resultQuality, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.citation, self.internalReview, self.featureOfInterest, self.status, self.keywords, self.relatedObservation, self.description) 
    290282 
    291283    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationcollection/ceda_observationcollection.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
     
    4747        self._geographicExtent_ex_geographicdescription = [] 
    4848        self._geographicExtent_ex_geographicboundingbox = [] 
     49        self._phenomenonTime_tm_primitive = [] 
    4950        self._phenomenonTime_tm_complex = [] 
    50         self._phenomenonTime_tm_primitive = [] 
    5151        self.review = [] 
     52        self.verticalExtent = [] 
    5253        self.subCollection = [] 
    53         self.verticalExtent = [] 
     54        self.additionalMetadata = [] 
    5455        self.member = [] 
    55         self.additionalMetadata = [] 
    5656        self.description = None 
    5757        self.CEDAOfficer = None 
     
    9292 
    9393    @property 
     94    def verticalExtent(self):    
     95        return self._mo_observationcollection.verticalExtent 
     96 
     97    @verticalExtent.setter 
     98    def verticalExtent(self, value):     
     99            self._mo_observationcollection.verticalExtent = value 
     100 
     101    @property 
    94102    def subCollection(self):     
    95103        return self._mo_observationcollection.subCollection 
     
    100108 
    101109    @property 
    102     def verticalExtent(self):    
    103         return self._mo_observationcollection.verticalExtent 
     110    def additionalMetadata(self):        
     111        return self._mo_observationcollection.additionalMetadata 
    104112 
    105     @verticalExtent.setter 
    106     def verticalExtent(self, value):     
    107             self._mo_observationcollection.verticalExtent = value 
     113    @additionalMetadata.setter 
     114    def additionalMetadata(self, value):         
     115            self._mo_observationcollection.additionalMetadata = value 
    108116 
    109117    @property 
     
    114122    def member(self, value):     
    115123            self._mo_observationcollection.member = value 
    116  
    117     @property 
    118     def additionalMetadata(self):        
    119         return self._mo_observationcollection.additionalMetadata 
    120  
    121     @additionalMetadata.setter 
    122     def additionalMetadata(self, value):         
    123             self._mo_observationcollection.additionalMetadata = value 
    124124 
    125125    @property 
     
    140140 
    141141    def __key(self): 
    142         return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.review, self.subCollection, self.verticalExtent, self.member, self.additionalMetadata, self.description, self.CEDAOfficer, self.isoMetadata) 
     142        return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.review, self.verticalExtent, self.subCollection, self.additionalMetadata, self.member, self.description, self.CEDAOfficer, self.isoMetadata) 
    143143 
    144144    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_compositeprocess.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:38 
     26Created on 16-Feb-2012 16:18:04 
    2727 
    2828@author: mnagni 
     
    5151        self.description = None 
    5252        self.acquisitionComponent = [] 
     53        self._generatedObservation_om_discretecoverageobservation = [] 
     54        self._generatedObservation_om_temporalobservation = [] 
    5355        self._generatedObservation_om_measurement = [] 
     56        self._generatedObservation_mo_observation = [] 
     57        self._generatedObservation_om_truthobservation = [] 
     58        self._generatedObservation_om_countobservation = [] 
     59        self._generatedObservation_om_categoryobservation = [] 
     60        self._generatedObservation_om_geometryobservation = [] 
    5461        self._generatedObservation_om_complexobservation = [] 
    55         self._generatedObservation_om_countobservation = [] 
    56         self._generatedObservation_om_temporalobservation = [] 
    57         self._generatedObservation_mo_observation = [] 
    58         self._generatedObservation_om_geometryobservation = [] 
    59         self._generatedObservation_om_truthobservation = [] 
    60         self._generatedObservation_om_categoryobservation = [] 
    61         self._generatedObservation_om_discretecoverageobservation = [] 
    6262        super(CEDA_CompositeProcess, self).__init__() 
    6363 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_process.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._mo_process = MO_Process()          
    4343 
     44        self._generatedObservation_om_discretecoverageobservation = [] 
     45        self._generatedObservation_om_temporalobservation = [] 
    4446        self._generatedObservation_om_measurement = [] 
     47        self._generatedObservation_mo_observation = [] 
     48        self._generatedObservation_om_truthobservation = [] 
     49        self._generatedObservation_om_countobservation = [] 
     50        self._generatedObservation_om_categoryobservation = [] 
     51        self._generatedObservation_om_geometryobservation = [] 
    4552        self._generatedObservation_om_complexobservation = [] 
    46         self._generatedObservation_om_countobservation = [] 
    47         self._generatedObservation_om_temporalobservation = [] 
    48         self._generatedObservation_mo_observation = [] 
    49         self._generatedObservation_om_geometryobservation = [] 
    50         self._generatedObservation_om_truthobservation = [] 
    51         self._generatedObservation_om_categoryobservation = [] 
    52         self._generatedObservation_om_discretecoverageobservation = [] 
    5353        super(CEDA_Process, self).__init__() 
    5454 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_project/ceda_project.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    5050        self.identifier = [] 
    5151        self.abstract = None 
     52        self.keywords = [] 
    5253        self.status = None 
    53         self.keywords = [] 
    5454        self.documentation = [] 
    5555        self.description = None 
     
    106106 
    107107    @property 
     108    def keywords(self):  
     109        return self._mo_project.keywords 
     110 
     111    @keywords.setter 
     112    def keywords(self, value):   
     113            self._mo_project.keywords = value 
     114 
     115    @property 
    108116    def status(self):    
    109117        return self._mo_project.status 
     
    112120    def status(self, value):     
    113121            self._mo_project.status = value 
    114  
    115     @property 
    116     def keywords(self):  
    117         return self._mo_project.keywords 
    118  
    119     @keywords.setter 
    120     def keywords(self, value):   
    121             self._mo_project.keywords = value 
    122122 
    123123    @property 
     
    146146 
    147147    def __key(self): 
    148         return (self.relatedParty, self.review, self.dmp, self.projectResource, self.subProject, self.publicationState, self.identifier, self.abstract, self.status, self.keywords, self.documentation, self.description, self.observationCollection) 
     148        return (self.relatedParty, self.review, self.dmp, self.projectResource, self.subProject, self.publicationState, self.identifier, self.abstract, self.keywords, self.status, self.documentation, self.description, self.observationCollection) 
    149149 
    150150    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_curationvalue.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_result.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 
     
    4242        self._mo_result = MO_Result()    
    4343 
     44        self.segment = [] 
    4445        self.sample = [] 
    45         self.segment = [] 
    4646        self.numberOfFiles = None 
    4747        self.curationCategory = None 
     
    5050        self.internalPath = None 
    5151        super(CEDA_Result, self).__init__() 
     52 
     53    @property 
     54    def segment(self):   
     55        return self._mo_result.segment 
     56 
     57    @segment.setter 
     58    def segment(self, value):    
     59            self._mo_result.segment = value 
    5260 
    5361    @property 
     
    6068 
    6169    @property 
    62     def segment(self):   
    63         return self._mo_result.segment 
    64  
    65     @segment.setter 
    66     def segment(self, value):    
    67             self._mo_result.segment = value 
    68  
    69     @property 
    7070    def source(self):    
    7171        return self._mo_result.source 
     
    7676 
    7777    def __key(self): 
    78         return (self.sample, self.segment, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
     78        return (self.segment, self.sample, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
    7979 
    8080    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_notes.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:33 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_review.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:36 
     24Created on 16-Feb-2012 16:18:11 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewfrequencyvalue.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewstatusvalue.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_00639_language_codes/languagecode.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     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_serbian = "Serbian"  
     38    cl_japanese = "Japanese"  
     39    cl_afrikaans = "Afrikaans"  
     40    cl_greek = "Greek"  
     41    cl_english = "English"  
     42    cl_catalan = "Catalan"  
     43    cl_icelandic = "Icelandic"  
     44    cl_swahili = "Swahili"  
     45    cl_russian = "Russian"  
     46    cl_korean = "Korean"  
     47    cl_german = "German"  
     48    cl_hawaian = "Hawaian"  
     49    cl_indonesian = "Indonesian"  
     50    cl_basque = "Basque"  
     51    cl_arabic = "Arabic"  
    3752    cl_slovak = "Slovak"  
    38     cl_korean = "Korean"  
     53    cl_lithuanian = "Lithuanian"  
     54    cl_czech = "Czech"  
     55    cl_chinese = "Chinese"  
     56    cl_italian = "Italian"  
     57    cl_polish = "Polish"  
     58    cl_slovenian = "Slovenian"  
     59    cl_croatian = "Croatian"  
     60    cl_hungarian = "Hungarian"  
     61    cl_latvian = "Latvian"  
     62    cl_dutch = "Dutch"  
     63    cl_hebrew = "Hebrew"  
     64    cl_romanian = "Romanian"  
     65    cl_faeroese = "Faeroese"  
     66    cl_swedish = "Swedish"  
     67    cl_norwegian = "Norwegian"  
     68    cl_belarusian = "Belarusian"  
     69    cl_malaysian = "Malaysian"  
     70    cl_estonian = "Estonian"  
     71    cl_french_canadian_ = "French(Canadian)"  
     72    cl_danish = "Danish"  
    3973    cl_albanian = "Albanian"  
    40     cl_hawaian = "Hawaian"  
    41     cl_estonian = "Estonian"  
    42     cl_chinese = "Chinese"  
    43     cl_indonesian = "Indonesian"  
    44     cl_swedish = "Swedish"  
    45     cl_serbian = "Serbian"  
    46     cl_latvian = "Latvian"  
    47     cl_greek = "Greek"  
    48     cl_hebrew = "Hebrew"  
    49     cl_italian = "Italian"  
    50     cl_belarusian = "Belarusian"  
    51     cl_basque = "Basque"  
    52     cl_slovenian = "Slovenian"  
    53     cl_malaysian = "Malaysian"  
    54     cl_danish = "Danish"  
    55     cl_croatian = "Croatian"  
    56     cl_japanese = "Japanese"  
     74    cl_turkish = "Turkish"  
     75    cl_french = "French"  
     76    cl_finnish = "Finnish"  
     77    cl_ukranian = "Ukranian"  
    5778    cl_portuguese = "Portuguese"  
     79    cl_bulgarian = "Bulgarian"  
    5880    cl_spanish = "Spanish"  
    59     cl_czech = "Czech"  
    60     cl_icelandic = "Icelandic"  
    61     cl_lithuanian = "Lithuanian"  
    62     cl_english = "English"  
    63     cl_hungarian = "Hungarian"  
    64     cl_russian = "Russian"  
    65     cl_french = "French"  
    66     cl_afrikaans = "Afrikaans"  
    67     cl_turkish = "Turkish"  
    68     cl_polish = "Polish"  
    69     cl_bulgarian = "Bulgarian"  
    70     cl_norwegian = "Norwegian"  
    71     cl_faeroese = "Faeroese"  
    72     cl_finnish = "Finnish"  
    73     cl_dutch = "Dutch"  
    74     cl_arabic = "Arabic"  
    75     cl_ukranian = "Ukranian"  
    76     cl_french_canadian_ = "French(Canadian)"  
    77     cl_german = "German"  
    78     cl_romanian = "Romanian"  
    79     cl_catalan = "Catalan"  
    80     cl_swahili = "Swahili"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angle.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:05 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angularvelocity.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_19103_2005_schema_language/basic_types/derived/units_of_measure/area.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/currency.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/distance.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/length.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measure.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:33 
     24Created on 16-Feb-2012 16:18:03 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measuretype.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     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_angle = "angle"  
    3837    cl_length = "length"  
    3938    cl_area = "area"  
     39    cl_velocity = "velocity"  
     40    cl_weight = "weight"  
     41    cl_angle = "angle"  
    4042    cl_volume = "volume"  
    4143    cl_time = "time"  
    4244    cl_scale = "scale"  
    43     cl_velocity = "velocity"  
    44     cl_weight = "weight"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/scale.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/standardunits.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    3636    ''' 
    3737    cl_meter = "meter"  
    38     cl_meter_meter = "meter/meter"  
     38    cl_meters_second = "meters/second"  
     39    cl_squaremeter = "squareMeter"  
     40    cl_second = "second"  
     41    cl_kilogram = "kilogram"  
    3942    cl_cubicmeter = "cubicMeter"  
    4043    cl_radian = "radian"  
    41     cl_second = "second"  
    42     cl_meters_second = "meters/second"  
    43     cl_squaremeter = "squareMeter"  
    44     cl_kilogram = "kilogram"  
     44    cl_meter_meter = "meter/meter"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/subunitsperunit.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:05 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/time.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_19103_2005_schema_language/basic_types/derived/units_of_measure/unitofmeasure.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:28 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
     
    4343        self.nameStandardUnit = None 
    4444        self.scaleToStandardUnit = None 
     45        self.measureType = None 
    4546        self.measure = [] 
    46         self.measureType = None 
    4747        self.offsetToStandardUnit = None 
    4848        self.uomName = None 
     
    5252 
    5353    def __key(self): 
    54         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     54        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    5555 
    5656    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitslist.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:38 
     26Created on 16-Feb-2012 16:18:03 
    2727 
    2828@author: mnagni 
     
    3636        This class has been genererated automatically using the Apache Velocity project. 
    3737    ''' 
     38    cl_foot = "foot"  
     39    cl_cubicyard = "cubicYard"  
    3840    cl_squarefoot = "squareFoot"  
    39     cl_cubicyard = "cubicYard"  
    40     cl_foot = "foot"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangle.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 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangularvelocity.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 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._uomvelocity.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._uomvelocity.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._uomvelocity.measure 
     
    8492    def measure(self, value):    
    8593            self._uomvelocity.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._uomvelocity.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._uomvelocity.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomarea.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomcurrency.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomlength.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomscale.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:30 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomtime.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvelocity.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvolume.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomweight.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measureType = None 
    4748        self.measure = [] 
    48         self.measureType = None 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measureType(self):       
     81        return self._unitofmeasure.measureType 
     82 
     83    @measureType.setter 
     84    def measureType(self, value):        
     85            self._unitofmeasure.measureType = value 
     86 
     87    @property 
    8088    def measure(self):   
    8189        return self._unitofmeasure.measure 
     
    8492    def measure(self, value):    
    8593            self._unitofmeasure.measure = value 
    86  
    87     @property 
    88     def measureType(self):       
    89         return self._unitofmeasure.measureType 
    90  
    91     @measureType.setter 
    92     def measureType(self, value):        
    93             self._unitofmeasure.measureType = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/velocity.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_19103_2005_schema_language/basic_types/derived/units_of_measure/volume.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/weight.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/bag.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:00 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/circularsequence.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/code.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:28 
     26Created on 16-Feb-2012 16:18:04 
    2727 
    2828@author: mnagni 
     
    3636        This class has been genererated automatically using the Apache Velocity project. 
    3737    ''' 
    38     types = {'asNumber':NUMERIC,'asCharacter':Text} 
     38    types = {'asCharacter':Text,'asNumber':NUMERIC} 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/codelist.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:38 
     24Created on 16-Feb-2012 16:18:01 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/collection.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:38 
     24Created on 16-Feb-2012 16:18:11 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/dictionary.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:31 
     24Created on 16-Feb-2012 16:18:04 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keytype.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:33 
     24Created on 16-Feb-2012 16:18:04 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keyvaluepair.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/sequence.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/set.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:38 
     25Created on 16-Feb-2012 16:18:03 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/t.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:36 
     24Created on 16-Feb-2012 16:18:09 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/transfiniteset.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:29 
     24Created on 16-Feb-2012 16:18:12 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/valuetype.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:35 
     24Created on 16-Feb-2012 16:18:09 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/genericname.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:27 
     24Created on 16-Feb-2012 16:18:00 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/localname.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:08 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/membername.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/namespace.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:11 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/null.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_19103_2005_schema_language/basic_types/implementation/names/reference.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:31 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/scopedname.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/typename.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/void.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:33 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/any.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:31 
     24Created on 16-Feb-2012 16:18:09 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/classtypedescriptor.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:37 
     24Created on 16-Feb-2012 16:18:05 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/operationtype.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_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/record.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:35 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordschema.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_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordtype.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:31 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/schema.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:33 
     25Created on 16-Feb-2012 16:18:02 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/type.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:03 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/clocktime.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:33 
     24Created on 16-Feb-2012 16:18:00 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/date.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
     
    4141 
    4242        self.day = None 
     43        self.century = None 
    4344        self.year = None 
    44         self.century = None 
    4545        self.month = None 
    4646        self.precision = None 
     
    4848 
    4949    def __key(self): 
    50         return (self.day, self.year, self.century, self.month, self.precision) 
     50        return (self.day, self.century, self.year, self.month, self.precision) 
    5151 
    5252    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/dateprecision.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:30 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/datetime.py

    r8089 r8091  
    2424 
    2525''' 
    26 Created on 14-Feb-2012 17:19:36 
     26Created on 16-Feb-2012 16:18:10 
    2727 
    2828@author: mnagni 
     
    4747        self.second = None 
    4848        self.day = None 
     49        self.century = None 
    4950        self.year = None 
    50         self.century = None 
    5151        self.month = None 
    5252        self.minute = None 
     
    8080 
    8181    @property 
     82    def century(self):   
     83        return self._date.century 
     84 
     85    @century.setter 
     86    def century(self, value):    
     87            self._date.century = value 
     88 
     89    @property 
    8290    def year(self):      
    8391        return self._date.year 
     
    8694    def year(self, value):       
    8795            self._date.year = value 
    88  
    89     @property 
    90     def century(self):   
    91         return self._date.century 
    92  
    93     @century.setter 
    94     def century(self, value):    
    95             self._date.century = value 
    9696 
    9797    @property 
     
    128128 
    129129    def __key(self): 
    130         return (self.timeZone, self.second, self.day, self.year, self.century, self.month, self.minute, self.precision, self.hour) 
     130        return (self.timeZone, self.second, self.day, self.century, self.year, self.month, self.minute, self.precision, self.hour) 
    131131 
    132132    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/bit.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_19103_2005_schema_language/basic_types/primitive/enumerations/digit.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:37 
     25Created on 16-Feb-2012 16:18:12 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    en_eight = "eight"  
     38    en_one = "one"  
     39    en_zero = "zero"  
    3740    en_two = "two"  
     41    en_four = "four"  
     42    en_nine = "nine"  
     43    en_three = "three"  
     44    en_six = "six"  
     45    en_seven = "seven"  
    3846    en_five = "five"  
    39     en_four = "four"  
    40     en_six = "six"  
    41     en_eight = "eight"  
    42     en_zero = "zero"  
    43     en_seven = "seven"  
    44     en_three = "three"  
    45     en_nine = "nine"  
    46     en_one = "one"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/sign.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:11 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/multiplicities/multiplicity.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:32 
     24Created on 16-Feb-2012 16:18:02 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/multiplicities/multiplicityrange.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:37 
     24Created on 16-Feb-2012 16:18:10 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/decimal.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 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/integer.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:36 
     25Created on 16-Feb-2012 16:18:09 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/number.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:06 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/real.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:27 
     25Created on 16-Feb-2012 16:18:06 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/unlimitedinteger.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_19103_2005_schema_language/basic_types/primitive/numerics/vector.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:34 
     24Created on 16-Feb-2012 16:18:05 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/character.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_19103_2005_schema_language/basic_types/primitive/text/charactersetcode.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:27 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_iso10646_2 = "ISO10646-2"  
    3738    cl_iso10646_1 = "ISO10646-1"  
    3839    cl_iso8859 = "ISO8859"  
    39     cl_iso10646_2 = "ISO10646-2"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/ocl.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:35 
     25Created on 16-Feb-2012 16:18:01 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/boolean.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_19103_2005_schema_language/basic_types/primitive/truth/continuoustruth.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:34 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/discretetruth.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:27 
     25Created on 16-Feb-2012 16:18:10 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/logical.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 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    en_true = "TRUE"  
     38    en_maybe = "MAYBE"  
    3739    en_false = "FALSE"  
    38     en_maybe = "MAYBE"  
    39     en_true = "TRUE"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/probability.py

    r8089 r8091  
    2323 
    2424''' 
    25 Created on 14-Feb-2012 17:19:29 
     25Created on 16-Feb-2012 16:18:07 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/truth.py

    r8089 r8091  
    2222 
    2323''' 
    24 Created on 14-Feb-2012 17:19:30 
     24Created on 16-Feb-2012 16:18:03 
    2525 
    2626@author: mnagni 
  • 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_arcstringbybu