Rework article numbers

[r2c2.git] / source / libr2c2 / objecttype.h

diff --git a/source/libr2c2/objecttype.h b/source/libr2c2/objecttype.h
index 0cca264b77c12bfb880270d67d8d04d4b11d97eb..59bd879067d59a1fd8f95d319ee928f855a25968 100644 (file)
--- a/source/libr2c2/objecttype.h
+++ b/source/libr2c2/objecttype.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include "articlenumber.h"
+#include "geometry.h"
 
 namespace R2C2 {
 
@@ -14,20 +15,25 @@ public:
        {
        public:
                Loader(ObjectType &);
+
+       private:
+               void article_number();
        };
 
 protected:
        ArticleNumber art_nr;
        std::string name;
        std::string description;
+       Shape *shape;
 
-       ObjectType(const ArticleNumber &a): art_nr(a) { }
+       ObjectType();
 public:
-       virtual ~ObjectType() { }
+       virtual ~ObjectType();
 
        const ArticleNumber &get_article_number() const { return art_nr; }
        const std::string &get_name() const { return name; }
        const std::string &get_description() const { return description; }
+       const Shape *get_shape() const { return shape; }
 };
 
 } // namespace R2C2