Commit 90d5bde5b4de66d4b32995df285e050123238e32

Authored by Benjamin Renard
2 parents 11c59ef1 afd10dba

Merge branch 'FER_11242' into amdadev

generic_data/Functions/functions.xml
... ... @@ -327,6 +327,10 @@
327 327 <info_brief>Closest integer greater than or equal to its argument</info_brief>
328 328 <new_kernel>Ceil</new_kernel>
329 329 </function>
  330 + <function name="isNaN()" kind="math" group="math">
  331 + <info_brief>Checks if there is a NaN value</info_brief>
  332 + <new_kernel>IsNaN</new_kernel>
  333 + </function>
330 334 <function name="cos()" kind="math" group="math">
331 335 <info_brief>cosine</info_brief>
332 336 <new_kernel>cos</new_kernel>
... ...
js/app/models/PlotObjects/PlotPanelObject.js
... ... @@ -52,6 +52,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
52 52 {name: 'panel-title-font-size', type: 'int'},
53 53 {name: 'panel-title-font-bold', type: 'boolean'},
54 54 {name: 'panel-title-font-italic', type: 'boolean'},
  55 + {name: 'panel-showint-info', type: 'boolean'},
55 56 {name: 'panel-plot-type', type: 'string'},
56 57 {name: 'panel-font-activated', type: 'boolean'},
57 58 {name: 'panel-font-name', type: 'string'},
... ... @@ -571,6 +572,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
571 572 this.set('panel-title-font-bold', false);
572 573 this.set('panel-title-font-italic', false);
573 574  
  575 +
  576 + this.set('panel-showint-info', false);
  577 +
574 578 this.set('panel-font-activated', false);
575 579 this.set('panel-font-name', amdaDefaultValues.plot.panel.font.name);
576 580 this.set('panel-font-size', amdaDefaultValues.plot.panel.font.size);
... ... @@ -710,6 +714,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
710 714 panelValues['panel-title-font-size'] = this.get('panel-title-font-size');
711 715 panelValues['panel-title-font-bold'] = this.get('panel-title-font-bold');
712 716 panelValues['panel-title-font-italic'] = this.get('panel-title-font-italic');
  717 +
  718 + panelValues['panel-showint-info'] = this.get('panel-showint-info');
  719 +
713 720 panelValues['panel-plot-type'] = this.get('panel-plot-type');
714 721 panelValues['panel-font-activated'] = this.get('panel-font-activated');
715 722 panelValues['panel-font-name'] = this.get('panel-font-name');
... ...
js/app/views/PlotComponents/PlotPanelForm.js
... ... @@ -152,6 +152,12 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
152 152 this.addStandardFieldSet('Manual Margins', '', marginItems),
153 153 this.addStandardFieldSet('Preferred Dimensions', '', preferedDimItems),
154 154 this.addStandardFieldSet('Title', '', titleItems),
  155 +
  156 + this.addStandardCheck('panel-showint-info', 'Show interval number', function(name, value, oldValue) {
  157 + me.object.set('panel-showint-info', value);
  158 + me.crtTree.refresh();
  159 + }, 'When this option is selected, the number of the interval on the TT/Catalog is shown on plot.'),
  160 +
155 161 this.addStandardFont('panel-font'),
156 162 this.addStandardFieldSet('Status Bars', '', statusItems),
157 163 this.addStandardFieldSet('Ticks Bars', '', tickItems)
... ...