changed ref/impls xsd and xml

[blast.git] / ReferenceBlock.h

diff --git a/ReferenceBlock.h b/ReferenceBlock.h
index 83f38c55d0902f114146662d18ed6a3efb801937..2aca8797119874d09f96fc3c239889131a7f5ce4 100644 (file)
--- a/ReferenceBlock.h
+++ b/ReferenceBlock.h
@@ -26,25 +26,26 @@ public:
 
   ReferenceBlock(const QString _xmlFile);
 
 
   ReferenceBlock(const QString _xmlFile);
 

+  // getters

   int getType();
   inline QString getXmlFile() { return xmlFile; }
   int getType();
   inline QString getXmlFile() { return xmlFile; }

-  inline QString getBriefDescription() { return descriptionBrief; }
-  inline QString getDetailedDescription() { return descriptionDetail; }
+  inline QString getDescription() { return description; }

   inline QList<int> getCategories() { return categories; }
   inline QList<BlockImplementation *> getImplementations() { return implementations; }
   inline QList<int> getCategories() { return categories; }
   inline QList<BlockImplementation *> getImplementations() { return implementations; }

-  inline QString getHashMd5() { return hashMd5; }
-
+  inline QString getHashMd5() { return hashMd5; }  

   inline AbstractBlock* getParent() { return NULL; }
   inline AbstractBlock* getParent() { return NULL; }

+  QList<QString> getExternalResources();

 
 

-  void addCategory(int id);
-  void setBriefDescription(const QString& str);
-  void setDetailedDescription(const QString& str);
+  // setters
+  void setDescription(const QString& str);
+
+  // others

   void addImplementation(BlockImplementation* impl);
   void addImplementation(BlockImplementation* impl);

+  void addCategory(int id);

 
   void load(QDomElement &elt) throw(Exception);
   void setHashMd5();
 
 
   void load(QDomElement &elt) throw(Exception);
   void setHashMd5();
 

-  QList<QString> getExternalResources();

   void generateVHDL(const QString& path) throw(Exception); // main entry to generate the VHDL code
 
   void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);
   void generateVHDL(const QString& path) throw(Exception); // main entry to generate the VHDL code
 
   void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);


@@ -52,8 +53,7 @@ public:
 private:
   QString xmlFile; // the xml file from which attributes are initialized.
   QString hashMd5;
 private:
   QString xmlFile; // the xml file from which attributes are initialized.
   QString hashMd5;

-  QString descriptionBrief;
-  QString descriptionDetail;
+  QString description;

   QList<int> categories;
   QList<BlockImplementation *> implementations; // set when implementations are read
 
   QList<int> categories;
   QList<BlockImplementation *> implementations; // set when implementations are read