Update of /cvsroot/csp/APPLICATIONS/CSPSim/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv31976/Source
Modified Files:
Tag: systems
System.cpp
Log Message:
Index: System.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Source/Attic/System.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** System.cpp 9 Oct 2003 23:50:47 -0000 1.1.2.1
--- System.cpp 11 Oct 2003 06:43:15 -0000 1.1.2.2
***************
*** 27,37 ****
#include <System.h>
! #include <DataRecorder.h>
! #include <PhysicsModel.h>
! #include <Controller.h>
!
!
! SIMDATA_REGISTER_INTERFACE(SystemsModel)
!
void System::setModel(SystemsModel *model) {
--- 27,31 ----
#include <System.h>
! #include <SystemsModel.h>
void System::setModel(SystemsModel *model) {
***************
*** 42,83 ****
registerChannels(bus.get());
}
- }
-
- void SystemsModel::setDataRecorder(DataRecorder *recorder) {
- if (!recorder) return;
- // TODO pass recorder to subsystems
- }
-
- simdata::Ref<PhysicsModel> SystemsModel::getPhysicsModel() const {
- return m_PhysicsModel;
- }
-
- simdata::Ref<Controller> SystemsModel::getController() const {
- return m_Controller;
- }
-
- void SystemsModel::postCreate() {
- System::postCreate();
- if (m_PhysicsModel.valid()) {
- CSP_LOG(OBJECT, DEBUG, "Adding PhysicsModel (" << m_PhysicsModel->getClassName() << ")");
- addChild(m_PhysicsModel.get());
- }
- if (m_Controller.valid()) {
- CSP_LOG(OBJECT, DEBUG, "Adding Controller (" << m_Controller->getClassName() << ")");
- addChild(m_Controller.get());
- }
- }
-
-
- void SystemsModel::serialize(simdata::Archive &archive) {
- System::serialize(archive);
- archive(m_PhysicsModel);
- // XXX temporarily disabled (no controller classes yet)
- //archive(m_Controller);
- }
-
-
- void SystemsModel::getInfo(InfoList &info) {
- accept(new InfoVisitor(info));
}
--- 36,39 ----
|
