|
|
@@ -230,16 +230,22 @@ namespace CnasSynchronusClient |
|
|
|
double db1, db2; |
|
|
|
if (double.TryParse(drNewTarget[item.ColumnName].ToString(), out db1)) |
|
|
|
{ |
|
|
|
if (double.TryParse(item.Value.ToString(), out db2)) |
|
|
|
drNewTarget[item.ColumnName] = db1 / db2; |
|
|
|
string[] slist = item.Value.ToString().Split(','); |
|
|
|
if (slist.Length > 1) |
|
|
|
{ |
|
|
|
drNewTarget[item.ColumnName] = Math.Round(db1 / Convert.ToDouble(slist[0].ToString()), Convert.ToInt32(slist[1])); |
|
|
|
//if (double.TryParse(item.Value.ToString(), out db2)) |
|
|
|
// = db1 / db2; |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
case MapCondition.Multiplied: |
|
|
|
double db3, db4; |
|
|
|
if (double.TryParse(drNewTarget[item.ColumnName].ToString(), out db3)) |
|
|
|
{ |
|
|
|
if (double.TryParse(item.Value.ToString(), out db4)) |
|
|
|
drNewTarget[item.ColumnName] = db3 * db4; |
|
|
|
string[] slist = item.Value.ToString().Split(','); |
|
|
|
if (slist.Length > 1) |
|
|
|
{ drNewTarget[item.ColumnName] = Math.Round(db3 * Convert.ToDouble(slist[0].ToString()), Convert.ToInt32(slist[1])); } |
|
|
|
} |
|
|
|
break; |
|
|
|
case MapCondition.DecimalDigits: |
|
|
|