Update of /cvsroot/robotflow/RobotFlow/MARIE/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18474/include Modified Files: Makefile.am MarieCommandBehavior.h MarieCommandCamera.h MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h MarieDataCamera.h MarieDataIR.h MarieDataLaser.h MarieDataLocalisation.h MarieDataMap.h MarieDataNull.h MarieDataOdometry.h MarieDataRaw.h MarieDataSonar.h MarieObject.h MarieRequestSystem.h Log Message: Remove useless Flowdesigner types for MARIE. Add MarieObject as a dataAbstract container. Remove multiple inheritance. Index: MarieDataBumper.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataBumper.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataBumper.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataBumper : public MarieObject, public DataBumper { ! ! public: ! ! MarieDataBumper(); ! MarieDataBumper(const DataBumper &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataBumper : public MarieObject, public DataBumper { ! // ! // public: ! // ! // MarieDataBumper(); ! // MarieDataBumper(const DataBumper &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieCommandMotor.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieCommandMotor.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieCommandMotor.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieCommandMotor : public MarieObject, public CommandMotor { ! ! public: ! ! MarieCommandMotor(); ! MarieCommandMotor(const CommandMotor &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } --- 32,47 ---- namespace marie { ! // class MarieCommandMotor : public MarieObject, public CommandMotor { ! // ! // public: ! // ! // MarieCommandMotor(); ! // MarieCommandMotor(const CommandMotor &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } Index: MarieCommandJoystick.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieCommandJoystick.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieCommandJoystick.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,48 **** namespace marie { ! class MarieCommandJoystick : public MarieObject, public CommandJoystick { ! ! public: ! ! MarieCommandJoystick(); ! MarieCommandJoystick(const CommandJoystick &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! ! }; } #endif --- 32,48 ---- namespace marie { ! // class MarieCommandJoystick : public MarieObject, public CommandJoystick { ! // ! // public: ! // ! // MarieCommandJoystick(); ! // MarieCommandJoystick(const CommandJoystick &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // ! // }; } #endif Index: MarieCommandBehavior.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MarieCommandBehavior.h 7 Sep 2005 21:12:48 -0000 1.6 --- MarieCommandBehavior.h 12 Sep 2005 21:31:19 -0000 1.7 *************** *** 31,47 **** namespace marie { ! class MarieCommandBehavior : public MarieObject, public CommandBehavior { ! ! public: ! ! MarieCommandBehavior(); ! MarieCommandBehavior(const CommandBehavior &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! ! }; } #endif --- 31,49 ---- namespace marie { ! // typedef MarieObject<CommandBehavior> MarieCommandBehavior; ! ! // class MarieCommandBehavior : public MarieObject, public CommandBehavior { ! // ! // public: ! // ! // MarieCommandBehavior(); ! // MarieCommandBehavior(const CommandBehavior &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // ! // }; } #endif Index: MarieObject.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieObject.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieObject.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 38,50 **** #include "DataAbstract.h" - namespace marie { ! class MarieObject : public FD::Object{ public: MarieObject() {}; ! virtual void copyDataAbstract(DataAbstract *data) = 0; }; } --- 38,98 ---- #include "DataAbstract.h" namespace marie { ! class MarieObject : public FD::Object ! { public: MarieObject() {}; ! MarieObject(DataAbstract *data); ! ~MarieObject(); ! ! DataAbstract* getData(); ! ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! ! ! protected: ! DataAbstract *m_data; ! // MarieObject(const C &marieObject) ! // : C(marieObject) ! // { ! // ! // } ! // ! // virtual void MarieObject::printOn(std::ostream &out) const ! // { ! // MarieXMLDataFactory factory; ! // ! // //writing XML data ! // string value = factory.toString((CommandBehavior) (*this)); ! // ! // out.write(value.c_str(), value.size()); ! // } ! // ! // virtual void readFrom(std::istream &in=std::cin) ! // { ! // throw new GeneralException("readFrom not supported for type : " + C::ID + " Use the MariePull Node to read data from the stream.",__FILE__,__LINE__); ! // } ! // ! // virtual void copyDataAbstract(DataAbstract *data) ! // { ! // if (data) ! // { ! // C *marieObjectPtr = dynamic_cast<C*>(data); ! // if (marieObjectPtr) ! // { ! // this->C::operator=(*marieObjectPtr); ! // } ! // else ! // { ! // throw new GeneralException(string("Unable to cast into" + C::ID + " Abstract : ") + data->getID(),__FILE__,__LINE__); ! // } ! // } ! // } ! }; } Index: MarieDataSonar.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataSonar.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataSonar.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataSonar.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 31,46 **** namespace marie { ! class MarieDataSonar : public MarieObject, public DataSonar { ! ! public: ! ! MarieDataSonar(); ! MarieDataSonar (const DataSonar &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 31,46 ---- namespace marie { ! // class MarieDataSonar : public MarieObject, public DataSonar { ! // ! // public: ! // ! // MarieDataSonar(); ! // MarieDataSonar (const DataSonar &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieCommandCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieCommandCamera.h 7 Sep 2005 21:12:48 -0000 1.5 --- MarieCommandCamera.h 12 Sep 2005 21:31:19 -0000 1.6 *************** *** 32,47 **** namespace marie { ! class MarieCommandCamera : public MarieObject, public CommandCamera { ! ! public: ! ! MarieCommandCamera(); ! MarieCommandCamera(const CommandCamera &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieCommandCamera : public MarieObject, public CommandCamera { ! // ! // public: ! // ! // MarieCommandCamera(); ! // MarieCommandCamera(const CommandCamera &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataIR.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataIR.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataIR.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataIR : public MarieObject, public DataIR { ! ! public: ! ! MarieDataIR(); ! MarieDataIR (const DataIR &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataIR : public MarieObject, public DataIR { ! // ! // public: ! // ! // MarieDataIR(); ! // MarieDataIR (const DataIR &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataCamera.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataCamera.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataCamera.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataCamera : public MarieObject, public DataCamera { ! ! public: ! ! MarieDataCamera(); ! MarieDataCamera(const DataCamera &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataCamera : public MarieObject, public DataCamera { ! // ! // public: ! // ! // MarieDataCamera(); ! // MarieDataCamera(const DataCamera &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataLaser.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataLaser.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataLaser.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataLaser : public MarieObject, public DataLaser { ! ! public: ! ! MarieDataLaser(); ! MarieDataLaser (const DataLaser &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataLaser : public MarieObject, public DataLaser { ! // ! // public: ! // ! // MarieDataLaser(); ! // MarieDataLaser (const DataLaser &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataOdometry.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataOdometry.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataOdometry.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 31,46 **** namespace marie { ! class MarieDataOdometry : public MarieObject, public DataOdometry { ! ! public: ! ! MarieDataOdometry(); ! MarieDataOdometry (const DataOdometry &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 31,46 ---- namespace marie { ! // class MarieDataOdometry : public MarieObject, public DataOdometry { ! // ! // public: ! // ! // MarieDataOdometry(); ! // MarieDataOdometry (const DataOdometry &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataNull.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataNull.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataNull.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,50 **** namespace marie { ! class MarieDataNull : public MarieObject, public DataNull { ! ! public: ! ! MarieDataNull(); ! MarieDataNull(const DataNull &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! ! //from Object ! virtual bool isNil() const {return true;} ! }; } #endif --- 32,50 ---- namespace marie { ! // class MarieDataNull : public MarieObject, public DataNull { ! // ! // public: ! // ! // MarieDataNull(); ! // MarieDataNull(const DataNull &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // ! // //from Object ! // virtual bool isNil() const {return true;} ! // }; } #endif Index: MarieDataLocalisation.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLocalisation.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataLocalisation.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataLocalisation.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataLocalisation : public MarieObject, public DataLocalisation { ! ! public: ! ! MarieDataLocalisation(); ! MarieDataLocalisation(const DataLocalisation &command); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataLocalisation : public MarieObject, public DataLocalisation { ! // ! // public: ! // ! // MarieDataLocalisation(); ! // MarieDataLocalisation(const DataLocalisation &command); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieRequestSystem.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieRequestSystem.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieRequestSystem.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieRequestSystem : public MarieObject, public RequestSystem { ! ! public: ! ! MarieRequestSystem(); ! MarieRequestSystem (const RequestSystem &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieRequestSystem : public MarieObject, public RequestSystem { ! // ! // public: ! // ! // MarieRequestSystem(); ! // MarieRequestSystem (const RequestSystem &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataRaw.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataRaw.h 7 Sep 2005 21:12:48 -0000 1.4 --- MarieDataRaw.h 12 Sep 2005 21:31:19 -0000 1.5 *************** *** 32,47 **** namespace marie { ! class MarieDataRaw : public MarieObject, public DataRaw { ! ! public: ! ! MarieDataRaw(); ! MarieDataRaw (const DataRaw &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 32,47 ---- namespace marie { ! // class MarieDataRaw : public MarieObject, public DataRaw { ! // ! // public: ! // ! // MarieDataRaw(); ! // MarieDataRaw (const DataRaw &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: MarieDataMap.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataMap.h 7 Sep 2005 21:12:48 -0000 1.5 --- MarieDataMap.h 12 Sep 2005 21:31:19 -0000 1.6 *************** *** 31,46 **** namespace marie { ! class MarieDataMap : public MarieObject, public DataAssociativeMap { ! ! public: ! ! MarieDataMap(); ! MarieDataMap (const DataAssociativeMap &data); ! ! //from MarieObject ! virtual void printOn(std::ostream &out) const; ! virtual void readFrom(std::istream &in=std::cin); ! virtual void copyDataAbstract(DataAbstract *data); ! }; } #endif --- 31,46 ---- namespace marie { ! // class MarieDataMap : public MarieObject, public DataAssociativeMap { ! // ! // public: ! // ! // MarieDataMap(); ! // MarieDataMap (const DataAssociativeMap &data); ! // ! // //from MarieObject ! // virtual void printOn(std::ostream &out) const; ! // virtual void readFrom(std::istream &in=std::cin); ! // virtual void copyDataAbstract(DataAbstract *data); ! // }; } #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 7 Sep 2005 21:12:48 -0000 1.14 --- Makefile.am 12 Sep 2005 21:31:19 -0000 1.15 *************** *** 1,21 **** AUTOMAKE_OPTIONS = no-dependencies ! noinst_HEADERS = MarieCommandBehavior.h \ ! MarieCommandMotor.h \ ! MarieDataLaser.h \ ! MarieDataIR.h \ ! MarieDataBumper.h \ ! MarieDataSonar.h \ ! MarieDataNull.h \ ! MarieCommandCamera.h \ ! MarieDataCamera.h \ ! MarieDataOdometry.h \ ! MariePull.h \ MariePeek.h \ ! MariePush.h \ ! MarieDataRaw.h \ ! MarieCommandJoystick.h \ ! MarieDataMap.h \ ! MarieRequestSystem.h include_HEADERS = MarieObject.h \ --- 1,21 ---- AUTOMAKE_OPTIONS = no-dependencies ! noinst_HEADERS = MariePull.h \ MariePeek.h \ ! MariePush.h ! # MarieCommandBehavior.h \ ! # MarieCommandMotor.h \ ! # MarieDataLaser.h \ ! # MarieDataIR.h \ ! # MarieDataBumper.h \ ! # MarieDataSonar.h \ ! # MarieDataNull.h \ ! # MarieCommandCamera.h \ ! # MarieDataCamera.h \ ! # MarieDataOdometry.h \ ! # MarieDataRaw.h \ ! # MarieCommandJoystick.h \ ! # MarieDataMap.h \ ! # MarieRequestSystem.h include_HEADERS = MarieObject.h \ |