diff --git a/pvDataApp/Makefile b/pvDataApp/Makefile index 237ac33..aeb282b 100644 --- a/pvDataApp/Makefile +++ b/pvDataApp/Makefile @@ -1,5 +1,6 @@ TOP = .. include $(TOP)/configure/CONFIG +DIRS += misc DIRS += pv DIRS += factory DIRS += test diff --git a/pvDataApp/misc/Makefile b/pvDataApp/misc/Makefile new file mode 100644 index 0000000..d5bec0b --- /dev/null +++ b/pvDataApp/misc/Makefile @@ -0,0 +1,13 @@ +TOP=../.. + +include $(TOP)/configure/CONFIG + +INC += requester.h +INC += serialize.h +INC += bitSet.h +INC += byteBuffer.h + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/pvDataApp/pv/bitSet.h b/pvDataApp/misc/bitSet.h similarity index 100% rename from pvDataApp/pv/bitSet.h rename to pvDataApp/misc/bitSet.h diff --git a/pvDataApp/pv/byteBuffer.h b/pvDataApp/misc/byteBuffer.h similarity index 100% rename from pvDataApp/pv/byteBuffer.h rename to pvDataApp/misc/byteBuffer.h diff --git a/pvDataApp/pv/requester.h b/pvDataApp/misc/requester.h similarity index 100% rename from pvDataApp/pv/requester.h rename to pvDataApp/misc/requester.h diff --git a/pvDataApp/pv/serialize.h b/pvDataApp/misc/serialize.h similarity index 100% rename from pvDataApp/pv/serialize.h rename to pvDataApp/misc/serialize.h diff --git a/pvDataApp/pv/Makefile b/pvDataApp/pv/Makefile index 88392ec..5051490 100644 --- a/pvDataApp/pv/Makefile +++ b/pvDataApp/pv/Makefile @@ -3,10 +3,6 @@ TOP=../.. include $(TOP)/configure/CONFIG INC += pvIntrospect.h -INC += bitSet.h -INC += requester.h -INC += byteBuffer.h -INC += serialize.h INC += pvData.h include $(TOP)/configure/RULES diff --git a/pvDataApp/pv/convert.h b/pvDataApp/pv/convert.h new file mode 100644 index 0000000..1883d22 --- /dev/null +++ b/pvDataApp/pv/convert.h @@ -0,0 +1,32 @@ +/* convert.h */ +#include +#include +#include +#ifndef CONVERT_H +#define CONVERT_H +#include "pvIntrospect.h" +#include "pvData.h" + +namespace epics { namespace pvData { + + + class Convert { + public: + Convert(); + ~Convert(); + void getFullName(std::string *buf,PVField *pvField); + void getString(std::string *buf,PVfield *pvField,int indentLevel); + void getString(std::string *buf,PVfield *pvField); + void fromString(PVScalar *pv, StringConstPtr from); + int fromString(PVScalarArray *pv, StringConstPtr from); + private: + Convert(); // not implemented + Convert(Convert const & ); // not implemented + Convert & operator=(Convert const &); //not implemented + class Convert *pImpl; + }; + + extern Convert * getConvert(); + +}} +#endif /* CONVERT_H */