CDPP / AMDA_IHM

Commit 4f728fd90a2988a5aa1c6d83d5411125b80fd55e

Authored by Erdogan Furkan
1 parent 851cf2f0
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

For now 2

Showing 40 changed files with 939 additions and 585 deletions   Show diff stats
Inline Side-by-side
@@ -112,6 +112,9 @@ if ($sessionID === FALSE) { @@ -112,6 +112,9 @@ if ($sessionID === FALSE) {
112 112
113 var helpDir = 'help/'; 113 var helpDir = 'help/';
114 var isGuest = sessionID.match('guest'); 114 var isGuest = sessionID.match('guest');
  115 + var amdaDefaultValues = null;
  116 + var amdaDefaultConfigs = null;
  117 + var amdaDefaultOptions = null;
115 118
116 var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>'; 119 var max_uploaded_file_size = '<?php echo MAX_UPLOADED_FILESIZE; ?>';
117 var guestSessionDuration = '<?php echo GuestSessionDuration * 60; ?>'; // in secs 120 var guestSessionDuration = '<?php echo GuestSessionDuration * 60; ?>'; // in secs
@@ -191,14 +194,32 @@ if ($sessionID === FALSE) { @@ -191,14 +194,32 @@ if ($sessionID === FALSE) {
191 stateProvider.on({ 194 stateProvider.on({
192 scope: this, 195 scope: this,
193 afterrestore: function(provider) { 196 afterrestore: function(provider) {
194 - amdaDesktop.JobsMgr.getStatus();  
195 - Ext.state.Manager.setProvider(provider);  
196 - myDesktopApp = new amdaApp.AmdaApp();  
197 - // global message bus  
198 - myDesktopApp.EventManager = new Ext.util.Observable();  
199 - // not needed - for documentation only  
200 - myDesktopApp.EventManager.addEvents('refresh');  
201 - loadMask = new AMDAMask(); 197 + AmdaAction.getDefaultValueTree(false, function(defaults){
  198 + amdaDefaultValues=defaults;
  199 +
  200 + AmdaAction.getDefaultValueConfigs(function(configs){
  201 + amdaDefaultConfigs = configs;
  202 +
  203 + AmdaAction.getDefaultValueLinks(function(links){
  204 + amdaDefaultOptions = links;
  205 +
  206 + Ext.Object.each(amdaDefaultOptions, function(parameter, links){
  207 + if(links.store)
  208 + links.store = amdaDefaultConfigs[links.store];
  209 + });
  210 + amdaDesktop.JobsMgr.getStatus();
  211 + Ext.state.Manager.setProvider(provider);
  212 + myDesktopApp = new amdaApp.AmdaApp();
  213 + // global message bus
  214 + myDesktopApp.EventManager = new Ext.util.Observable();
  215 + // not needed - for documentation only
  216 + myDesktopApp.EventManager.addEvents('refresh');
  217 + loadMask = new AMDAMask();
  218 + }) ;
  219 + });
  220 + }) ;
  221 +
  222 +
202 } 223 }
203 }); 224 });
204 225
generic_data/defaultValuesConfig.json 0 → 100644
  Diff comments   View file @4f728fd
@@ -0,0 +1,300 @@ @@ -0,0 +1,300 @@
  1 +{
  2 + "availableFileFormats": [
  3 + { "key": "PNG", "value": "PNG" },
  4 + { "key": "PDF", "value": "PDF" },
  5 + { "key": "PS", "value": "PS" },
  6 + { "key": "SVG", "value": "SVG" }
  7 + ],
  8 +
  9 + "availableFileOutputsForPng": [
  10 + { "key": "INTERACTIVE", "value": "screen" },
  11 + { "key": "TGZ", "value": "tar+gzip archive" },
  12 + { "key": "ZIP", "value": "zip archive" }
  13 + ],
  14 +
  15 + "availableFileOutputsForOtherFormats": [
  16 + { "key": "TGZ", "value": "tar+gzip archive" },
  17 + { "key": "ZIP", "value": "zip archive" }
  18 + ],
  19 +
  20 + "availablePageModes": [
  21 + { "key": "color", "value": "Color" },
  22 + { "key": "grayscale", "value": "Grayscale" }
  23 + ],
  24 +
  25 + "availablePageOrientations": [
  26 + { "key": "landscape", "value": "Landscape" },
  27 + { "key": "portrait", "value": "Portrait" }
  28 + ],
  29 +
  30 + "availablePageDimensions": [
  31 + { "key": "ISO A4", "value": "ISO A4" },
  32 + { "key": "US letter", "value": "US letter" }
  33 + ],
  34 +
  35 + "availablePlotTypes": [
  36 + { "key": "timePlot", "value": "Time Plot" },
  37 + { "key": "xyPlot", "value": "Scatter Plot" },
  38 + { "key": "epochPlot", "value": "Epoch Plot" },
  39 + { "key": "instantPlot", "value": "Instant Plot" },
  40 + { "key": "statusPlot", "value": "Status Plot" },
  41 + { "key": "tickPlot", "value": "Tick Plot" }
  42 + ],
  43 +
  44 + "availableFontNames": [
  45 + { "key": "sans-serif", "value": "sans-serif" },
  46 + { "key": "serif", "value": "serif" },
  47 + { "key": "monospace", "value": "monospace" },
  48 + { "key": "script", "value": "script" }
  49 + ],
  50 +
  51 + "availableTitlePositions": [
  52 + { "key": "top", "value": "Top" },
  53 + { "key": "bottom", "value": "Bottom" }
  54 + ],
  55 +
  56 + "availableTitleAlignments": [
  57 + { "key": "center", "value": "Center" },
  58 + { "key": "left", "value": "Left" },
  59 + { "key": "right", "value": "Right" }
  60 + ],
  61 +
  62 + "availableAxisScales": [
  63 + { "key": "linear", "value": "Linear" },
  64 + { "key": "logarithmic", "value": "Logarithmic" }
  65 + ],
  66 +
  67 + "availableTicksPositions": [
  68 + { "key": "inwards", "value": "Inwards" },
  69 + { "key": "outwards", "value": "Outwards" }
  70 + ],
  71 +
  72 + "availableTimeAxisFormats": [
  73 + { "key": "dd/mm/yy", "value": "dd/mm/yy" },
  74 + { "key": "ddd/yy", "value": "ddd/yy" },
  75 + { "key": "DD/MM/YYYY", "value": "dd/mm/yyyy" },
  76 + { "key": "yyyy/dd/mm", "value": "yyyy/dd/mm" },
  77 + { "key": "yyyy-dd-mm", "value": "yyyy-dd-mm" }
  78 + ],
  79 +
  80 + "availableYAxes": [
  81 + { "key": "y-left", "value": "Left" },
  82 + { "key": "y-right", "value": "Right" }
  83 + ],
  84 +
  85 + "availableResolutions": [
  86 + { "key": 3000, "value": "3000" },
  87 + { "key": 10000, "value": "10000" },
  88 + { "key": 50000, "value": "50000" },
  89 + { "key": 100000, "value": "100000" }
  90 + ],
  91 +
  92 + "availableLinesStyles": [
  93 + { "key": "plain", "value": "Plain" },
  94 + { "key": "dot", "value": "Dot" },
  95 + { "key": "long-spaced-dot", "value": "Long spaced dot" },
  96 + { "key": "long-short-dot", "value": "Long short dot" }
  97 + ],
  98 +
  99 + "availableSymbolsTypes": [
  100 + { "key": "dot", "value": "Dot" },
  101 + { "key": "plus", "value": "Plus" },
  102 + { "key": "wildcard", "value": "Wildcard" },
  103 + { "key": "circle", "value": "Circle" },
  104 + { "key": "crux", "value": "Crux" },
  105 + { "key": "square", "value": "Square" },
  106 + { "key": "triangle", "value": "Triangle" },
  107 + { "key": "crux-in-circle", "value": "Crux in circle" },
  108 + { "key": "dot-in-circle", "value": "Dot in circle" },
  109 + { "key": "diamond", "value": "Diamond" },
  110 + { "key": "star", "value": "Star" },
  111 + { "key": "david-star", "value": "David star" },
  112 + { "key": "full-square", "value": "Full square" },
  113 + { "key": "full-circle", "value": "Full circle" },
  114 + { "key": "full-star", "value": "Full star" }
  115 + ],
  116 +
  117 + "availableColorMaps": [
  118 + { "key": "0", "value": "Blue Red" },
  119 + { "key": "1", "value": "Default" },
  120 + { "key": "2", "value": "Blue Yellow" },
  121 + { "key": "3", "value": "Grayscale" },
  122 + { "key": "4", "value": "AMDA Default" },
  123 + { "key": "5", "value": "GeoWhite" },
  124 + { "key": "6", "value": "GeoBlack" },
  125 + { "key": "7", "value": "Violet Yellow" },
  126 + { "key": "8", "value": "Red Blue 4" }
  127 + ],
  128 +
  129 + "availableColors": [
  130 + { "key": "auto", "color": "auto", "value": "auto" },
  131 + { "key": "[0,0,0]", "color": "#000000", "value": "Black" },
  132 + { "key": "[0,0,255]", "color": "#0000ff", "value": "Blue" },
  133 + { "key": "[255,0,0]", "color": "#ff0000", "value": "Red" },
  134 + { "key": "[0,255,255]", "color": "#00ffff", "value": "Cyan" },
  135 + { "key": "[255,0,255]", "color": "#ff00ff", "value": "Magenta" },
  136 + { "key": "[0,128,0]", "color": "#008000", "value": "Green" },
  137 + { "key": "[128,128,128]", "color": "#808080", "value": "Gray" },
  138 + { "key": "[0,255,0]", "color": "#00ff00", "value": "Lime" },
  139 + { "key": "[128,0,0]", "color": "#800000", "value": "Maroon" },
  140 + { "key": "[0,0,128]", "color": "#000080", "value": "Navy" },
  141 + { "key": "[128,128,0]", "color": "#808000", "value": "Olive" },
  142 + { "key": "[128,0,128]", "color": "#800080", "value": "Purple" },
  143 + { "key": "[192,192,192]", "color": "#c0c0c0", "value": "Silver" },
  144 + { "key": "[0,128,128]", "color": "#008080", "value": "Teal" },
  145 + { "key": "[255,255,0]", "color": "#ffff00", "value": "Yellow" },
  146 + { "key": "[0,64,64]", "color": "#004040", "value": "Cyprus" }
  147 + ],
  148 +
  149 + "availableColorsNew": [
  150 + "#000000", "#0000ff", "#ff0000", "#00ffff", "#ff00ff", "#008000", "#800000",
  151 + "#000080", "#808000", "#800080", "#c0c0c0", "#008080", "#ffff00", "#004040",
  152 + "#29d8d7", "#6b9842", "#73a9b4", "#1c883d", "#808080", "#4342dd", "#e84130",
  153 + "#dee2e6", "#ced4da", "#adb5bd", "#868e96", "#495057", "#343a40", "#212529",
  154 + "#ffa8a8", "#ff8787", "#ff6b6b", "#fa5252", "#f03e3e", "#e03131", "#c92a2a",
  155 + "#faa2c1", "#f783ac", "#f06595", "#e64980", "#d6336c", "#c2255c", "#a61e4d",
  156 + "#e599f7", "#da77f2", "#cc5de8", "#be4bdb", "#ae3ec9", "#9c36b5", "#862e9c",
  157 + "#b197fc", "#9775fa", "#845ef7", "#7950f2", "#7048e8", "#6741d9", "#5f3dc4",
  158 + "#91a7ff", "#748ffc", "#5c7cfa", "#4c6ef5", "#4263eb", "#3b5bdb", "#364fc7",
  159 + "#74c0fc", "#4dabf7", "#339af0", "#228be6", "#1c7ed6", "#1971c2", "#1864ab",
  160 + "#66d9e8", "#3bc9db", "#22b8cf", "#15aabf", "#1098ad", "#0c8599", "#0b7285",
  161 + "#63e6be", "#38d9a9", "#20c997", "#12b886", "#0ca678", "#099268", "#087f5b",
  162 + "#8ce99a", "#69db7c", "#51cf66", "#40c057", "#37b24d", "#2f9e44", "#2b8a3e",
  163 + "#c0eb75", "#a9e34b", "#94d82d", "#82c91e", "#74b816", "#66a80f", "#5c940d",
  164 + "#ffe066", "#ffd43b", "#fcc419", "#fab005", "#f59f00", "#f08c00", "#e67700",
  165 + "#ffc078", "#ffa94d", "#ff922b", "#fd7e14", "#f76707", "#e8590c", "#d9480f"
  166 + ],
  167 +
  168 + "availableBackgroundColors": [
  169 + { "color": "none", "value": "None" },
  170 + { "key": "[0,0,0]", "color": "#000000", "value": "Black" },
  171 + { "key": "[0,0,255]", "color": "#0000FF", "value": "Blue" },
  172 + { "key": "[255,0,0]", "color": "#FF0000", "value": "Red" },
  173 + { "key": "[0,255,255]", "color": "#00FFFF", "value": "Cyan" },
  174 + { "key": "[255,0,255]", "color": "#FF00FF", "value": "Magenta" },
  175 + { "key": "[0,128,0]", "color": "#008000", "value": "Green" },
  176 + { "key": "[128,128,128]", "color": "#808080", "value": "Gray" },
  177 + { "key": "[0,255,0]", "color": "#00FF00", "value": "Lime" },
  178 + { "key": "[128,0,0]", "color": "#800000", "value": "Maroon" },
  179 + { "key": "[0,0,128]", "color": "#000080", "value": "Navy" },
  180 + { "key": "[128,128,0]", "color": "#808000", "value": "Olive" },
  181 + { "key": "[128,0,128]", "color": "#800080", "value": "Purple" },
  182 + { "key": "[192,192,192]", "color": "#C0C0C0", "value": "Silver" },
  183 + { "key": "[0,128,128]", "color": "#008080", "value": "Teal" },
  184 + { "key": "[255,255,0]", "color": "#FFFF00", "value": "Yellow" },
  185 + { "key": "[0,64,64]", "color": "#004040", "value": "Cyprus" }
  186 + ],
  187 +
  188 + "availableStatusBarPositions": [
  189 + { "key": "top", "value": "Top" },
  190 + { "key": "bottom", "value": "Bottom" }
  191 + ],
  192 +
  193 + "availableStatusBarColorMaps": [
  194 + { "key": "0", "value": "0" },
  195 + { "key": "1", "value": "1" },
  196 + { "key": "2", "value": "2" }
  197 + ],
  198 +
  199 + "availablePageLayouts": [
  200 + { "key": "vertical", "value": "Vertical" },
  201 + { "key": "auto", "value": "Auto" },
  202 + { "key": "manual", "value": "Manual" }
  203 + ],
  204 +
  205 + "availableResamplingModes": [
  206 + { "key": "xparam", "value": "X Parameter" },
  207 + { "key": "yparam", "value": "Y Parameter" }
  208 + ],
  209 +
  210 + "availableOrbitSerieProjections": [
  211 + { "key": "XY", "value": "XY" },
  212 + { "key": "XZ", "value": "XZ" },
  213 + { "key": "YZ", "value": "YZ" },
  214 + { "key": "XR", "value": "XR" },
  215 + { "key": "YR", "value": "YR" },
  216 + { "key": "ZR", "value": "ZR" }
  217 + ],
  218 +
  219 + "availableHistogram2DFunctions": [
  220 + { "key": "density", "value": "Density" },
  221 + { "key": "mean", "value": "Mean" },
  222 + { "key": "min", "value": "Minimum" },
  223 + { "key": "max", "value": "Maximum" },
  224 + { "key": "median", "value": "Median" },
  225 + { "key": "stadev", "value": "Standard Deviation" }
  226 + ],
  227 +
  228 + "availableDimsOnXAxis": [
  229 + { "key": "0", "value": "First dimension" },
  230 + { "key": "1", "value": "Second dimension" }
  231 + ],
  232 +
  233 + "availableTimeTickTypes": [
  234 + { "key": "auto", "value": "Auto" },
  235 + { "key": "time-step", "value": "Time step" },
  236 + { "key": "nb-major", "value": "Num. of major symb." }
  237 + ],
  238 +
  239 + "availableIntervalTickModes": [
  240 + { "key": "symbol-only", "value": "Symbol only" },
  241 + { "key": "interval-index", "value": "Interval index" },
  242 + { "key": "start-time", "value": "Start time" },
  243 + { "key": "start-stop-time", "value": "Start/Stop times" }
  244 + ],
  245 +
  246 + "availableErrorBarTypes": [
  247 + { "key": "min-max", "value": "Min./Max. Parameters" },
  248 + { "key": "delta", "value": "Delta parameter" }
  249 + ],
  250 +
  251 + "availableLegendSeriesTypes": [
  252 + { "key": "text-line-symbol", "value": "Text, Line & Symbols" },
  253 + { "key": "text-only", "value": "Text only" }
  254 + ],
  255 +
  256 + "availableLegendSeriesPositions": [
  257 + { "key": "inside", "value": "Inside" },
  258 + { "key": "outside", "value": "Outside" }
  259 + ],
  260 +
  261 + "availableLegendSeriesIntervalInfoTypes": [
  262 + { "key": "index", "value": "Interval Index" },
  263 + { "key": "start-stop", "value": "Interval Start/Stop" }
  264 + ],
  265 +
  266 + "availableLegendTextPositions": [
  267 + { "key": "right", "value": "Right" },
  268 + { "key": "left", "value": "Left" },
  269 + { "key": "top", "value": "Top" },
  270 + { "key": "bottom", "value": "Bottom" }
  271 + ],
  272 +
  273 + "availableConstantAxes": [
  274 + { "key": "x", "value": "X / Time / Epoch" },
  275 + { "key": "y-left", "value": "Y Left" },
  276 + { "key": "y-right", "value": "Y Right" }
  277 + ],
  278 +
  279 + "availableTextAlignments": [
  280 + { "key": "left", "value": "Left" },
  281 + { "key": "center", "value": "Center" },
  282 + { "key": "right", "value": "Right" }
  283 + ],
  284 +
  285 + "availableFillTypes": [
  286 + { "key": "serie-constant", "value": "Serie / Constant" },
  287 + { "key": "serie-serie", "value": "Serie / Serie" }
  288 + ],
  289 + "availableSpectroNormalization": [
  290 + { "key": "none", "value": "None" },
  291 + { "key": "linear", "value": "Linear" },
  292 + { "key": "log", "value": "Logarithmic" }
  293 + ],
  294 +
  295 + "availableFilteringLevel": [
  296 + { "key": 1, "value": "Weak" },
  297 + { "key": 2, "value": "Intermediate/moderated" },
  298 + { "key": 3, "value": "Strong" }
  299 + ]
  300 +}
0 \ No newline at end of file 301 \ No newline at end of file
generic_data/defaultValuesLinks.json 0 → 100644
  Diff comments   View file @4f728fd
@@ -0,0 +1,330 @@ @@ -0,0 +1,330 @@
  1 +{
  2 + "plot.file.format" :
  3 + {
  4 + "type":"combobox",
  5 + "store":"availableFileFormats"
  6 + },
  7 + "plot.file.output" :
  8 + {
  9 + "type":"combobox",
  10 + "store":"availableFileOutputsForPng",
  11 + "store2":"availableFileOutputsForOtherFormats"
  12 + },
  13 + "plot.page.title.position":
  14 + {
  15 + "type":"combobox",
  16 + "store":"availableTitlePositions"
  17 + },
  18 + "plot.page.title.alignment":
  19 + {
  20 + "type":"combobox",
  21 + "store":"availableTitleAlignments"
  22 + },
  23 + "plot.page.font.name":
  24 + {
  25 + "type":"combobox",
  26 + "store":"availableFontNames"
  27 + },
  28 + "plot.page.layout.type":
  29 + {
  30 + "type":"combobox",
  31 + "store":"availablePageLayouts"
  32 + },
  33 + "plot.page.mode":
  34 + {
  35 + "type":"combobox",
  36 + "store":"availablePageModes"
  37 + },
  38 + "plot.page.orientation":
  39 + {
  40 + "type":"combobox",
  41 + "store":"availablePageOrientations"
  42 + },
  43 + "plot.page.dimension":
  44 + {
  45 + "type":"combobox",
  46 + "store":"availablePageDimensions"
  47 + },
  48 + "plot.panel.title.position":
  49 + {
  50 + "type":"combobox",
  51 + "store":"availableTitlePositions"
  52 + },
  53 + "plot.panel.title.alignment":
  54 + {
  55 + "type":"combobox",
  56 + "store":"availableTitleAlignments"
  57 + },
  58 + "plot.panel.font.name":
  59 + {
  60 + "type":"combobox",
  61 + "store":"availableFontNames"
  62 + },
  63 + "plot.panel.status.position":
  64 + {
  65 + "type":"combobox",
  66 + "store":"availableStatusBarPositions"
  67 + },
  68 + "plot.panel.status.colorMap":
  69 + {
  70 + "type":"combobox",
  71 + "store":"availableStatusBarColorMaps"
  72 + },
  73 +
  74 + "plot.panel.plotType":
  75 + {
  76 + "type":"combobox",
  77 + "store":"availablePlotTypes"
  78 + },
  79 + "plot.panel.backgroundColor":
  80 + {
  81 + "type":"colorpicker",
  82 + "store":null
  83 + },
  84 + "plot.axis.legend.font.name":
  85 + {
  86 + "type":"combobox",
  87 + "store":"availableFontNames"
  88 + },
  89 + "plot.axis.scale":
  90 + {
  91 + "type":"combobox",
  92 + "store":"availableAxisScales"
  93 + },
  94 + "plot.axis.tickPosition":
  95 + {
  96 + "type":"combobox",
  97 + "store":"availableTicksPositions"
  98 + },
  99 + "plot.axis.timeFormat":
  100 + {
  101 + "type":"combobox",
  102 + "store":"availableTimeAxisFormats"
  103 + },
  104 + "plot.axis.colorMap":
  105 + {
  106 + "type":"combobox",
  107 + "store":"availableColorMaps"
  108 + },
  109 + "plot.serie.lines.style":
  110 + {
  111 + "type":"combobox",
  112 + "store":"availableLinesStyles"
  113 + },
  114 + "plot.serie.lines.color":
  115 + {
  116 + "type":"colorpicker",
  117 + "store":null
  118 + },
  119 + "plot.serie.symbols.type":
  120 + {
  121 + "type":"combobox",
  122 + "store":"availableSymbolsTypes"
  123 + },
  124 + "plot.serie.symbols.color":
  125 + {
  126 + "type":"colorpicker",
  127 + "store":null
  128 + },
  129 + "plot.serie.timetick.symbols.type":
  130 + {
  131 + "type":"combobox",
  132 + "store":"availableSymbolsTypes"
  133 + },
  134 + "plot.serie.timetick.symbols.color":
  135 + {
  136 + "type":"colorpicker",
  137 + "store":null
  138 + },
  139 + "plot.serie.timetick.firstsymbols.type":
  140 + {
  141 + "type":"combobox",
  142 + "store":"availableSymbolsTypes"
  143 + },
  144 + "plot.serie.timetick.firstsymbols.color":
  145 + {
  146 + "type":"colorpicker",
  147 + "store":null
  148 + },
  149 + "plot.serie.timetick.font.name":
  150 + {
  151 + "type":"combobox",
  152 + "store":"availableFontNames"
  153 + },
  154 + "plot.serie.timetick.type":
  155 + {
  156 + "type":"combobox",
  157 + "store":"availableTimeTickTypes"
  158 + },
  159 + "plot.serie.intervaltick.symbols.type":
  160 + {
  161 + "type":"combobox",
  162 + "store":"availableSymbolsTypes"
  163 + },
  164 + "plot.serie.intervaltick.symbols.color":
  165 + {
  166 + "type":"colorpicker",
  167 + "store":null
  168 + },
  169 + "plot.serie.intervaltick.font.name":
  170 + {
  171 + "type":"combobox",
  172 + "store":"availableFontNames"
  173 + },
  174 + "plot.serie.intervaltick.mode":
  175 + {
  176 + "type":"combobox",
  177 + "store":"availableIntervalTickModes"
  178 + },
  179 + "plot.serie.errorbar.lines.style":
  180 + {
  181 + "type":"combobox",
  182 + "store":"availableLinesStyles"
  183 + },
  184 + "plot.serie.errorbar.lines.color":
  185 + {
  186 + "type":"colorpicker",
  187 + "store":null
  188 + },
  189 + "plot.serie.errorbar.type":
  190 + {
  191 + "type":"combobox",
  192 + "store":"availableErrorBarTypes"
  193 + },
  194 + "plot.serie.yAxis":
  195 + {
  196 + "type":"combobox",
  197 + "store":"availableYAxes"
  198 + },
  199 + "plot.serie.resolution":
  200 + {
  201 + "type":"combobox",
  202 + "store":"availableResolutions"
  203 + },
  204 + "plot.serie.resamplingMode":
  205 + {
  206 + "type":"combobox",
  207 + "store":"availableResamplingModes"
  208 + },
  209 + "plot.serie.projection":
  210 + {
  211 + "type":"combobox",
  212 + "store":"availableOrbitSerieProjections"
  213 + },
  214 + "plot.spectro.yAxis":
  215 + {
  216 + "type":"combobox",
  217 + "store":"availableYAxes"
  218 + },
  219 + "plot.spectro.resolution":
  220 + {
  221 + "type":"combobox",
  222 + "store":"availableResolutions"
  223 + },
  224 + "plot.histogram2D.histo2DFunction":
  225 + {
  226 + "type":"combobox",
  227 + "store":"availableHistogram2DFunctions"
  228 + },
  229 + "plot.sauvaud.yAxis":
  230 + {
  231 + "type":"combobox",
  232 + "store":"availableYAxes"
  233 + },
  234 + "plot.sauvaud.resolution":
  235 + {
  236 + "type":"combobox",
  237 + "store":"availableResolutions"
  238 + },
  239 +
  240 + "plot.legends.series.intervalinfo.type":
  241 + {
  242 + "type":"combobox",
  243 + "store":"availableLegendSeriesIntervalInfoTypes"
  244 + },
  245 + "plot.legends.series.font.name":
  246 + {
  247 + "type":"combobox",
  248 + "store":"availableFontNames"
  249 + },
  250 + "plot.legends.series.type":
  251 + {
  252 + "type":"combobox",
  253 + "store":"availableLegendSeriesTypes"
  254 + },
  255 + "plot.legends.series.position":
  256 + {
  257 + "type":"combobox",
  258 + "store":"availableLegendSeriesPositions"
  259 + },
  260 + "plot.legends.text.font.name":
  261 + {
  262 + "type":"combobox",
  263 + "store":"availableFontNames"
  264 + },
  265 + "plot.legends.text.position":
  266 + {
  267 + "type":"combobox",
  268 + "store":"availableLegendTextPositions"
  269 + },
  270 + "plot.constants.line.style":
  271 + {
  272 + "type":"combobox",
  273 + "store":"availableLinesStyles"
  274 + },
  275 + "plot.constants.line.color":
  276 + {
  277 + "type":"colorpicker",
  278 + "store":null
  279 + },
  280 + "plot.constants.axisId":
  281 + {
  282 + "type":"combobox",
  283 + "store":"availableConstantAxes"
  284 + },
  285 + "plot.textObjs.font.name":
  286 + {
  287 + "type":"combobox",
  288 + "store":"availableFontNames"
  289 + },
  290 + "plot.textObjs.yAxisId":
  291 + {
  292 + "type":"combobox",
  293 + "store":"availableYAxes"
  294 + },
  295 + "plot.textObjs.align":
  296 + {
  297 + "type":"combobox",
  298 + "store":"availableTextAlignments"
  299 + },
  300 + "plot.curves.line.style":
  301 + {
  302 + "type":"combobox",
  303 + "store":"availableLinesStyles"
  304 + },
  305 + "plot.curves.line.color":
  306 + {
  307 + "type":"colorpicker",
  308 + "store":null
  309 + },
  310 + "plot.fills.type":
  311 + {
  312 + "type":"combobox",
  313 + "store":"availableFillTypes"
  314 + },
  315 + "plot.fills.greaterColor":
  316 + {
  317 + "type":"colorpicker",
  318 + "store":null
  319 + },
  320 + "plot.fills.lessColor":
  321 + {
  322 + "type":"colorpicker",
  323 + "store":null
  324 + },
  325 + "plot.filtering.level":
  326 + {
  327 + "type":"combobox",
  328 + "store":"availableFilteringLevel"
  329 + }
  330 +}
0 \ No newline at end of file 331 \ No newline at end of file
js/app/models/DefaultValues.js deleted
View file @851cf2f
@@ -1,44 +0,0 @@ @@ -1,44 +0,0 @@
1 -Ext.define('amdaModel.DefaultValues', {  
2 - singleton: true,  
3 - type:null,  
4 - userValues:'',  
5 -  
6 - constructor: function() {  
7 - this.getDefaultValues();  
8 - },  
9 -  
10 - getDefaultValues: function(){  
11 - var me = this;  
12 -  
13 - Ext.Ajax.request({  
14 - url: 'generic_data/defaultValues.json',  
15 - method: 'GET',  
16 - success: function(response) {  
17 - me.values = Ext.decode(response.responseText);  
18 -  
19 - // after reading generic default values, we read user defaults.  
20 - Ext.Ajax.request({  
21 - url: 'data/'+ sessionID +'/userDefaults.json',  
22 - method: 'GET',  
23 - success: function(response) {  
24 - me.userValues = Ext.decode(response.responseText);  
25 - Ext.Object.each(me.userValues, function(key,value){  
26 - var keys = key.split('_');  
27 - var obj = me.values;  
28 - for (var i = 0; i < keys.length - 1; i++) {  
29 - obj = obj[keys[i]];  
30 - }  
31 - obj[keys[keys.length - 1]] = value;  
32 - })  
33 - },  
34 - failure:function(){  
35 - // Maybe create the file ?  
36 - }  
37 - });  
38 - },  
39 - failure: function(response) {  
40 - console.error('Failed to load default values', response);  
41 - }  
42 - });  
43 - },  
44 -});  
45 \ No newline at end of file 0 \ No newline at end of file
js/app/models/DefaultValuesModel.js
  Diff comments   View file @4f728fd
1 Ext.define('amdaModel.DefaultValuesModel', { 1 Ext.define('amdaModel.DefaultValuesModel', {
2 extend: 'Ext.data.TreeModel', 2 extend: 'Ext.data.TreeModel',
3 - fields: [{  
4 - name: 'parameter',  
5 - type: 'string'  
6 - }, {  
7 - name: 'value',  
8 - type: 'string'  
9 - }] 3 + fields: [
  4 + { name: 'parameter', type: 'string'},
  5 + { name: 'value', type: 'string'},
  6 + { name: 'modified', type: 'boolean' },
  7 + { name: 'default'}
  8 + ]
10 }); 9 });
11 \ No newline at end of file 10 \ No newline at end of file
js/app/models/PlotObjects/PlotConstantObject.js
  Diff comments   View file @4f728fd
@@ -66,7 +66,7 @@ Ext.define(&#39;amdaPlotObj.PlotConstantObject&#39;, { @@ -66,7 +66,7 @@ Ext.define(&#39;amdaPlotObj.PlotConstantObject&#39;, {
66 66
67 getShortInfo : function() 67 getShortInfo : function()
68 { 68 {
69 - var axis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableConstantAxes, this.get('constant-axis-id')); 69 + var axis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableConstantAxes, this.get('constant-axis-id'));
70 return 'Id : '+this.get('id')+', '+axis; 70 return 'Id : '+this.get('id')+', '+axis;
71 }, 71 },
72 72
js/app/models/PlotObjects/PlotFillObject.js
  Diff comments   View file @4f728fd
@@ -57,7 +57,7 @@ Ext.define(&#39;amdaPlotObj.PlotFillObject&#39;, { @@ -57,7 +57,7 @@ Ext.define(&#39;amdaPlotObj.PlotFillObject&#39;, {
57 57
58 getShortInfo : function() 58 getShortInfo : function()
59 { 59 {
60 - var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableFillTypes, this.get('fill-type')); 60 + var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableFillTypes, this.get('fill-type'));
61 return type; 61 return type;
62 }, 62 },
63 63
js/app/models/PlotObjects/PlotLegendTextObject.js
  Diff comments   View file @4f728fd
@@ -61,7 +61,7 @@ Ext.define(&#39;amdaPlotObj.PlotLegendTextObject&#39;, { @@ -61,7 +61,7 @@ Ext.define(&#39;amdaPlotObj.PlotLegendTextObject&#39;, {
61 61
62 getShortInfo : function() 62 getShortInfo : function()
63 { 63 {
64 - var position = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableLegendTextPositions, this.get('legend-text-position')); 64 + var position = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableLegendTextPositions, this.get('legend-text-position'));
65 return position; 65 return position;
66 }, 66 },
67 67
js/app/models/PlotObjects/PlotObjectConfig.js
  Diff comments   View file @4f728fd
@@ -15,13 +15,9 @@ @@ -15,13 +15,9 @@
15 15
16 Ext.define('amdaPlotObj.PlotObjectConfig', { 16 Ext.define('amdaPlotObj.PlotObjectConfig', {
17 singleton: true, 17 singleton: true,
18 - requires:['amdaModel.DefaultValues'],  
19 18
20 - defaultValues: null, 19 + defaultValues: amdaDefaultValues.plot,
21 20
22 - constructor: function(){  
23 - this.defaultValues = amdaModel.DefaultValues.values.plot;  
24 - },  
25 getValueByKey: function (dataList, key) { 21 getValueByKey: function (dataList, key) {
26 var value = ''; 22 var value = '';
27 Ext.each(dataList, function (data) { 23 Ext.each(dataList, function (data) {
@@ -33,304 +29,6 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, { @@ -33,304 +29,6 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
33 return value; 29 return value;
34 }, 30 },
35 31
36 - availableFileFormats: [  
37 - { 'key': 'PNG', 'value': 'PNG' },  
38 - { 'key': 'PDF', 'value': 'PDF' },  
39 - { 'key': 'PS', 'value': 'PS' },  
40 - { 'key': 'SVG', 'value': 'SVG' }  
41 - ],  
42 -  
43 - availableFileOutputsForPng: [  
44 - { 'key': 'INTERACTIVE', 'value': 'screen' },  
45 - { 'key': 'TGZ', 'value': 'tar+gzip archive' },  
46 - { 'key': 'ZIP', 'value': 'zip archive' }  
47 - ],  
48 -  
49 - availableFileOutputsForOtherFormats: [  
50 - { 'key': 'TGZ', 'value': 'tar+gzip archive' },  
51 - { 'key': 'ZIP', 'value': 'zip archive' }  
52 - ],  
53 -  
54 - availablePageModes: [  
55 - { 'key': 'color', 'value': 'Color' },  
56 - { 'key': 'grayscale', 'value': 'Grayscale' }  
57 - ],  
58 -  
59 - availablePageOrientations: [  
60 - { 'key': 'landscape', 'value': 'Landscape' },  
61 - { 'key': 'portrait', 'value': 'Portrait' }  
62 - ],  
63 -  
64 - availablePageDimensions: [  
65 - { 'key': 'ISO A4', 'value': 'ISO A4' },  
66 - { 'key': 'US letter', 'value': 'US letter' }  
67 - ],  
68 -  
69 - availablePlotTypes: [  
70 - { 'key': 'timePlot', value: 'Time Plot' },  
71 - { 'key': 'xyPlot', value: 'Scatter Plot' },  
72 - { 'key': 'epochPlot', value: 'Epoch Plot' },  
73 - { 'key': 'instantPlot', value: 'Instant Plot' },  
74 - { 'key': 'statusPlot', value: 'Status Plot' },  
75 - { 'key': 'tickPlot', value: 'Tick Plot' }  
76 - ],  
77 -  
78 - availableFontNames: [  
79 - { 'key': 'sans-serif', 'value': 'sans-serif' },  
80 - { 'key': 'serif', 'value': 'serif' },  
81 - { 'key': 'monospace', 'value': 'monospace' },  
82 - { 'key': 'script', 'value': 'script' }  
83 - ],  
84 -  
85 - availableTitlePositions: [  
86 - { 'key': 'top', 'value': 'Top' },  
87 - { 'key': 'bottom', 'value': 'Bottom' }  
88 - ],  
89 -  
90 - availableTitleAlignments: [  
91 - { 'key': 'center', 'value': 'Center' },  
92 - { 'key': 'left', 'value': 'Left' },  
93 - { 'key': 'right', 'value': 'Right' }  
94 - ],  
95 -  
96 - availableAxisScales: [  
97 - { 'key': 'linear', 'value': 'Linear' },  
98 - { 'key': 'logarithmic', 'value': 'Logarithmic' }  
99 - ],  
100 -  
101 - availableTicksPositions: [  
102 - { 'key': 'inwards', 'value': 'Inwards' },  
103 - { 'key': 'outwards', 'value': 'Outwards' }  
104 - ],  
105 -  
106 - availableTimeAxisFormats: [  
107 - { 'key': 'dd/mm/yy', 'value': 'dd/mm/yy' },  
108 - { 'key': 'ddd/yy', 'value': 'ddd/yy' },  
109 - { 'key': 'DD/MM/YYYY', 'value': 'dd/mm/yyyy' },  
110 - { 'key': 'yyyy/dd/mm', 'value': 'yyyy/dd/mm' },  
111 - { 'key': 'yyyy-dd-mm', 'value': 'yyyy-dd-mm' }  
112 - ],  
113 -  
114 - availableYAxes: [  
115 - { 'key': 'y-left', 'value': 'Left' },  
116 - { 'key': 'y-right', 'value': 'Right' }  
117 - ],  
118 -  
119 - availableResolutions: [  
120 - { 'key': 3000, 'value': '3000' },  
121 - { 'key': 10000, 'value': '10000' },  
122 - { 'key': 50000, 'value': '50000' },  
123 - { 'key': 100000, 'value': '100000' }  
124 - ],  
125 -  
126 - availableLinesStyles: [  
127 - { 'key': 'plain', 'value': 'Plain' },  
128 - { 'key': 'dot', 'value': 'Dot' },  
129 - { 'key': 'long-spaced-dot', 'value': 'Long spaced dot' },  
130 - { 'key': 'long-short-dot', 'value': 'Long short dot' }  
131 - ],  
132 -  
133 - availableSymbolsTypes: [  
134 - { 'key': 'dot', 'value': 'Dot' },  
135 - { 'key': 'plus', 'value': 'Plus' },  
136 - { 'key': 'wildcard', 'value': 'Wildcard' },  
137 - { 'key': 'circle', 'value': 'Circle' },  
138 - { 'key': 'crux', 'value': 'Crux' },  
139 - { 'key': 'square', 'value': 'Square' },  
140 - { 'key': 'triangle', 'value': 'Triangle' },  
141 - { 'key': 'crux-in-circle', 'value': 'Crux in circle' },  
142 - { 'key': 'dot-in-circle', 'value': 'Dot in circle' },  
143 - { 'key': 'diamond', 'value': 'Diamond' },  
144 - { 'key': 'star', 'value': 'Star' },  
145 - { 'key': 'david-star', 'value': 'David star' },  
146 - { 'key': 'full-square', 'value': 'Full square' },  
147 - { 'key': 'full-circle', 'value': 'Full circle' },  
148 - { 'key': 'full-star', 'value': 'Full star' }  
149 - ],  
150 -  
151 - availableColorMaps: [  
152 - { 'key': '0', 'value': 'Blue Red' },  
153 - { 'key': '1', 'value': 'Default' },  
154 - { 'key': '2', 'value': 'Blue Yellow' },  
155 - { 'key': '3', 'value': 'Grayscale' },  
156 - { 'key': '4', 'value': 'AMDA Default' },  
157 - { 'key': '5', 'value': 'GeoWhite' },  
158 - { 'key': '6', 'value': 'GeoBlack' },  
159 - { 'key': '7', 'value': 'Violet Yellow' },  
160 - { 'key': '8', 'value': 'Red Blue 4' }  
161 - ],  
162 -  
163 - availableColors: [  
164 - { 'key': 'auto', 'color': 'auto', 'value': 'auto' },  
165 - { 'key': '[0,0,0]', 'color': '#000000', 'value': 'Black' },  
166 - { 'key': '[0,0,255]', 'color': '#0000ff', 'value': 'Blue' },  
167 - { 'key': '[255,0,0]', 'color': '#ff0000', 'value': 'Red' },  
168 - { 'key': '[0,255,255]', 'color': '#00ffff', 'value': 'Cyan' },  
169 - { 'key': '[255,0,255]', 'color': '#ff00ff', 'value': 'Magenta' },  
170 - { 'key': '[0,128,0]', 'color': '#008000', 'value': 'Green' },  
171 - { 'key': '[128,128,128]', 'color': '#808080', 'value': 'Gray' },  
172 - { 'key': '[0,255,0]', 'color': '#00ff00', 'value': 'Lime' },  
173 - { 'key': '[128,0,0]', 'color': '#800000', 'value': 'Maroon' },  
174 - { 'key': '[0,0,128]', 'color': '#000080', 'value': 'Navy' },  
175 - { 'key': '[128,128,0]', 'color': '#808000', 'value': 'Olive' },  
176 - { 'key': '[128,0,128]', 'color': '#800080', 'value': 'Purple' },  
177 - { 'key': '[192,192,192]', 'color': '#c0c0c0', 'value': 'Silver' },  
178 - { 'key': '[0,128,128]', 'color': '#008080', 'value': 'Teal' },  
179 - { 'key': '[255,255,0]', 'color': '#ffff00', 'value': 'Yellow' },  
180 - { 'key': '[0,64,64]', 'color': '#004040', 'value': 'Cyprus' }  
181 - ],  
182 -  
183 - availableColorsNew: [  
184 - "#000000", "#0000ff", "#ff0000", "#00ffff", "#ff00ff", "#008000", "#800000",  
185 - "#000080", "#808000", "#800080", "#c0c0c0", "#008080", "#ffff00", "#004040",  
186 - "#29d8d7", "#6b9842", "#73a9b4", "#1c883d", "#808080", "#4342dd", "#e84130",  
187 - "#dee2e6", "#ced4da", "#adb5bd", "#868e96", "#495057", "#343a40", "#212529",  
188 - "#ffa8a8", "#ff8787", "#ff6b6b", "#fa5252", "#f03e3e", "#e03131", "#c92a2a",  
189 - "#faa2c1", "#f783ac", "#f06595", "#e64980", "#d6336c", "#c2255c", "#a61e4d",  
190 - "#e599f7", "#da77f2", "#cc5de8", "#be4bdb", "#ae3ec9", "#9c36b5", "#862e9c",  
191 - "#b197fc", "#9775fa", "#845ef7", "#7950f2", "#7048e8", "#6741d9", "#5f3dc4",  
192 - "#91a7ff", "#748ffc", "#5c7cfa", "#4c6ef5", "#4263eb", "#3b5bdb", "#364fc7",  
193 - "#74c0fc", "#4dabf7", "#339af0", "#228be6", "#1c7ed6", "#1971c2", "#1864ab",  
194 - "#66d9e8", "#3bc9db", "#22b8cf", "#15aabf", "#1098ad", "#0c8599", "#0b7285",  
195 - "#63e6be", "#38d9a9", "#20c997", "#12b886", "#0ca678", "#099268", "#087f5b",  
196 - "#8ce99a", "#69db7c", "#51cf66", "#40c057", "#37b24d", "#2f9e44", "#2b8a3e",  
197 - "#c0eb75", "#a9e34b", "#94d82d", "#82c91e", "#74b816", "#66a80f", "#5c940d",  
198 - "#ffe066", "#ffd43b", "#fcc419", "#fab005", "#f59f00", "#f08c00", "#e67700",  
199 - "#ffc078", "#ffa94d", "#ff922b", "#fd7e14", "#f76707", "#e8590c", "#d9480f"  
200 - ],  
201 -  
202 - availableBackgroundColors: [  
203 - { 'color': 'none', 'value': 'None' },  
204 - { 'key': '[0,0,0]', 'color': '#000000', 'value': 'Black' },  
205 - { 'key': '[0,0,255]', 'color': '#0000FF', 'value': 'Blue' },  
206 - { 'key': '[255,0,0]', 'color': '#FF0000', 'value': 'Red' },  
207 - { 'key': '[0,255,255]', 'color': '#00FFFF', 'value': 'Cyan' },  
208 - { 'key': '[255,0,255]', 'color': '#FF00FF', 'value': 'Magenta' },  
209 - { 'key': '[0,128,0]', 'color': '#008000', 'value': 'Green' },  
210 - { 'key': '[128,128,128]', 'color': '#808080', 'value': 'Gray' },  
211 - { 'key': '[0,255,0]', 'color': '#00FF00', 'value': 'Lime' },  
212 - { 'key': '[128,0,0]', 'color': '#800000', 'value': 'Maroon' },  
213 - { 'key': '[0,0,128]', 'color': '#000080', 'value': 'Navy' },  
214 - { 'key': '[128,128,0]', 'color': '#808000', 'value': 'Olive' },  
215 - { 'key': '[128,0,128]', 'color': '#800080', 'value': 'Purple' },  
216 - { 'key': '[192,192,192]', 'color': '#C0C0C0', 'value': 'Silver' },  
217 - { 'key': '[0,128,128]', 'color': '#008080', 'value': 'Teal' },  
218 - { 'key': '[255,255,0]', 'color': '#FFFF00', 'value': 'Yellow' },  
219 - { 'key': '[0,64,64]', 'color': '#004040', 'value': 'Cyprus' }  
220 - ],  
221 -  
222 - availableStatusBarPositions: [  
223 - { 'key': 'top', 'value': 'Top' },  
224 - { 'key': 'bottom', 'value': 'Bottom' }  
225 - ],  
226 -  
227 - availableStatusBarColorMaps: [  
228 - { 'key': '0', 'value': '0' },  
229 - { 'key': '1', 'value': '1' },  
230 - { 'key': '2', 'value': '2' }  
231 - ],  
232 -  
233 - availablePageLayouts: [  
234 - { 'key': 'vertical', 'value': 'Vertical' },  
235 - { 'key': 'auto', 'value': 'Auto' },  
236 - { 'key': 'manual', 'value': 'Manual' }  
237 - ],  
238 -  
239 - availableResamplingModes: [  
240 - { 'key': 'xparam', 'value': 'X Parameter' },  
241 - { 'key': 'yparam', 'value': 'Y Parameter' }  
242 - ],  
243 -  
244 - availableOrbitSerieProjections: [  
245 - { 'key': 'XY', 'value': 'XY' },  
246 - { 'key': 'XZ', 'value': 'XZ' },  
247 - { 'key': 'YZ', 'value': 'YZ' },  
248 - { 'key': 'XR', 'value': 'XR' },  
249 - { 'key': 'YR', 'value': 'YR' },  
250 - { 'key': 'ZR', 'value': 'ZR' }  
251 - ],  
252 -  
253 - availableHistogram2DFunctions: [  
254 - { 'key': 'density', 'value': 'Density' },  
255 - { 'key': 'mean', 'value': 'Mean' },  
256 - { 'key': 'min', 'value': 'Minimum' },  
257 - { 'key': 'max', 'value': 'Maximum' },  
258 - { 'key': 'median', 'value': 'Median' },  
259 - { 'key': 'stadev', 'value': 'Standard Deviation' }  
260 - ],  
261 -  
262 - availableDimsOnXAxis: [  
263 - { 'key': '0', 'value': 'First dimension' },  
264 - { 'key': '1', 'value': 'Second dimension' }  
265 - ],  
266 -  
267 - availableTimeTickTypes: [  
268 - { 'key': 'auto', 'value': 'Auto' },  
269 - { 'key': 'time-step', 'value': 'Time step' },  
270 - { 'key': 'nb-major', 'value': 'Num. of major symb.' }  
271 - ],  
272 -  
273 - availableIntervalTickModes: [  
274 - { 'key': 'symbol-only', 'value': 'Symbol only' },  
275 - { 'key': 'interval-index', 'value': 'Interval index' },  
276 - { 'key': 'start-time', 'value': 'Start time' },  
277 - { 'key': 'start-stop-time', 'value': 'Start/Stop times' }  
278 - ],  
279 -  
280 - availableErrorBarTypes: [  
281 - { 'key': 'min-max', 'value': 'Min./Max. Parameters' },  
282 - { 'key': 'delta', 'value': 'Delta parameter' }  
283 - ],  
284 -  
285 - availableLegendSeriesTypes: [  
286 - { 'key': 'text-line-symbol', 'value': 'Text, Line & Symbols' },  
287 - { 'key': 'text-only', 'value': 'Text only' }  
288 - ],  
289 -  
290 - availableLegendSeriesPositions: [  
291 - { 'key': 'inside', 'value': 'Inside' },  
292 - { 'key': 'outside', 'value': 'Outside' }  
293 - ],  
294 -  
295 - availableLegendSeriesIntervalInfoTypes: [  
296 - { 'key': 'index', 'value': 'Interval Index' },  
297 - { 'key': 'start-stop', 'value': 'Interval Start/Stop' }  
298 - ],  
299 -  
300 - availableLegendTextPositions: [  
301 - { 'key': 'right', 'value': 'Right' },  
302 - { 'key': 'left', 'value': 'Left' },  
303 - { 'key': 'top', 'value': 'Top' },  
304 - { 'key': 'bottom', 'value': 'Bottom' }  
305 - ],  
306 -  
307 - availableConstantAxes: [  
308 - { 'key': 'x', 'value': 'X / Time / Epoch' },  
309 - { 'key': 'y-left', 'value': 'Y Left' },  
310 - { 'key': 'y-right', 'value': 'Y Right' }  
311 - ],  
312 -  
313 - availableTextAlignments: [  
314 - { 'key': 'left', 'value': 'Left' },  
315 - { 'key': 'center', 'value': 'Center' },  
316 - { 'key': 'right', 'value': 'Right' }  
317 - ],  
318 -  
319 - availableFillTypes: [  
320 - { 'key': 'serie-constant', 'value': 'Serie / Constant' },  
321 - { 'key': 'serie-serie', 'value': 'Serie / Serie' }  
322 - ],  
323 - availableSpectroNormalization: [  
324 - { 'key': 'none', 'value': 'None' },  
325 - { 'key': 'linear', 'value': 'Linear' },  
326 - { 'key': 'log', 'value': 'Logarithmic' }  
327 - ],  
328 -  
329 - availableFilteringLevel: [  
330 - { 'key': 1, 'value': 'Weak' },  
331 - { 'key': 2, 'value': 'Intermediate/moderated' },  
332 - { 'key': 3, 'value': 'Strong' }  
333 - ],  
334 32
335 fieldComboBox: { 33 fieldComboBox: {
336 key: 'key', 34 key: 'key',
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @4f728fd
@@ -601,7 +601,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, { @@ -601,7 +601,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
601 601
602 getPanelShortInfo : function() 602 getPanelShortInfo : function()
603 { 603 {
604 - var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePlotTypes, this.get('panel-plot-type')); 604 + var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availablePlotTypes, this.get('panel-plot-type'));
605 var info = '#'+this.get('panel-index')+', '+type; 605 var info = '#'+this.get('panel-index')+', '+type;
606 switch (this.get('panel-plot-type')) 606 switch (this.get('panel-plot-type'))
607 { 607 {
js/app/models/PlotObjects/PlotParamObject.js
  Diff comments   View file @4f728fd
@@ -194,7 +194,7 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, { @@ -194,7 +194,7 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
194 case 'xyPlot' : 194 case 'xyPlot' :
195 if (this.get('param-drawing-type') == 'orbit-serie') 195 if (this.get('param-drawing-type') == 'orbit-serie')
196 { 196 {
197 - var projection = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableOrbitSerieProjections, this.get('param-drawing-object').get('serie-projection')); 197 + var projection = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableOrbitSerieProjections, this.get('param-drawing-object').get('serie-projection'));
198 info = fullName+', '+projection; 198 info = fullName+', '+projection;
199 } 199 }
200 else 200 else
@@ -212,15 +212,15 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, { @@ -212,15 +212,15 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
212 switch (this.get('param-drawing-type')) 212 switch (this.get('param-drawing-type'))
213 { 213 {
214 case 'serie' : 214 case 'serie' :
215 - var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableYAxes, this.get('param-drawing-object').get('serie-yaxis')); 215 + var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableYAxes, this.get('param-drawing-object').get('serie-yaxis'));
216 info += ', Y '+yAxis; 216 info += ', Y '+yAxis;
217 break; 217 break;
218 case 'spectro' : 218 case 'spectro' :
219 - var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableYAxes, this.get('param-drawing-object').get('spectro-yaxis')); 219 + var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableYAxes, this.get('param-drawing-object').get('spectro-yaxis'));
220 info += ', Y '+yAxis; 220 info += ', Y '+yAxis;
221 break; 221 break;
222 case 'sauvaud' : 222 case 'sauvaud' :
223 - var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableYAxes, this.get('param-drawing-object').get('spectro-yaxis')); 223 + var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availableYAxes, this.get('param-drawing-object').get('spectro-yaxis'));
224 info += ', Y '+yAxis; 224 info += ', Y '+yAxis;
225 break; 225 break;
226 } 226 }
js/app/models/PlotObjects/PlotRequestObject.js
  Diff comments   View file @4f728fd
@@ -195,8 +195,8 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, { @@ -195,8 +195,8 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
195 195
196 getPageShortInfo : function() 196 getPageShortInfo : function()
197 { 197 {
198 - var dimension = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageDimensions, this.get('page-dimension'));  
199 - var orientation = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageOrientations, this.get('page-orientation')); 198 + var dimension = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availablePageDimensions, this.get('page-dimension'));
  199 + var orientation = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availablePageOrientations, this.get('page-orientation'));
200 200
201 var info = dimension+', '+orientation; 201 var info = dimension+', '+orientation;
202 if (this.get('page-superpose-mode')) 202 if (this.get('page-superpose-mode'))
@@ -206,7 +206,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, { @@ -206,7 +206,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
206 206
207 getLayoutShortInfo : function() 207 getLayoutShortInfo : function()
208 { 208 {
209 - var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageLayouts, this.get('page-layout-type')); 209 + var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaDefaultConfigs.availablePageLayouts, this.get('page-layout-type'));
210 return type; 210 return type;
211 }, 211 },
212 212
js/app/views/CatalogVisuHistogram.js
  Diff comments   View file @4f728fd
@@ -156,7 +156,7 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, { @@ -156,7 +156,7 @@ Ext.define(&#39;amdaUI.CatalogVisuHistogram&#39;, {
156 } 156 }
157 ], 157 ],
158 }; 158 };
159 - var colorPicker = this.addColorsPicker('visu-histo-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'standard'); 159 + var colorPicker = this.addColorsPicker('visu-histo-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'standard');
160 var plotThemeComboConfig = {xtype:'fieldset', 160 var plotThemeComboConfig = {xtype:'fieldset',
161 id:'visu-hiso-color-fieldset', 161 id:'visu-hiso-color-fieldset',
162 margin:'5 0 0 0', 162 margin:'5 0 0 0',
js/app/views/CatalogVisuScatter.js
  Diff comments   View file @4f728fd
@@ -364,7 +364,7 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, { @@ -364,7 +364,7 @@ Ext.define(&#39;amdaUI.CatalogVisuScatter&#39;, {
364 } 364 }
365 },scope: this 365 },scope: this
366 }; 366 };
367 - var colorPicker = this.addColorsPicker('visu-scatter-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'standard'); 367 + var colorPicker = this.addColorsPicker('visu-scatter-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'standard');
368 var plotThemeComboConfig = {xtype:'fieldset', 368 var plotThemeComboConfig = {xtype:'fieldset',
369 id:'visu-scatter-color-fieldset', 369 id:'visu-scatter-color-fieldset',
370 margin:'5 0 0 0', 370 margin:'5 0 0 0',
js/app/views/ColorPicker.js 0 → 100644
  Diff comments   View file @4f728fd
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
  1 +Ext.define('amdaUI.ColorPicker', {
  2 + extend: 'Ext.form.field.Picker',
  3 + alias: 'widget.colorpicker',
  4 + toUpper : function(x){
  5 + return x.toUpperCase();
  6 + },
  7 + replaceColor : function(x){
  8 + return x.replace("#","");
  9 + },
  10 + createPicker: function() {
  11 + var me = this;
  12 + return Ext.create('Ext.picker.Color', {
  13 + pickerField: me,
  14 + renderTo: Ext.getBody(),
  15 + floating: true,
  16 + minWidth: 133,
  17 + maxWidth: 200,
  18 + minHeight: 225,
  19 + autoScroll:true,
  20 + focusOnShow: true,
  21 + colors: amdaDefaultConfigs.availableColorsNew.map(this.replaceColor).map(this.toUpper),
  22 + listeners: {
  23 + select: function(picker, color) {
  24 + me.setValue('#'+color);
  25 + me.picker.hide();
  26 + },
  27 + scope: me
  28 + }
  29 + });
  30 + }
  31 +});
0 \ No newline at end of file 32 \ No newline at end of file
js/app/views/DefaultTreeGrid.js
  Diff comments   View file @4f728fd
1 -Ext.define('StatusColorPicker', {  
2 - extend: 'Ext.form.field.Picker',  
3 - alias: 'widget.statuscolorpicker',  
4 - availableColorsNew: [  
5 - "#000000", "#0000ff", "#ff0000", "#00ffff", "#ff00ff", "#008000", "#800000",  
6 - "#000080", "#808000", "#800080", "#c0c0c0", "#008080", "#ffff00", "#004040",  
7 - "#29d8d7", "#6b9842", "#73a9b4", "#1c883d", "#808080", "#4342dd", "#e84130",  
8 - "#dee2e6", "#ced4da", "#adb5bd", "#868e96", "#495057", "#343a40", "#212529",  
9 - "#ffa8a8", "#ff8787", "#ff6b6b", "#fa5252", "#f03e3e", "#e03131", "#c92a2a",  
10 - "#faa2c1", "#f783ac", "#f06595", "#e64980", "#d6336c", "#c2255c", "#a61e4d",  
11 - "#e599f7", "#da77f2", "#cc5de8", "#be4bdb", "#ae3ec9", "#9c36b5", "#862e9c",  
12 - "#b197fc", "#9775fa", "#845ef7", "#7950f2", "#7048e8", "#6741d9", "#5f3dc4",  
13 - "#91a7ff", "#748ffc", "#5c7cfa", "#4c6ef5", "#4263eb", "#3b5bdb", "#364fc7",  
14 - "#74c0fc", "#4dabf7", "#339af0", "#228be6", "#1c7ed6", "#1971c2", "#1864ab",  
15 - "#66d9e8", "#3bc9db", "#22b8cf", "#15aabf", "#1098ad", "#0c8599", "#0b7285",  
16 - "#63e6be", "#38d9a9", "#20c997", "#12b886", "#0ca678", "#099268", "#087f5b",  
17 - "#8ce99a", "#69db7c", "#51cf66", "#40c057", "#37b24d", "#2f9e44", "#2b8a3e",  
18 - "#c0eb75", "#a9e34b", "#94d82d", "#82c91e", "#74b816", "#66a80f", "#5c940d",  
19 - "#ffe066", "#ffd43b", "#fcc419", "#fab005", "#f59f00", "#f08c00", "#e67700",  
20 - "#ffc078", "#ffa94d", "#ff922b", "#fd7e14", "#f76707", "#e8590c", "#d9480f"  
21 - ],  
22 - toUpper : function(x){  
23 - return x.toUpperCase();  
24 - },  
25 - replaceColor : function(x){  
26 - return x.replace("#","");  
27 - },  
28 - createPicker: function() {  
29 - var me = this;  
30 - return Ext.create('Ext.picker.Color', {  
31 - pickerField: me,  
32 - renderTo: Ext.getBody(),  
33 - floating: true,  
34 - minWidth: 133,  
35 - maxWidth: 200,  
36 - minHeight: 225,  
37 - autoScroll:true,  
38 - focusOnShow: true,  
39 - colors: this.availableColorsNew.map(this.replaceColor).map(this.toUpper),  
40 - listeners: {  
41 - select: function(picker, color) {  
42 - me.setValue('#'+color);  
43 - me.picker.hide();  
44 - },  
45 - scope: me  
46 - }  
47 - });  
48 - }  
49 -});  
50 -  
51 Ext.define('amdaUI.DefaultTreeGrid', { 1 Ext.define('amdaUI.DefaultTreeGrid', {
52 extend: 'Ext.tree.Panel', 2 extend: 'Ext.tree.Panel',
53 3
@@ -56,7 +6,7 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, { @@ -56,7 +6,7 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, {
56 'Ext.grid.*', 6 'Ext.grid.*',
57 'Ext.tree.*', 7 'Ext.tree.*',
58 'amdaModel.DefaultValuesModel', 8 'amdaModel.DefaultValuesModel',
59 - 'StatusColorPicker' 9 + 'amdaUI.ColorPicker'
60 ], 10 ],
61 xtype: 'tree-grid', 11 xtype: 'tree-grid',
62 12
@@ -87,7 +37,7 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, { @@ -87,7 +37,7 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, {
87 } 37 }
88 var value = context.record.get(context.field); 38 var value = context.record.get(context.field);
89 if (me.isHexCode(value)) { 39 if (me.isHexCode(value)) {
90 - var colorPicker = Ext.create('StatusColorPicker', { 40 + var colorPicker = Ext.create('amdaUI.ColorPicker', {
91 pickerField: context.field, 41 pickerField: context.field,
92 value: value, 42 value: value,
93 listeners: { 43 listeners: {
@@ -102,90 +52,116 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, { @@ -102,90 +52,116 @@ Ext.define(&#39;amdaUI.DefaultTreeGrid&#39;, {
102 } 52 }
103 } 53 }
104 }); 54 });
105 -  
106 - AmdaAction.getDefaultValueTree(function(res,e) {  
107 - console.log(res);  
108 - });  
109 55
110 Ext.apply(this, { 56 Ext.apply(this, {
111 store: new Ext.data.TreeStore({ 57 store: new Ext.data.TreeStore({
112 model: amdaModel.DefaultValuesModel, 58 model: amdaModel.DefaultValuesModel,
113 proxy: { 59 proxy: {
114 type: 'direct', 60 type: 'direct',
115 - directFn: AmdaAction.getDefaultValueTree 61 + directFn: AmdaAction.getDefaultValueTree
116 }, 62 },
117 folderSort: true 63 folderSort: true
118 }), 64 }),
119 plugins: [me.cellEditing], 65 plugins: [me.cellEditing],
120 - columns: [{  
121 - xtype: 'treecolumn', //this is so we know which column will show the tree  
122 - text: 'Parameters',  
123 - flex: 2,  
124 - sortable: true,  
125 - dataIndex: 'parameter'  
126 - },{  
127 - xtype: 'gridcolumn',  
128 - getEditor: function(record) {  
129 - var grid = this.up().grid,  
130 - cellediting = grid.findPlugin('cellediting'),  
131 - editors = cellediting.editors,  
132 - editor = editors.getByKey(this.id),  
133 - fieldType;  
134 -  
135 - if (editor) {  
136 - // Do this to avoid memory leaks  
137 - editors.remove(editor);  
138 - }  
139 - value = record.get('value');  
140 - if(me.isHexCode(value)){  
141 - fieldType = 'statuscolorpicker'  
142 - }  
143 - else if(value === 'true' || value == 'false'){  
144 - fieldType = 'combobox'  
145 - }  
146 - else{  
147 - fieldType = isNaN(parseFloat(record.get('value'))) ? 'textfield' : 'numberfield';  
148 - }  
149 - return {  
150 - xtype: fieldType,  
151 - store: (fieldType=='combobox') ? [[true, 'true'], [false, 'false']] : null,  
152 - editable: false,  
153 - value: (fieldType=='combobox') ? value : null,  
154 - allowBlank: false  
155 - };  
156 - },  
157 - text: 'Values',  
158 - flex: 1,  
159 - sortable: true,  
160 - dataIndex: 'value',  
161 - align: 'center',  
162 - renderer: function(value, meta) {  
163 - if (me.isHexCode(value)){  
164 - value = value.substring(1, 7);  
165 - return '<div style="background-color:#' + value + '; margin-left: auto; \  
166 - margin-right: auto;width:15px;height:15px;"></div>';  
167 - }  
168 - else{ 66 + columns: [
  67 + {
  68 + xtype: 'treecolumn', //this is so we know which column will show the tree
  69 + text: 'Parameters',
  70 + flex: 2,
  71 + sortable: true,
  72 + dataIndex: 'parameter',
  73 + renderer: function(value, metaData, record) {
  74 + if (record.get('modified')) {
  75 + return '<b style="color: blue;">'+value+'</b>';
  76 + }
169 return value; 77 return value;
170 } 78 }
171 - },  
172 - },{  
173 - text: 'Reset',  
174 - width: 55,  
175 - menuDisabled: true,  
176 - xtype: 'actioncolumn',  
177 - tooltip: 'Reset to the default value',  
178 - align: 'center',  
179 - icon: 'js/resources/images/16x16/arrow_circle_double.png',  
180 - handler: function(grid, rowIndex, colIndex, actionItem, event, record, row) {  
181 - Ext.Msg.alert('Editing' + record.get('parameter'));  
182 - },  
183 - // Only leaf level tasks may be edited  
184 - isDisabled: function(view, rowIdx, colIdx, item, record) {  
185 - return !record.data.leaf; 79 + },{
  80 + xtype: 'gridcolumn',
  81 + getEditor: function(record) {
  82 + var grid = this.up().grid,
  83 + cellediting = grid.findPlugin('cellediting'),
  84 + editors = cellediting.editors,
  85 + editor = editors.getByKey(this.id),
  86 + fieldType;
  87 +
  88 + if (editor) {
  89 + // Do this to avoid memory leaks
  90 + editors.remove(editor);
  91 + }
  92 + var parentNode = record;
  93 + var parameter ="";
  94 + while (parentNode.parentNode) {
  95 + parentNode = parentNode.parentNode;
  96 + if(parentNode.get('parameter'))
  97 + parameter = parentNode.get('parameter')+'.'.concat(parameter);
  98 + }
  99 + option = amdaDefaultOptions[parameter+record.get('parameter')];
  100 + console.log(record.get('default'));
  101 + value = record.get('value');
  102 + store = null;
  103 + if(me.isHexCode(value)){
  104 + fieldType = 'colorpicker'
  105 + }
  106 + else if(value === 'true' || value == 'false'){
  107 + fieldType = 'combobox'
  108 + store= [[true, 'true'], [false, 'false']];
  109 + }
  110 + else{
  111 + fieldType = isNaN(parseFloat(record.get('value'))) ? 'textfield' : 'numberfield';
  112 + }
  113 +
  114 + if (option && option.type){
  115 + fieldType = option.type;
  116 + var myStore = Ext.create('Ext.data.Store', {
  117 + fields: ['key', 'value'],
  118 + data: option.store
  119 + });
  120 + store = myStore;
  121 +
  122 + }
  123 + return {
  124 + xtype: fieldType,
  125 + store: store,
  126 + editable: false, queryMode: 'local',
  127 + displayField: 'value',
  128 + valueField: 'key',
  129 + value: (fieldType=='combobox') ? value : null,
  130 + allowBlank: false
  131 + };
  132 + },
  133 + text: 'Values',
  134 + flex: 1,
  135 + sortable: true,
  136 + dataIndex: 'value',
  137 + align: 'center',
  138 + renderer: function(value, meta) {
  139 + if (me.isHexCode(value)){
  140 + value = value.substring(1, 7);
  141 + return '<div style="background-color:#' + value + '; margin-left: auto; \
  142 + margin-right: auto;width:15px;height:15px;"></div>';
  143 + }
  144 + else{
  145 + return value;
  146 + }
  147 + },
  148 + },{
  149 + text: 'Reset',
  150 + width: 55,
  151 + menuDisabled: true,
  152 + xtype: 'actioncolumn',
  153 + tooltip: 'Reset to the default value',
  154 + align: 'center',
  155 + icon: 'js/resources/images/16x16/arrow_circle_double.png',
  156 + handler: function(grid, rowIndex, colIndex, actionItem, event, record, row) {
  157 + Ext.Msg.alert('Editing' + record.get('parameter'));
  158 + },
  159 + // Only leaf level tasks may be edited
  160 + isDisabled: function(view, rowIdx, colIdx, item, record) {
  161 + return !record.data.leaf;
  162 + }
186 } 163 }
187 - }  
188 - ] 164 + ],
189 }); 165 });
190 } 166 }
191 }); 167 });
js/app/views/DefaultValuesWindow.js
  Diff comments   View file @4f728fd
@@ -69,19 +69,9 @@ Ext.define(&#39;amdaUI.DefaultValuesWindow&#39;,{ @@ -69,19 +69,9 @@ Ext.define(&#39;amdaUI.DefaultValuesWindow&#39;,{
69 }, 69 },
70 }, 70 },
71 { 71 {
72 - // to reset the form  
73 - text: 'Reset',  
74 - handler: function() {  
75 - // me.statusGrid.clearStore();  
76 - // me.statusGrid.parseStatus(config.status);  
77 - }  
78 - },  
79 - {  
80 // To quit the window 72 // To quit the window
81 text: 'Cancel', 73 text: 'Cancel',
82 handler: function() { 74 handler: function() {
83 - // me.statusGrid.clearStore();  
84 - // me.statusGrid.destroy();  
85 me.close(); 75 me.close();
86 } 76 }
87 }] 77 }]
js/app/views/PlotComponents/PlotBaseAxisForm.js
  Diff comments   View file @4f728fd
