From 2f43ba669d8955de4c074c8b54038c035bd67ef8 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Thu, 10 Jul 2014 18:07:03 +0300
Subject: [PATCH] Measurement name can't have "." and ",". This names do not
 valid for math parser.

--HG--
branch : develop
---
 src/app/dialogs/app/dialogincrements.cpp   | 4 ++--
 src/app/share/resources/schema/pattern.xsd | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp
index e2c25c175..b4a6c9551 100644
--- a/src/app/dialogs/app/dialogincrements.cpp
+++ b/src/app/dialogs/app/dialogincrements.cpp
@@ -70,8 +70,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par
         }
     }
 
-    //Same regex in each shema files. Don't forget synchronize.
-    TextDelegate *textDelegate = new TextDelegate("^([^0-9-*/^+=\\s\\(\\)%:;!]){1,1}([^-*/^+=\\s\\(\\)%:;!]){0,}$",
+    //Same regex in pattern.xsd shema file. Don't forget synchronize.
+    TextDelegate *textDelegate = new TextDelegate("^([^0-9-*/^+=\\s\\(\\)%:;!.,]){1,1}([^-*/^+=\\s\\(\\)%:;!.,]){0,}$",
                                                   ui->tableWidgetIncrement);
     ui->tableWidgetIncrement->setItemDelegateForColumn(0, textDelegate);// name
     DoubleSpinBoxDelegate *doubleDelegate = new DoubleSpinBoxDelegate(ui->tableWidgetIncrement);
diff --git a/src/app/share/resources/schema/pattern.xsd b/src/app/share/resources/schema/pattern.xsd
index f6101313e..dc58f0e41 100644
--- a/src/app/share/resources/schema/pattern.xsd
+++ b/src/app/share/resources/schema/pattern.xsd
@@ -213,8 +213,8 @@
                </xs:complexType>
          </xs:element>
 	<xs:simpleType name="shortName">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="^([^0-9-*/^+=\s\(\)%:;!]){1,1}([^-*/^+=\s\(\)%:;!]){0,}$"/>
+		<xs:restriction base="xs:string">   
+			<xs:pattern value="^([^0-9-*/^+=\s\(\)%:;!.,]){1,1}([^-*/^+=\s\(\)%:;!.,]){0,}$"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="units">