aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Measurement name can't have "." and ",". This names do not valid for math

Browse Source 
parser.

--HG--
branch : develop
This commit is contained in:
dismine 2014-07-10 18:07:03 +03:00
parent 169f61ae7a
commit 2f43ba669d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/dialogs/app/dialogincrements.cpp
View File

@ -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);

2
src/app/share/resources/schema/pattern.xsd
View File

@ -214,7 +214,7 @@
</xs:element>
<xs:simpleType name="shortName">
<xs:restriction base="xs:string">
<xs:pattern value="^([^0-9-*/^+=\s\(\)%:;!]){1,1}([^-*/^+=\s\(\)%:;!]){0,}$"/>
<xs:pattern value="^([^0-9-*/^+=\s\(\)%:;!.,]){1,1}([^-*/^+=\s\(\)%:;!.,]){0,}$"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="units">