correct bug with clkrstgen

[blast.git] / AbstractBlock.cpp

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index f551b302bb0f9cd11b0ab00e2e3a8f0eaac537a6..cdde69fcdc9b6051c396c62559a84f4151b60e04 100644 (file)
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -10,7 +10,7 @@ AbstractBlock::AbstractBlock() {
 }\r
 \r
 AbstractBlock::AbstractBlock(const QString& _name) {\r
 }\r
 \r
 AbstractBlock::AbstractBlock(const QString& _name) {\r

-  name = _name;\r
+  name = normalizeName(_name);\r

   parent = NULL;\r
 }\r
 \r
   parent = NULL;\r
 }\r
 \r


@@ -25,7 +25,7 @@ AbstractBlock::~AbstractBlock() {
 }\r
 \r
 void AbstractBlock::setName(const QString& str) {\r
 }\r
 \r
 void AbstractBlock::setName(const QString& str) {\r

-  name = str;\r
+  name = normalizeName(str);\r

 }\r
 \r
 void AbstractBlock::setParent(AbstractBlock* _parent) {\r
 }\r
 \r
 void AbstractBlock::setParent(AbstractBlock* _parent) {\r


@@ -235,3 +235,11 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   return lst;\r
 }\r
 \r
   return lst;\r
 }\r
 \r

+QString AbstractBlock::normalizeName(const QString &name) {\r
+  QString s = name;\r
+  s.replace(QRegularExpression("[^a-zA-Z0-9_]"),"_");\r
+  s.replace(QRegularExpression("[_]+"),"_");\r
+  return s;\r
+}\r
+\r
+\r