ScadaData: fix formatter

2mik · 2mik · commit 406953704f16 · 2018-03-19T20:27:52.000+03:00
diff --git a/ScadaData/ScadaData/Client/DataFormatter.cs b/ScadaData/ScadaData/Client/DataFormatter.cs
@@ -174,12 +174,13 @@ public void FormatCnlVal(double val, int stat, InCnlProps cnlProps, string decSe
 
                         // определение формата числа
                         NumberFormatInfo nfi;
+                        bool sepDefined = !(decSep == null && grSep == null);
 
-                        if (cnlPropsIsNull)
+                        if (cnlPropsIsNull || sepDefined)
                         {
-                            nfi = decSep == null && grSep == null ? 
-                                defNfi : 
-                                CreateFormatInfo(DefDecDig, decSep, grSep);
+                            nfi = sepDefined ? 
+                                CreateFormatInfo(DefDecDig, decSep, grSep) :
+                                defNfi;
                         }
                         else if (cnlProps.FormatInfo == null)
                         {

Original file line number	Diff line number	Diff line change
`@@ -174,12 +174,13 @@ public void FormatCnlVal(double val, int stat, InCnlProps cnlProps, string decSe`
`174`	`174`
`175`	`175`	`// определение формата числа`
`176`	`176`	`NumberFormatInfo nfi;`
	`177`	`+ bool sepDefined = !(decSep == null && grSep == null);`
`177`	`178`
`178`		`- if (cnlPropsIsNull)`
	`179`	`+ if (cnlPropsIsNull \|\| sepDefined)`
`179`	`180`	`{`
`180`		`- nfi = decSep == null && grSep == null ?`
`181`		`- defNfi :`
`182`		`- CreateFormatInfo(DefDecDig, decSep, grSep);`
	`181`	`+ nfi = sepDefined ?`
	`182`	`+ CreateFormatInfo(DefDecDig, decSep, grSep) :`
	`183`	`+ defNfi;`
`183`	`184`	`}`
`184`	`185`	`else if (cnlProps.FormatInfo == null)`
`185`	`186`	`{`