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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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): 
Note: See TracChangeset for help on using the changeset viewer.