X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/c25a6c891bde475aa51b4c4f5d42ecd7540910bb..9bfa0c13066918f440ac2b5461fb3f8847f43fd6:/AbstractBlock.cpp

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 13adcae..b78a1e1 100644
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -3,9 +3,11 @@
 #include <QMessageBox>
 #include "AbstractInterface.h"
 #include "BlockParameter.h"
+#include "Parameters.h"
 #include "GroupBlock.h"
 #include "ConnectedInterface.h"
 
+
 AbstractBlock::AbstractBlock() {
   name = "";
   parent = NULL;
@@ -13,7 +15,7 @@ AbstractBlock::AbstractBlock() {
 
 /*
 AbstractBlock::AbstractBlock(const QString& _name) {
-  name = normalizeName(_name);
+  name = Parameters::normalizeName(_name);
   parent = NULL;
 }
 */
@@ -29,7 +31,7 @@ AbstractBlock::~AbstractBlock() {
 }
 
 void AbstractBlock::setName(const QString& str) {
-  name = normalizeName(str);
+  name = Parameters::normalizeName(str);
 }
 
 void AbstractBlock::setParent(AbstractBlock* _parent) {
@@ -57,10 +59,12 @@ bool AbstractBlock::isSourceBlock() {
 }
 /* NB: a generator is a block that has no data inputs
  * and has at least one data output.
+ * By the way, blokcs that have no data input/output
+ * (like clkrstgen) are not generators !
  */
 bool AbstractBlock::isGeneratorBlock() {
   if (getDataInputs().size() > 0) return false;
-  
+  if (getDataOutputs().size() == 0) return false;
   return true;
 }
 
@@ -239,12 +243,7 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   return lst;
 }
 
-QString AbstractBlock::normalizeName(const QString &name) {
-  QString s = name;
-  s.replace(QRegularExpression("[^a-zA-Z0-9_]"),"_");
-  s.replace(QRegularExpression("[_]+"),"_");
-  return s;
-}
+
 
 void AbstractBlock::connectClkReset() throw(Exception) {