Changeset 8089


Ignore:
Timestamp:
16/02/12 14:26:42 (8 years ago)
Author:
mnagni
Message:

Played with DOJO
New EA library
Addede CEDA_Process to the migration

Location:
mauRepo/MolesManager/trunk/src
Files:
6 added
4 deleted
822 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

    r8088 r8089  
    1818 
    1919    @classmethod         
    20     def addCedaObject(self, ceda_observation, session = None): 
     20    def addCedaObject(self, ceda_observation, session = None, commit = False): 
     21        """ 
     22            Adds and eventually commit a CEDA Object in MOLES3 db 
     23            @param ceda_observation: the CEDA object to persist 
     24            @param session: the external session to use. If None a new session will be open to add and commit the object and then closed at the exit. The object is committed 
     25            @param commit: defines if the object has to be committed immediately or not. 
     26        """ 
    2127        intSession = Moles3EPB._getSession(session) 
    2228        intSession.add(ceda_observation) 
     29        if commit: 
     30            intSession.commit() 
    2331        Moles3EPB._closeSession(session)  
    2432 
  • mauRepo/MolesManager/trunk/src/MolesManager/settings.py

    r8088 r8089  
    5757MEDIA_ROOT = '' 
    5858 
     59 
    5960# URL that handles the media served from MEDIA_ROOT. Make sure to use a 
    6061# trailing slash. 
     
    6667# in apps' "static/" subdirectories and in STATICFILES_DIRS. 
    6768# Example: "/home/media/media.lawrence.com/static/" 
    68 STATIC_ROOT = '' 
     69STATIC_ROOT = os.path.join(DJANGO_PROJECT, 'static') 
    6970 
    7071# URL prefix for static files. 
    7172# Example: "http://media.lawrence.com/static/" 
    72 STATIC_URL = '/static/' 
     73STATIC_URL = 'http://127.0.0.1:8000/static/' 
    7374 
    7475# URL prefix for admin static files -- CSS, JavaScript and images. 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

    r8088 r8089  
    33<head> 
    44        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> 
    5         <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"></script> 
     5        <script type="text/javascript"> 
     6                console.log("load dojoConfig"); 
     7        var dojoConfig = { 
     8            parseOnLoad: true, 
     9            isDebug: true, 
     10            locale: 'en-gb', 
     11            extraLocale: ['it-it'], 
     12                // Register 'ceda' js libs 
     13                // Make sure the module path does *not* end in a slash.             
     14            paths: {"ceda": "/static/js"} 
     15        }; 
     16                console.log(dojoConfig); 
     17    </script> 
     18         
     19        <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"> 
     20        </script> 
    621<title>{% block title %}{% endblock %}</title> 
    722</head> 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/cedaObservation.html

    r8088 r8089  
    66 
    77<script type="text/javascript"> 
    8 require(['dojo/_base/json', "dojo/domReady!"], function(dojo){ 
    9           // require on dojo/_base/json will return the actual object of dojo 
    10           var json = dojo.byId("coObs_id").value; 
    11           var coObs = dojo.fromJson(json); 
    12           dojo.attr("records_dataLineage", 'value', coObs.dataLineage);   
    13         }); 
     8        require(['dijit/form/TextBox', 'ceda/cedaObservation']); 
    149</script> 
    1510 
     
    2722        <input type="submit" value="Submit" /> 
    2823 
    29  
     24         
    3025 
    3126        <label for="id_dataLineage">dataLineage</label> 
     
    3429        data-dojo-props="trim:true, propercase:true" id="records_dataLineage"/> 
    3530 
    36 <!--  
    37         <div class="fieldWrapper"> 
    38                 <label for="id_dataLineage">dataLineage</label> {{ coObs.dataLineage }}                  
    39                 <label for="id_relatedParty">relatedParty</label> 
    40                         <ul>     
    41                         {% for respInfo in coObs.relatedParty %}                         
    42                                 <li>{{ respInfo.role }}</li> 
    43                         {% endfor %} 
    44                         </ul>            
    45         </div> 
    46  -->     
     31        <div id="relatedParty"></div>    
    4732</form> 
    4833 
  • mauRepo/MolesManager/trunk/src/MolesManager/static/templates/debugJS.html

    r8088 r8089  
    2020</script> 
    2121 
    22 <input type="hidden" name="coObs" id="coObs_id" value='{"status": null, "__module__": "ea_model.ceda_metadatamodel.ceda_observation.ceda_observation", "description": null, "permission": null, "validTime": null, "resolution": null, "featureOfInterest": null, "resultQuality": [], "publicationState": null, "resultAccumulation": null, "resultTime": null, "observedProperty": null, "id": 12, "relatedObservation": [], "result": null, "inSupportOf": null, "mo_observationcollection_member": null, "geographicExtent": [], "phenomenonTime": null, "documentation": [], "__class__": "CEDA_Observation", "relatedParty": [{"mo_acquisition_realatedparty": null, "__module__": "ea_model.moles3_4.utilities.mo_responsiblepartyinfo", "mo_platform_relatedparty": null, "ceda_review_reviewer_id": null, "mo_project_relatedparty": null, "mo_instrument_realatedparty": null, "ceda_notes_commentator_id": null, "__class__": "MO_ResponsiblePartyInfo", "mo_observation_relatedparty": 12, "mo_operation_relatedpartyinfo": null, "role": {"name": "cl_curator", "__module__": "ascore.asenumeration", "__class__": "MO_RoleValue", "value": "curator", "description": null}, "extent": [], "id": 34, "party": [{"ci_responsibility__party_ci_individual": 34, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "Centre for Environmental Data Archive", "contactInfo": [], "__class__": "CI_Individual", "id": 45}], "ceda_observationcollection_cedaofficer_id": null, "mo_processing_relatedparty": null, "mo_compositeprocess_relatedparty": null, "mo_organization_relatedparty": null}, {"mo_acquisition_realatedparty": null, "__module__": "ea_model.moles3_4.utilities.mo_responsiblepartyinfo", "mo_platform_relatedparty": null, "ceda_review_reviewer_id": null, "mo_project_relatedparty": null, "mo_instrument_realatedparty": null, "ceda_notes_commentator_id": null, "__class__": "MO_ResponsiblePartyInfo", "mo_observation_relatedparty": 12, "mo_operation_relatedpartyinfo": null, "role": {"name": "cl_author", "__module__": "ascore.asenumeration", "__class__": "CI_RoleCode", "value": "author", "description": null}, "extent": [], "id": 35, "party": [{"ci_responsibility__party_ci_individual": 35, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "Natural Environment Research Council (NERC)", "contactInfo": [], "__class__": "CI_Individual", "id": 46}], "ceda_observationcollection_cedaofficer_id": null, "mo_processing_relatedparty": null, "mo_compositeprocess_relatedparty": null, "mo_organization_relatedparty": null}, {"mo_acquisition_realatedparty": null, "__module__": "ea_model.moles3_4.utilities.mo_responsiblepartyinfo", "mo_platform_relatedparty": null, "ceda_review_reviewer_id": null, "mo_project_relatedparty": null, "mo_instrument_realatedparty": null, "ceda_notes_commentator_id": null, "__class__": "MO_ResponsiblePartyInfo", "mo_observation_relatedparty": 12, "mo_operation_relatedpartyinfo": null, "role": {"name": "cl_coinvestigator", "__module__": "ascore.asenumeration", "__class__": "MO_RoleValue", "value": "coInvestigator", "description": null}, "extent": [], "id": 36, "party": [{"ci_responsibility__party_ci_individual": 36, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "Alan Blyth", "contactInfo": [], "__class__": "CI_Individual", "id": 47}, {"ci_responsibility__party_ci_individual": 36, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "University of Leeds", "contactInfo": [], "__class__": "CI_Individual", "id": 48}], "ceda_observationcollection_cedaofficer_id": null, "mo_processing_relatedparty": null, "mo_compositeprocess_relatedparty": null, "mo_organization_relatedparty": null}], "dataLineage": "Data provided by CSIP participants.", "identifier": [], "parameter": [], "verticalExtent": [], "procedure": null, "metadata": null}' /> 
     22<input type="hidden" name="coObs" id="coObs_id" value='{"status": null, "__module__": "ea_model.ceda_metadatamodel.ceda_observation.ceda_observation", "identifier": [], "description": null, "permission": null, "documentation": [], "citation": [], "observedProperty": null, "internalReview": [], "mo_observation__om_observation_id": null, "om_complexobservation__om_observation_id": null, "publicationState": null, "featureOfInterest": null, "keywords": [], "om_truthobservation__om_observation_id": null, "resultTime": null, "mo_observationcollection_member": 1, "id": 13, "ceda_observation__mo_observation_id": null, "om_geometryobservation__om_observation_id": null, "result": null, "inSupportOf": null, "gfi_feature__propertyvalueprovider_mo_observation": null, "resultQuality": [], "relatedObservation": [], "om_temporalobservation__om_observation_id": null, "om_measurement__om_observation_id": null, "parameter": [], "om_countobservation__om_observation_id": null, "resultAccumulation": null, "__class__": "CEDA_Observation", "om_discretecoverageobservation__om_observation_id": null, "validTime": null, "relatedParty": [{"ceda_review_reviewer_id": null, "__module__": "ea_model.moles3_4.utilities.mo_responsiblepartyinfo", "ceda_observationcollection_cedaofficer_id": null, "mo_acquisition_realatedparty": null, "mo_project_relatedparty": null, "mo_platform_relatedparty": null, "ceda_notes_commentator_id": null, "__class__": "MO_ResponsiblePartyInfo", "mo_observation_relatedparty": 13, "mo_operation_relatedpartyinfo": null, "role": {"name": "cl_curator", "__module__": "ascore.asenumeration", "__class__": "MO_RoleValue", "value": "curator", "description": null}, "extent": [], "id": 37, "party": [{"ci_responsibility__party_ci_individual": 37, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "Centre for Environmental Data Archive", "contactInfo": [], "__class__": "CI_Individual", "id": 49}], "mo_instrument_realatedparty": null, "mo_processing_relatedparty": null, "mo_compositeprocess_relatedparty": null, "mo_organization_relatedparty": null}, {"ceda_review_reviewer_id": null, "__module__": "ea_model.moles3_4.utilities.mo_responsiblepartyinfo", "ceda_observationcollection_cedaofficer_id": null, "mo_acquisition_realatedparty": null, "mo_project_relatedparty": null, "mo_platform_relatedparty": null, "ceda_notes_commentator_id": null, "__class__": "MO_ResponsiblePartyInfo", "mo_observation_relatedparty": 13, "mo_operation_relatedpartyinfo": null, "role": {"name": "cl_author", "__module__": "ascore.asenumeration", "__class__": "CI_RoleCode", "value": "author", "description": null}, "extent": [], "id": 38, "party": [{"ci_responsibility__party_ci_individual": 38, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "Natural Environment Research Council (NERC)", "contactInfo": [], "__class__": "CI_Individual", "id": 50}], "mo_instrument_realatedparty": null, "mo_processing_relatedparty": null, "mo_compositeprocess_relatedparty": null, "mo_organization_relatedparty": null}, {"ceda_review_reviewer_id": null, "__module__": "ea_model.moles3_4.utilities.mo_responsiblepartyinfo", "ceda_observationcollection_cedaofficer_id": null, "mo_acquisition_realatedparty": null, "mo_project_relatedparty": null, "mo_platform_relatedparty": null, "ceda_notes_commentator_id": null, "__class__": "MO_ResponsiblePartyInfo", "mo_observation_relatedparty": 13, "mo_operation_relatedpartyinfo": null, "role": {"name": "cl_coinvestigator", "__module__": "ascore.asenumeration", "__class__": "MO_RoleValue", "value": "coInvestigator", "description": null}, "extent": [], "id": 39, "party": [{"ci_responsibility__party_ci_individual": 39, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "Alan Blyth", "contactInfo": [], "__class__": "CI_Individual", "id": 51}, {"ci_responsibility__party_ci_individual": 39, "__module__": "ea_model.upcomingiso.ci_individual", "ci_organisation_individual": null, "positionName": null, "name": "University of Leeds", "contactInfo": [], "__class__": "CI_Individual", "id": 52}], "mo_instrument_realatedparty": null, "mo_processing_relatedparty": null, "mo_compositeprocess_relatedparty": null, "mo_organization_relatedparty": null}], "dataLineage": "Data provided by CSIP participants.", "verticalExtent": [], "geographicExtent": [], "metadata": null, "resolution": null, "phenomenonTime": null, "procedure": {"realatedParty": [], "__module__": "ea_model.ceda_metadatamodel.ceda_acquisition.ceda_acquisition", "om_observation_procedure_id": null, "ceda_acquisition__ceda_process_id": null, "om_observation__procedure_ceda_acquisition": {}, "mo_process__om_process_id": null, "__class__": "CEDA_Acquisition", "generatedObservation": [], "ceda_acquisition__mo_acquisition_id": null, "platform": [], "mo_compositeprocess_acquisitioncomponent": null, "operation": [], "om_observation__procedure_ceda_acquisition_id": 13, "id": 12, "ceda_process__mo_process_id": null, "description": null, "instrument": [], "ceda_processing__ceda_process_id": null, "mo_computation__mo_process_id": null, "review": [], "documentation": [], "mo_acquisition__mo_process_id": null, "outputDescription": null, "ceda_compositeprocess__ceda_process_id": null, "instrumentPlatformPair": [], "mo_compositeprocess__mo_process_id": null, "identifier": []}, "om_categoryobservation__om_observation_id": null}' /> 
    2323 
    2424<form action="." method="post"> 
  • mauRepo/MolesManager/trunk/src/MolesManager/urls.py

    r8075 r8089  
    11from django.conf.urls.defaults import patterns, include, url 
     2from MolesManager.settings import STATIC_ROOT 
    23 
    34# Uncomment the next two lines to enable the admin: 
     
    2021    (r'cov/$', 'coView'), 
    2122) 
     23 
     24urlpatterns += patterns('', 
     25    url(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': STATIC_ROOT , 'show_indexes': True}), 
     26) 
  • mauRepo/MolesManager/trunk/src/MolesManager/views/cedaObservationView.py

    r8088 r8089  
    2626    __getSample(request, objectId, c) 
    2727    if c.has_key('records'): 
    28         c['coObs'] = DJEncoder().encode(c['records'])   
     28        c['coObs'] = DJEncoder().encode(c['records']) 
     29        print c['coObs']  
    2930    c['objId'] = objectId 
    3031     
  • mauRepo/MolesManager/trunk/src/ascore/utils.py

    r8087 r8089  
    66def has_value(item): 
    77    if item is not None: 
    8         if isinstance(item, list) and len(item) > 0: 
     8        if (isinstance(item, list) and len(item) > 0) or not isinstance(item, list):             
    99            return True 
    1010        else: 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_acquisition.py

    r8088 r8089  
    2424 
    2525''' 
    26 Created on 10-Feb-2012 12:03:10 
     26Created on 14-Feb-2012 17:19:32 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_Acquisition(MO_Acquisition,CEDA_Process): 
     31class CEDA_Acquisition(CEDA_Process,MO_Acquisition): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._mo_acquisition = MO_Acquisition()          
    4344        self._ceda_process = CEDA_Process()      
    44         self._mo_acquisition = MO_Acquisition()          
    4545 
    4646        self.identifier = [] 
     
    5353        self.description = None 
    5454        self.instrumentPlatformPair = [] 
    55         self.realatedParty = [] 
     55        self._generatedObservation_om_measurement = [] 
     56        self._generatedObservation_om_complexobservation = [] 
    5657        self._generatedObservation_om_countobservation = [] 
     58        self._generatedObservation_om_temporalobservation = [] 
     59        self._generatedObservation_mo_observation = [] 
     60        self._generatedObservation_om_geometryobservation = [] 
    5761        self._generatedObservation_om_truthobservation = [] 
    5862        self._generatedObservation_om_categoryobservation = [] 
    59         self._generatedObservation_om_measurement = [] 
    60         self._generatedObservation_om_temporalobservation = [] 
    61         self._generatedObservation_om_geometryobservation = [] 
    6263        self._generatedObservation_om_discretecoverageobservation = [] 
    63         self._generatedObservation_mo_observation = [] 
    64         self._generatedObservation_om_complexobservation = [] 
     64        self.realatedParty = [] 
    6565        super(CEDA_Acquisition, self).__init__() 
    6666 
     
    130130 
    131131    @property 
     132    def generatedObservation(self):      
     133        return self._mo_acquisition.generatedObservation 
     134 
     135    @generatedObservation.setter 
     136    def generatedObservation(self, value):       
     137            self._mo_acquisition.generatedObservation = value 
     138 
     139    @property 
    132140    def realatedParty(self):     
    133141        return self._mo_acquisition.realatedParty 
     
    137145            self._mo_acquisition.realatedParty = value 
    138146 
    139     @property 
    140     def generatedObservation(self):      
    141         return self._ceda_process.generatedObservation 
    142  
    143     @generatedObservation.setter 
    144     def generatedObservation(self, value):       
    145             self._ceda_process.generatedObservation = value 
    146  
    147147    def __key(self): 
    148         return (self.identifier, self.instrument, self.review, self.operation, self.documentation, self.outputDescription, self.platform, self.description, self.instrumentPlatformPair, self.realatedParty, self.generatedObservation) 
     148        return (self.identifier, self.instrument, self.review, self.operation, self.documentation, self.outputDescription, self.platform, self.description, self.instrumentPlatformPair, self.generatedObservation, self.realatedParty) 
    149149 
    150150    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_instrument.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:08 
     25Created on 14-Feb-2012 17:19:29 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_operation.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:16 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_platform.py

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

    r8088 r8089  
    2424 
    2525''' 
    26 Created on 10-Feb-2012 12:03:13 
     26Created on 14-Feb-2012 17:19:38 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_Processing(MO_Processing,CEDA_Process): 
     31class CEDA_Processing(CEDA_Process,MO_Processing): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._mo_processing = MO_Processing()    
    4344        self._ceda_process = CEDA_Process()      
    44         self._mo_processing = MO_Processing()    
    4545 
    4646        self.identifier = [] 
     
    4949        self.review = [] 
    5050        self.algorithm = [] 
     51        self.processingInput = [] 
    5152        self.documentation = [] 
    52         self.processingInput = [] 
    5353        self.description = None 
    5454        self.processingOutput = None 
     55        self._generatedObservation_om_measurement = [] 
     56        self._generatedObservation_om_complexobservation = [] 
    5557        self._generatedObservation_om_countobservation = [] 
     58        self._generatedObservation_om_temporalobservation = [] 
     59        self._generatedObservation_mo_observation = [] 
     60        self._generatedObservation_om_geometryobservation = [] 
    5661        self._generatedObservation_om_truthobservation = [] 
    5762        self._generatedObservation_om_categoryobservation = [] 
    58         self._generatedObservation_om_measurement = [] 
    59         self._generatedObservation_om_temporalobservation = [] 
    60         self._generatedObservation_om_geometryobservation = [] 
    6163        self._generatedObservation_om_discretecoverageobservation = [] 
    62         self._generatedObservation_mo_observation = [] 
    63         self._generatedObservation_om_complexobservation = [] 
    6464        super(CEDA_Processing, self).__init__() 
    6565 
     
    9797 
    9898    @property 
     99    def processingInput(self):   
     100        return self._mo_processing.processingInput 
     101 
     102    @processingInput.setter 
     103    def processingInput(self, value):    
     104            self._mo_processing.processingInput = value 
     105 
     106    @property 
    99107    def documentation(self):     
    100108        return self._mo_processing.documentation 
     
    103111    def documentation(self, value):      
    104112            self._mo_processing.documentation = value 
    105  
    106     @property 
    107     def processingInput(self):   
    108         return self._mo_processing.processingInput 
    109  
    110     @processingInput.setter 
    111     def processingInput(self, value):    
    112             self._mo_processing.processingInput = value 
    113113 
    114114    @property 
     
    130130    @property 
    131131    def generatedObservation(self):      
    132         return self._ceda_process.generatedObservation 
     132        return self._mo_processing.generatedObservation 
    133133 
    134134    @generatedObservation.setter 
    135135    def generatedObservation(self, value):       
    136             self._ceda_process.generatedObservation = value 
     136            self._mo_processing.generatedObservation = value 
    137137 
    138138    def __key(self): 
    139         return (self.identifier, self.softwareReference, self.relatedParty, self.review, self.algorithm, self.documentation, self.processingInput, self.description, self.processingOutput, self.generatedObservation) 
     139        return (self.identifier, self.softwareReference, self.relatedParty, self.review, self.algorithm, self.processingInput, self.documentation, 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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:07 
     24Created on 14-Feb-2012 17:19:33 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observation/ceda_observation.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:08 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.resolution = None 
     45        self._geographicExtent_ex_boundingpolygon = [] 
    4546        self._geographicExtent_ex_geographicdescription = [] 
    46         self._geographicExtent_ex_boundingpolygon = [] 
    4747        self._geographicExtent_ex_geographicboundingbox = [] 
    4848        self.relatedParty = [] 
     
    5151        self.resultTime = None 
    5252        self.resultAccumulation = None 
     53        self._observedProperty_gf_associationrole = None 
    5354        self._observedProperty_gf_attributetype = None 
    5455        self._observedProperty_gf_operation = None 
    55         self._observedProperty_gf_associationrole = None 
    5656        self.parameter = [] 
     57        self.metadata = None 
    5758        self.publicationState = None 
    5859        self.identifier = [] 
    59         self.metadata = None 
    6060        self.dataLineage = None 
    6161        self._phenomenonTime_tm_complex = None 
    6262        self._phenomenonTime_tm_primitive = None 
    6363        self.documentation = [] 
     64        self._resultQuality_dq_completeness = [] 
     65        self._resultQuality_qe_usability = [] 
    6466        self._resultQuality_dq_temporalaccuracy = [] 
    6567        self._resultQuality_dq_logicalconsistency = [] 
    66         self._resultQuality_qe_usability = [] 
     68        self._resultQuality_dq_thematicaccuracy = [] 
    6769        self._resultQuality_dq_positionalaccuracy = [] 
    68         self._resultQuality_dq_completeness = [] 
    69         self._resultQuality_dq_thematicaccuracy = [] 
    7070        self.validTime = None 
    71         self.procedure = None 
     71        self._procedure_ceda_acquisition = None 
     72        self._procedure_ceda_processing = None 
     73        self._procedure_ceda_compositeprocess = None 
    7274        self.result = None 
    7375        self.verticalExtent = [] 
     
    7880        self._featureOfInterest_sf_samplingfeature = None 
    7981        self._featureOfInterest_gfi_domainfeature = None 
     82        self.status = None 
    8083        self.keywords = [] 
    81         self.status = None 
     84        self._relatedObservation_om_measurement = [] 
     85        self._relatedObservation_om_complexobservation = [] 
    8286        self._relatedObservation_om_countobservation = [] 
     87        self._relatedObservation_om_temporalobservation = [] 
     88        self._relatedObservation_mo_observation = [] 
     89        self._relatedObservation_om_geometryobservation = [] 
    8390        self._relatedObservation_om_truthobservation = [] 
    8491        self._relatedObservation_om_categoryobservation = [] 
    85         self._relatedObservation_om_measurement = [] 
    86         self._relatedObservation_om_temporalobservation = [] 
    87         self._relatedObservation_om_geometryobservation = [] 
    8892        self._relatedObservation_om_discretecoverageobservation = [] 
    89         self._relatedObservation_mo_observation = [] 
    90         self._relatedObservation_om_complexobservation = [] 
    9193        self.description = None 
    9294        super(CEDA_Observation, self).__init__() 
     
    157159 
    158160    @property 
     161    def metadata(self):  
     162        return self._mo_observation.metadata 
     163 
     164    @metadata.setter 
     165    def metadata(self, value):   
     166            self._mo_observation.metadata = value 
     167 
     168    @property 
    159169    def publicationState(self):  
    160170        return self._mo_observation.publicationState 
     
    173183 
    174184    @property 
    175     def metadata(self):  
    176         return self._mo_observation.metadata 
    177  
    178     @metadata.setter 
    179     def metadata(self, value):   
    180             self._mo_observation.metadata = value 
    181  
    182     @property 
    183185    def phenomenonTime(self):    
    184186        return self._mo_observation.phenomenonTime 
     
    221223 
    222224    @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 
    223233    def result(self):    
    224234        return self._mo_observation.result 
     
    277287 
    278288    def __key(self): 
    279         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.resultQuality, self.validTime, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.internalReview, self.citation, self.featureOfInterest, self.keywords, self.status, self.relatedObservation, self.description) 
     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) 
    280290 
    281291    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationcollection/ceda_observationcollection.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
     
    4242        self._mo_observationcollection = MO_ObservationCollection()      
    4343 
     44        self.identifier = [] 
    4445        self.publicationState = None 
    45         self.identifier = [] 
     46        self._geographicExtent_ex_boundingpolygon = [] 
    4647        self._geographicExtent_ex_geographicdescription = [] 
    47         self._geographicExtent_ex_boundingpolygon = [] 
    4848        self._geographicExtent_ex_geographicboundingbox = [] 
    4949        self._phenomenonTime_tm_complex = [] 
     
    6060 
    6161    @property 
     62    def identifier(self):        
     63        return self._mo_observationcollection.identifier 
     64 
     65    @identifier.setter 
     66    def identifier(self, value):         
     67            self._mo_observationcollection.identifier = value 
     68 
     69    @property 
    6270    def publicationState(self):  
    6371        return self._mo_observationcollection.publicationState 
     
    6674    def publicationState(self, value):   
    6775            self._mo_observationcollection.publicationState = value 
    68  
    69     @property 
    70     def identifier(self):        
    71         return self._mo_observationcollection.identifier 
    72  
    73     @identifier.setter 
    74     def identifier(self, value):         
    75             self._mo_observationcollection.identifier = value 
    7676 
    7777    @property 
     
    140140 
    141141    def __key(self): 
    142         return (self.publicationState, self.identifier, 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.subCollection, self.verticalExtent, self.member, self.additionalMetadata, 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

    r8088 r8089  
    2424 
    2525''' 
    26 Created on 10-Feb-2012 12:03:10 
     26Created on 14-Feb-2012 17:19:38 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_CompositeProcess(MO_CompositeProcess,CEDA_Process): 
     31class CEDA_CompositeProcess(CEDA_Process,MO_CompositeProcess): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._mo_compositeprocess = MO_CompositeProcess()        
    4344        self._ceda_process = CEDA_Process()      
    44         self._mo_compositeprocess = MO_CompositeProcess()        
    4545 
    4646        self.identifier = [] 
     
    4949        self.review = [] 
    5050        self.documentation = [] 
     51        self.description = None 
    5152        self.acquisitionComponent = [] 
    52         self.description = None 
     53        self._generatedObservation_om_measurement = [] 
     54        self._generatedObservation_om_complexobservation = [] 
    5355        self._generatedObservation_om_countobservation = [] 
     56        self._generatedObservation_om_temporalobservation = [] 
     57        self._generatedObservation_mo_observation = [] 
     58        self._generatedObservation_om_geometryobservation = [] 
    5459        self._generatedObservation_om_truthobservation = [] 
    5560        self._generatedObservation_om_categoryobservation = [] 
    56         self._generatedObservation_om_measurement = [] 
    57         self._generatedObservation_om_temporalobservation = [] 
    58         self._generatedObservation_om_geometryobservation = [] 
    5961        self._generatedObservation_om_discretecoverageobservation = [] 
    60         self._generatedObservation_mo_observation = [] 
    61         self._generatedObservation_om_complexobservation = [] 
    6262        super(CEDA_CompositeProcess, self).__init__() 
    6363 
     
    9595 
    9696    @property 
     97    def description(self):       
     98        return self._mo_compositeprocess.description 
     99 
     100    @description.setter 
     101    def description(self, value):        
     102            self._mo_compositeprocess.description = value 
     103 
     104    @property 
    97105    def acquisitionComponent(self):      
    98106        return self._mo_compositeprocess.acquisitionComponent 
     
    103111 
    104112    @property 
    105     def description(self):       
    106         return self._mo_compositeprocess.description 
    107  
    108     @description.setter 
    109     def description(self, value):        
    110             self._mo_compositeprocess.description = value 
    111  
    112     @property 
    113113    def generatedObservation(self):      
    114         return self._ceda_process.generatedObservation 
     114        return self._mo_compositeprocess.generatedObservation 
    115115 
    116116    @generatedObservation.setter 
    117117    def generatedObservation(self, value):       
    118             self._ceda_process.generatedObservation = value 
     118            self._mo_compositeprocess.generatedObservation = value 
    119119 
    120120    def __key(self): 
    121         return (self.identifier, self.computationComponent, self.relatedParty, self.review, self.documentation, self.acquisitionComponent, self.description, self.generatedObservation) 
     121        return (self.identifier, self.computationComponent, self.relatedParty, self.review, self.documentation, self.description, self.acquisitionComponent, self.generatedObservation) 
    122122 
    123123    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_process.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:12 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
     
    4242        self._mo_process = MO_Process()          
    4343 
     44        self._generatedObservation_om_measurement = [] 
     45        self._generatedObservation_om_complexobservation = [] 
    4446        self._generatedObservation_om_countobservation = [] 
     47        self._generatedObservation_om_temporalobservation = [] 
     48        self._generatedObservation_mo_observation = [] 
     49        self._generatedObservation_om_geometryobservation = [] 
    4550        self._generatedObservation_om_truthobservation = [] 
    4651        self._generatedObservation_om_categoryobservation = [] 
    47         self._generatedObservation_om_measurement = [] 
    48         self._generatedObservation_om_temporalobservation = [] 
    49         self._generatedObservation_om_geometryobservation = [] 
    5052        self._generatedObservation_om_discretecoverageobservation = [] 
    51         self._generatedObservation_mo_observation = [] 
    52         self._generatedObservation_om_complexobservation = [] 
    5353        super(CEDA_Process, self).__init__() 
    5454 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_project/ceda_project.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
     
    4747        self.projectResource = [] 
    4848        self.subProject = [] 
     49        self.publicationState = None 
    4950        self.identifier = [] 
    50         self.publicationState = None 
    5151        self.abstract = None 
     52        self.status = None 
    5253        self.keywords = [] 
    53         self.status = None 
    5454        self.documentation = [] 
    5555        self.description = None 
     
    8282 
    8383    @property 
     84    def publicationState(self):  
     85        return self._mo_project.publicationState 
     86 
     87    @publicationState.setter 
     88    def publicationState(self, value):   
     89            self._mo_project.publicationState = value 
     90 
     91    @property 
    8492    def identifier(self):        
    8593        return self._mo_project.identifier 
     
    8896    def identifier(self, value):         
    8997            self._mo_project.identifier = value 
    90  
    91     @property 
    92     def publicationState(self):  
    93         return self._mo_project.publicationState 
    94  
    95     @publicationState.setter 
    96     def publicationState(self, value):   
    97             self._mo_project.publicationState = value 
    9898 
    9999    @property 
     
    106106 
    107107    @property 
     108    def status(self):    
     109        return self._mo_project.status 
     110 
     111    @status.setter 
     112    def status(self, value):     
     113            self._mo_project.status = value 
     114 
     115    @property 
    108116    def keywords(self):  
    109117        return self._mo_project.keywords 
     
    112120    def keywords(self, value):   
    113121            self._mo_project.keywords = value 
    114  
    115     @property 
    116     def status(self):    
    117         return self._mo_project.status 
    118  
    119     @status.setter 
    120     def status(self, value):     
    121             self._mo_project.status = value 
    122122 
    123123    @property 
     
    146146 
    147147    def __key(self): 
    148         return (self.relatedParty, self.review, self.dmp, self.projectResource, self.subProject, self.identifier, self.publicationState, self.abstract, self.keywords, self.status, 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.status, self.keywords, 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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:11 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_result.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
     
    4242        self._mo_result = MO_Result()    
    4343 
     44        self.sample = [] 
    4445        self.segment = [] 
    45         self.sample = [] 
    4646        self.numberOfFiles = None 
    4747        self.curationCategory = None 
     
    5050        self.internalPath = None 
    5151        super(CEDA_Result, self).__init__() 
     52 
     53    @property 
     54    def sample(self):    
     55        return self._mo_result.sample 
     56 
     57    @sample.setter 
     58    def sample(self, value):     
     59            self._mo_result.sample = value 
    5260 
    5361    @property 
     
    6068 
    6169    @property 
    62     def sample(self):    
    63         return self._mo_result.sample 
    64  
    65     @sample.setter 
    66     def sample(self, value):     
    67             self._mo_result.sample = value 
    68  
    69     @property 
    7070    def source(self):    
    7171        return self._mo_result.source 
     
    7676 
    7777    def __key(self): 
    78         return (self.segment, self.sample, self.numberOfFiles, self.curationCategory, self.source, self.volume, self.internalPath) 
     78        return (self.sample, self.segment, 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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:08 
     24Created on 14-Feb-2012 17:19:33 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_review.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:36 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewfrequencyvalue.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:12 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewstatusvalue.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:10 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_00639_language_codes/languagecode.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:07 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angularvelocity.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/area.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:12 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/currency.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/distance.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:11 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/length.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:31 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measure.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:05 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
    37     cl_velocity = "velocity"  
    38     cl_time = "time"  
    3937    cl_angle = "angle"  
    40     cl_weight = "weight"  
     38    cl_length = "length"  
    4139    cl_area = "area"  
    4240    cl_volume = "volume"  
    43     cl_length = "length"  
     41    cl_time = "time"  
    4442    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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:06 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/standardunits.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:38 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_meter = "meter"  
     38    cl_meter_meter = "meter/meter"  
    3739    cl_cubicmeter = "cubicMeter"  
     40    cl_radian = "radian"  
    3841    cl_second = "second"  
    39     cl_kilogram = "kilogram"  
    4042    cl_meters_second = "meters/second"  
    4143    cl_squaremeter = "squareMeter"  
    42     cl_radian = "radian"  
    43     cl_meter_meter = "meter/meter"  
    44     cl_meter = "meter"  
     44    cl_kilogram = "kilogram"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/subunitsperunit.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:14 
     24Created on 14-Feb-2012 17:19:34 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/time.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitofmeasure.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:10 
     24Created on 14-Feb-2012 17:19:28 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitslist.py

    r8088 r8089  
    2424 
    2525''' 
    26 Created on 10-Feb-2012 12:03:11 
     26Created on 14-Feb-2012 17:19:38 
    2727 
    2828@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangle.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:11 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangularvelocity.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomarea.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:08 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomcurrency.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:15 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomlength.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:11 
     25Created on 14-Feb-2012 17:19:31 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomscale.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:30 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomtime.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:15 
     25Created on 14-Feb-2012 17:19:31 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvelocity.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:12 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvolume.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomweight.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:12 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/velocity.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:08 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/volume.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:10 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/weight.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:29 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/circularsequence.py

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

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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:07 
     24Created on 14-Feb-2012 17:19:38 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/collection.py

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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:13 
     24Created on 14-Feb-2012 17:19:31 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keytype.py

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

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:06 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/set.py

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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:36 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/transfiniteset.py

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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:07 
     24Created on 14-Feb-2012 17:19:35 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/genericname.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:11 
     24Created on 14-Feb-2012 17:19:27 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/localname.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:31 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/membername.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:27 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/namespace.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:34 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/null.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:11 
     24Created on 14-Feb-2012 17:19:34 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/reference.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:10 
     24Created on 14-Feb-2012 17:19:31 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/scopedname.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:05 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/typename.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:07 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/void.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:33 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/any.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:11 
     24Created on 14-Feb-2012 17:19:31 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/classtypedescriptor.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:11 
     24Created on 14-Feb-2012 17:19:37 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/operationtype.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:13 
     24Created on 14-Feb-2012 17:19:38 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/record.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:09 
     24Created on 14-Feb-2012 17:19:35 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordschema.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:07 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordtype.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:05 
     25Created on 14-Feb-2012 17:19:33 
    2626 
    2727@author: mnagni 
     
    4545        self.isGlobal = None 
    4646        self.schemaName = None 
     47        self.acceptableClassList = [] 
    4748        self.description = None 
    48         self.acceptableClassList = [] 
    4949        super(Schema, self).__init__() 
    5050 
     
    5858 
    5959    def __key(self): 
    60         return (self.name, self.isGlobal, self.schemaName, self.description, self.acceptableClassList) 
     60        return (self.name, self.isGlobal, self.schemaName, self.acceptableClassList, self.description) 
    6161 
    6262    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/type.py

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

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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:07 
     24Created on 14-Feb-2012 17:19:34 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/dateprecision.py

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

    r8088 r8089  
    2424 
    2525''' 
    26 Created on 10-Feb-2012 12:03:08 
     26Created on 14-Feb-2012 17:19:36 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class DateTime(Date,ClockTime): 
     31class DateTime(ClockTime,Date): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._date = Date()      
    4344        self._clocktime = ClockTime()    
    44         self._date = Date()      
    4545 
    4646        self.timeZone = None 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/bit.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:08 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/enumerations/digit.py

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

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

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:32 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/multiplicities/multiplicityrange.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:37 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/decimal.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:38 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/integer.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/number.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:16 
     25Created on 14-Feb-2012 17:19:27 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/unlimitedinteger.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:09 
     24Created on 14-Feb-2012 17:19:29 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/numerics/vector.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:16 
     24Created on 14-Feb-2012 17:19:34 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/character.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:14 
     24Created on 14-Feb-2012 17:19:37 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/charactersetcode.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:07 
     25Created on 14-Feb-2012 17:19:27 
    2626 
    2727@author: mnagni 
     
    3636    ''' 
    3737    cl_iso10646_1 = "ISO10646-1"  
     38    cl_iso8859 = "ISO8859"  
    3839    cl_iso10646_2 = "ISO10646-2"  
    39     cl_iso8859 = "ISO8859"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/text/ocl.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/boolean.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:15 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/continuoustruth.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:27 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/logical.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    en_false = "FALSE"  
    3738    en_maybe = "MAYBE"  
    38     en_false = "FALSE"  
    3939    en_true = "TRUE"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/probability.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:04 
     25Created on 14-Feb-2012 17:19:29 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/truth/truth.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:09 
     24Created on 14-Feb-2012 17:19:30 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/directposition.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:15 
     24Created on 14-Feb-2012 17:19:31 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_affineplacement.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:08 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_arcstring = GM_ArcString()      
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    5252 
    5353    @property 
     54    def numDerivativesAtEnd(self):       
     55        return self._gm_arcstring.numDerivativesAtEnd 
     56 
     57    @numDerivativesAtEnd.setter 
     58    def numDerivativesAtEnd(self, value):        
     59            self._gm_arcstring.numDerivativesAtEnd = value 
     60 
     61    @property 
    5462    def curve(self):     
    5563        return self._gm_arcstring.curve 
     
    5866    def curve(self, value):      
    5967            self._gm_arcstring.curve = value 
    60  
    61     @property 
    62     def numDerivativesAtEnd(self):       
    63         return self._gm_arcstring.numDerivativesAtEnd 
    64  
    65     @numDerivativesAtEnd.setter 
    66     def numDerivativesAtEnd(self, value):        
    67             self._gm_arcstring.numDerivativesAtEnd = value 
    6868 
    6969    @property 
     
    108108 
    109109    def __key(self): 
    110         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     110        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    111111 
    112112    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcbybulge.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_arcstringbybulge = GM_ArcStringByBulge()        
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.normal = [] 
    4747        self.interpolation = None 
     
    5353 
    5454    @property 
     55    def numDerivativesAtEnd(self):       
     56        return self._gm_arcstringbybulge.numDerivativesAtEnd 
     57 
     58    @numDerivativesAtEnd.setter 
     59    def numDerivativesAtEnd(self, value):        
     60            self._gm_arcstringbybulge.numDerivativesAtEnd = value 
     61 
     62    @property 
    5563    def curve(self):     
    5664        return self._gm_arcstringbybulge.curve 
     
    5967    def curve(self, value):      
    6068            self._gm_arcstringbybulge.curve = value 
    61  
    62     @property 
    63     def numDerivativesAtEnd(self):       
    64         return self._gm_arcstringbybulge.numDerivativesAtEnd 
    65  
    66     @numDerivativesAtEnd.setter 
    67     def numDerivativesAtEnd(self, value):        
    68             self._gm_arcstringbybulge.numDerivativesAtEnd = value 
    6969 
    7070    @property 
     
    117117 
    118118    def __key(self): 
    119         return (self.curve, self.numDerivativesAtEnd, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
     119        return (self.numDerivativesAtEnd, self.curve, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
    120120 
    121121    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstring.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:15 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    5252 
    5353    @property 
     54    def numDerivativesAtEnd(self):       
     55        return self._gm_curvesegment.numDerivativesAtEnd 
     56 
     57    @numDerivativesAtEnd.setter 
     58    def numDerivativesAtEnd(self, value):        
     59            self._gm_curvesegment.numDerivativesAtEnd = value 
     60 
     61    @property 
    5462    def curve(self):     
    5563        return self._gm_curvesegment.curve 
     
    5866    def curve(self, value):      
    5967            self._gm_curvesegment.curve = value 
    60  
    61     @property 
    62     def numDerivativesAtEnd(self):       
    63         return self._gm_curvesegment.numDerivativesAtEnd 
    64  
    65     @numDerivativesAtEnd.setter 
    66     def numDerivativesAtEnd(self, value):        
    67             self._gm_curvesegment.numDerivativesAtEnd = value 
    6868 
    6969    @property 
     
    9292 
    9393    def __key(self): 
    94         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     94        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    9595 
    9696    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_arcstringbybulge.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:29 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.normal = [] 
    4747        self.interpolation = None 
     
    5353 
    5454    @property 
     55    def numDerivativesAtEnd(self):       
     56        return self._gm_curvesegment.numDerivativesAtEnd 
     57 
     58    @numDerivativesAtEnd.setter 
     59    def numDerivativesAtEnd(self, value):        
     60            self._gm_curvesegment.numDerivativesAtEnd = value 
     61 
     62    @property 
    5563    def curve(self):     
    5664        return self._gm_curvesegment.curve 
     
    5967    def curve(self, value):      
    6068            self._gm_curvesegment.curve = value 
    61  
    62     @property 
    63     def numDerivativesAtEnd(self):       
    64         return self._gm_curvesegment.numDerivativesAtEnd 
    65  
    66     @numDerivativesAtEnd.setter 
    67     def numDerivativesAtEnd(self, value):        
    68             self._gm_curvesegment.numDerivativesAtEnd = value 
    6969 
    7070    @property 
     
    9393 
    9494    def __key(self): 
    95         return (self.curve, self.numDerivativesAtEnd, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
     95        return (self.numDerivativesAtEnd, self.curve, self.normal, self.interpolation, self.bulge, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc) 
    9696 
    9797    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bezier.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:06 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.curveForm = None 
     45        self.numDerivativesAtEnd = None 
    4546        self.curve = None 
    46         self.numDerivativesAtEnd = None 
    4747        self.knot = [] 
    4848        self.interpolation = None 
     
    6464 
    6565    @property 
     66    def numDerivativesAtEnd(self):       
     67        return self._gm_bsplinecurve.numDerivativesAtEnd 
     68 
     69    @numDerivativesAtEnd.setter 
     70    def numDerivativesAtEnd(self, value):        
     71            self._gm_bsplinecurve.numDerivativesAtEnd = value 
     72 
     73    @property 
    6674    def curve(self):     
    6775        return self._gm_bsplinecurve.curve 
     
    7078    def curve(self, value):      
    7179            self._gm_bsplinecurve.curve = value 
    72  
    73     @property 
    74     def numDerivativesAtEnd(self):       
    75         return self._gm_bsplinecurve.numDerivativesAtEnd 
    76  
    77     @numDerivativesAtEnd.setter 
    78     def numDerivativesAtEnd(self, value):        
    79             self._gm_bsplinecurve.numDerivativesAtEnd = value 
    8080 
    8181    @property 
     
    144144 
    145145    def __key(self): 
    146         return (self.curveForm, self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
     146        return (self.curveForm, self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
    147147 
    148148    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bicubicgrid.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:13 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bilineargrid.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:16 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.curveForm = None 
     45        self.numDerivativesAtEnd = None 
    4546        self.curve = None 
    46         self.numDerivativesAtEnd = None 
    4747        self.knot = [] 
    4848        self.interpolation = None 
     
    5656 
    5757    @property 
     58    def numDerivativesAtEnd(self):       
     59        return self._gm_splinecurve.numDerivativesAtEnd 
     60 
     61    @numDerivativesAtEnd.setter 
     62    def numDerivativesAtEnd(self, value):        
     63            self._gm_splinecurve.numDerivativesAtEnd = value 
     64 
     65    @property 
    5866    def curve(self):     
    5967        return self._gm_splinecurve.curve 
     
    6270    def curve(self, value):      
    6371            self._gm_splinecurve.curve = value 
    64  
    65     @property 
    66     def numDerivativesAtEnd(self):       
    67         return self._gm_splinecurve.numDerivativesAtEnd 
    68  
    69     @numDerivativesAtEnd.setter 
    70     def numDerivativesAtEnd(self, value):        
    71             self._gm_splinecurve.numDerivativesAtEnd = value 
    7272 
    7373    @property 
     
    120120 
    121121    def __key(self): 
    122         return (self.curveForm, self.curve, self.numDerivativesAtEnd, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
     122        return (self.curveForm, self.numDerivativesAtEnd, self.curve, self.knot, self.interpolation, self.numDerivativesAtStart, self.degree, self.numDerivativeInterior, self.isPolynomial, self.controlPoints, self.knotSpec) 
    123123 
    124124    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_bsplinesurface.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:15 
     25Created on 14-Feb-2012 17:19:27 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_conical = "conical"  
    3738    cl_planar = "planar"  
     39    cl_cylindrical = "cylindrical"  
     40    cl_toroidal = "toroidal"  
    3841    cl_unspecified = "unspecified"  
    39     cl_conical = "conical"  
    40     cl_toroidal = "toroidal"  
    4142    cl_spherical = "spherical"  
    42     cl_cylindrical = "cylindrical"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_circle.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:11 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_arc = GM_Arc()          
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    5252 
    5353    @property 
     54    def numDerivativesAtEnd(self):       
     55        return self._gm_arc.numDerivativesAtEnd 
     56 
     57    @numDerivativesAtEnd.setter 
     58    def numDerivativesAtEnd(self, value):        
     59            self._gm_arc.numDerivativesAtEnd = value 
     60 
     61    @property 
    5462    def curve(self):     
    5563        return self._gm_arc.curve 
     
    5866    def curve(self, value):      
    5967            self._gm_arc.curve = value 
    60  
    61     @property 
    62     def numDerivativesAtEnd(self):       
    63         return self._gm_arc.numDerivativesAtEnd 
    64  
    65     @numDerivativesAtEnd.setter 
    66     def numDerivativesAtEnd(self, value):        
    67             self._gm_arc.numDerivativesAtEnd = value 
    6868 
    6969    @property 
     
    108108 
    109109    def __key(self): 
    110         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
     110        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.numArc, self.controlPoints) 
    111111 
    112112    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_clothoid.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:35 
    2626 
    2727@author: mnagni 
     
    4444        self.endParameter = None 
    4545        self.startParameter = None 
     46        self.numDerivativesAtEnd = None 
    4647        self.curve = None 
    47         self.numDerivativesAtEnd = None 
    4848        self.interpolation = None 
    4949        self.numDerivativesAtStart = None 
     
    5454 
    5555    @property 
     56    def numDerivativesAtEnd(self):       
     57        return self._gm_curvesegment.numDerivativesAtEnd 
     58 
     59    @numDerivativesAtEnd.setter 
     60    def numDerivativesAtEnd(self, value):        
     61            self._gm_curvesegment.numDerivativesAtEnd = value 
     62 
     63    @property 
    5664    def curve(self):     
    5765        return self._gm_curvesegment.curve 
     
    6068    def curve(self, value):      
    6169            self._gm_curvesegment.curve = value 
    62  
    63     @property 
    64     def numDerivativesAtEnd(self):       
    65         return self._gm_curvesegment.numDerivativesAtEnd 
    66  
    67     @numDerivativesAtEnd.setter 
    68     def numDerivativesAtEnd(self, value):        
    69             self._gm_curvesegment.numDerivativesAtEnd = value 
    7070 
    7171    @property 
     
    9494 
    9595    def __key(self): 
    96         return (self.endParameter, self.startParameter, self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.refLocation, self.scaleFactor) 
     96        return (self.endParameter, self.startParameter, 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

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:32 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.startConstrParam = None 
     45        self.numDerivativesAtEnd = None 
    4546        self.curve = None 
    46         self.numDerivativesAtEnd = None 
    4747        self.interpolation = None 
    4848        self.numDerivativesAtStart = None 
     
    5656 
    5757    @property 
     58    def numDerivativesAtEnd(self):       
     59        return self._gm_curvesegment.numDerivativesAtEnd 
     60 
     61    @numDerivativesAtEnd.setter 
     62    def numDerivativesAtEnd(self, value):        
     63            self._gm_curvesegment.numDerivativesAtEnd = value 
     64 
     65    @property 
    5866    def curve(self):     
    5967        return self._gm_curvesegment.curve 
     
    6270    def curve(self, value):      
    6371            self._gm_curvesegment.curve = value 
    64  
    65     @property 
    66     def numDerivativesAtEnd(self):       
    67         return self._gm_curvesegment.numDerivativesAtEnd 
    68  
    69     @numDerivativesAtEnd.setter 
    70     def numDerivativesAtEnd(self, value):        
    71             self._gm_curvesegment.numDerivativesAtEnd = value 
    7272 
    7373    @property 
     
    9696 
    9797    def __key(self): 
    98         return (self.startConstrParam, self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.endConstrParam, self.numDerivativeInterior, self.shifted, self.position, self.semiLatusRectum, self.eccentricity) 
     98        return (self.startConstrParam, self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.endConstrParam, self.numDerivativeInterior, self.shifted, self.position, self.semiLatusRectum, self.eccentricity) 
    9999 
    100100    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_cubicspline.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:10 
     25Created on 14-Feb-2012 17:19:30 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_polynomialspline = GM_PolynomialSpline()        
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.knot = [] 
    4747        self.interpolation = None 
     
    5555 
    5656    @property 
     57    def numDerivativesAtEnd(self):       
     58        return self._gm_polynomialspline.numDerivativesAtEnd 
     59 
     60    @numDerivativesAtEnd.setter 
     61    def numDerivativesAtEnd(self, value):        
     62            self._gm_polynomialspline.numDerivativesAtEnd = value 
     63 
     64    @property 
    5765    def curve(self):     
    5866        return self._gm_polynomialspline.curve 
     
    6169    def curve(self, value):      
    6270            self._gm_polynomialspline.curve = value 
    63  
    64     @property 
    65     def numDerivativesAtEnd(self):       
    66         return self._gm_polynomialspline.numDerivativesAtEnd 
    67  
    68     @numDerivativesAtEnd.setter 
    69     def numDerivativesAtEnd(self, value):        
    70             self._gm_polynomialspline.numDerivativesAtEnd = value 
    7171 
    7272    @property 
     
    135135 
    136136    def __key(self): 
    137         return (self.curve, self.numDerivativesAtEnd, 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.vectorAtStart, self.vectorAtEnd, 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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_envelope.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:09 
     24Created on 14-Feb-2012 17:19:29 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericcurve.py

    r8088 r8089  
    2222 
    2323''' 
    24 Created on 10-Feb-2012 12:03:13 
     24Created on 14-Feb-2012 17:19:34 
    2525 
    2626@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_genericsurface.py

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:04 
     25Created on 14-Feb-2012 17:19:36 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_geodesicstring = GM_GeodesicString()    
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    4949        self.controlPoint = None 
    5050        super(GM_Geodesic, self).__init__() 
     51 
     52    @property 
     53    def numDerivativesAtEnd(self):       
     54        return self._gm_geodesicstring.numDerivativesAtEnd 
     55 
     56    @numDerivativesAtEnd.setter 
     57    def numDerivativesAtEnd(self, value):        
     58            self._gm_geodesicstring.numDerivativesAtEnd = value 
    5159 
    5260    @property 
     
    5765    def curve(self, value):      
    5866            self._gm_geodesicstring.curve = value 
    59  
    60     @property 
    61     def numDerivativesAtEnd(self):       
    62         return self._gm_geodesicstring.numDerivativesAtEnd 
    63  
    64     @numDerivativesAtEnd.setter 
    65     def numDerivativesAtEnd(self, value):        
    66             self._gm_geodesicstring.numDerivativesAtEnd = value 
    6767 
    6868    @property 
     
    9999 
    100100    def __key(self): 
    101         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     101        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    102102 
    103103    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_geodesicstring.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:09 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    4949        self.controlPoint = None 
    5050        super(GM_GeodesicString, self).__init__() 
     51 
     52    @property 
     53    def numDerivativesAtEnd(self):       
     54        return self._gm_curvesegment.numDerivativesAtEnd 
     55 
     56    @numDerivativesAtEnd.setter 
     57    def numDerivativesAtEnd(self, value):        
     58            self._gm_curvesegment.numDerivativesAtEnd = value 
    5159 
    5260    @property 
     
    5765    def curve(self, value):      
    5866            self._gm_curvesegment.curve = value 
    59  
    60     @property 
    61     def numDerivativesAtEnd(self):       
    62         return self._gm_curvesegment.numDerivativesAtEnd 
    63  
    64     @numDerivativesAtEnd.setter 
    65     def numDerivativesAtEnd(self, value):        
    66             self._gm_curvesegment.numDerivativesAtEnd = value 
    6767 
    6868    @property 
     
    9191 
    9292    def __key(self): 
    93         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     93        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    9494 
    9595    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_griddedsurface.py

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

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

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_linesegment.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:05 
     25Created on 14-Feb-2012 17:19:34 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_linestring = GM_LineString()    
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    4949        self.controlPoint = None 
    5050        super(GM_LineSegment, self).__init__() 
     51 
     52    @property 
     53    def numDerivativesAtEnd(self):       
     54        return self._gm_linestring.numDerivativesAtEnd 
     55 
     56    @numDerivativesAtEnd.setter 
     57    def numDerivativesAtEnd(self, value):        
     58            self._gm_linestring.numDerivativesAtEnd = value 
    5159 
    5260    @property 
     
    5765    def curve(self, value):      
    5866            self._gm_linestring.curve = value 
    59  
    60     @property 
    61     def numDerivativesAtEnd(self):       
    62         return self._gm_linestring.numDerivativesAtEnd 
    63  
    64     @numDerivativesAtEnd.setter 
    65     def numDerivativesAtEnd(self, value):        
    66             self._gm_linestring.numDerivativesAtEnd = value 
    6767 
    6868    @property 
     
    9999 
    100100    def __key(self): 
    101         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     101        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    102102 
    103103    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_linestring.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:10 
     25Created on 14-Feb-2012 17:19:37 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
     44        self.numDerivativesAtEnd = None 
    4445        self.curve = None 
    45         self.numDerivativesAtEnd = None 
    4646        self.interpolation = None 
    4747        self.numDerivativesAtStart = None 
     
    4949        self.controlPoint = None 
    5050        super(GM_LineString, self).__init__() 
     51 
     52    @property 
     53    def numDerivativesAtEnd(self):       
     54        return self._gm_curvesegment.numDerivativesAtEnd 
     55 
     56    @numDerivativesAtEnd.setter 
     57    def numDerivativesAtEnd(self, value):        
     58            self._gm_curvesegment.numDerivativesAtEnd = value 
    5159 
    5260    @property 
     
    5765    def curve(self, value):      
    5866            self._gm_curvesegment.curve = value 
    59  
    60     @property 
    61     def numDerivativesAtEnd(self):       
    62         return self._gm_curvesegment.numDerivativesAtEnd 
    63  
    64     @numDerivativesAtEnd.setter 
    65     def numDerivativesAtEnd(self, value):        
    66             self._gm_curvesegment.numDerivativesAtEnd = value 
    6767 
    6868    @property 
     
    9191 
    9292    def __key(self): 
    93         return (self.curve, self.numDerivativesAtEnd, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
     93        return (self.numDerivativesAtEnd, self.curve, self.interpolation, self.numDerivativesAtStart, self.numDerivativeInterior, self.controlPoint) 
    9494 
    9595    def __eq__(self, y): 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19107_2003_spatial_schema/geometry/coordinate_geometry/gm_offsetcurve.py

    r8088 r8089  
    2323 
    2424''' 
    25 Created on 10-Feb-2012 12:03:14 
     25Created on 14-Feb-2012 17:19:28 
    2626 
    2727@author: mnagni 
     
    4242        self._gm_curvesegment = GM_CurveSegment()        
    4343 
     44        self._baseCurve_gm_arcstringbybulge = None 
     45        self._baseCurve_gm_linestring = None 
     46        self._baseCurve_gm_arcstring = None 
     47        self._baseCurve_gm_clothoid = None 
     48        self._baseCurve_gm_conic = None 
     49        self._baseCurve_gm_geodesicstring = None 
    4450        self._baseCurve_gm_offsetcurve = None 
    45         self._baseCurve_gm_geodesicstring = None 
    46         self._baseCurve_gm_clothoid = None 
    47         self._baseCurve_gm_arcstring = None 
    48         self._baseCurve_gm_conic = None 
    49         self._baseCurve_gm_linestring = None 
    50         self._baseCurve_gm_arcstringbybulge = None 
    5151        self._baseCurve_gm_splinecurve = None 
    5252        self.refDirection = None 
     53        self.numDerivativesAtEnd = None 
    5354        self.curve = None 
    54         self.numDerivativesAtEnd = None 
    5555        self.distance = None 
    5656        self.interpolation = 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 
     67        if(has_value(self._baseCurve_gm_arcstring)): 
     68            return self._baseCurve_gm_arcstring