Commit 426f44e0 by Valera Rozuvan Committed by Alexander Kryklia

Refined error messaging.

parent be418be6
...@@ -74,6 +74,10 @@ define('ElOutput', ['logme'], function (logme) { ...@@ -74,6 +74,10 @@ define('ElOutput', ['logme'], function (logme) {
funcString + funcString +
'" was not converted by the Function constructor.' '" was not converted by the Function constructor.'
); );
logme('Error message: "' + err.message + '".');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from string "' + funcString + '".' + '</div>');
$('#' + gstId).html('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
paramNames.pop(); paramNames.pop();
......
...@@ -279,6 +279,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -279,6 +279,9 @@ define('Graph', ['logme'], function (logme) {
logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.'); logme('ERROR: could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.');
logme('Error message: "' + err.message + '"'); logme('Error message: "' + err.message + '"');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.min + '" for xrange.min.' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
return false; return false;
} }
allParamNames.pop(); allParamNames.pop();
...@@ -290,6 +293,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -290,6 +293,9 @@ define('Graph', ['logme'], function (logme) {
logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.'); logme('ERROR: could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.');
logme('Error message: "' + err.message + '"'); logme('Error message: "' + err.message + '"');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + config.plot.xrange.max + '" for xrange.max.' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
return false; return false;
} }
allParamNames.pop(); allParamNames.pop();
...@@ -463,6 +469,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -463,6 +469,9 @@ define('Graph', ['logme'], function (logme) {
); );
logme('Error message: "' + err.message + '"'); logme('Error message: "' + err.message + '"');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
paramNames.pop(); paramNames.pop();
paramNames.pop(); paramNames.pop();
...@@ -565,6 +574,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -565,6 +574,9 @@ define('Graph', ['logme'], function (logme) {
logme('ERROR: Could not determine xrange start.'); logme('ERROR: Could not determine xrange start.');
logme('Error message: "' + err.message + '".'); logme('Error message: "' + err.message + '".');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not determine xrange start from defined function.' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
return false; return false;
} }
try { try {
...@@ -573,6 +585,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -573,6 +585,9 @@ define('Graph', ['logme'], function (logme) {
logme('ERROR: Could not determine xrange end.'); logme('ERROR: Could not determine xrange end.');
logme('Error message: "' + err.message + '".'); logme('Error message: "' + err.message + '".');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not determine xrange end from defined function.' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
return false; return false;
} }
step = (end - start) / (numPoints - 1); step = (end - start) / (numPoints - 1);
...@@ -592,6 +607,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -592,6 +607,9 @@ define('Graph', ['logme'], function (logme) {
logme('ERROR: Could not generate data.'); logme('ERROR: Could not generate data.');
logme('Error message: "' + err.message + '".'); logme('Error message: "' + err.message + '".');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from defined function.' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');
return false; return false;
} }
...@@ -618,6 +636,9 @@ define('Graph', ['logme'], function (logme) { ...@@ -618,6 +636,9 @@ define('Graph', ['logme'], function (logme) {
logme('ERROR: Could not generate data.'); logme('ERROR: Could not generate data.');
logme('Error message: "' + err.message + '".'); logme('Error message: "' + err.message + '".');
$('#' + gstId).html('<div style="color: red;">' + 'ERROR IN XML: Could not generate data from function.' + '</div>');
$('#' + gstId).append('<div style="color: red;">' + 'Error message: "' + err.message + '".' + '</div>');g
return false; return false;
} }
paramValues.pop(); paramValues.pop();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment