changed sources to stimulis

[blast.git] / ReferenceBlock.cpp

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index b6dee80ce813a88016e75e0cc823a856239a263c..9b3959c052fccde774b6584e5bef6c39bab06de6 100644 (file)
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -9,7 +9,7 @@
 #include "Parameters.h"
 
 ReferenceBlock::ReferenceBlock(const QString _xmlFile) : AbstractBlock() {
 #include "Parameters.h"
 
 ReferenceBlock::ReferenceBlock(const QString _xmlFile) : AbstractBlock() {

-  xmlFile = _xmlFile;
+  xmlFile = _xmlFile;  

 }
 
 void ReferenceBlock::addCategory(int id) {
 }
 
 void ReferenceBlock::addCategory(int id) {


@@ -40,6 +40,16 @@ void ReferenceBlock::setHashMd5() {
 
 void ReferenceBlock::load(QDomElement &elt) throw(Exception) {
 
 
 void ReferenceBlock::load(QDomElement &elt) throw(Exception) {
 

+  cout << "Block : get version" << endl;
+  QString verStr = elt.attribute("version","none");
+  QString specialStr = elt.attribute("special","none");
+  if (verStr != "none") {
+    setVersion(verStr);
+  }
+  else {
+    setVersion("0.0");
+  }
+  setSpecialType(getSpecialTypeFromString(specialStr));

 
   cout << "Block : get informations" << endl;  
   QDomElement eltInfo  = elt.firstChildElement("informations");
 
   cout << "Block : get informations" << endl;  
   QDomElement eltInfo  = elt.firstChildElement("informations");


@@ -419,6 +429,8 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
 
   toWrite << b.name;
   toWrite << b.xmlFile;
 
   toWrite << b.name;
   toWrite << b.xmlFile;

+  toWrite << b.specialType;
+  toWrite << b.version;

   toWrite << b.description;
   toWrite << b.categories;
   toWrite << b.hashMd5;
   toWrite << b.description;
   toWrite << b.categories;
   toWrite << b.hashMd5;


@@ -547,6 +559,8 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
 
   in >> b.name;
   in >> b.xmlFile;
 
   in >> b.name;
   in >> b.xmlFile;

+  in >> b.specialType;
+  in >> b.version;

   in >> b.description;
   in >> b.categories;
   in >> b.hashMd5;
   in >> b.description;
   in >> b.categories;
   in >> b.hashMd5;