@@ -28,7 +28,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, { @@ -28,7 +28,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, {
28 28
29 var legendItems = [ 29 var legendItems = [
30 this.addStandardText('axis-legend-text', 'Text'), 30 this.addStandardText('axis-legend-text', 'Text'),
31 - this.addColorsPicker('axis-legend-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'auto'), 31 + this.addColorsPicker('axis-legend-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'auto'),
32 this.addStandardFont('axis-legend-font') 32 this.addStandardFont('axis-legend-font')
33 ]; 33 ];
34 var manageTicksNumber = function (name, newValue, oldValue){ 34 var manageTicksNumber = function (name, newValue, oldValue){
@@ -49,7 +49,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, { @@ -49,7 +49,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, {
49 }; 49 };
50 50
51 var tickGridItems = [ 51 var tickGridItems = [
52 - this.addStandardCombo('axis-tick-position', 'Ticks position', amdaPlotObj.PlotObjectConfig.availableTicksPositions), 52 + this.addStandardCombo('axis-tick-position', 'Ticks position', amdaDefaultConfigs.availableTicksPositions),
53 this.addStandardCheck('axis-tick-showmarks', 'Show tick marks'), 53 this.addStandardCheck('axis-tick-showmarks', 'Show tick marks'),
54 this.addStandardCheck('axis-grid-major', 'Show major grid'), 54 this.addStandardCheck('axis-grid-major', 'Show major grid'),
55 this.addStandardCheck('axis-grid-minor', 'Show minor grid')]; 55 this.addStandardCheck('axis-grid-minor', 'Show minor grid')];
@@ -63,9 +63,9 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, { @@ -63,9 +63,9 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, {
63 63
64 var axisItems = []; 64 var axisItems = [];
65 if (this.showScaleOption) 65 if (this.showScaleOption)
66 - axisItems.push(this.addStandardCombo('axis-scale', 'Scale', amdaPlotObj.PlotObjectConfig.availableAxisScales)); 66 + axisItems.push(this.addStandardCombo('axis-scale', 'Scale', amdaDefaultConfigs.availableAxisScales));
67 if (this.showColorOption) { 67 if (this.showColorOption) {
68 - axisItems.push(this.addColorsPicker('axis-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'auto')); 68 + axisItems.push(this.addColorsPicker('axis-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'auto'));
69 } 69 }
70 axisItems.push(this.addStandardFloat('axis-thickness', 'Thickness', 1, 10)); 70 axisItems.push(this.addStandardFloat('axis-thickness', 'Thickness', 1, 10));
71 axisItems.push(this.addStandardCheck('axis-reverse', 'Reverse direction')); 71 axisItems.push(this.addStandardCheck('axis-reverse', 'Reverse direction'));
js/app/views/PlotComponents/PlotBaseSerieForm.js
  Diff comments   View file @4f728fd
@@ -53,13 +53,13 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, { @@ -53,13 +53,13 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
53 getTimeTickItems: function() { 53 getTimeTickItems: function() {
54 var me = this; 54 var me = this;
55 return [ 55 return [
56 - this.addStandardCombo('serie-timetick-type', 'Type', amdaPlotObj.PlotObjectConfig.availableTimeTickTypes, function(name, value, oldValue) { 56 + this.addStandardCombo('serie-timetick-type', 'Type', amdaDefaultConfigs.availableTimeTickTypes, function(name, value, oldValue) {
57 me.updateOptions(me.crtTree.getSelectedPlotType()); 57 me.updateOptions(me.crtTree.getSelectedPlotType());
58 }), 58 }),
59 this.addStandardFloat('serie-timetick-step', 'Time step (sec.)'), 59 this.addStandardFloat('serie-timetick-step', 'Time step (sec.)'),
60 this.addStandardFloat('serie-timetick-nbmajor', 'Number of major ticks'), 60 this.addStandardFloat('serie-timetick-nbmajor', 'Number of major ticks'),
61 this.addStandardFloat('serie-timetick-nbminor', 'Number of minor ticks'), 61 this.addStandardFloat('serie-timetick-nbminor', 'Number of minor ticks'),
62 - this.addColorsPicker('serie-timetick-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew), 62 + this.addColorsPicker('serie-timetick-color', 'Color', amdaDefaultConfigs.availableColorsNew),
63 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-timetick-symbols')), 63 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-timetick-symbols')),
64 this.addStandardFieldSet('First symbol', 'serie-timetick-firstsymbols-activated', this.addStandardSymbolsItems('serie-timetick-firstsymbols')), 64 this.addStandardFieldSet('First symbol', 'serie-timetick-firstsymbols-activated', this.addStandardSymbolsItems('serie-timetick-firstsymbols')),
65 this.addStandardFont('serie-timetick-font') 65 this.addStandardFont('serie-timetick-font')
@@ -70,8 +70,8 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, { @@ -70,8 +70,8 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
70 var me = this; 70 var me = this;
71 71
72 return [ 72 return [
73 - this.addStandardCombo('serie-intervaltick-mode', 'Mode', amdaPlotObj.PlotObjectConfig.availableIntervalTickModes),  
74 - this.addColorsPicker('serie-intervaltick-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew), 73 + this.addStandardCombo('serie-intervaltick-mode', 'Mode', amdaDefaultConfigs.availableIntervalTickModes),
  74 + this.addColorsPicker('serie-intervaltick-color', 'Color', amdaDefaultConfigs.availableColorsNew),
75 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-intervaltick-symbols')), 75 this.addStandardFieldSet('Symbols', '', this.addStandardSymbolsItems('serie-intervaltick-symbols')),
76 this.addStandardFont('serie-intervaltick-font') 76 this.addStandardFont('serie-intervaltick-font')
77 ]; 77 ];
@@ -85,7 +85,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, { @@ -85,7 +85,7 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
85 }, 85 },
86 getFilteringItems: function(){ 86 getFilteringItems: function(){
87 return[ 87 return[
88 - this.addStandardCombo('filtering-level', 'Level', amdaPlotObj.PlotObjectConfig.availableFilteringLevel) 88 + this.addStandardCombo('filtering-level', 'Level', amdaDefaultConfigs.availableFilteringLevel)
89 ]; 89 ];
90 }, 90 },
91 91
@@ -93,10 +93,10 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, { @@ -93,10 +93,10 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
93 var me = this; 93 var me = this;
94 94
95 return [ 95 return [
96 - this.addStandardCombo('serie-resolution', 'Points per plot', amdaPlotObj.PlotObjectConfig.availableResolutions, function(name, value, oldValue) { 96 + this.addStandardCombo('serie-resolution', 'Points per plot', amdaDefaultConfigs.availableResolutions, function(name, value, oldValue) {
97 me.object.set('serie-resolution', value); 97 me.object.set('serie-resolution', value);
98 }), 98 }),
99 - this.addStandardCombo('serie-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function(name, value, oldValue) { 99 + this.addStandardCombo('serie-yaxis', 'Y axis', amdaDefaultConfigs.availableYAxes, function(name, value, oldValue) {
100 me.object.set('serie-yaxis', value); 100 me.object.set('serie-yaxis', value);
101 me.crtTree.refresh(); 101 me.crtTree.refresh();
102 }), 102 }),
js/app/views/PlotComponents/PlotColorAxisForm.js
  Diff comments   View file @4f728fd
@@ -16,9 +16,9 @@ Ext.define(&#39;amdaPlotComp.PlotColorAxisForm&#39;, { @@ -16,9 +16,9 @@ Ext.define(&#39;amdaPlotComp.PlotColorAxisForm&#39;, {
16 16
17 getFormItems: function() { 17 getFormItems: function() {
18 var timeItems = [ 18 var timeItems = [
19 - this.addStandardCombo('axis-color-map', 'Color Map', amdaPlotObj.PlotObjectConfig.availableColorMaps),  
20 - this.addColorsPicker('axis-color-minval', 'Min. Val. Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'),  
21 - this.addColorsPicker('axis-color-maxval', 'Max. Val. Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none') 19 + this.addStandardCombo('axis-color-map', 'Color Map', amdaDefaultConfigs.availableColorMaps),
  20 + this.addColorsPicker('axis-color-minval', 'Min. Val. Color', amdaDefaultConfigs.availableColorsNew, 'none'),
  21 + this.addColorsPicker('axis-color-maxval', 'Max. Val. Color', amdaDefaultConfigs.availableColorsNew, 'none')
22 ]; 22 ];
23 23
24 return Ext.Array.merge(timeItems, this.callParent()); 24 return Ext.Array.merge(timeItems, this.callParent());
js/app/views/PlotComponents/PlotConstantForm.js
  Diff comments   View file @4f728fd
@@ -29,7 +29,7 @@ Ext.define(&#39;amdaPlotComp.PlotConstantForm&#39;, { @@ -29,7 +29,7 @@ Ext.define(&#39;amdaPlotComp.PlotConstantForm&#39;, {
29 getFormItems: function() { 29 getFormItems: function() {
30 var me = this; 30 var me = this;
31 return [ 31 return [
32 - this.addStandardCombo('constant-axis-id', 'Axis attachment', amdaPlotObj.PlotObjectConfig.availableConstantAxes, function (name, value, oldValue) { 32 + this.addStandardCombo('constant-axis-id', 'Axis attachment', amdaDefaultConfigs.availableConstantAxes, function (name, value, oldValue) {
33 if (me.object.get('constant-axis-id') != value) 33 if (me.object.get('constant-axis-id') != value)
34 { 34 {
35 me.updateOptions(value, me.crtTree.getSelectedPlotType()); 35 me.updateOptions(value, me.crtTree.getSelectedPlotType());
js/app/views/PlotComponents/PlotFillForm.js
  Diff comments   View file @4f728fd
@@ -77,7 +77,7 @@ Ext.define(&#39;amdaPlotComp.PlotFillForm&#39;, { @@ -77,7 +77,7 @@ Ext.define(&#39;amdaPlotComp.PlotFillForm&#39;, {
77 77
78 return [ 78 return [
79 79
80 - this.addStandardCombo('fill-type', 'Fill type', amdaPlotObj.PlotObjectConfig.availableFillTypes, function(name, value, oldValue) { 80 + this.addStandardCombo('fill-type', 'Fill type', amdaDefaultConfigs.availableFillTypes, function(name, value, oldValue) {
81 if (me.object.get('fill-type') != value) 81 if (me.object.get('fill-type') != value)
82 { 82 {
83 me.updateOptions(); 83 me.updateOptions();
@@ -88,8 +88,8 @@ Ext.define(&#39;amdaPlotComp.PlotFillForm&#39;, { @@ -88,8 +88,8 @@ Ext.define(&#39;amdaPlotComp.PlotFillForm&#39;, {
88 this.addStandardCombo('fill-firstserie-id', 'First serie Id', []), 88 this.addStandardCombo('fill-firstserie-id', 'First serie Id', []),
89 this.addStandardCombo('fill-secondserie-id', 'Second serie Id', []), 89 this.addStandardCombo('fill-secondserie-id', 'Second serie Id', []),
90 this.addStandardCombo('fill-constant-id', 'Constant Id', []), 90 this.addStandardCombo('fill-constant-id', 'Constant Id', []),
91 - this.addColorsPicker('fill-greater-color', 'Greater Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'),  
92 - this.addColorsPicker('fill-less-color', 'Less Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none') 91 + this.addColorsPicker('fill-greater-color', 'Greater Color', amdaDefaultConfigs.availableColorsNew, 'none'),
  92 + this.addColorsPicker('fill-less-color', 'Less Color', amdaDefaultConfigs.availableColorsNew, 'none')
93 ]; 93 ];
94 } 94 }
95 }); 95 });
js/app/views/PlotComponents/PlotHistogram2DSerieForm.js
  Diff comments   View file @4f728fd
@@ -93,8 +93,8 @@ Ext.define(&#39;amdaPlotComp.PlotHistogram2DSerieForm&#39;, { @@ -93,8 +93,8 @@ Ext.define(&#39;amdaPlotComp.PlotHistogram2DSerieForm&#39;, {
93 me.crtTree.refresh(); 93 me.crtTree.refresh();
94 }), 94 }),
95 me.getRangeForms(), 95 me.getRangeForms(),
96 - this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaPlotObj.PlotObjectConfig.availableResamplingModes),  
97 - this.addStandardCombo('histo2d-function', 'Function to apply', amdaPlotObj.PlotObjectConfig.availableHistogram2DFunctions, function(name, value, oldValue) { 96 + this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaDefaultConfigs.availableResamplingModes),
  97 + this.addStandardCombo('histo2d-function', 'Function to apply', amdaDefaultConfigs.availableHistogram2DFunctions, function(name, value, oldValue) {
98 me.object.set('histo2d-function', value); 98 me.object.set('histo2d-function', value);
99 me.updateOptions(value); 99 me.updateOptions(value);
100 }), 100 }),
js/app/views/PlotComponents/PlotInstantSpectroForm.js
  Diff comments   View file @4f728fd
@@ -18,7 +18,7 @@ Ext.define(&#39;amdaPlotComp.PlotInstantSpectroForm&#39;, { @@ -18,7 +18,7 @@ Ext.define(&#39;amdaPlotComp.PlotInstantSpectroForm&#39;, {
18 18
19 getFormItems: function() { 19 getFormItems: function() {
20 return [ 20 return [
21 - this.addStandardCombo('ispectro-dimonxaxis', 'Dim. on X axis', amdaPlotObj.PlotObjectConfig.availableDimsOnXAxis) 21 + this.addStandardCombo('ispectro-dimonxaxis', 'Dim. on X axis', amdaDefaultConfigs.availableDimsOnXAxis)
22 ]; 22 ];
23 } 23 }
24 }); 24 });
25 \ No newline at end of file 25 \ No newline at end of file
js/app/views/PlotComponents/PlotIntervalsForm.js
  Diff comments   View file @4f728fd
@@ -19,11 +19,11 @@ Ext.define(&#39;amdaPlotComp.PlotIntervalsForm&#39;, { @@ -19,11 +19,11 @@ Ext.define(&#39;amdaPlotComp.PlotIntervalsForm&#39;, {
19 getFormItems: function() { 19 getFormItems: function() {
20 var legendItems = [ 20 var legendItems = [
21 this.addStandardText('legend-text-value', 'Text'), 21 this.addStandardText('legend-text-value', 'Text'),
22 - this.addStandardCombo('legend-text-position', 'Position', amdaPlotObj.PlotObjectConfig.availableLegendTextPositions), 22 + this.addStandardCombo('legend-text-position', 'Position', amdaDefaultConfigs.availableLegendTextPositions),
23 this.addStandardFont('legend-text-font')] 23 this.addStandardFont('legend-text-font')]
24 24
25 return [ 25 return [
26 - this.addColorsPicker('intervals-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'), 26 + this.addColorsPicker('intervals-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'none'),
27 this.addStandardFieldSet('Legend', 'legend-text-activated', legendItems) 27 this.addStandardFieldSet('Legend', 'legend-text-activated', legendItems)
28 ]; 28 ];
29 } 29 }
js/app/views/PlotComponents/PlotLayoutForm.js
  Diff comments   View file @4f728fd
@@ -89,7 +89,7 @@ Ext.define(&#39;amdaPlotComp.PlotLayoutForm&#39;, { @@ -89,7 +89,7 @@ Ext.define(&#39;amdaPlotComp.PlotLayoutForm&#39;, {
89 }); 89 });
90 90
91 return [ 91 return [
92 - this.addStandardCombo('page-layout-type', 'Layout type', amdaPlotObj.PlotObjectConfig.availablePageLayouts, function(name, value, oldValue) { 92 + this.addStandardCombo('page-layout-type', 'Layout type', amdaDefaultConfigs.availablePageLayouts, function(name, value, oldValue) {
93 if (me.object.get('page-layout-type') != value) 93 if (me.object.get('page-layout-type') != value)
94 { 94 {
95 me.updateLayoutOptions(); 95 me.updateLayoutOptions();
js/app/views/PlotComponents/PlotLegendSeriesForm.js
  Diff comments   View file @4f728fd
@@ -22,17 +22,17 @@ Ext.define(&#39;amdaPlotComp.PlotLegendSeriesForm&#39;, { @@ -22,17 +22,17 @@ Ext.define(&#39;amdaPlotComp.PlotLegendSeriesForm&#39;, {
22 22
23 getFormItems: function() { 23 getFormItems: function() {
24 var borderItems = [ 24 var borderItems = [
25 - this.addColorsPicker('legend-series-border-color', 'Border Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none') 25 + this.addColorsPicker('legend-series-border-color', 'Border Color', amdaDefaultConfigs.availableColorsNew, 'none')
26 ]; 26 ];
27 27
28 var intervalInfoItems = [ 28 var intervalInfoItems = [
29 - this.addStandardCombo('legend-series-intervalinfo-type', 'Type', amdaPlotObj.PlotObjectConfig.availableLegendSeriesIntervalInfoTypes) 29 + this.addStandardCombo('legend-series-intervalinfo-type', 'Type', amdaDefaultConfigs.availableLegendSeriesIntervalInfoTypes)
30 ]; 30 ];
31 31
32 var legendItems = [ 32 var legendItems = [
33 - this.addStandardCombo('legend-series-type', 'Type', amdaPlotObj.PlotObjectConfig.availableLegendSeriesTypes),  
34 - this.addStandardCombo('legend-series-position', 'Position', amdaPlotObj.PlotObjectConfig.availableLegendSeriesPositions),  
35 - this.addColorsPicker('legend-series-defaulttextcolor', 'Default Text Color', amdaPlotObj.PlotObjectConfig.availableColorsNew), 33 + this.addStandardCombo('legend-series-type', 'Type', amdaDefaultConfigs.availableLegendSeriesTypes),
  34 + this.addStandardCombo('legend-series-position', 'Position', amdaDefaultConfigs.availableLegendSeriesPositions),
  35 + this.addColorsPicker('legend-series-defaulttextcolor', 'Default Text Color', amdaDefaultConfigs.availableColorsNew),
36 this.addStandardCheck('legend-series-showparaminfo', 'Show Param Info'), 36 this.addStandardCheck('legend-series-showparaminfo', 'Show Param Info'),
37 this.addStandardFieldSet('Show Interval Info', 'legend-series-intervalinfo-activated', intervalInfoItems), 37 this.addStandardFieldSet('Show Interval Info', 'legend-series-intervalinfo-activated', intervalInfoItems),
38 this.addStandardFieldSet('Border', 'legend-series-border-activated', borderItems), 38 this.addStandardFieldSet('Border', 'legend-series-border-activated', borderItems),
js/app/views/PlotComponents/PlotLegendTextForm.js
  Diff comments   View file @4f728fd
@@ -22,8 +22,8 @@ Ext.define(&#39;amdaPlotComp.PlotLegendTextForm&#39;, { @@ -22,8 +22,8 @@ Ext.define(&#39;amdaPlotComp.PlotLegendTextForm&#39;, {
22 22
23 return [ 23 return [
24 this.addStandardText('legend-text-value', 'Text'), 24 this.addStandardText('legend-text-value', 'Text'),
25 - this.addColorsPicker('legend-text-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew),  
26 - this.addStandardCombo('legend-text-position', 'Position', amdaPlotObj.PlotObjectConfig.availableLegendTextPositions, function(name, value, oldValue) { 25 + this.addColorsPicker('legend-text-color', 'Color', amdaDefaultConfigs.availableColorsNew),
  26 + this.addStandardCombo('legend-text-position', 'Position', amdaDefaultConfigs.availableLegendTextPositions, function(name, value, oldValue) {
27 me.object.set('legend-text-position', value); 27 me.object.set('legend-text-position', value);
28 me.crtTree.refresh(); 28 me.crtTree.refresh();
29 }), 29 }),
js/app/views/PlotComponents/PlotOrbitSerieForm.js
  Diff comments   View file @4f728fd
@@ -17,7 +17,7 @@ Ext.define(&#39;amdaPlotComp.PlotOrbitSerieForm&#39;, { @@ -17,7 +17,7 @@ Ext.define(&#39;amdaPlotComp.PlotOrbitSerieForm&#39;, {
17 var baseSerieItems = this.callParent(arguments); 17 var baseSerieItems = this.callParent(arguments);
18 18
19 var orbitSerieItems = [ 19 var orbitSerieItems = [
20 - this.addStandardCombo('serie-projection', 'Projection', amdaPlotObj.PlotObjectConfig.availableOrbitSerieProjections, function(name, value, oldValue) { 20 + this.addStandardCombo('serie-projection', 'Projection', amdaDefaultConfigs.availableOrbitSerieProjections, function(name, value, oldValue) {
21 me.object.set('serie-projection', value); 21 me.object.set('serie-projection', value);
22 me.crtTree.refresh(); 22 me.crtTree.refresh();
23 }), 23 }),
js/app/views/PlotComponents/PlotOutputForm.js
  Diff comments   View file @4f728fd
@@ -41,7 +41,7 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, { @@ -41,7 +41,7 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, {
41 41
42 if(format == 'PNG') 42 if(format == 'PNG')
43 { 43 {
44 - outputField.getStore().loadData(amdaPlotObj.PlotObjectConfig.availableFileOutputsForPng); 44 + outputField.getStore().loadData(amdaDefaultConfigs.availableFileOutputsForPng);
45 if(!output) 45 if(!output)
46 { 46 {
47 if(!outputValue) 47 if(!outputValue)
@@ -56,7 +56,7 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, { @@ -56,7 +56,7 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, {
56 } 56 }
57 else 57 else
58 { 58 {
59 - outputField.getStore().loadData(amdaPlotObj.PlotObjectConfig.availableFileOutputsForOtherFormats); 59 + outputField.getStore().loadData(amdaDefaultConfigs.availableFileOutputsForOtherFormats);
60 if(!output) 60 if(!output)
61 { 61 {
62 if(outputValue =='INTERACTIVE' || !outputValue) 62 if(outputValue =='INTERACTIVE' || !outputValue)
@@ -75,14 +75,14 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, { @@ -75,14 +75,14 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, {
75 var me = this; 75 var me = this;
76 76
77 return [ 77 return [
78 - this.addStandardCombo('file-format', 'File format', amdaPlotObj.PlotObjectConfig.availableFileFormats, function(name, value, oldValue) { 78 + this.addStandardCombo('file-format', 'File format', amdaDefaultConfigs.availableFileFormats, function(name, value, oldValue) {
79 if (me.object.get('file-format') != value) 79 if (me.object.get('file-format') != value)
80 { 80 {
81 me.updateOutputOption(value); 81 me.updateOutputOption(value);
82 me.updateOneFilePerIntOption(value); 82 me.updateOneFilePerIntOption(value);
83 } 83 }
84 }), 84 }),
85 - this.addStandardCombo('file-output', 'File output', amdaPlotObj.PlotObjectConfig.availableFileOutputs, function(name, value, oldValue) { 85 + this.addStandardCombo('file-output', 'File output', amdaDefaultConfigs.availableFileOutputs, function(name, value, oldValue) {
86 if (me.object.get('file-output') != value) 86 if (me.object.get('file-output') != value)
87 me.updateFilePrefixOption(value); 87 me.updateFilePrefixOption(value);
88 }), 88 }),
js/app/views/PlotComponents/PlotPageForm.js
  Diff comments   View file @4f728fd
@@ -14,9 +14,9 @@ Ext.define(&#39;amdaPlotComp.PlotPageForm&#39;, { @@ -14,9 +14,9 @@ Ext.define(&#39;amdaPlotComp.PlotPageForm&#39;, {
14 getFormItems: function() { 14 getFormItems: function() {
15 var titleItems = [ 15 var titleItems = [
16 this.addStandardText('page-title-text', 'Text'), 16 this.addStandardText('page-title-text', 'Text'),
17 - this.addColorsPicker('page-title-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew),  
18 - this.addStandardCombo('page-title-position', 'Position', amdaPlotObj.PlotObjectConfig.availableTitlePositions),  
19 - this.addStandardCombo('page-title-alignment', 'Alignment', amdaPlotObj.PlotObjectConfig.availableTitleAlignments), 17 + this.addColorsPicker('page-title-color', 'Color', amdaDefaultConfigs.availableColorsNew),
  18 + this.addStandardCombo('page-title-position', 'Position', amdaDefaultConfigs.availableTitlePositions),
  19 + this.addStandardCombo('page-title-alignment', 'Alignment', amdaDefaultConfigs.availableTitleAlignments),
20 this.addStandardFont('page-title-font') 20 this.addStandardFont('page-title-font')
21 ]; 21 ];
22 22
@@ -27,12 +27,12 @@ Ext.define(&#39;amdaPlotComp.PlotPageForm&#39;, { @@ -27,12 +27,12 @@ Ext.define(&#39;amdaPlotComp.PlotPageForm&#39;, {
27 27
28 var me = this; 28 var me = this;
29 return [ 29 return [
30 - //this.addStandardCombo('page-mode', 'Mode', amdaPlotObj.PlotObjectConfig.availablePageModes),  
31 - this.addStandardCombo('page-orientation', 'Orientation', amdaPlotObj.PlotObjectConfig.availablePageOrientations, function(name, value, oldValue) { 30 + //this.addStandardCombo('page-mode', 'Mode', amdaDefaultOptions['plot.page.mode'].store),
  31 + this.addStandardCombo('page-orientation', 'Orientation', amdaDefaultConfigs.availablePageOrientations, function(name, value, oldValue) {
32 me.object.set('page-orientation', value); 32 me.object.set('page-orientation', value);
33 me.crtTree.refresh(); 33 me.crtTree.refresh();
34 }), 34 }),
35 - this.addStandardCombo('page-dimension', 'Dimension', amdaPlotObj.PlotObjectConfig.availablePageDimensions, function(name, value, oldValue) { 35 + this.addStandardCombo('page-dimension', 'Dimension', amdaDefaultConfigs.availablePageDimensions, function(name, value, oldValue) {
36 me.object.set('page-dimension', value); 36 me.object.set('page-dimension', value);
37 me.crtTree.refresh(); 37 me.crtTree.refresh();
38 }), 38 }),
js/app/views/PlotComponents/PlotPanelForm.js
  Diff comments   View file @4f728fd
@@ -101,15 +101,15 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, { @@ -101,15 +101,15 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
101 101
102 var titleItems = [ 102 var titleItems = [
103 this.addStandardText('panel-title-text', 'Text'), 103 this.addStandardText('panel-title-text', 'Text'),
104 - this.addColorsPicker('panel-title-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew),  
105 - this.addStandardCombo('panel-title-position', 'Position', amdaPlotObj.PlotObjectConfig.availableTitlePositions),  
106 - this.addStandardCombo('panel-title-alignment', 'Alignment', amdaPlotObj.PlotObjectConfig.availableTitleAlignments), 104 + this.addColorsPicker('panel-title-color', 'Color', amdaDefaultConfigs.availableColorsNew),
  105 + this.addStandardCombo('panel-title-position', 'Position', amdaDefaultConfigs.availableTitlePositions),
  106 + this.addStandardCombo('panel-title-alignment', 'Alignment', amdaDefaultConfigs.availableTitleAlignments),
107 this.addStandardFont('panel-title-font') 107 this.addStandardFont('panel-title-font')
108 ]; 108 ];
109 109
110 var statusItems = [ 110 var statusItems = [
111 - this.addStandardCombo('panel-status-position', 'Position', amdaPlotObj.PlotObjectConfig.availableStatusBarPositions),  
112 - this.addStandardCombo('panel-status-colormap', 'Color Map', amdaPlotObj.PlotObjectConfig.availableStatusBarColorMaps) 111 + this.addStandardCombo('panel-status-position', 'Position', amdaDefaultConfigs.availableStatusBarPositions),
  112 + this.addStandardCombo('panel-status-colormap', 'Color Map', amdaDefaultConfigs.availableStatusBarColorMaps)
113 ]; 113 ];
114 114
115 var tickItems = [ 115 var tickItems = [
@@ -120,7 +120,7 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, { @@ -120,7 +120,7 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
120 120
121 var me = this; 121 var me = this;
122 return [ 122 return [
123 - this.addStandardCombo('panel-plot-type', 'Plot type', amdaPlotObj.PlotObjectConfig.availablePlotTypes, function(name, value, oldValue) { 123 + this.addStandardCombo('panel-plot-type', 'Plot type', amdaDefaultConfigs.availablePlotTypes, function(name, value, oldValue) {
124 if (value != me.object.get('panel-plot-type')) 124 if (value != me.object.get('panel-plot-type'))
125 { 125 {
126 me.object.changePlotType(value); 126 me.object.changePlotType(value);
@@ -146,8 +146,8 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, { @@ -146,8 +146,8 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
146 me.object.set('panel-instant-time', value); 146 me.object.set('panel-instant-time', value);
147 me.crtTree.refresh(); 147 me.crtTree.refresh();
148 }), 148 }),
149 - this.addColorsPicker('panel-background-color', 'Background Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'),  
150 - this.addColorsPicker('panel-plotareabackground-color', 'Plot Area Background Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'), 149 + this.addColorsPicker('panel-background-color', 'Background Color', amdaDefaultConfigs.availableColorsNew, 'none'),
  150 + this.addColorsPicker('panel-plotareabackground-color', 'Plot Area Background Color', amdaDefaultConfigs.availableColorsNew, 'none'),
151 this.addStandardFieldSet('Manual Bounds', '', boundsItems), 151 this.addStandardFieldSet('Manual Bounds', '', boundsItems),
152 this.addStandardFieldSet('Manual Margins', '', marginItems), 152 this.addStandardFieldSet('Manual Margins', '', marginItems),
153 this.addStandardFieldSet('Preferred Dimensions', '', preferedDimItems), 153 this.addStandardFieldSet('Preferred Dimensions', '', preferedDimItems),
js/app/views/PlotComponents/PlotSerieForm.js
  Diff comments   View file @4f728fd
@@ -46,7 +46,7 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, { @@ -46,7 +46,7 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
46 var me = this; 46 var me = this;
47 47
48 return [ 48 return [
49 - this.addStandardCombo('serie-errorbar-type', 'Type', amdaPlotObj.PlotObjectConfig.availableErrorBarTypes, function(name, value, oldValue) { 49 + this.addStandardCombo('serie-errorbar-type', 'Type', amdaDefaultConfigs.availableErrorBarTypes, function(name, value, oldValue) {
50 me.updateOptions(me.crtTree.getSelectedPlotType()); 50 me.updateOptions(me.crtTree.getSelectedPlotType());
51 }), 51 }),
52 this.addStandardParamDropTarget('serie-errorbar-minparam', 'Min. Parameter'), 52 this.addStandardParamDropTarget('serie-errorbar-minparam', 'Min. Parameter'),
@@ -74,7 +74,7 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, { @@ -74,7 +74,7 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
74 me.crtTree.refresh(); 74 me.crtTree.refresh();
75 }), 75 }),
76 this.addStandardFieldSet('X Values range', '', this.getXValuesRangeItems()), 76 this.addStandardFieldSet('X Values range', '', this.getXValuesRangeItems()),
77 - this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaPlotObj.PlotObjectConfig.availableResamplingModes) 77 + this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaDefaultConfigs.availableResamplingModes)
78 ]; 78 ];
79 79
80 Ext.each(baseSerieItems, function(item) { 80 Ext.each(baseSerieItems, function(item) {
js/app/views/PlotComponents/PlotSpectroForm.js
  Diff comments   View file @4f728fd
@@ -29,7 +29,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, { @@ -29,7 +29,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
29 }, 29 },
30 getFilteringItems: function () { 30 getFilteringItems: function () {
31 return [ 31 return [
32 - this.addStandardCombo('filtering-level', 'Level', amdaPlotObj.PlotObjectConfig.availableFilteringLevel) 32 + this.addStandardCombo('filtering-level', 'Level', amdaDefaultConfigs.availableFilteringLevel)
33 ]; 33 ];
34 }, 34 },
35 35
@@ -267,10 +267,10 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, { @@ -267,10 +267,10 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
267 }); 267 });
268 268
269 return [ 269 return [
270 - this.addStandardCombo('spectro-resolution', 'Points per plot', amdaPlotObj.PlotObjectConfig.availableResolutions, function (name, value, oldValue) { 270 + this.addStandardCombo('spectro-resolution', 'Points per plot', amdaDefaultConfigs.availableResolutions, function (name, value, oldValue) {
271 ref.object.set('spectro-resolution', value); 271 ref.object.set('spectro-resolution', value);
272 }), 272 }),
273 - this.addStandardCombo('spectro-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function (name, value, oldValue) { 273 + this.addStandardCombo('spectro-yaxis', 'Y axis', amdaDefaultConfigs.availableYAxes, function (name, value, oldValue) {
274 ref.object.set('spectro-yaxis', value); 274 ref.object.set('spectro-yaxis', value);
275 ref.crtTree.refresh(); 275 ref.crtTree.refresh();
276 }), 276 }),
@@ -279,7 +279,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, { @@ -279,7 +279,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
279 this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function (name, value, oldValue) { 279 this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function (name, value, oldValue) {
280 ref.object.set('spectro-log0-as-min', value); 280 ref.object.set('spectro-log0-as-min', value);
281 }), 281 }),
282 - this.addStandardCombo('spectro-normalization', 'Normalization', amdaPlotObj.PlotObjectConfig.availableSpectroNormalization, function (name, value, oldValue) { 282 + this.addStandardCombo('spectro-normalization', 'Normalization', amdaDefaultConfigs.availableSpectroNormalization, function (name, value, oldValue) {
283 if (ref.object.get('spectro-normalization') != value) { 283 if (ref.object.get('spectro-normalization') != value) {
284 ref.object.set('spectro-normalization', value); 284 ref.object.set('spectro-normalization', value);
285 } 285 }
js/app/views/PlotComponents/PlotStandardForm.js
  Diff comments   View file @4f728fd
@@ -237,7 +237,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, { @@ -237,7 +237,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
237 237
238 addStandardFont: function (namePrefix) { 238 addStandardFont: function (namePrefix) {
239 var fontItems = [ 239 var fontItems = [
240 - this.addStandardCombo(namePrefix + '-name', 'Name', amdaPlotObj.PlotObjectConfig.availableFontNames), 240 + this.addStandardCombo(namePrefix + '-name', 'Name', amdaDefaultConfigs.availableFontNames),
241 { 241 {
242 xtype: 'toolbar', 242 xtype: 'toolbar',
243 bodyStyle: { background: '#dfe8f6' }, 243 bodyStyle: { background: '#dfe8f6' },
@@ -411,17 +411,17 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, { @@ -411,17 +411,17 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
411 411
412 addStandardLineItems: function (namePrefix) { 412 addStandardLineItems: function (namePrefix) {
413 return [ 413 return [
414 - this.addStandardCombo(namePrefix + '-style', 'Style', amdaPlotObj.PlotObjectConfig.availableLinesStyles), 414 + this.addStandardCombo(namePrefix + '-style', 'Style', amdaDefaultConfigs.availableLinesStyles),
415 this.addStandardFloat(namePrefix + '-width', 'Width', 1, 10), 415 this.addStandardFloat(namePrefix + '-width', 'Width', 1, 10),
416 - this.addColorsPicker(namePrefix + '-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'auto') 416 + this.addColorsPicker(namePrefix + '-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'auto')
417 ]; 417 ];
418 }, 418 },
419 419
420 addStandardSymbolsItems: function (namePrefix) { 420 addStandardSymbolsItems: function (namePrefix) {
421 return [ 421 return [
422 - this.addStandardCombo(namePrefix + '-type', 'Type', amdaPlotObj.PlotObjectConfig.availableSymbolsTypes), 422 + this.addStandardCombo(namePrefix + '-type', 'Type', amdaDefaultConfigs.availableSymbolsTypes),
423 this.addStandardFloat(namePrefix + '-size', 'Size', 1, 10), 423 this.addStandardFloat(namePrefix + '-size', 'Size', 1, 10),
424 - this.addColorsPicker(namePrefix + '-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'auto') 424 + this.addColorsPicker(namePrefix + '-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'auto')
425 ]; 425 ];
426 }, 426 },
427 427
js/app/views/PlotComponents/PlotStatusBarForm.js
  Diff comments   View file @4f728fd
@@ -17,7 +17,7 @@ Ext.define(&#39;amdaPlotComp.PlotStatusBarForm&#39;, { @@ -17,7 +17,7 @@ Ext.define(&#39;amdaPlotComp.PlotStatusBarForm&#39;, {
17 }, 17 },
18 18
19 getFormItems: function() { 19 getFormItems: function() {
20 - return [this.addColorsPicker('statusbar-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none') 20 + return [this.addColorsPicker('statusbar-color', 'Color', amdaDefaultConfigs.availableColorsNew, 'none')
21 ]; 21 ];
22 } 22 }
23 }); 23 });
24 \ No newline at end of file 24 \ No newline at end of file
js/app/views/PlotComponents/PlotTextForm.js
  Diff comments   View file @4f728fd
@@ -62,8 +62,8 @@ Ext.define(&#39;amdaPlotComp.PlotTextForm&#39;, { @@ -62,8 +62,8 @@ Ext.define(&#39;amdaPlotComp.PlotTextForm&#39;, {
62 var me = this; 62 var me = this;
63 return [ 63 return [
64 this.addStandardText('text-value', 'Text'), 64 this.addStandardText('text-value', 'Text'),
65 - this.addColorsPicker('text-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColorsNew),  
66 - this.addStandardCombo('text-align', 'Alignment', amdaPlotObj.PlotObjectConfig.availableTextAlignments), 65 + this.addColorsPicker('text-color', 'Color', amdaDefaultConfigs.availableColorsNew),
  66 + this.addStandardCombo('text-align', 'Alignment', amdaDefaultConfigs.availableTextAlignments),
67 this.addStandardCheck('text-x-relative', 'Relative X Position', function(name, value, oldValue) { 67 this.addStandardCheck('text-x-relative', 'Relative X Position', function(name, value, oldValue) {
68 me.updateOptions(me.crtTree.getSelectedPlotType()); 68 me.updateOptions(me.crtTree.getSelectedPlotType());
69 }), 69 }),
@@ -72,7 +72,7 @@ Ext.define(&#39;amdaPlotComp.PlotTextForm&#39;, { @@ -72,7 +72,7 @@ Ext.define(&#39;amdaPlotComp.PlotTextForm&#39;, {
72 this.addStandardCheck('text-y-relative', 'Relative Y Position', function(name, value, oldValue) { 72 this.addStandardCheck('text-y-relative', 'Relative Y Position', function(name, value, oldValue) {
73 me.updateOptions(me.crtTree.getSelectedPlotType()); 73 me.updateOptions(me.crtTree.getSelectedPlotType());
74 }), 74 }),
75 - this.addStandardCombo('text-y-axis', 'Y Axis attachment', amdaPlotObj.PlotObjectConfig.availableYAxes), 75 + this.addStandardCombo('text-y-axis', 'Y Axis attachment', amdaDefaultConfigs.availableYAxes),
76 this.addStandardFloat('text-y-value', 'Y Position', 0, 1), 76 this.addStandardFloat('text-y-value', 'Y Position', 0, 1),
77 this.addStandardFloat('text-angle', 'Rotation Angle', 0, 360), 77 this.addStandardFloat('text-angle', 'Rotation Angle', 0, 360),
78 this.addStandardFont('text-font') 78 this.addStandardFont('text-font')
js/app/views/PlotComponents/PlotTimeAxisForm.js
  Diff comments   View file @4f728fd
@@ -17,7 +17,7 @@ Ext.define(&#39;amdaPlotComp.PlotTimeAxisForm&#39;, { @@ -17,7 +17,7 @@ Ext.define(&#39;amdaPlotComp.PlotTimeAxisForm&#39;, {
17 17
18 getFormItems: function() { 18 getFormItems: function() {
19 var timeItems = [ 19 var timeItems = [
20 - this.addStandardCombo('axis-time-format', 'Time Format', amdaPlotObj.PlotObjectConfig.availableTimeAxisFormats) 20 + this.addStandardCombo('axis-time-format', 'Time Format', amdaDefaultConfigs.availableTimeAxisFormats)
21 ]; 21 ];
22 22
23 return Ext.Array.merge(timeItems, this.callParent()); 23 return Ext.Array.merge(timeItems, this.callParent());
php/classes/AmdaAction.php
  Diff comments   View file @4f728fd
@@ -1697,9 +1697,8 @@ class AmdaAction @@ -1697,9 +1697,8 @@ class AmdaAction
1697 1697
1698 public function getNodeValues($data,&$transformed){ 1698 public function getNodeValues($data,&$transformed){
1699 $iconCls = "task-folder"; 1699 $iconCls = "task-folder";
1700 - $expanded = true;  
1701 foreach ($data as $parameter => $value) { 1700 foreach ($data as $parameter => $value) {
1702 - if(is_array($value)){ 1701 + if(is_array($value) && !$value['modified']){
1703 $child = [ 1702 $child = [
1704 "parameter" => $parameter, 1703 "parameter" => $parameter,
1705 "value" => "", 1704 "value" => "",
@@ -1707,23 +1706,49 @@ class AmdaAction @@ -1707,23 +1706,49 @@ class AmdaAction
1707 "expanded" => false, 1706 "expanded" => false,
1708 "children" => [] 1707 "children" => []
1709 ]; 1708 ];
  1709 +
1710 $this->getNodeValues($value,$child['children']); 1710 $this->getNodeValues($value,$child['children']);
1711 $transformed[] = $child; 1711 $transformed[] = $child;
1712 } 1712 }
  1713 + else if (is_array($value) && $value['modified']){
  1714 + $child =[
  1715 + "parameter" => $parameter,
  1716 + "value" => $value["value"],
  1717 + "iconCls" => "task",
  1718 + "leaf" => true,
  1719 + "modified" => $value["modified"],
  1720 + "default" => $value["defaultValue"]
  1721 + ];
  1722 + $transformed[] = $child;
  1723 + }
1713 else{ 1724 else{
1714 $child =[ 1725 $child =[
1715 "parameter" => $parameter, 1726 "parameter" => $parameter,
1716 "value" => $value, 1727 "value" => $value,
1717 "iconCls" => "task", 1728 "iconCls" => "task",
1718 - "leaf" => true 1729 + "leaf" => true,
  1730 + "modified" => false,
  1731 + "default" =>$value
1719 ]; 1732 ];
1720 -  
1721 $transformed[] = $child; 1733 $transformed[] = $child;
1722 } 1734 }
1723 } 1735 }
1724 } 1736 }
  1737 + public function getDefaultValueConfigs(){
  1738 + if (file_exists(DATAPATH.'defaultValuesConfig.json'))
  1739 + return json_decode(file_get_contents(DATAPATH.'defaultValuesConfig.json'), true);
  1740 + else
  1741 + return array();
  1742 + }
  1743 +
  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();
  1749 + }
1725 1750
1726 - public function getDefaultValueTree(){ 1751 + public function getDefaultValueTree($isTree=TRUE){
1727 $childrenToReturn = array(); 1752 $childrenToReturn = array();
1728 $children = []; 1753 $children = [];
1729 if (file_exists(DATAPATH.'defaultValues.json')) { 1754 if (file_exists(DATAPATH.'defaultValues.json')) {
@@ -1732,11 +1757,37 @@ class AmdaAction @@ -1732,11 +1757,37 @@ class AmdaAction
1732 $childrenToReturn = array(); 1757 $childrenToReturn = array();
1733 } 1758 }
1734 else { 1759 else {
1735 - $this->getNodeValues($json_o,$children);  
1736 - $childrenToReturn = [  
1737 - "text" => ".",  
1738 - "children" => $children  
1739 - ]; 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 + $results = array("value" => $value, "modified" => true, "defaultValue" => $results);
  1769 +
  1770 + // if(is_string($value) || is_numeric($value))
  1771 + // $results = "*".$value;
  1772 + // if(is_bool($value)){
  1773 + // $results = $value ? "true":"false";
  1774 + // $results = "*".$results;
  1775 + // }
  1776 + }
  1777 + }
  1778 +
  1779 + if($isTree){
  1780 +
  1781 + $this->getNodeValues($json_o,$children);
  1782 +
  1783 + $childrenToReturn = [
  1784 + "text" => ".",
  1785 + "children" => $children
  1786 + ];
  1787 + }
  1788 + else {
  1789 + $childrenToReturn = $json_o;
  1790 + }
1740 } 1791 }
1741 } 1792 }
1742 else { 1793 else {
php/config.php
  Diff comments   View file @4f728fd
@@ -207,7 +207,9 @@ $API = array( @@ -207,7 +207,9 @@ $API = array(
207 'getCatColumnInfo' => array('len' => 1), 207 'getCatColumnInfo' => array('len' => 1),
208 'editColumn' => array('len' => 5), 208 'editColumn' => array('len' => 5),
209 // Default Values options 209 // Default Values options
210 - 'getDefaultValueTree' => array('len'=>0) 210 + 'getDefaultValueLinks' => array('len' => 0),
  211 + 'getDefaultValueTree' => array('len'=>1),
  212 + 'getDefaultValueConfigs' => array('len' => 0)
211 ) 213 )
212 ) 214 )
213 ); 215 );