Show
Ignore:
Timestamp:
12/12/07 18:00:42 (9 months ago)
Author:
cneumann
Message:

added: generic interface
changed: factory functions return RefPtr?

The unittests don't pass right now, because of the change
to the factory functions, which leads to containers
being immediately destroyed as they are not assigned to
a RefPtr?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGScaleManipulatorBase.cpp

    r1020 r1032  
    7878 */ 
    7979 
     80     
     81void ScaleManipulatorBase::classDescInserter(TypeObject &oType) 
     82{ 
     83    FieldDescriptionBase *pDesc = NULL; 
     84 
     85} 
    8086 
    8187ScaleManipulatorBase::TypeObject ScaleManipulatorBase::_type( 
    …… 
    106112    "The ScaleHandle is used for scaleing objects. It consist of three axis which can be picked and scaled and one center box to scale freely in 3D.\n" 
    107113    ); 
    108  
     114     
    109115/*------------------------------ get -----------------------------------*/ 
    110116 
    …… 
    154160 
    155161//! create a new instance of the class 
    156 ScaleManipulatorPtr ScaleManipulatorBase::create(void) 
    157 { 
    158     ScaleManipulatorPtr fc; 
     162ScaleManipulatorBase::ObjRefPtr 
     163ScaleManipulatorBase::create(void) 
     164{ 
     165    ObjRefPtr pFC; 
    159166 
    160167    if(getClassType().getPrototype() != NullFC) 
    161168    { 
    162         fc = dynamic_cast<ScaleManipulator::ObjPtr>( 
    163             getClassType().getPrototype()-> shallowCopy()); 
     169        pFC = boost::dynamic_pointer_cast<ScaleManipulator>( 
     170            getClassType().getPrototype()->shallowCopy()); 
    164171    } 
    165172 
    166     return fc; 
     173    return pFC; 
    167174} 
    168175 
    …… 
    177184} 
    178185 
    179 FieldContainerPtr ScaleManipulatorBase::shallowCopy(void) const 
    180 { 
    181     ScaleManipulatorPtr returnValue; 
     186FieldContainerRefPtr 
     187ScaleManipulatorBase::shallowCopy(void) const 
     188{ 
     189    ObjPtr returnValue; 
    182190 
    183191    newPtr(returnValue, dynamic_cast<const ScaleManipulator *>(this)); 
    184192 
    185     return returnValue; 
     193    return FieldContainerRefPtr(returnValue); 
    186194} 
    187195