Changeset 7105 for code/branches/presentation3/src/libraries/core
- Timestamp:
- Jun 3, 2010, 2:24:14 AM (15 years ago)
- Location:
- code/branches/presentation3/src/libraries/core
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/libraries/core/BaseObject.cc
r6926 r7105 196 196 { 197 197 this->templates_.insert(temp); 198 if( temp->isLink() ) 199 { 200 this->networkTemplateNames_.insert(temp->getLink()); 201 assert( !Template::getTemplate(temp->getLink())->isLink() ); 202 } 203 else 204 this->networkTemplateNames_.insert(temp->getName()); 198 205 temp->applyOn(this); 199 206 } -
code/branches/presentation3/src/libraries/core/BaseObject.h
r6926 r7105 191 191 EventState* getEventState(const std::string& name) const; 192 192 193 std::string name_; //!< The name of the object 194 std::string oldName_; //!< The old name of the object 195 mbool bActive_; //!< True = the object is active 196 mbool bVisible_; //!< True = the object is visible 197 std::string mainStateName_; 198 Functor* mainStateFunctor_; 193 std::string name_; //!< The name of the object 194 std::string oldName_; //!< The old name of the object 195 mbool bActive_; //!< True = the object is active 196 mbool bVisible_; //!< True = the object is visible 197 std::string mainStateName_; 198 Functor* mainStateFunctor_; 199 std::set<std::string> networkTemplateNames_; 199 200 200 201 private: -
code/branches/presentation3/src/libraries/core/Template.h
r6938 r7105 51 51 inline const std::string& getLink() const 52 52 { return this->link_; } 53 inline bool isLink() const 54 { return this->bIsLink_; } 53 55 54 56 inline void setLoadDefaults(bool bLoadDefaults)
Note: See TracChangeset
for help on using the changeset viewer.