finished conn mode of library

[blast.git] / BlockImplementation.h

diff --git a/BlockImplementation.h b/BlockImplementation.h
index 72776e3b675af175a773a0e38c2d774a7518feda..a9a52494364310af019fd3cb2d32c75ba7e2f65f 100644 (file)
--- a/BlockImplementation.h
+++ b/BlockImplementation.h
@@ -35,6 +35,7 @@ public:
   inline QHash<QString,QString> getConsumptionPattern() { return consumptionPattern; }\r
   inline QHash<QString,QString> getProductionPattern() { return productionPattern; }\r
   inline QString getProductionCounter() { return productionCounter; }\r
   inline QHash<QString,QString> getConsumptionPattern() { return consumptionPattern; }\r
   inline QHash<QString,QString> getProductionPattern() { return productionPattern; }\r
   inline QString getProductionCounter() { return productionCounter; }\r

+  inline QList<QString> getResources() { return resources; }\r

 \r
   // setters\r
   inline void setDelta(QString _delta) { delta = _delta; }\r
 \r
   // setters\r
   inline void setDelta(QString _delta) { delta = _delta; }\r


@@ -46,25 +47,18 @@ public:
 \r
   inline bool hasNoPatterns() { return noPatterns; }\r
 \r
 \r
   inline bool hasNoPatterns() { return noPatterns; }\r
 \r

-  QString eval(QString line, QTextStream& out);\r
-  QString evalComplex(QString line, int num);\r
-  QString evalString(QString s);\r
-  QList<AbstractInterface*>* evalStringComplex(QString s);\r
-  QString evalValue(QString s);\r
-  QString calculateWidth(QString s);\r
-\r

   inline void setReference(ReferenceBlock* _reference) { reference = _reference; }\r
 \r
   void loadPatterns(QDomElement &root) throw(Exception);\r
   bool checkPatterns();  \r
   \r
   inline void setReference(ReferenceBlock* _reference) { reference = _reference; }\r
 \r
   void loadPatterns(QDomElement &root) throw(Exception);\r
   bool checkPatterns();  \r
   \r

-  inline void addSource(QString file) { sources.append(file); }\r
+  inline void addResource(QString file) { resources.append(file); }\r

 private:  \r
   QString xmlFile;\r
   QString referenceXml;\r
   QString referenceMd5;\r
 \r
 private:  \r
   QString xmlFile;\r
   QString referenceXml;\r
   QString referenceMd5;\r
 \r

-  QList<QString> sources;\r
+  QList<QString> resources;\r

 \r
   QMap<QString, int> paramMap;\r
   ArithmeticEvaluator* evaluator;\r
 \r
   QMap<QString, int> paramMap;\r
   ArithmeticEvaluator* evaluator;\r


@@ -74,9 +68,7 @@ private:
   QString delta;\r
   QHash<QString,QString> consumptionPattern; // key = reference interface name, value = pattern expression\r
   QHash<QString,QString> productionPattern; // key = reference interface name, value = pattern expression\r
   QString delta;\r
   QHash<QString,QString> consumptionPattern; // key = reference interface name, value = pattern expression\r
   QHash<QString,QString> productionPattern; // key = reference interface name, value = pattern expression\r

-  QString productionCounter;\r
-\r
-  QString getIfaceUserName(AbstractInterface* refIface); // get the name of an interface given by the user, from the reference interface\r
+  QString productionCounter;  \r

 \r
   friend QDataStream &operator<<(QDataStream &out, const BlockImplementation &impl);\r
   friend QDataStream &operator>>(QDataStream &in, BlockImplementation &impl);\r
 \r
   friend QDataStream &operator<<(QDataStream &out, const BlockImplementation &impl);\r
   friend QDataStream &operator>>(QDataStream &in, BlockImplementation &impl);\r