CDPP / AMDA_IHM

Commit 8018f104c5176833f07244e020236ddfc6445a18

Authored by Benjamin Renard
2 parents 66ed4a83 f6464410
Exists in master and in 40 other branches FER_10400, FER_10435, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, openam

Merge branch 'FER_10765' into 'develop' 

Fer 10765

See merge request !53
Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/views/CatalogUI.js
  Diff comments   View file @8018f10
... ... @@ -458,7 +458,10 @@ Ext.define('amdaUI.CatalogUI', {
458 458 xtype: 'gridcolumn',
459 459 width: pramColumnWidth * parseInt(obj.size),
460 460 editor: 'textfield',
461   - filter: {type: 'numeric', menuItemCfgs: {decimalPrecision: 10}}
  461 + filter: {type: 'numeric', menuItemCfgs: {decimalPrecision: 10}},
  462 + renderer :function(value){
  463 + return (value == "NAN") ? "nan": value;
  464 + },
462 465 });
463 466 break;
464 467 case 1: //dateTime
... ...
php/classes/CatalogCacheIntervalObject.php
  Diff comments   View file @8018f10
... ... @@ -56,7 +56,11 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
56 56 $value = ($i >= count($values_array)) ? "" : $values_array[$i];
57 57 switch ($parameter['type']) {
58 58 case 0: //double
59   - fwrite($handle,pack('d', floatval($value)));
  59 + if($value == "nan")
  60 + $floatValue = NAN;
  61 + else
  62 + $floatValue = floatval($value);
  63 + fwrite($handle,pack('d', $floatValue));
60 64 break;
61 65 case 1: //date (timestamp)
62 66 fwrite($handle,pack('d', TimeUtils::iso2stamp($value)));
... ... @@ -98,7 +102,7 @@ class CatalogCacheIntervalObject extends TimeTableCacheIntervalObject
98 102 if (!$res = unpack('dval',fread($handle,8))) {
99 103 break;
100 104 }
101   - $val = $res['val'];
  105 + $val = is_nan($res['val']) ? "nan" : $res['val'];
102 106 break;
103 107 case 1: //date (timestamp)
104 108 if (!$res = unpack('dval',fread($handle,8))) {
... ...