CDPP / AMDA_IHM

Commit b1dc2eb34668d255b1ddbbb7e3528cee3f36e260

Authored by Erdogan Furkan
1 parent 239d9f8f
Exists in master and in 29 other branches FER_10435, FER_10828_2, FER_10829, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6951, FER_7862, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_11427, MAZ_FIX_9016, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, develop, openam

More modifications

Showing 23 changed files with 187 additions and 184 deletions   Show diff stats
Inline Side-by-side
desktop.php
  Diff comments   View file @b1dc2eb
... ... @@ -195,17 +195,16 @@ if ($sessionID === FALSE) {
195 195 scope: this,
196 196 afterrestore: function(provider) {
197 197 AmdaAction.getDefaultValueTree(false, function(defaults){
198   - amdaDefaultValues=defaults;
  198 + if(defaults['success'])
  199 + amdaDefaultValues=defaults['defaultValues'];
199 200 AmdaAction.getDefaultValueConfigs(function(configs){
200   - amdaDefaultConfigs = configs;
  201 + if(configs["success"])
  202 + amdaDefaultConfigs = configs["configs"];
201 203  
202 204 AmdaAction.getDefaultValueLinks(function(links){
203   - amdaDefaultOptions = links;
  205 + if(links["success"])
  206 + amdaDefaultOptions = links['links'];
204 207  
205   - Ext.Object.each(amdaDefaultOptions, function(parameter, links){
206   - if(links.store)
207   - links.store = amdaDefaultConfigs[links.store];
208   - });
209 208 amdaDesktop.JobsMgr.getStatus();
210 209 Ext.state.Manager.setProvider(provider);
211 210 myDesktopApp = new amdaApp.AmdaApp();
... ...
js/app/models/PlotObjects/PlotAxisObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -87,14 +87,14 @@ Ext.define('amdaPlotObj.PlotAxisObject', {
87 87 {
88 88 this.set('axis-type', type);
89 89 this.set('axis-reverse', false);
90   - this.set('axis-scale', amdaPlotObj.PlotObjectConfig.defaultValues.axis.scale);
  90 + this.set('axis-scale', amdaDefaultValues.plot.axis.scale);
91 91 this.set('axis-range-min', 0);
92 92 this.set('axis-range-max', 0);
93 93 this.set('axis-range-extend', true);
94   - this.set('axis-color', amdaPlotObj.PlotObjectConfig.defaultValues.axis.color);
95   - this.set('axis-thickness', amdaPlotObj.PlotObjectConfig.defaultValues.axis.thickness);
  94 + this.set('axis-color', amdaDefaultValues.plot.axis.color);
  95 + this.set('axis-thickness', amdaDefaultValues.plot.axis.thickness);
96 96 this.set('axis-tick-showmarks', true);
97   - this.set('axis-tick-position', amdaPlotObj.PlotObjectConfig.defaultValues.axis.tickPosition);
  97 + this.set('axis-tick-position', amdaDefaultValues.plot.axis.tickPosition);
98 98 this.set('axis-grid-minor-number',1);
99 99 this.set('axis-grid-major-number',1);
100 100 this.set('axis-grid-minor-space',0);
... ... @@ -105,15 +105,15 @@ Ext.define('amdaPlotObj.PlotAxisObject', {
105 105 this.set('axis-grid-major', false);
106 106 this.set('axis-legend-activated', true);
107 107 this.set('axis-legend-text', '');
108   - this.set('axis-legend-color', amdaPlotObj.PlotObjectConfig.defaultValues.axis.legend.color);
  108 + this.set('axis-legend-color', amdaDefaultValues.plot.axis.legend.color);
109 109 this.set('axis-legend-font-activated', false);
110   - this.set('axis-legend-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.axis.legend.font.name);
111   - this.set('axis-legend-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.axis.legend.font.size);
  110 + this.set('axis-legend-font-name', amdaDefaultValues.plot.axis.legend.font.name);
  111 + this.set('axis-legend-font-size', amdaDefaultValues.plot.axis.legend.font.size);
112 112 this.set('axis-legend-font-bold', false);
113 113 this.set('axis-legend-font-italic', false);
114   - this.set('axis-time-format', amdaPlotObj.PlotObjectConfig.defaultValues.axis.timeFormat);
  114 + this.set('axis-time-format', amdaDefaultValues.plot.axis.timeFormat);
115 115 this.set('axis-epoch-normalized', false);
116   - this.set('axis-color-map', amdaPlotObj.PlotObjectConfig.defaultValues.axis.colorMap);
  116 + this.set('axis-color-map', amdaDefaultValues.plot.axis.colorMap);
117 117 this.set('axis-color-minval', 'none');
118 118 this.set('axis-color-maxval', 'none');
119 119 },
... ...
js/app/models/PlotObjects/PlotBaseSerieObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -87,54 +87,54 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', {
87 87  
88 88 setDefaultValues: function ()
89 89 {
90   - this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis);
91   - this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution);
  90 + this.set('serie-yaxis', amdaDefaultValues.plot.serie.yAxis);
  91 + this.set('serie-resolution', amdaDefaultValues.plot.serie.resolution);
92 92  
93 93 this.set('serie-lines-activated', true);
94   - this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);
95   - this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
96   - this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color);
  94 + this.set('serie-lines-style', amdaDefaultValues.plot.serie.lines.style);
  95 + this.set('serie-lines-width', amdaDefaultValues.plot.serie.lines.width);
  96 + this.set('serie-lines-color', amdaDefaultValues.plot.serie.lines.color);
97 97  
98 98 this.set('serie-symbols-activated', false);
99   - this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);
100   - this.set('serie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);
101   - this.set('serie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color);
  99 + this.set('serie-symbols-type', amdaDefaultValues.plot.serie.symbols.type);
  100 + this.set('serie-symbols-size', amdaDefaultValues.plot.serie.symbols.size);
  101 + this.set('serie-symbols-color', amdaDefaultValues.plot.serie.symbols.color);
102 102 this.set('serie-colored-param', '');
103 103  
104 104 this.set('serie-timetick-activated', false);
105   - this.set('serie-timetick-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.type);
106   - this.set('serie-timetick-step', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.step);
107   - this.set('serie-timetick-nbmajor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbmajor);
108   - this.set('serie-timetick-nbminor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbminor);
109   - this.set('serie-timetick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color);
110   - this.set('serie-timetick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.type);
111   - this.set('serie-timetick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.size);
112   - this.set('serie-timetick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color);
  105 + this.set('serie-timetick-type', amdaDefaultValues.plot.serie.timetick.type);
  106 + this.set('serie-timetick-step', amdaDefaultValues.plot.serie.timetick.step);
  107 + this.set('serie-timetick-nbmajor', amdaDefaultValues.plot.serie.timetick.nbmajor);
  108 + this.set('serie-timetick-nbminor', amdaDefaultValues.plot.serie.timetick.nbminor);
  109 + this.set('serie-timetick-color', amdaDefaultValues.plot.serie.timetick.color);
  110 + this.set('serie-timetick-symbols-type', amdaDefaultValues.plot.serie.timetick.symbols.type);
  111 + this.set('serie-timetick-symbols-size', amdaDefaultValues.plot.serie.timetick.symbols.size);
  112 + this.set('serie-timetick-symbols-color', amdaDefaultValues.plot.serie.timetick.symbols.color);
113 113 this.set('serie-timetick-firstsymbols-activated', true);
114   - this.set('serie-timetick-firstsymbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.type);
115   - this.set('serie-timetick-firstsymbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.size);
116   - this.set('serie-timetick-firstsymbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color);
  114 + this.set('serie-timetick-firstsymbols-type', amdaDefaultValues.plot.serie.timetick.firstsymbols.type);
  115 + this.set('serie-timetick-firstsymbols-size', amdaDefaultValues.plot.serie.timetick.firstsymbols.size);
  116 + this.set('serie-timetick-firstsymbols-color', amdaDefaultValues.plot.serie.timetick.firstsymbols.color);
117 117 this.set('serie-timetick-font-activated', false);
118   - this.set('serie-timetick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.name);
119   - this.set('serie-timetick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.size);
  118 + this.set('serie-timetick-font-name', amdaDefaultValues.plot.serie.timetick.font.name);
  119 + this.set('serie-timetick-font-size', amdaDefaultValues.plot.serie.timetick.font.size);
120 120 this.set('serie-timetick-font-bold', false);
121 121 this.set('serie-timetick-font-italic', false);
122 122  
123 123 this.set('serie-intervaltick-activated', false);
124   - this.set('serie-intervaltick-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.mode);
125   - this.set('serie-intervaltick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color);
126   - this.set('serie-intervaltick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.type);
127   - this.set('serie-intervaltick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.size);
128   - this.set('serie-intervaltick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color);
  124 + this.set('serie-intervaltick-mode', amdaDefaultValues.plot.serie.intervaltick.mode);
  125 + this.set('serie-intervaltick-color', amdaDefaultValues.plot.serie.intervaltick.color);
  126 + this.set('serie-intervaltick-symbols-type', amdaDefaultValues.plot.serie.intervaltick.symbols.type);
  127 + this.set('serie-intervaltick-symbols-size', amdaDefaultValues.plot.serie.intervaltick.symbols.size);
  128 + this.set('serie-intervaltick-symbols-color', amdaDefaultValues.plot.serie.intervaltick.symbols.color);
129 129 this.set('serie-intervaltick-font-activated', false);
130   - this.set('serie-intervaltick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.name);
131   - this.set('serie-intervaltick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.size);
  130 + this.set('serie-intervaltick-font-name', amdaDefaultValues.plot.serie.intervaltick.font.name);
  131 + this.set('serie-intervaltick-font-size', amdaDefaultValues.plot.serie.intervaltick.font.size);
132 132 this.set('serie-intervaltick-font-bold', false);
133 133 this.set('serie-intervaltick-font-italic', false);
134 134  
135 135 // filtering
136 136 this.set( 'filtering-activated', false);
137   - this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level);
  137 + this.set('filtering-level', amdaDefaultValues.plot.filtering.level);
138 138 },
139 139  
140 140 loadFromData: function (drawData)
... ...
js/app/models/PlotObjects/PlotConstantObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -57,11 +57,11 @@ Ext.define('amdaPlotObj.PlotConstantObject', {
57 57  
58 58 setDefaultValues: function()
59 59 {
60   - this.set('constant-axis-id', amdaPlotObj.PlotObjectConfig.defaultValues.constants.axisId);
  60 + this.set('constant-axis-id', amdaDefaultValues.plot.constants.axisId);
61 61 this.set('constant-float-value', 0.);
62   - this.set('constant-line-style', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.style);
63   - this.set('constant-line-width', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.width);
64   - this.set('constant-line-color', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.color);
  62 + this.set('constant-line-style', amdaDefaultValues.plot.constants.line.style);
  63 + this.set('constant-line-width', amdaDefaultValues.plot.constants.line.width);
  64 + this.set('constant-line-color', amdaDefaultValues.plot.constants.line.color);
65 65 },
66 66  
67 67 getShortInfo : function()
... ...
js/app/models/PlotObjects/PlotCurveObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -146,9 +146,9 @@ Ext.define('amdaPlotObj.PlotCurveObject', {
146 146 {
147 147 this.set('curve-name', '');
148 148 this.set('curve-serie-id', null);
149   - this.set('curve-line-style', amdaPlotObj.PlotObjectConfig.defaultValues.curves.line.style);
150   - this.set('curve-line-width', amdaPlotObj.PlotObjectConfig.defaultValues.curves.line.width);
151   - this.set('curve-line-color', amdaPlotObj.PlotObjectConfig.defaultValues.curves.line.color);
  149 + this.set('curve-line-style', amdaDefaultValues.plot.curves.line.style);
  150 + this.set('curve-line-width', amdaDefaultValues.plot.curves.line.width);
  151 + this.set('curve-line-color', amdaDefaultValues.plot.curves.line.color);
152 152 },
153 153  
154 154 isDirty : function()
... ...
js/app/models/PlotObjects/PlotFillObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -47,12 +47,12 @@ Ext.define('amdaPlotObj.PlotFillObject', {
47 47  
48 48 setDefaultValues: function()
49 49 {
50   - this.set('fill-type', amdaPlotObj.PlotObjectConfig.defaultValues.fills.type);
  50 + this.set('fill-type', amdaDefaultValues.plot.fills.type);
51 51 this.set('fill-firstserie-id', null);
52 52 this.set('fill-secondserie-id', null);
53 53 this.set('fill-constant-id', null);
54   - this.set('fill-greater-color', amdaPlotObj.PlotObjectConfig.defaultValues.fills.greaterColor);
55   - this.set('fill-less-color', amdaPlotObj.PlotObjectConfig.defaultValues.fills.lessColor);
  54 + this.set('fill-greater-color', amdaDefaultValues.plot.fills.greaterColor);
  55 + this.set('fill-less-color', amdaDefaultValues.plot.fills.lessColor);
56 56 },
57 57  
58 58 getShortInfo : function()
... ...
js/app/models/PlotObjects/PlotHistogram2DSerieObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -35,12 +35,12 @@ Ext.define('amdaPlotObj.PlotHistogram2DSerieObject', {
35 35 setDefaultValues: function()
36 36 {
37 37 this.set('serie-xaxis-param', '');
38   - this.set('serie-resampling-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resamplingMode);
39   - this.set('histo2d-function', 'density');
  38 + this.set('serie-resampling-mode', amdaDefaultValues.plot.serie.resamplingMode);
  39 + this.set('histo2d-function', amdaDefaultValues.plot.histogram2D.histo2DFunction);
40 40 this.set('histotype-param', '');
41   - this.set('histo2d-xbinnumber', amdaPlotObj.PlotObjectConfig.defaultValues.histogram2D.xbinnumber);
42   - this.set('histo2d-ybinnumber', amdaPlotObj.PlotObjectConfig.defaultValues.histogram2D.ybinnumber);
43   - this.set('histo2d-smoothfactor', amdaPlotObj.PlotObjectConfig.defaultValues.histogram2D.smoothfactor)
  41 + this.set('histo2d-xbinnumber', amdaDefaultValues.plot.histogram2D.xbinnumber);
  42 + this.set('histo2d-ybinnumber', amdaDefaultValues.plot.histogram2D.ybinnumber);
  43 + this.set('histo2d-smoothfactor', amdaDefaultValues.plot.histogram2D.smoothfactor)
44 44  
45 45 this.callParent(arguments);
46 46 },
... ...
js/app/models/PlotObjects/PlotInstantSerieObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -50,13 +50,13 @@ Ext.define('amdaPlotObj.PlotInstantSerieObject', {
50 50 {
51 51 this.set('iserie-tableonx', false);
52 52 this.set('iserie-lines-activated', true);
53   - this.set('iserie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);
54   - this.set('iserie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
55   - this.set('iserie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color);
  53 + this.set('iserie-lines-style', amdaDefaultValues.plot.serie.lines.style);
  54 + this.set('iserie-lines-width', amdaDefaultValues.plot.serie.lines.width);
  55 + this.set('iserie-lines-color', amdaDefaultValues.plot.serie.lines.color);
56 56 this.set('iserie-symbols-activated', false);
57   - this.set('iserie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);
58   - this.set('iserie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);
59   - this.set('iserie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color);
  57 + this.set('iserie-symbols-type', amdaDefaultValues.plot.serie.symbols.type);
  58 + this.set('iserie-symbols-size', amdaDefaultValues.plot.serie.symbols.size);
  59 + this.set('iserie-symbols-color', amdaDefaultValues.plot.serie.symbols.color);
60 60 },
61 61  
62 62 getJsonValues : function()
... ...
js/app/models/PlotObjects/PlotIntervalsObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -50,14 +50,14 @@ Ext.define('amdaPlotObj.PlotIntervalsObject', {
50 50  
51 51 setDefaultValues: function()
52 52 {
53   - this.set('intervals-color', amdaPlotObj.PlotObjectConfig.defaultValues.intervals.color);
  53 + this.set('intervals-color', amdaDefaultValues.plot.intervals.color);
54 54 this.set('legend-text-activated', true);
55 55 this.set('legend-text-value', '');
56   - this.set('legend-text-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.position);
57   - this.set('legend-text-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.color);
  56 + this.set('legend-text-position', amdaDefaultValues.plot.legends.text.position);
  57 + this.set('legend-text-color', amdaDefaultValues.plot.legends.text.color);
58 58 this.set('legend-text-font-activated', false);
59   - this.set('legend-text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.name);
60   - this.set('legend-text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.size);
  59 + this.set('legend-text-font-name', amdaDefaultValues.plot.legends.text.font.name);
  60 + this.set('legend-text-font-size', amdaDefaultValues.plot.legends.text.font.size);
61 61 this.set('legend-text-font-bold', false);
62 62 this.set('legend-text-font-italic', false);
63 63  
... ...
js/app/models/PlotObjects/PlotLayoutAutoObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -44,10 +44,10 @@ Ext.define('amdaPlotObj.PlotLayoutAutoObject', {
44 44  
45 45 setDefaultValues: function()
46 46 {
47   - this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);
48   - this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);
49   - this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);
50   - this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend);
  47 + this.set('layout-panel-height', amdaDefaultValues.plot.page.layout.panelHeight);
  48 + this.set('layout-panel-spacing', amdaDefaultValues.plot.page.layout.panelSpacing);
  49 + this.set('layout-expand', amdaDefaultValues.plot.page.layout.expand);
  50 + this.set('layout-timeaxes-legend-lowerone', amdaDefaultValues.plot.page.layout.timeAxesLegend);
51 51 },
52 52  
53 53 getJsonValues : function()
... ...
js/app/models/PlotObjects/PlotLayoutVerticalObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -47,10 +47,10 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
47 47  
48 48 setDefaultValues: function()
49 49 {
50   - this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);
51   - this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);
52   - this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);
53   - this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend);
  50 + this.set('layout-panel-height', amdaDefaultValues.plot.page.layout.panelHeight);
  51 + this.set('layout-panel-spacing', amdaDefaultValues.plot.page.layout.panelSpacing);
  52 + this.set('layout-expand', amdaDefaultValues.plot.page.layout.expand);
  53 + this.set('layout-timeaxes-legend-lowerone', amdaDefaultValues.plot.page.layout.timeAxesLegend);
54 54 },
55 55  
56 56 getJsonValues : function()
... ...
js/app/models/PlotObjects/PlotLegendSeriesObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -54,17 +54,17 @@ Ext.define('amdaPlotObj.PlotLegendSeriesObject', {
54 54 setDefaultValues: function()
55 55 {
56 56 this.set('legend-series-activated', false);
57   - this.set('legend-series-type', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.type);
58   - this.set('legend-series-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.position);
  57 + this.set('legend-series-type', amdaDefaultValues.plot.legends.series.type);
  58 + this.set('legend-series-position', amdaDefaultValues.plot.legends.series.position);
59 59 this.set('legend-series-showparaminfo', true);
60   - this.set('legend-series-defaulttextcolor', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.text.color);
  60 + this.set('legend-series-defaulttextcolor', amdaDefaultValues.plot.legends.series.text.color);
61 61 this.set('legend-series-border-activated', false);
62   - this.set('legend-series-border-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.border.color);
  62 + this.set('legend-series-border-color', amdaDefaultValues.plot.legends.series.border.color);
63 63 this.set('legend-series-intervalinfo-activated', false);
64   - this.set('legend-series-intervalinfo-type', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.intervalinfo.type);
  64 + this.set('legend-series-intervalinfo-type', amdaDefaultValues.plot.legends.series.intervalinfo.type);
65 65 this.set('legend-series-font-activated', false);
66   - this.set('legend-series-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.name);
67   - this.set('legend-series-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.size);
  66 + this.set('legend-series-font-name', amdaDefaultValues.plot.legends.series.font.name);
  67 + this.set('legend-series-font-size', amdaDefaultValues.plot.legends.series.font.size);
68 68 this.set('legend-series-font-bold', false);
69 69 this.set('legend-series-font-italic', false);
70 70 },
... ...
js/app/models/PlotObjects/PlotLegendTextObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -50,11 +50,11 @@ Ext.define('amdaPlotObj.PlotLegendTextObject', {
50 50 setDefaultValues: function()
51 51 {
52 52 this.set('legend-text-value', '');
53   - this.set('legend-text-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.position);
54   - this.set('legend-text-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.color);
  53 + this.set('legend-text-position', amdaDefaultValues.plot.legends.text.position);
  54 + this.set('legend-text-color', amdaDefaultValues.plot.legends.text.color);
55 55 this.set('legend-text-font-activated', false);
56   - this.set('legend-text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.name);
57   - this.set('legend-text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.size);
  56 + this.set('legend-text-font-name', amdaDefaultValues.plot.legends.text.font.name);
  57 + this.set('legend-text-font-size', amdaDefaultValues.plot.legends.text.font.size);
58 58 this.set('legend-text-font-bold', false);
59 59 this.set('legend-text-font-italic', false);
60 60 },
... ...
js/app/models/PlotObjects/PlotObjectConfig.js
  Diff comments   View file @b1dc2eb
... ... @@ -16,8 +16,6 @@
16 16 Ext.define('amdaPlotObj.PlotObjectConfig', {
17 17 singleton: true,
18 18  
19   - defaultValues: amdaDefaultValues.plot,
20   -
21 19 getValueByKey: function (dataList, key) {
22 20 var value = '';
23 21 Ext.each(dataList, function (data) {
... ...
js/app/models/PlotObjects/PlotOrbitSerieObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -27,7 +27,7 @@ Ext.define('amdaPlotObj.PlotOrbitSerieObject', {
27 27  
28 28 setDefaultValues: function()
29 29 {
30   - this.set('serie-projection', amdaPlotObj.PlotObjectConfig.defaultValues.serie.projection);
  30 + this.set('serie-projection', amdaDefaultValues.plot.serie.projection);
31 31 this.callParent(arguments);
32 32 },
33 33  
... ...
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -557,22 +557,22 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
557 557  
558 558 setDefaultValues: function()
559 559 {
560   - this.set('panel-background-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor);
561   - this.set('panel-plotareabackground-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor);
  560 + this.set('panel-background-color', amdaDefaultValues.plot.panel.backgroundColor);
  561 + this.set('panel-plotareabackground-color', amdaDefaultValues.plot.panel.backgroundColor);
562 562 this.set('panel-title-text', '');
563   - this.set('panel-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.color);
564   - this.set('panel-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.position);
565   - this.set('panel-title-alignment', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.alignment);
  563 + this.set('panel-title-color', amdaDefaultValues.plot.panel.title.color);
  564 + this.set('panel-title-position', amdaDefaultValues.plot.panel.title.position);
  565 + this.set('panel-title-alignment', amdaDefaultValues.plot.panel.title.alignment);
566 566  
567 567 this.set('panel-title-font-activated', false);
568   - this.set('panel-title-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.name);
569   - this.set('panel-title-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.size);
  568 + this.set('panel-title-font-name', amdaDefaultValues.plot.panel.font.name);
  569 + this.set('panel-title-font-size', amdaDefaultValues.plot.panel.font.size);
570 570 this.set('panel-title-font-bold', false);
571 571 this.set('panel-title-font-italic', false);
572 572  
573 573 this.set('panel-font-activated', false);
574   - this.set('panel-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.name);
575   - this.set('panel-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.size);
  574 + this.set('panel-font-name', amdaDefaultValues.plot.panel.font.name);
  575 + this.set('panel-font-size', amdaDefaultValues.plot.panel.font.size);
576 576 this.set('panel-font-bold', false);
577 577 this.set('panel-font-italic', false);
578 578  
... ... @@ -587,16 +587,16 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
587 587 this.set('panel-prefered-width', null);
588 588 this.set('panel-prefered-height', null);
589 589  
590   - this.set('panel-scatter-isotropic', amdaPlotObj.PlotObjectConfig.defaultValues.panel.isotropic);
  590 + this.set('panel-scatter-isotropic', amdaDefaultValues.plot.panel.isotropic);
591 591  
592   - this.set('panel-status-position', amdaPlotObj.PlotObjectConfig.defaultValues.panel.status.position);
593   - this.set('panel-status-colormap', amdaPlotObj.PlotObjectConfig.defaultValues.panel.status.colorMap);
  592 + this.set('panel-status-position', amdaDefaultValues.plot.panel.status.position);
  593 + this.set('panel-status-colormap', amdaDefaultValues.plot.panel.status.colorMap);
594 594  
595 595 this.set('panel-tick-format', "");
596 596  
597 597 this.set('panel-epoch-centertimeid', "");
598 598  
599   - this.changePlotType(amdaPlotObj.PlotObjectConfig.defaultValues.panel.plotType);
  599 + this.changePlotType(amdaDefaultValues.plot.panel.plotType);
600 600 },
601 601  
602 602 getPanelShortInfo : function()
... ...
js/app/models/PlotObjects/PlotRequestObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -158,39 +158,39 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
158 158  
159 159 setDefaultValues: function()
160 160 {
161   - this.set('file-format', amdaPlotObj.PlotObjectConfig.defaultValues.file.format);
162   - this.set('file-output', amdaPlotObj.PlotObjectConfig.defaultValues.file.output);
  161 + this.set('file-format', amdaDefaultValues.plot.file.format);
  162 + this.set('file-output', amdaDefaultValues.plot.file.output);
163 163 this.set('file-prefix', '');
164   - this.set('one-file-per-interval', amdaPlotObj.PlotObjectConfig.defaultValues.file.oneFilePerInterval);
  164 + this.set('one-file-per-interval', amdaDefaultValues.plot.file.oneFilePerInterval);
165 165 this.set('name', '');
166 166  
167   - this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView);
  167 + this.set('tree-full-view', amdaDefaultValues.plot.tree.fullView);
168 168  
169 169 this.set('page-title-text', '');
170   - this.set('page-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.color);
171   - this.set('page-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.position);
172   - this.set('page-title-alignment', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.alignment);
  170 + this.set('page-title-color', amdaDefaultValues.plot.page.title.color);
  171 + this.set('page-title-position', amdaDefaultValues.plot.page.title.position);
  172 + this.set('page-title-alignment', amdaDefaultValues.plot.page.title.alignment);
173 173  
174 174 this.set('page-title-font-activated', false);
175   - this.set('page-title-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);
176   - this.set('page-title-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size);
  175 + this.set('page-title-font-name', amdaDefaultValues.plot.page.font.name);
  176 + this.set('page-title-font-size', amdaDefaultValues.plot.page.font.size);
177 177 this.set('page-title-font-bold', false);
178 178 this.set('page-title-font-italic', false);
179 179  
180 180 this.set('page-margins-activated', false);
181   - this.set('page-margin-x', amdaPlotObj.PlotObjectConfig.defaultValues.page.xMargin);
182   - this.set('page-margin-y', amdaPlotObj.PlotObjectConfig.defaultValues.page.yMargin);
183   - this.set('page-mode', amdaPlotObj.PlotObjectConfig.defaultValues.page.mode);
184   - this.set('page-orientation', amdaPlotObj.PlotObjectConfig.defaultValues.page.orientation);
185   - this.set('page-dimension', amdaPlotObj.PlotObjectConfig.defaultValues.page.dimension);
  181 + this.set('page-margin-x', amdaDefaultValues.plot.page.xMargin);
  182 + this.set('page-margin-y', amdaDefaultValues.plot.page.yMargin);
  183 + this.set('page-mode', amdaDefaultValues.plot.page.mode);
  184 + this.set('page-orientation', amdaDefaultValues.plot.page.orientation);
  185 + this.set('page-dimension', amdaDefaultValues.plot.page.dimension);
186 186 this.set('page-superpose-mode', false);
187 187 this.set('page-font-activated', false);
188   - this.set('page-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);
189   - this.set('page-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size);
  188 + this.set('page-font-name', amdaDefaultValues.plot.page.font.name);
  189 + this.set('page-font-size', amdaDefaultValues.plot.page.font.size);
190 190 this.set('page-font-bold', false);
191 191 this.set('page-font-italic', false);
192 192  
193   - this.setLayout(amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.type);
  193 + this.setLayout(amdaDefaultValues.plot.page.layout.type);
194 194 },
195 195  
196 196 getPageShortInfo : function()
... ...
js/app/models/PlotObjects/PlotSauvaudObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -59,13 +59,13 @@ Ext.define('amdaPlotObj.PlotSauvaudObject', {
59 59 },
60 60  
61 61 setDefaultValues: function () {
62   - this.set('spectro-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.yAxis);
63   - this.set('spectro-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.resolution);
  62 + this.set('spectro-yaxis', amdaDefaultValues.plot.spectro.yAxis);
  63 + this.set('spectro-resolution', amdaDefaultValues.plot.spectro.resolution);
64 64 this.set('spectro-log0-as-min', false);
65 65 this.set('spectro-normalization', "none");
66 66 // filtering
67 67 this.set('filtering-activated', false);
68   - this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level);
  68 + this.set('filtering-level', amdaDefaultValues.plot.filtering.level);
69 69 this.set('right_dim', 0);
70 70  
71 71 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false);
... ...
js/app/models/PlotObjects/PlotSerieObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -42,16 +42,16 @@ Ext.define('amdaPlotObj.PlotSerieObject', {
42 42 setDefaultValues: function()
43 43 {
44 44 this.set('serie-errorbar-activated', false);
45   - this.set('serie-errorbar-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.type);
46   - this.set('serie-errorbar-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.lines.style);
47   - this.set('serie-errorbar-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.lines.width);
48   - this.set('serie-errorbar-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.lines.color);
  45 + this.set('serie-errorbar-type', amdaDefaultValues.plot.serie.errorbar.type);
  46 + this.set('serie-errorbar-lines-style', amdaDefaultValues.plot.serie.errorbar.lines.style);
  47 + this.set('serie-errorbar-lines-width', amdaDefaultValues.plot.serie.errorbar.lines.width);
  48 + this.set('serie-errorbar-lines-color', amdaDefaultValues.plot.serie.errorbar.lines.color);
49 49 this.set('serie-errorbar-minparam', '');
50 50 this.set('serie-errorbar-maxparam', '');
51 51 this.set('serie-errorbar-deltaparam', '');
52 52  
53 53 this.set('serie-xaxis-param', '');
54   - this.set('serie-resampling-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resamplingMode);
  54 + this.set('serie-resampling-mode', amdaDefaultValues.plot.serie.resamplingMode);
55 55  
56 56 this.callParent(arguments);
57 57 },
... ...
js/app/models/PlotObjects/PlotSpectroObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -58,13 +58,13 @@ Ext.define('amdaPlotObj.PlotSpectroObject', {
58 58 },
59 59  
60 60 setDefaultValues: function () {
61   - this.set('spectro-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.yAxis);
62   - this.set('spectro-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.resolution);
  61 + this.set('spectro-yaxis', amdaDefaultValues.plot.spectro.yAxis);
  62 + this.set('spectro-resolution', amdaDefaultValues.plot.spectro.resolution);
63 63 this.set('spectro-log0-as-min', false);
64 64 this.set('spectro-normalization', "none");
65 65 // filtering
66 66 this.set('filtering-activated', false);
67   - this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level);
  67 + this.set('filtering-level', amdaDefaultValues.plot.filtering.level);
68 68  
69 69 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false);
70 70 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, null);
... ...
js/app/models/PlotObjects/PlotTextObject.js
  Diff comments   View file @b1dc2eb
... ... @@ -67,17 +67,17 @@ Ext.define('amdaPlotObj.PlotTextObject', {
67 67 setDefaultValues: function()
68 68 {
69 69 this.set('text-value', '');
70   - this.set('text-y-axis', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.yAxisId);
71   - this.set('text-x-relative', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.xRelative);
  70 + this.set('text-y-axis', amdaDefaultValues.plot.textObjs.yAxisId);
  71 + this.set('text-x-relative', amdaDefaultValues.plot.textObjs.xRelative);
72 72 this.set('text-x-floatvalue', 0.);
73   - this.set('text-y-relative', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.yRelative);
  73 + this.set('text-y-relative', amdaDefaultValues.plot.textObjs.yRelative);
74 74 this.set('text-y-value', 0.);
75 75 this.set('text-angle', 0.);
76   - this.set('text-color', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.color);
77   - this.set('text-align', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.align);
  76 + this.set('text-color', amdaDefaultValues.plot.textObjs.color);
  77 + this.set('text-align', amdaDefaultValues.plot.textObjs.align);
78 78 this.set('text-font-activated', false);
79   - this.set('text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.font.name);
80   - this.set('text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.font.size);
  79 + this.set('text-font-name', amdaDefaultValues.plot.textObjs.font.name);
  80 + this.set('text-font-size', amdaDefaultValues.plot.textObjs.font.size);
81 81 this.set('text-font-bold', false);
82 82 this.set('text-font-italic', false);
83 83 },
... ...
js/app/views/DefaultValuesWindow.js
  Diff comments   View file @b1dc2eb
... ... @@ -47,7 +47,8 @@ Ext.define('amdaUI.DefaultValuesWindow',{
47 47 AmdaAction.setUserDefaultValues(me.defaultValuesGrid.modifiedDefaults, function(res) {
48 48 if(res['success']){
49 49 AmdaAction.getDefaultValueTree(false, function(defaults){
50   - amdaDefaultValues=defaults;
  50 + if(defaults['success'])
  51 + amdaDefaultValues=defaults['defaultValues'];
51 52 });
52 53 me.defaultValuesGrid.removeAll();
53 54 me.defaultValuesGrid.destroy();
... ...
php/classes/AmdaAction.php
  Diff comments   View file @b1dc2eb
... ... @@ -1736,64 +1736,69 @@ class AmdaAction
1736 1736 }
1737 1737 public function getDefaultValueConfigs(){
1738 1738 if (file_exists(DATAPATH.'defaultValuesConfig.json'))
1739   - return json_decode(file_get_contents(DATAPATH.'defaultValuesConfig.json'), true);
  1739 + return array('success' => true , 'configs' => json_decode(file_get_contents(DATAPATH.'defaultValuesConfig.json'), true));
1740 1740 else
1741   - return array();
  1741 + return array('success' => false , 'configs' => array(), 'message'=>'Error : No default value configs file.');
1742 1742 }
1743 1743  
1744 1744 public function getDefaultValueLinks(){
1745   - if (file_exists(DATAPATH.'defaultValuesLinks.json'))
1746   - return json_decode(file_get_contents(DATAPATH.'defaultValuesLinks.json'), true);
1747   - else
1748   - return array();
  1745 + if (!file_exists(DATAPATH.'defaultValuesLinks.json'))
  1746 + return array('success' => false , 'links' => array(), 'message'=>'Error : No default value links file.');
  1747 +
  1748 + $json_links = json_decode(file_get_contents(DATAPATH.'defaultValuesLinks.json'), true);
  1749 + if (!file_exists(DATAPATH.'defaultValuesConfig.json'))
  1750 + return array('success' => false , 'links' => array(), 'message'=>'Error : No default value configs file.');
  1751 +
  1752 + $json_configs= json_decode(file_get_contents(DATAPATH.'defaultValuesConfig.json'), true);
  1753 + foreach ($json_links as $parameter => &$links){
  1754 + if(!empty($links['store']))
  1755 + $links['store']= $json_configs[$links['store']];
  1756 + }
  1757 + return array('success' => true , 'links' => $json_links);
  1758 +
1749 1759 }
1750 1760  
1751 1761 public function getDefaultValueTree($isTree=TRUE){
1752 1762 $childrenToReturn = array();
1753 1763 $children = [];
1754   - if (file_exists(DATAPATH.'defaultValues.json')) {
1755   - $json_o = json_decode(file_get_contents(DATAPATH.'defaultValues.json'), true);
1756   - if (empty($json_o)) {
1757   - $childrenToReturn = array();
1758   - }
1759   - else {
1760   - if (file_exists(USERDIR.'userDefaults.json')) {
1761   - $json_user = json_decode(file_get_contents(USERDIR.'userDefaults.json'), true);
1762   - foreach($json_user as $key => $value){
1763   - $keys = explode(".", $key);
1764   - $results = &$json_o; // Use a reference to update the original array
1765   - foreach($keys as $parameter){
1766   - $results = &$results[$parameter];
1767   - }
1768   - if($isTree)
1769   - $results = array("value" => $value, "modified" => true, "defaultValue" => $results);
1770   - else
1771   - $results = $value;
1772   - }
1773   - }
1774   -
1775   - if($isTree){
1776   -
1777   - $this->getNodeValues($json_o,$children);
1778   -
1779   - $childrenToReturn = [
1780   - "text" => ".",
1781   - "children" => $children
1782   - ];
1783   - }
1784   - else {
1785   - $childrenToReturn = $json_o;
1786   - }
  1764 + if (!file_exists(DATAPATH.'defaultValues.json'))
  1765 + return array('success' => false , 'defaultValues' => array(), 'message'=>'efaultvalues file not found.');
  1766 + $json_o = json_decode(file_get_contents(DATAPATH.'defaultValues.json'), true);
  1767 + if (empty($json_o))
  1768 + return array('success' => false , 'defaultValues' => array(), 'message'=>'Error : defaultValues file empty.');
  1769 +
  1770 + if (!file_exists(USERDIR.'userDefaults.json'))
  1771 + return array('success' => true , 'defaultValues' => $json_o, 'message'=>'No modification on defaultvalues.');
  1772 +
  1773 + $json_user = json_decode(file_get_contents(USERDIR.'userDefaults.json'), true);
  1774 + if (empty($json_user))
  1775 + return array('success' => true , 'defaultValues' => $json_o, 'message'=>'No modification on defaultvalues.');
  1776 +
  1777 + foreach($json_user as $key => $value){
  1778 + $keys = explode(".", $key);
  1779 + $results = &$json_o; // Use a reference to update the original array
  1780 + foreach($keys as $parameter){
  1781 + $results = &$results[$parameter];
1787 1782 }
  1783 + if($isTree)
  1784 + $results = array("value" => $value, "modified" => true, "defaultValue" => $results);
  1785 + else
  1786 + $results = $value;
1788 1787 }
1789   - else {
1790   - $childrenToReturn = array();
  1788 +
  1789 + if($isTree){
  1790 + $this->getNodeValues($json_o,$children);
  1791 + return [ "text" => ".", "children" => $children ];
1791 1792 }
1792   - return $childrenToReturn;
  1793 +
  1794 + return array('success' => true , 'defaultValues' => $json_o);
1793 1795 }
1794 1796  
1795 1797 public function setUserDefaultValues($data){
1796 1798 $json_user = json_encode($data, true);
  1799 + if (empty($json_user))
  1800 + return array('success' => false , 'message'=>'Error : No modifications to write.');
  1801 +
1797 1802 file_put_contents(USERDIR.'userDefaults.json',$json_user);
1798 1803  
1799 1804 return array('success' => true);
... ...