CDPP / AMDA_IHM

Commit 9b67ae6b0f178d4219b455f5e890a64d9be31497

Authored by Benjamin Renard
2 parents b954fc79 7be58eb6
Exists in master and in 23 other branches FER_10828_2, 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, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, openam

Merge FER_10934 into amdadev_test

Showing 65 changed files with 1661 additions and 927 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,30 @@ if ($sessionID === FALSE) { @@ -191,14 +194,30 @@ 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 + if(defaults['success'])
  199 + amdaDefaultValues=defaults['defaultValues'];
  200 + AmdaAction.getDefaultValueConfigs(function(configs){
  201 + if(configs["success"])
  202 + amdaDefaultConfigs = configs["configs"];
  203 +
  204 + AmdaAction.getDefaultValueLinks(function(links){
  205 + if(links["success"])
  206 + amdaDefaultOptions = links['links'];
  207 +
  208 + amdaDesktop.JobsMgr.getStatus();
  209 + Ext.state.Manager.setProvider(provider);
  210 + myDesktopApp = new amdaApp.AmdaApp();
  211 + // global message bus
  212 + myDesktopApp.EventManager = new Ext.util.Observable();
  213 + // not needed - for documentation only
  214 + myDesktopApp.EventManager.addEvents('refresh');
  215 + loadMask = new AMDAMask();
  216 + }) ;
  217 + });
  218 + }) ;
  219 +
  220 +
202 } 221 }
203 }); 222 });
204 223
generic_data/defaultValues.json 0 → 100644
  Diff comments   View file @9b67ae6
@@ -0,0 +1,195 @@ @@ -0,0 +1,195 @@
  1 +{
  2 + "plot":{
  3 + "file":{
  4 + "format":"PNG",
  5 + "output":"INTERACTIVE",
  6 + "oneFilePerInterval":false
  7 + },
  8 + "tree":{
  9 + "fullView":false
  10 + },
  11 + "page":{
  12 + "xMargin":5,
  13 + "yMargin":5,
  14 + "mode":"color",
  15 + "orientation":"landscape",
  16 + "dimension":"ISO A4",
  17 + "title":{
  18 + "position":"top",
  19 + "alignment":" center",
  20 + "color":"#000000"
  21 + },
  22 + "font":{
  23 + "name":"sans-serif",
  24 + "size":8
  25 + },
  26 + "layout":{
  27 + "type":"vertical",
  28 + "panelHeight":0.5,
  29 + "panelSpacing":0,
  30 + "expand":false,
  31 + "timeAxesLegend":true
  32 + }
  33 + },
  34 + "panel":{
  35 + "plotType":"timePlot",
  36 + "isotropic":false,
  37 + "title":{
  38 + "position":"top",
  39 + "alignment":" center",
  40 + "color":"#000000"
  41 + },
  42 + "font":{
  43 + "name":"sans-serif",
  44 + "size":8
  45 + },
  46 + "backgroundColor":"none",
  47 + "status":{
  48 + "position":"top",
  49 + "colorMap":0
  50 + }
  51 + },
  52 + "axis":{
  53 + "scale":"linear",
  54 + "tickPosition":"outwards",
  55 + "color":"#000000",
  56 + "thickness":1,
  57 + "legend":{
  58 + "color":"#000000",
  59 + "font":{
  60 + "name":"sans-serif",
  61 + "size":8
  62 + }
  63 + },
  64 + "timeFormat":"dd/mm/yy",
  65 + "colorMap":"1"
  66 + },
  67 + "serie":{
  68 + "yAxis":"y-left",
  69 + "resolution":3000,
  70 + "lines":{
  71 + "style":"plain",
  72 + "width":1,
  73 + "color":"auto"
  74 + },
  75 + "symbols":{
  76 + "type":"dot",
  77 + "size":3,
  78 + "color":"auto"
  79 + },
  80 + "resamplingMode":"xparam",
  81 + "timetick":{
  82 + "type":"auto",
  83 + "step":3600,
  84 + "nbmajor":5,
  85 + "nbminor":5,
  86 + "color":"#FF0000",
  87 + "symbols":{
  88 + "type":"full-circle",
  89 + "size":10,
  90 + "color":"#FF0000"
  91 + },
  92 + "firstsymbols":{
  93 + "type":"triangle",
  94 + "size":4,
  95 + "color":"#00FF00"
  96 + },
  97 + "font":{
  98 + "name":"sans-serif",
  99 + "size":8
  100 + }
  101 + },
  102 + "intervaltick":{
  103 + "mode":"start-time",
  104 + "color":"#FF0000",
  105 + "symbols":{
  106 + "type":"full-circle",
  107 + "size":10,
  108 + "color":"#FF0000"
  109 + },
  110 + "font":{
  111 + "name":"sans-serif",
  112 + "size":8
  113 + }
  114 + },
  115 + "errorbar":{
  116 + "type":"min-max",
  117 + "lines":{
  118 + "style":"plain",
  119 + "width":1,
  120 + "color":"auto"
  121 + }
  122 + },
  123 + "projection":"XY"
  124 + },
  125 + "spectro":{
  126 + "yAxis":"y-left",
  127 + "resolution":3000
  128 + },
  129 + "histogram2D":{
  130 + "histo2DFunction":"density",
  131 + "xbinnumber":100,
  132 + "ybinnumber":100,
  133 + "smoothfactor":1
  134 + },
  135 + "sauvaud":{
  136 + "yAxis":"y-right",
  137 + "resolution":3000
  138 + },
  139 + "intervals":{
  140 + "color":"#FF0000"
  141 + },
  142 + "statusbar":{
  143 + "color":"#FF0000"
  144 + },
  145 + "legends":{
  146 + "series":{
  147 + "type":"text-only",
  148 + "position":"outside",
  149 + "text":{
  150 + "color":"#000000"
  151 + },
  152 + "border":{"color":"#000000"},
  153 + "intervalinfo":{"type":"start-stop"},
  154 + "font":{"name":"sans-serif","size":"8"}
  155 + },
  156 + "text":{
  157 + "position":"left",
  158 + "color":"#000000",
  159 + "font":{
  160 + "name":"sans-serif",
  161 + "size":8
  162 + }
  163 + }
  164 + },
  165 + "constants":{
  166 + "axisId":"y-left",
  167 + "line":{
  168 + "style":"plain",
  169 + "width":1,
  170 + "color":"#000000"
  171 + }
  172 + },
  173 + "textObjs":{
  174 + "yAxisId":"y-left",
  175 + "xRelative":true,
  176 + "yRelative":true,
  177 + "align":"left",
  178 + "color":"#000000",
  179 + "font":{"name":"sans-serif","size":8}
  180 + },
  181 + "curves":{
  182 + "line":{
  183 + "style":"plain",
  184 + "width":1,
  185 + "color":"#000000"
  186 + }
  187 + },
  188 + "fills":{
  189 + "type":"serie-constant",
  190 + "greaterColor":"none",
  191 + "lessColor":"none"
  192 + },
  193 + "filtering":{"level":1}
  194 + }
  195 +}
0 \ No newline at end of file 196 \ No newline at end of file
generic_data/defaultValuesConfig.json 0 → 100644
  Diff comments   View file @9b67ae6
@@ -0,0 +1,329 @@ @@ -0,0 +1,329 @@
  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", "svgFile":"cmap1_blue_red.svg" },
  119 + { "key": "1", "value": "Default", "svgFile":"cmap1_default.svg"},
  120 + { "key": "2", "value": "Blue Yellow", "svgFile":"cmap1_blue_yellow.svg" },
  121 + { "key": "3", "value": "Grayscale", "svgFile":"cmap1_gray.svg" },
  122 + { "key": "4", "value": "AMDA Default", "svgFile":"cmap1_amda_default.svg" },
  123 + { "key": "5", "value": "GeoWhite", "svgFile":"cmap1_geowhite.svg" },
  124 + { "key": "6", "value": "GeoBlack", "svgFile":"cmap1_geoblack.svg" },
  125 + { "key": "7", "value": "Violet Yellow", "svgFile":"cmap1_dark_violet_yellow.svg" },
  126 + { "key": "8", "value": "Red Blue 4", "svgFile":"cmap1_red_blue.svg" },
  127 + { "key": "9", "value": "Acton", "svgFile":"cmap1_acton.svg" },
  128 + { "key": "11", "value": "Bamako", "svgFile":"cmap1_bamako.svg" },
  129 + { "key": "12", "value": "Batlow", "svgFile":"cmap1_batlow.svg" },
  130 + { "key": "13", "value": "BatlowK", "svgFile":"cmap1_batlowK.svg" },
  131 + { "key": "14", "value": "BatlowW", "svgFile":"cmap1_batlowW.svg" },
  132 + { "key": "15", "value": "Bilbao", "svgFile":"cmap1_bilbao.svg" },
  133 + { "key": "16", "value": "Buda", "svgFile":"cmap1_buda.svg" },
  134 + { "key": "17", "value": "Davos", "svgFile":"cmap1_davos.svg" },
  135 + { "key": "18", "value": "Devon", "svgFile":"cmap1_devon.svg" },
  136 + { "key": "19", "value": "GrayC", "svgFile":"cmap1_grayC.svg" },
  137 + { "key": "20", "value": "Hawaii", "svgFile":"cmap1_hawaii.svg" },
  138 + { "key": "21", "value": "Imola", "svgFile":"cmap1_imola.svg" },
  139 + { "key": "22", "value": "Lajolla", "svgFile":"cmap1_lajolla.svg" },
  140 + { "key": "23", "value": "Lapaz", "svgFile":"cmap1_lapaz.svg" },
  141 + { "key": "24", "value": "Nuuk", "svgFile":"cmap1_nuuk.svg" },
  142 + { "key": "25", "value": "Oslo", "svgFile":"cmap1_oslo.svg" },
  143 + { "key": "26", "value": "Tokyo", "svgFile":"cmap1_tokyo.svg" },
  144 + { "key": "27", "value": "Turku", "svgFile":"cmap1_turku.svg" },
  145 +
  146 + { "key": "28", "value": "Bam", "svgFile":"cmap1_div_bam.svg" },
  147 + { "key": "29", "value": "Berlin", "svgFile":"cmap1_div_berlin.svg" },
  148 + { "key": "30", "value": "Broc", "svgFile":"cmap1_div_broc.svg" },
  149 + { "key": "31", "value": "Cork", "svgFile":"cmap1_div_cork.svg" },
  150 + { "key": "32", "value": "Lisbon", "svgFile":"cmap1_div_lisbon.svg" },
  151 + { "key": "33", "value": "Roma", "svgFile":"cmap1_div_roma.svg" },
  152 + { "key": "34", "value": "Tofino", "svgFile":"cmap1_div_tofino.svg" },
  153 + { "key": "35", "value": "Vanimo", "svgFile":"cmap1_div_vanimo.svg" },
  154 + { "key": "36", "value": "vik", "svgFile":"cmap1_div_vik.svg" }
  155 + ],
  156 +
  157 + "availableColors": [
  158 + { "key": "auto", "color": "auto", "value": "auto" },
  159 + { "key": "[0,0,0]", "color": "#000000", "value": "Black" },
  160 + { "key": "[0,0,255]", "color": "#0000ff", "value": "Blue" },
  161 + { "key": "[255,0,0]", "color": "#ff0000", "value": "Red" },
  162 + { "key": "[0,255,255]", "color": "#00ffff", "value": "Cyan" },
  163 + { "key": "[255,0,255]", "color": "#ff00ff", "value": "Magenta" },
  164 + { "key": "[0,128,0]", "color": "#008000", "value": "Green" },
  165 + { "key": "[128,128,128]", "color": "#808080", "value": "Gray" },
  166 + { "key": "[0,255,0]", "color": "#00ff00", "value": "Lime" },
  167 + { "key": "[128,0,0]", "color": "#800000", "value": "Maroon" },
  168 + { "key": "[0,0,128]", "color": "#000080", "value": "Navy" },
  169 + { "key": "[128,128,0]", "color": "#808000", "value": "Olive" },
  170 + { "key": "[128,0,128]", "color": "#800080", "value": "Purple" },
  171 + { "key": "[192,192,192]", "color": "#c0c0c0", "value": "Silver" },
  172 + { "key": "[0,128,128]", "color": "#008080", "value": "Teal" },
  173 + { "key": "[255,255,0]", "color": "#ffff00", "value": "Yellow" },
  174 + { "key": "[0,64,64]", "color": "#004040", "value": "Cyprus" }
  175 + ],
  176 +
  177 + "availableColorsNew": [
  178 + "#000000", "#0000ff", "#ff0000", "#00ffff", "#ff00ff", "#008000", "#800000",
  179 + "#000080", "#808000", "#800080", "#c0c0c0", "#008080", "#ffff00", "#004040",
  180 + "#29d8d7", "#6b9842", "#73a9b4", "#1c883d", "#808080", "#4342dd", "#e84130",
  181 + "#dee2e6", "#ced4da", "#adb5bd", "#868e96", "#495057", "#343a40", "#212529",
  182 + "#ffa8a8", "#ff8787", "#ff6b6b", "#fa5252", "#f03e3e", "#e03131", "#c92a2a",
  183 + "#faa2c1", "#f783ac", "#f06595", "#e64980", "#d6336c", "#c2255c", "#a61e4d",
  184 + "#e599f7", "#da77f2", "#cc5de8", "#be4bdb", "#ae3ec9", "#9c36b5", "#862e9c",
  185 + "#b197fc", "#9775fa", "#845ef7", "#7950f2", "#7048e8", "#6741d9", "#5f3dc4",
  186 + "#91a7ff", "#748ffc", "#5c7cfa", "#4c6ef5", "#4263eb", "#3b5bdb", "#364fc7",
  187 + "#74c0fc", "#4dabf7", "#339af0", "#228be6", "#1c7ed6", "#1971c2", "#1864ab",
  188 + "#66d9e8", "#3bc9db", "#22b8cf", "#15aabf", "#1098ad", "#0c8599", "#0b7285",
  189 + "#63e6be", "#38d9a9", "#20c997", "#12b886", "#0ca678", "#099268", "#087f5b",
  190 + "#8ce99a", "#69db7c", "#51cf66", "#40c057", "#37b24d", "#2f9e44", "#2b8a3e",
  191 + "#c0eb75", "#a9e34b", "#94d82d", "#82c91e", "#74b816", "#66a80f", "#5c940d",
  192 + "#ffe066", "#ffd43b", "#fcc419", "#fab005", "#f59f00", "#f08c00", "#e67700",
  193 + "#ffc078", "#ffa94d", "#ff922b", "#fd7e14", "#f76707", "#e8590c", "#d9480f"
  194 + ],
  195 +
  196 + "availableBackgroundColors": [
  197 + { "color": "none", "value": "None" },
  198 + { "key": "[0,0,0]", "color": "#000000", "value": "Black" },
  199 + { "key": "[0,0,255]", "color": "#0000FF", "value": "Blue" },
  200 + { "key": "[255,0,0]", "color": "#FF0000", "value": "Red" },
  201 + { "key": "[0,255,255]", "color": "#00FFFF", "value": "Cyan" },
  202 + { "key": "[255,0,255]", "color": "#FF00FF", "value": "Magenta" },
  203 + { "key": "[0,128,0]", "color": "#008000", "value": "Green" },
  204 + { "key": "[128,128,128]", "color": "#808080", "value": "Gray" },
  205 + { "key": "[0,255,0]", "color": "#00FF00", "value": "Lime" },
  206 + { "key": "[128,0,0]", "color": "#800000", "value": "Maroon" },
  207 + { "key": "[0,0,128]", "color": "#000080", "value": "Navy" },
  208 + { "key": "[128,128,0]", "color": "#808000", "value": "Olive" },
  209 + { "key": "[128,0,128]", "color": "#800080", "value": "Purple" },
  210 + { "key": "[192,192,192]", "color": "#C0C0C0", "value": "Silver" },
  211 + { "key": "[0,128,128]", "color": "#008080", "value": "Teal" },
  212 + { "key": "[255,255,0]", "color": "#FFFF00", "value": "Yellow" },
  213 + { "key": "[0,64,64]", "color": "#004040", "value": "Cyprus" }
  214 + ],
  215 +
  216 + "availableStatusBarPositions": [
  217 + { "key": "top", "value": "Top" },
  218 + { "key": "bottom", "value": "Bottom" }
  219 + ],
  220 +
  221 + "availableStatusBarColorMaps": [
  222 + { "key": "0", "value": "0" },
  223 + { "key": "1", "value": "1" },
  224 + { "key": "2", "value": "2" }
  225 + ],
  226 +
  227 + "availablePageLayouts": [
  228 + { "key": "vertical", "value": "Vertical" },
  229 + { "key": "auto", "value": "Auto" },
  230 + { "key": "manual", "value": "Manual" }
  231 + ],
  232 +
  233 + "availableResamplingModes": [
  234 + { "key": "xparam", "value": "X Parameter" },
  235 + { "key": "yparam", "value": "Y Parameter" }
  236 + ],
  237 +
  238 + "availableOrbitSerieProjections": [
  239 + { "key": "XY", "value": "XY" },
  240 + { "key": "XZ", "value": "XZ" },
  241 + { "key": "YZ", "value": "YZ" },
  242 + { "key": "XR", "value": "XR" },
  243 + { "key": "YR", "value": "YR" },
  244 + { "key": "ZR", "value": "ZR" }
  245 + ],
  246 +
  247 + "availableHistogram2DFunctions": [
  248 + { "key": "density", "value": "Density" },
  249 + { "key": "normdensity", "value": "Normalised Density" },
  250 + { "key": "mean", "value": "Mean" },
  251 + { "key": "min", "value": "Minimum" },
  252 + { "key": "max", "value": "Maximum" },
  253 + { "key": "median", "value": "Median" },
  254 + { "key": "stadev", "value": "Standard Deviation" }
  255 + ],
  256 +
  257 + "availableDimsOnXAxis": [
  258 + { "key": "0", "value": "First dimension" },
  259 + { "key": "1", "value": "Second dimension" }
  260 + ],
  261 +
  262 + "availableTimeTickTypes": [
  263 + { "key": "auto", "value": "Auto" },
  264 + { "key": "time-step", "value": "Time step" },
  265 + { "key": "nb-major", "value": "Num. of major symb." }
  266 + ],
  267 +
  268 + "availableIntervalTickModes": [
  269 + { "key": "symbol-only", "value": "Symbol only" },
  270 + { "key": "interval-index", "value": "Interval index" },
  271 + { "key": "start-time", "value": "Start time" },
  272 + { "key": "start-stop-time", "value": "Start/Stop times" }
  273 + ],
  274 +
  275 + "availableErrorBarTypes": [
  276 + { "key": "min-max", "value": "Min./Max. Parameters" },
  277 + { "key": "delta", "value": "Delta parameter" }
  278 + ],
  279 +
  280 + "availableLegendSeriesTypes": [
  281 + { "key": "text-line-symbol", "value": "Text, Line & Symbols" },
  282 + { "key": "text-only", "value": "Text only" }
  283 + ],
  284 +
  285 + "availableLegendSeriesPositions": [
  286 + { "key": "inside", "value": "Inside" },
  287 + { "key": "outside", "value": "Outside" }
  288 + ],
  289 +
  290 + "availableLegendSeriesIntervalInfoTypes": [
  291 + { "key": "index", "value": "Interval Index" },
  292 + { "key": "start-stop", "value": "Interval Start/Stop" }
  293 + ],
  294 +
  295 + "availableLegendTextPositions": [
  296 + { "key": "right", "value": "Right" },
  297 + { "key": "left", "value": "Left" },
  298 + { "key": "top", "value": "Top" },
  299 + { "key": "bottom", "value": "Bottom" }
  300 + ],
  301 +
  302 + "availableConstantAxes": [
  303 + { "key": "x", "value": "X / Time / Epoch" },
  304 + { "key": "y-left", "value": "Y Left" },
  305 + { "key": "y-right", "value": "Y Right" }
  306 + ],
  307 +
  308 + "availableTextAlignments": [
  309 + { "key": "left", "value": "Left" },
  310 + { "key": "center", "value": "Center" },
  311 + { "key": "right", "value": "Right" }
  312 + ],
  313 +
  314 + "availableFillTypes": [
  315 + { "key": "serie-constant", "value": "Serie / Constant" },
  316 + { "key": "serie-serie", "value": "Serie / Serie" }
  317 + ],
  318 + "availableSpectroNormalization": [
  319 + { "key": "none", "value": "None" },
  320 + { "key": "linear", "value": "Linear" },
  321 + { "key": "log", "value": "Logarithmic" }
  322 + ],
  323 +
  324 + "availableFilteringLevel": [
  325 + { "key": 1, "value": "Weak" },
  326 + { "key": 2, "value": "Intermediate/moderated" },
  327 + { "key": 3, "value": "Strong" }
  328 + ]
  329 +}
0 \ No newline at end of file 330 \ No newline at end of file
generic_data/defaultValuesLinks.json 0 → 100644
  Diff comments   View file @9b67ae6
@@ -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":"colormap",
  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/AmdaApp.js
  Diff comments   View file @9b67ae6
@@ -13,6 +13,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, { @@ -13,6 +13,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
13 requires: [ 13 requires: [
14 'Ext.window.MessageBox', 14 'Ext.window.MessageBox',
15 'Ext.ux.desktop.ShortcutModel', 15 'Ext.ux.desktop.ShortcutModel',
  16 + 'amdaUI.DefaultValuesWindow',
16 'amdaUI.SampToolBarUI', 17 'amdaUI.SampToolBarUI',
17 'amdaDesktop.DynamicModule', 18 'amdaDesktop.DynamicModule',
18 'MyDesktop.Settings' 19 'MyDesktop.Settings'
@@ -417,8 +418,12 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, { @@ -417,8 +418,12 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
417 { 418 {
418 text : 'Workspaces', 419 text : 'Workspaces',
419 iconCls : 'icon-ws', 420 iconCls : 'icon-ws',
420 - disabled: true,  
421 - scope : this 421 + disabled: false,
  422 + scope : this,
  423 + handler:function(obj, e){
  424 + e.stopEvent();
  425 + Ext.create('amdaUI.DefaultValuesWindow').show();
  426 + }
422 }, '-', 427 }, '-',
423 { 428 {
424 text : 'Logout', 429 text : 'Logout',
js/app/models/DefaultValuesModel.js 0 → 100644
  Diff comments   View file @9b67ae6
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +Ext.define('amdaModel.DefaultValuesModel', {
  2 + extend: 'Ext.data.TreeModel',
  3 + fields: [
  4 + { name: 'parameter', type: 'string'},
  5 + { name: 'value'},
  6 + { name: 'modified', type: 'boolean' },
  7 + { name: 'default'}
  8 + ]
  9 +});
0 \ No newline at end of file 10 \ No newline at end of file
js/app/models/PlotObjects/PlotAxisObject.js
  Diff comments   View file @9b67ae6
@@ -17,10 +17,6 @@ Ext.define(&#39;amdaPlotObj.PlotAxisObject&#39;, { @@ -17,10 +17,6 @@ Ext.define(&#39;amdaPlotObj.PlotAxisObject&#39;, {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 idProperty: 'id', 18 idProperty: 'id',
19 19
20 - requires: [  
21 - 'amdaPlotObj.PlotObjectConfig'  
22 - ],  
23 -  
24 fields : [ 20 fields : [
25 {name: 'id', type: 'string'}, 21 {name: 'id', type: 'string'},
26 //axis-type can be : time, y-left, y-right, x, color, epoch 22 //axis-type can be : time, y-left, y-right, x, color, epoch
@@ -87,14 +83,14 @@ Ext.define(&#39;amdaPlotObj.PlotAxisObject&#39;, { @@ -87,14 +83,14 @@ Ext.define(&#39;amdaPlotObj.PlotAxisObject&#39;, {
87 { 83 {
88 this.set('axis-type', type); 84 this.set('axis-type', type);
89 this.set('axis-reverse', false); 85 this.set('axis-reverse', false);
90 - this.set('axis-scale', amdaPlotObj.PlotObjectConfig.defaultValues.axis.scale); 86 + this.set('axis-scale', amdaDefaultValues.plot.axis.scale);
91 this.set('axis-range-min', 0); 87 this.set('axis-range-min', 0);
92 this.set('axis-range-max', 0); 88 this.set('axis-range-max', 0);
93 this.set('axis-range-extend', true); 89 this.set('axis-range-extend', true);
94 - this.set('axis-color', amdaPlotObj.PlotObjectConfig.defaultValues.axis.color);  
95 - this.set('axis-thickness', amdaPlotObj.PlotObjectConfig.defaultValues.axis.thickness); 90 + this.set('axis-color', amdaDefaultValues.plot.axis.color);
  91 + this.set('axis-thickness', amdaDefaultValues.plot.axis.thickness);
96 this.set('axis-tick-showmarks', true); 92 this.set('axis-tick-showmarks', true);
97 - this.set('axis-tick-position', amdaPlotObj.PlotObjectConfig.defaultValues.axis.tickPosition); 93 + this.set('axis-tick-position', amdaDefaultValues.plot.axis.tickPosition);
98 this.set('axis-grid-minor-number',1); 94 this.set('axis-grid-minor-number',1);
99 this.set('axis-grid-major-number',1); 95 this.set('axis-grid-major-number',1);
100 this.set('axis-grid-minor-space',0); 96 this.set('axis-grid-minor-space',0);
@@ -105,15 +101,15 @@ Ext.define(&#39;amdaPlotObj.PlotAxisObject&#39;, { @@ -105,15 +101,15 @@ Ext.define(&#39;amdaPlotObj.PlotAxisObject&#39;, {
105 this.set('axis-grid-major', false); 101 this.set('axis-grid-major', false);
106 this.set('axis-legend-activated', true); 102 this.set('axis-legend-activated', true);
107 this.set('axis-legend-text', ''); 103 this.set('axis-legend-text', '');
108 - this.set('axis-legend-color', amdaPlotObj.PlotObjectConfig.defaultValues.axis.legend.color); 104 + this.set('axis-legend-color', amdaDefaultValues.plot.axis.legend.color);
109 this.set('axis-legend-font-activated', false); 105 this.set('axis-legend-font-activated', false);
110 - this.set('axis-legend-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.axis.legend.font.name);  
111 - this.set('axis-legend-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.axis.legend.font.size); 106 + this.set('axis-legend-font-name', amdaDefaultValues.plot.axis.legend.font.name);
  107 + this.set('axis-legend-font-size', amdaDefaultValues.plot.axis.legend.font.size);
112 this.set('axis-legend-font-bold', false); 108 this.set('axis-legend-font-bold', false);
113 this.set('axis-legend-font-italic', false); 109 this.set('axis-legend-font-italic', false);
114 - this.set('axis-time-format', amdaPlotObj.PlotObjectConfig.defaultValues.axis.timeFormat); 110 + this.set('axis-time-format', amdaDefaultValues.plot.axis.timeFormat);
115 this.set('axis-epoch-normalized', false); 111 this.set('axis-epoch-normalized', false);
116 - this.set('axis-color-map', amdaPlotObj.PlotObjectConfig.defaultValues.axis.colorMap); 112 + this.set('axis-color-map', amdaDefaultValues.plot.axis.colorMap);
117 this.set('axis-color-minval', 'none'); 113 this.set('axis-color-minval', 'none');
118 this.set('axis-color-maxval', 'none'); 114 this.set('axis-color-maxval', 'none');
119 }, 115 },
js/app/models/PlotObjects/PlotBaseSerieObject.js
  Diff comments   View file @9b67ae6
@@ -15,11 +15,7 @@ @@ -15,11 +15,7 @@
15 15
16 Ext.define('amdaPlotObj.PlotBaseSerieObject', { 16 Ext.define('amdaPlotObj.PlotBaseSerieObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 -  
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 - 18 +
23 fields: [ 19 fields: [
24 {name: 'serie-yaxis', type: 'string'}, 20 {name: 'serie-yaxis', type: 'string'},
25 {name: 'serie-resolution', type: 'int'}, 21 {name: 'serie-resolution', type: 'int'},
@@ -87,54 +83,54 @@ Ext.define(&#39;amdaPlotObj.PlotBaseSerieObject&#39;, { @@ -87,54 +83,54 @@ Ext.define(&#39;amdaPlotObj.PlotBaseSerieObject&#39;, {
87 83
88 setDefaultValues: function () 84 setDefaultValues: function ()
89 { 85 {
90 - this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis);  
91 - this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution); 86 + this.set('serie-yaxis', amdaDefaultValues.plot.serie.yAxis);
  87 + this.set('serie-resolution', amdaDefaultValues.plot.serie.resolution);
92 88
93 this.set('serie-lines-activated', true); 89 this.set('serie-lines-activated', true);
94 - this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);  
95 - this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);  
96 - this.set('serie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color); 90 + this.set('serie-lines-style', amdaDefaultValues.plot.serie.lines.style);
  91 + this.set('serie-lines-width', amdaDefaultValues.plot.serie.lines.width);
  92 + this.set('serie-lines-color', amdaDefaultValues.plot.serie.lines.color);
97 93
98 this.set('serie-symbols-activated', false); 94 this.set('serie-symbols-activated', false);
99 - this.set('serie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);  
100 - this.set('serie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);  
101 - this.set('serie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color); 95 + this.set('serie-symbols-type', amdaDefaultValues.plot.serie.symbols.type);
  96 + this.set('serie-symbols-size', amdaDefaultValues.plot.serie.symbols.size);
  97 + this.set('serie-symbols-color', amdaDefaultValues.plot.serie.symbols.color);
102 this.set('serie-colored-param', ''); 98 this.set('serie-colored-param', '');
103 99
104 this.set('serie-timetick-activated', false); 100 this.set('serie-timetick-activated', false);
105 - this.set('serie-timetick-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.type);  
106 - this.set('serie-timetick-step', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.step);  
107 - this.set('serie-timetick-nbmajor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbmajor);  
108 - this.set('serie-timetick-nbminor', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.nbminor);  
109 - this.set('serie-timetick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.color);  
110 - this.set('serie-timetick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.type);  
111 - this.set('serie-timetick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.size);  
112 - this.set('serie-timetick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.symbols.color); 101 + this.set('serie-timetick-type', amdaDefaultValues.plot.serie.timetick.type);
  102 + this.set('serie-timetick-step', amdaDefaultValues.plot.serie.timetick.step);
  103 + this.set('serie-timetick-nbmajor', amdaDefaultValues.plot.serie.timetick.nbmajor);
  104 + this.set('serie-timetick-nbminor', amdaDefaultValues.plot.serie.timetick.nbminor);
  105 + this.set('serie-timetick-color', amdaDefaultValues.plot.serie.timetick.color);
  106 + this.set('serie-timetick-symbols-type', amdaDefaultValues.plot.serie.timetick.symbols.type);
  107 + this.set('serie-timetick-symbols-size', amdaDefaultValues.plot.serie.timetick.symbols.size);
  108 + this.set('serie-timetick-symbols-color', amdaDefaultValues.plot.serie.timetick.symbols.color);
113 this.set('serie-timetick-firstsymbols-activated', true); 109 this.set('serie-timetick-firstsymbols-activated', true);
114 - this.set('serie-timetick-firstsymbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.type);  
115 - this.set('serie-timetick-firstsymbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.size);  
116 - this.set('serie-timetick-firstsymbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.firstsymbols.color); 110 + this.set('serie-timetick-firstsymbols-type', amdaDefaultValues.plot.serie.timetick.firstsymbols.type);
  111 + this.set('serie-timetick-firstsymbols-size', amdaDefaultValues.plot.serie.timetick.firstsymbols.size);
  112 + this.set('serie-timetick-firstsymbols-color', amdaDefaultValues.plot.serie.timetick.firstsymbols.color);
117 this.set('serie-timetick-font-activated', false); 113 this.set('serie-timetick-font-activated', false);
118 - this.set('serie-timetick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.name);  
119 - this.set('serie-timetick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.timetick.font.size); 114 + this.set('serie-timetick-font-name', amdaDefaultValues.plot.serie.timetick.font.name);
  115 + this.set('serie-timetick-font-size', amdaDefaultValues.plot.serie.timetick.font.size);
120 this.set('serie-timetick-font-bold', false); 116 this.set('serie-timetick-font-bold', false);
121 this.set('serie-timetick-font-italic', false); 117 this.set('serie-timetick-font-italic', false);
122 118
123 this.set('serie-intervaltick-activated', false); 119 this.set('serie-intervaltick-activated', false);
124 - this.set('serie-intervaltick-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.mode);  
125 - this.set('serie-intervaltick-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.color);  
126 - this.set('serie-intervaltick-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.type);  
127 - this.set('serie-intervaltick-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.size);  
128 - this.set('serie-intervaltick-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.symbols.color); 120 + this.set('serie-intervaltick-mode', amdaDefaultValues.plot.serie.intervaltick.mode);
  121 + this.set('serie-intervaltick-color', amdaDefaultValues.plot.serie.intervaltick.color);
  122 + this.set('serie-intervaltick-symbols-type', amdaDefaultValues.plot.serie.intervaltick.symbols.type);
  123 + this.set('serie-intervaltick-symbols-size', amdaDefaultValues.plot.serie.intervaltick.symbols.size);
  124 + this.set('serie-intervaltick-symbols-color', amdaDefaultValues.plot.serie.intervaltick.symbols.color);
129 this.set('serie-intervaltick-font-activated', false); 125 this.set('serie-intervaltick-font-activated', false);
130 - this.set('serie-intervaltick-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.name);  
131 - this.set('serie-intervaltick-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.intervaltick.font.size); 126 + this.set('serie-intervaltick-font-name', amdaDefaultValues.plot.serie.intervaltick.font.name);
  127 + this.set('serie-intervaltick-font-size', amdaDefaultValues.plot.serie.intervaltick.font.size);
132 this.set('serie-intervaltick-font-bold', false); 128 this.set('serie-intervaltick-font-bold', false);
133 this.set('serie-intervaltick-font-italic', false); 129 this.set('serie-intervaltick-font-italic', false);
134 130
135 // filtering 131 // filtering
136 this.set( 'filtering-activated', false); 132 this.set( 'filtering-activated', false);
137 - this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level); 133 + this.set('filtering-level', amdaDefaultValues.plot.filtering.level);
138 }, 134 },
139 135
140 loadFromData: function (drawData) 136 loadFromData: function (drawData)
js/app/models/PlotObjects/PlotConstantObject.js
  Diff comments   View file @9b67ae6
@@ -57,16 +57,16 @@ Ext.define(&#39;amdaPlotObj.PlotConstantObject&#39;, { @@ -57,16 +57,16 @@ Ext.define(&#39;amdaPlotObj.PlotConstantObject&#39;, {
57 57
58 setDefaultValues: function() 58 setDefaultValues: function()
59 { 59 {
60 - this.set('constant-axis-id', amdaPlotObj.PlotObjectConfig.defaultValues.constants.axisId); 60 + this.set('constant-axis-id', amdaDefaultValues.plot.constants.axisId);
61 this.set('constant-float-value', 0.); 61 this.set('constant-float-value', 0.);
62 - this.set('constant-line-style', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.style);  
63 - this.set('constant-line-width', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.width);  
64 - this.set('constant-line-color', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.color); 62 + this.set('constant-line-style', amdaDefaultValues.plot.constants.line.style);
  63 + this.set('constant-line-width', amdaDefaultValues.plot.constants.line.width);
  64 + this.set('constant-line-color', amdaDefaultValues.plot.constants.line.color);
65 }, 65 },
66 66
67 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/PlotCurveObject.js
  Diff comments   View file @9b67ae6
@@ -146,9 +146,9 @@ Ext.define(&#39;amdaPlotObj.PlotCurveObject&#39;, { @@ -146,9 +146,9 @@ Ext.define(&#39;amdaPlotObj.PlotCurveObject&#39;, {
146 { 146 {
147 this.set('curve-name', ''); 147 this.set('curve-name', '');
148 this.set('curve-serie-id', null); 148 this.set('curve-serie-id', null);
149 - this.set('curve-line-style', amdaPlotObj.PlotObjectConfig.defaultValues.curves.line.style);  
150 - this.set('curve-line-width', amdaPlotObj.PlotObjectConfig.defaultValues.curves.line.width);  
151 - this.set('curve-line-color', amdaPlotObj.PlotObjectConfig.defaultValues.curves.line.color); 149 + this.set('curve-line-style', amdaDefaultValues.plot.curves.line.style);
  150 + this.set('curve-line-width', amdaDefaultValues.plot.curves.line.width);
  151 + this.set('curve-line-color', amdaDefaultValues.plot.curves.line.color);
152 }, 152 },
153 153
154 isDirty : function() 154 isDirty : function()
js/app/models/PlotObjects/PlotCurveParamObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotCurveParamObject', { 16 Ext.define('amdaPlotObj.PlotCurveParamObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 {name: 'curve-param-name', type: 'string'}, 20 {name: 'curve-param-name', type: 'string'},
25 {name: 'curve-param-internal', type: 'boolean'}, 21 {name: 'curve-param-internal', type: 'boolean'},
js/app/models/PlotObjects/PlotFillObject.js
  Diff comments   View file @9b67ae6
@@ -47,17 +47,17 @@ Ext.define(&#39;amdaPlotObj.PlotFillObject&#39;, { @@ -47,17 +47,17 @@ Ext.define(&#39;amdaPlotObj.PlotFillObject&#39;, {
47 47
48 setDefaultValues: function() 48 setDefaultValues: function()
49 { 49 {
50 - this.set('fill-type', amdaPlotObj.PlotObjectConfig.defaultValues.fills.type); 50 + this.set('fill-type', amdaDefaultValues.plot.fills.type);
51 this.set('fill-firstserie-id', null); 51 this.set('fill-firstserie-id', null);
52 this.set('fill-secondserie-id', null); 52 this.set('fill-secondserie-id', null);
53 this.set('fill-constant-id', null); 53 this.set('fill-constant-id', null);
54 - this.set('fill-greater-color', amdaPlotObj.PlotObjectConfig.defaultValues.fills.greaterColor);  
55 - this.set('fill-less-color', amdaPlotObj.PlotObjectConfig.defaultValues.fills.lessColor); 54 + this.set('fill-greater-color', amdaDefaultValues.plot.fills.greaterColor);
  55 + this.set('fill-less-color', amdaDefaultValues.plot.fills.lessColor);
56 }, 56 },
57 57
58 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/PlotHistogram2DSerieObject.js
  Diff comments   View file @9b67ae6
@@ -35,12 +35,12 @@ Ext.define(&#39;amdaPlotObj.PlotHistogram2DSerieObject&#39;, { @@ -35,12 +35,12 @@ Ext.define(&#39;amdaPlotObj.PlotHistogram2DSerieObject&#39;, {
35 setDefaultValues: function() 35 setDefaultValues: function()
36 { 36 {
37 this.set('serie-xaxis-param', ''); 37 this.set('serie-xaxis-param', '');
38 - this.set('serie-resampling-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resamplingMode);  
39 - this.set('histo2d-function', 'density'); 38 + this.set('serie-resampling-mode', amdaDefaultValues.plot.serie.resamplingMode);
  39 + this.set('histo2d-function', amdaDefaultValues.plot.histogram2D.histo2DFunction);
40 this.set('histotype-param', ''); 40 this.set('histotype-param', '');
41 - this.set('histo2d-xbinnumber', amdaPlotObj.PlotObjectConfig.defaultValues.histogram2D.xbinnumber);  
42 - this.set('histo2d-ybinnumber', amdaPlotObj.PlotObjectConfig.defaultValues.histogram2D.ybinnumber);  
43 - this.set('histo2d-smoothfactor', amdaPlotObj.PlotObjectConfig.defaultValues.histogram2D.smoothfactor) 41 + this.set('histo2d-xbinnumber', amdaDefaultValues.plot.histogram2D.xbinnumber);
  42 + this.set('histo2d-ybinnumber', amdaDefaultValues.plot.histogram2D.ybinnumber);
  43 + this.set('histo2d-smoothfactor', amdaDefaultValues.plot.histogram2D.smoothfactor)
44 44
45 this.callParent(arguments); 45 this.callParent(arguments);
46 }, 46 },
js/app/models/PlotObjects/PlotInstantSerieObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotInstantSerieObject', { 16 Ext.define('amdaPlotObj.PlotInstantSerieObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 {name: 'iserie-tableonx', type: 'boolean'}, 20 {name: 'iserie-tableonx', type: 'boolean'},
25 {name: 'iserie-lines-activated', type: 'boolean'}, 21 {name: 'iserie-lines-activated', type: 'boolean'},
@@ -50,13 +46,13 @@ Ext.define(&#39;amdaPlotObj.PlotInstantSerieObject&#39;, { @@ -50,13 +46,13 @@ Ext.define(&#39;amdaPlotObj.PlotInstantSerieObject&#39;, {
50 { 46 {
51 this.set('iserie-tableonx', false); 47 this.set('iserie-tableonx', false);
52 this.set('iserie-lines-activated', true); 48 this.set('iserie-lines-activated', true);
53 - this.set('iserie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);  
54 - this.set('iserie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);  
55 - this.set('iserie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color); 49 + this.set('iserie-lines-style', amdaDefaultValues.plot.serie.lines.style);
  50 + this.set('iserie-lines-width', amdaDefaultValues.plot.serie.lines.width);
  51 + this.set('iserie-lines-color', amdaDefaultValues.plot.serie.lines.color);
56 this.set('iserie-symbols-activated', false); 52 this.set('iserie-symbols-activated', false);
57 - this.set('iserie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);  
58 - this.set('iserie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);  
59 - this.set('iserie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color); 53 + this.set('iserie-symbols-type', amdaDefaultValues.plot.serie.symbols.type);
  54 + this.set('iserie-symbols-size', amdaDefaultValues.plot.serie.symbols.size);
  55 + this.set('iserie-symbols-color', amdaDefaultValues.plot.serie.symbols.color);
60 }, 56 },
61 57
62 getJsonValues : function() 58 getJsonValues : function()
js/app/models/PlotObjects/PlotInstantSpectroObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotInstantSpectroObject', { 16 Ext.define('amdaPlotObj.PlotInstantSpectroObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 {name: 'ispectro-dimonxaxis', type: 'int'} 20 {name: 'ispectro-dimonxaxis', type: 'int'}
25 ], 21 ],
js/app/models/PlotObjects/PlotIntervalsObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotIntervalsObject', { 16 Ext.define('amdaPlotObj.PlotIntervalsObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields: [ 19 fields: [
24 { name: 'intervals-color', type: 'string', defaultValue: "none" }, 20 { name: 'intervals-color', type: 'string', defaultValue: "none" },
25 { name: 'legend-text-activated', type: 'boolean', defaultValue: true}, 21 { name: 'legend-text-activated', type: 'boolean', defaultValue: true},
@@ -50,14 +46,14 @@ Ext.define(&#39;amdaPlotObj.PlotIntervalsObject&#39;, { @@ -50,14 +46,14 @@ Ext.define(&#39;amdaPlotObj.PlotIntervalsObject&#39;, {
50 46
51 setDefaultValues: function() 47 setDefaultValues: function()
52 { 48 {
53 - this.set('intervals-color', amdaPlotObj.PlotObjectConfig.defaultValues.intervals.color); 49 + this.set('intervals-color', amdaDefaultValues.plot.intervals.color);
54 this.set('legend-text-activated', true); 50 this.set('legend-text-activated', true);
55 this.set('legend-text-value', ''); 51 this.set('legend-text-value', '');
56 - this.set('legend-text-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.position);  
57 - this.set('legend-text-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.color); 52 + this.set('legend-text-position', amdaDefaultValues.plot.legends.text.position);
  53 + this.set('legend-text-color', amdaDefaultValues.plot.legends.text.color);
58 this.set('legend-text-font-activated', false); 54 this.set('legend-text-font-activated', false);
59 - this.set('legend-text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.name);  
60 - this.set('legend-text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.size); 55 + this.set('legend-text-font-name', amdaDefaultValues.plot.legends.text.font.name);
  56 + this.set('legend-text-font-size', amdaDefaultValues.plot.legends.text.font.size);
61 this.set('legend-text-font-bold', false); 57 this.set('legend-text-font-bold', false);
62 this.set('legend-text-font-italic', false); 58 this.set('legend-text-font-italic', false);
63 59
js/app/models/PlotObjects/PlotLayoutAutoObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotLayoutAutoObject', { 16 Ext.define('amdaPlotObj.PlotLayoutAutoObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 {name: 'layout-panel-height', type: 'float'}, 20 {name: 'layout-panel-height', type: 'float'},
25 {name: 'layout-panel-spacing', type: 'float'}, 21 {name: 'layout-panel-spacing', type: 'float'},
@@ -44,10 +40,10 @@ Ext.define(&#39;amdaPlotObj.PlotLayoutAutoObject&#39;, { @@ -44,10 +40,10 @@ Ext.define(&#39;amdaPlotObj.PlotLayoutAutoObject&#39;, {
44 40
45 setDefaultValues: function() 41 setDefaultValues: function()
46 { 42 {
47 - this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);  
48 - this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);  
49 - this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);  
50 - this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend); 43 + this.set('layout-panel-height', amdaDefaultValues.plot.page.layout.panelHeight);
  44 + this.set('layout-panel-spacing', amdaDefaultValues.plot.page.layout.panelSpacing);
  45 + this.set('layout-expand', amdaDefaultValues.plot.page.layout.expand);
  46 + this.set('layout-timeaxes-legend-lowerone', amdaDefaultValues.plot.page.layout.timeAxesLegend);
51 }, 47 },
52 48
53 getJsonValues : function() 49 getJsonValues : function()
js/app/models/PlotObjects/PlotLayoutManualObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotLayoutManualObject', { 16 Ext.define('amdaPlotObj.PlotLayoutManualObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 {name: 'layout-timeplot-margin-left', type: 'float', useNull:true}, 20 {name: 'layout-timeplot-margin-left', type: 'float', useNull:true},
25 {name: 'layout-timeplot-margin-right', type: 'float', useNull:true}, 21 {name: 'layout-timeplot-margin-right', type: 'float', useNull:true},
js/app/models/PlotObjects/PlotLayoutVerticalObject.js
  Diff comments   View file @9b67ae6
@@ -15,11 +15,7 @@ @@ -15,11 +15,7 @@
15 15
16 Ext.define('amdaPlotObj.PlotLayoutVerticalObject', { 16 Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 -  
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 - 18 +
23 fields : [ 19 fields : [
24 {name: 'layout-panel-height', type: 'float'}, 20 {name: 'layout-panel-height', type: 'float'},
25 {name: 'layout-panel-spacing', type: 'float'}, 21 {name: 'layout-panel-spacing', type: 'float'},
@@ -47,10 +43,10 @@ Ext.define(&#39;amdaPlotObj.PlotLayoutVerticalObject&#39;, { @@ -47,10 +43,10 @@ Ext.define(&#39;amdaPlotObj.PlotLayoutVerticalObject&#39;, {
47 43
48 setDefaultValues: function() 44 setDefaultValues: function()
49 { 45 {
50 - this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);  
51 - this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);  
52 - this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);  
53 - this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend); 46 + this.set('layout-panel-height', amdaDefaultValues.plot.page.layout.panelHeight);
  47 + this.set('layout-panel-spacing', amdaDefaultValues.plot.page.layout.panelSpacing);
  48 + this.set('layout-expand', amdaDefaultValues.plot.page.layout.expand);
  49 + this.set('layout-timeaxes-legend-lowerone', amdaDefaultValues.plot.page.layout.timeAxesLegend);
54 }, 50 },
55 51
56 getJsonValues : function() 52 getJsonValues : function()
js/app/models/PlotObjects/PlotLegendSeriesObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotLegendSeriesObject', { 16 Ext.define('amdaPlotObj.PlotLegendSeriesObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 {name: 'legend-series-activated', type: 'boolean'}, 20 {name: 'legend-series-activated', type: 'boolean'},
25 {name: 'legend-series-type', type: 'string'}, 21 {name: 'legend-series-type', type: 'string'},
@@ -54,17 +50,17 @@ Ext.define(&#39;amdaPlotObj.PlotLegendSeriesObject&#39;, { @@ -54,17 +50,17 @@ Ext.define(&#39;amdaPlotObj.PlotLegendSeriesObject&#39;, {
54 setDefaultValues: function() 50 setDefaultValues: function()
55 { 51 {
56 this.set('legend-series-activated', false); 52 this.set('legend-series-activated', false);
57 - this.set('legend-series-type', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.type);  
58 - this.set('legend-series-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.position); 53 + this.set('legend-series-type', amdaDefaultValues.plot.legends.series.type);
  54 + this.set('legend-series-position', amdaDefaultValues.plot.legends.series.position);
59 this.set('legend-series-showparaminfo', true); 55 this.set('legend-series-showparaminfo', true);
60 - this.set('legend-series-defaulttextcolor', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.text.color); 56 + this.set('legend-series-defaulttextcolor', amdaDefaultValues.plot.legends.series.text.color);
61 this.set('legend-series-border-activated', false); 57 this.set('legend-series-border-activated', false);
62 - this.set('legend-series-border-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.border.color); 58 + this.set('legend-series-border-color', amdaDefaultValues.plot.legends.series.border.color);
63 this.set('legend-series-intervalinfo-activated', false); 59 this.set('legend-series-intervalinfo-activated', false);
64 - this.set('legend-series-intervalinfo-type', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.intervalinfo.type); 60 + this.set('legend-series-intervalinfo-type', amdaDefaultValues.plot.legends.series.intervalinfo.type);
65 this.set('legend-series-font-activated', false); 61 this.set('legend-series-font-activated', false);
66 - this.set('legend-series-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.name);  
67 - this.set('legend-series-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.size); 62 + this.set('legend-series-font-name', amdaDefaultValues.plot.legends.series.font.name);
  63 + this.set('legend-series-font-size', amdaDefaultValues.plot.legends.series.font.size);
68 this.set('legend-series-font-bold', false); 64 this.set('legend-series-font-bold', false);
69 this.set('legend-series-font-italic', false); 65 this.set('legend-series-font-italic', false);
70 }, 66 },
js/app/models/PlotObjects/PlotLegendTextObject.js
  Diff comments   View file @9b67ae6
@@ -50,18 +50,18 @@ Ext.define(&#39;amdaPlotObj.PlotLegendTextObject&#39;, { @@ -50,18 +50,18 @@ Ext.define(&#39;amdaPlotObj.PlotLegendTextObject&#39;, {
50 setDefaultValues: function() 50 setDefaultValues: function()
51 { 51 {
52 this.set('legend-text-value', ''); 52 this.set('legend-text-value', '');
53 - this.set('legend-text-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.position);  
54 - this.set('legend-text-color', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.color); 53 + this.set('legend-text-position', amdaDefaultValues.plot.legends.text.position);
  54 + this.set('legend-text-color', amdaDefaultValues.plot.legends.text.color);
55 this.set('legend-text-font-activated', false); 55 this.set('legend-text-font-activated', false);
56 - this.set('legend-text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.name);  
57 - this.set('legend-text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.text.font.size); 56 + this.set('legend-text-font-name', amdaDefaultValues.plot.legends.text.font.name);
  57 + this.set('legend-text-font-size', amdaDefaultValues.plot.legends.text.font.size);
58 this.set('legend-text-font-bold', false); 58 this.set('legend-text-font-bold', false);
59 this.set('legend-text-font-italic', false); 59 this.set('legend-text-font-italic', false);
60 }, 60 },
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 @9b67ae6
@@ -16,212 +16,6 @@ @@ -16,212 +16,6 @@
16 Ext.define('amdaPlotObj.PlotObjectConfig', { 16 Ext.define('amdaPlotObj.PlotObjectConfig', {
17 singleton: true, 17 singleton: true,
18 18
19 - defaultValues: {  
20 - file: {  
21 - format: 'PNG',  
22 - output: 'INTERACTIVE',  
23 - oneFilePerInterval: false  
24 - },  
25 - tree: {  
26 - fullView: false  
27 - },  
28 - page: {  
29 - xMargin: 5.,  
30 - yMargin: 5.,  
31 - mode: 'color',  
32 - orientation: 'landscape',  
33 - dimension: 'ISO A4',  
34 - title: {  
35 - position: 'top',  
36 - alignment: ' center',  
37 - color: '#000000'  
38 - },  
39 - font: {  
40 - name: 'sans-serif',  
41 - size: '8'  
42 - },  
43 - layout: {  
44 - type: 'vertical',  
45 - panelHeight: 0.5,  
46 - panelSpacing: 0.,  
47 - expand: false,  
48 - timeAxesLegend: true  
49 - }  
50 - },  
51 - panel: {  
52 - plotType: 'timePlot',  
53 - isotropic: false,  
54 - title: {  
55 - position: 'top',  
56 - alignment: ' center',  
57 - color: '#000000'  
58 - },  
59 - font: {  
60 - name: 'sans-serif',  
61 - size: '8'  
62 - },  
63 - backgroundColor: 'none',  
64 - status: {  
65 - position: 'top',  
66 - colorMap: 0  
67 - }  
68 - },  
69 - axis: {  
70 - scale: 'linear',  
71 - tickPosition: 'outwards',  
72 - color: '#000000',  
73 - thickness: '1',  
74 - legend: {  
75 - color: '#000000',  
76 - font: {  
77 - name: 'sans-serif',  
78 - size: '8'  
79 - }  
80 - },  
81 - timeFormat: 'dd/mm/yy',  
82 - colorMap: '4'  
83 - },  
84 - serie: {  
85 - yAxis: 'y-left',  
86 - resolution: 3000,  
87 - lines: {  
88 - style: 'plain',  
89 - width: 1,  
90 - color: 'auto'  
91 - },  
92 - symbols: {  
93 - type: 'dot',  
94 - size: 3,  
95 - color: 'auto'  
96 - },  
97 - resamplingMode: 'xparam',  
98 - timetick: {  
99 - type: 'auto',  
100 - step: 3600,  
101 - nbmajor: 5,  
102 - nbminor: 5,  
103 - color: '#FF0000',  
104 - symbols: {  
105 - type: 'full-circle',  
106 - size: 10,  
107 - color: '#FF0000'  
108 - },  
109 - firstsymbols: {  
110 - type: 'triangle',  
111 - size: 4,  
112 - color: '#00FF00'  
113 - },  
114 - font: {  
115 - name: 'sans-serif',  
116 - size: '8'  
117 - }  
118 - },  
119 - intervaltick: {  
120 - mode: 'start-time',  
121 - color: '#FF0000',  
122 - symbols: {  
123 - type: 'full-circle',  
124 - size: 10,  
125 - color: '#FF0000'  
126 - },  
127 - font: {  
128 - name: 'sans-serif',  
129 - size: '8'  
130 - }  
131 - },  
132 - errorbar: {  
133 - type: 'min-max',  
134 - lines: {  
135 - style: 'plain',  
136 - width: 1,  
137 - color: 'auto'  
138 - }  
139 - },  
140 - projection: 'XY',  
141 - },  
142 - spectro: {  
143 - yAxis: 'y-left',  
144 - resolution: 3000  
145 - },  
146 - histogram2D:{  
147 - histo2DFunction: 'density',  
148 - xbinnumber: 100,  
149 - ybinnumber: 100,  
150 - smoothfactor: 1,  
151 - },  
152 - sauvaud: {  
153 - yAxis: 'y-right',  
154 - resolution: 3000  
155 - },  
156 - intervals: {  
157 - color: "#FF0000"  
158 - },  
159 - statusbar: {  
160 - color: "#FF0000"  
161 - },  
162 - legends: {  
163 - series: {  
164 - type: 'text-only',  
165 - position: 'outside',  
166 - text: {  
167 - color: '#000000'  
168 - },  
169 - border: {  
170 - color: '#000000'  
171 - },  
172 - intervalinfo: {  
173 - type: 'start-stop'  
174 - },  
175 - font: {  
176 - name: 'sans-serif',  
177 - size: '8'  
178 - }  
179 - },  
180 - text: {  
181 - position: 'left',  
182 - color: '#000000',  
183 - font: {  
184 - name: 'sans-serif',  
185 - size: '8'  
186 - }  
187 - }  
188 - },  
189 - constants: {  
190 - axisId: 'y-left',  
191 - line: {  
192 - style: 'plain',  
193 - width: 1,  
194 - color: '#000000'  
195 - }  
196 - },  
197 - textObjs: {  
198 - yAxisId: 'y-left',  
199 - xRelative: true,  
200 - yRelative: true,  
201 - align: 'left',  
202 - color: '#000000',  
203 - font: {  
204 - name: 'sans-serif',  
205 - size: '8'  
206 - }  
207 - },  
208 - curves: {  
209 - line: {  
210 - style: 'plain',  
211 - width: 1,  
212 - color: '#000000'  
213 - }  
214 - },  
215 - fills: {  
216 - type: 'serie-constant',  
217 - greaterColor: 'none',  
218 - lessColor: 'none'  
219 - },  
220 - filtering: {  
221 - level: 1  
222 - }  
223 - },  
224 -  
225 getValueByKey: function (dataList, key) { 19 getValueByKey: function (dataList, key) {
226 var value = ''; 20 var value = '';
227 Ext.each(dataList, function (data) { 21 Ext.each(dataList, function (data) {
@@ -233,334 +27,6 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, { @@ -233,334 +27,6 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
233 return value; 27 return value;
234 }, 28 },
235 29
236 - availableFileFormats: [  
237 - { 'key': 'PNG', 'value': 'PNG' },  
238 - { 'key': 'PDF', 'value': 'PDF' },  
239 - { 'key': 'PS', 'value': 'PS' },  
240 - { 'key': 'SVG', 'value': 'SVG' }  
241 - ],  
242 -  
243 - availableFileOutputsForPng: [  
244 - { 'key': 'INTERACTIVE', 'value': 'screen' },  
245 - { 'key': 'TGZ', 'value': 'tar+gzip archive' },  
246 - { 'key': 'ZIP', 'value': 'zip archive' }  
247 - ],  
248 -  
249 - availableFileOutputsForOtherFormats: [  
250 - { 'key': 'TGZ', 'value': 'tar+gzip archive' },  
251 - { 'key': 'ZIP', 'value': 'zip archive' }  
252 - ],  
253 -  
254 - availablePageModes: [  
255 - { 'key': 'color', 'value': 'Color' },  
256 - { 'key': 'grayscale', 'value': 'Grayscale' }  
257 - ],  
258 -  
259 - availablePageOrientations: [  
260 - { 'key': 'landscape', 'value': 'Landscape' },  
261 - { 'key': 'portrait', 'value': 'Portrait' }  
262 - ],  
263 -  
264 - availablePageDimensions: [  
265 - { 'key': 'ISO A4', 'value': 'ISO A4' },  
266 - { 'key': 'US letter', 'value': 'US letter' }  
267 - ],  
268 -  
269 - availablePlotTypes: [  
270 - { 'key': 'timePlot', value: 'Time Plot' },  
271 - { 'key': 'xyPlot', value: 'Scatter Plot' },  
272 - { 'key': 'epochPlot', value: 'Epoch Plot' },  
273 - { 'key': 'instantPlot', value: 'Instant Plot' },  
274 - { 'key': 'statusPlot', value: 'Status Plot' },  
275 - { 'key': 'tickPlot', value: 'Tick Plot' }  
276 - ],  
277 -  
278 - availableFontNames: [  
279 - { 'key': 'sans-serif', 'value': 'sans-serif' },  
280 - { 'key': 'serif', 'value': 'serif' },  
281 - { 'key': 'monospace', 'value': 'monospace' },  
282 - { 'key': 'script', 'value': 'script' }  
283 - ],  
284 -  
285 - availableTitlePositions: [  
286 - { 'key': 'top', 'value': 'Top' },  
287 - { 'key': 'bottom', 'value': 'Bottom' }  
288 - ],  
289 -  
290 - availableTitleAlignments: [  
291 - { 'key': 'center', 'value': 'Center' },  
292 - { 'key': 'left', 'value': 'Left' },  
293 - { 'key': 'right', 'value': 'Right' }  
294 - ],  
295 -  
296 - availableAxisScales: [  
297 - { 'key': 'linear', 'value': 'Linear' },  
298 - { 'key': 'logarithmic', 'value': 'Logarithmic' }  
299 - ],  
300 -  
301 - availableTicksPositions: [  
302 - { 'key': 'inwards', 'value': 'Inwards' },  
303 - { 'key': 'outwards', 'value': 'Outwards' }  
304 - ],  
305 -  
306 - availableTimeAxisFormats: [  
307 - { 'key': 'dd/mm/yy', 'value': 'dd/mm/yy' },  
308 - { 'key': 'ddd/yy', 'value': 'ddd/yy' },  
309 - { 'key': 'DD/MM/YYYY', 'value': 'dd/mm/yyyy' },  
310 - { 'key': 'yyyy/dd/mm', 'value': 'yyyy/dd/mm' },  
311 - { 'key': 'yyyy-dd-mm', 'value': 'yyyy-dd-mm' }  
312 - ],  
313 -  
314 - availableYAxes: [  
315 - { 'key': 'y-left', 'value': 'Left' },  
316 - { 'key': 'y-right', 'value': 'Right' }  
317 - ],  
318 -  
319 - availableResolutions: [  
320 - { 'key': 3000, 'value': '3000' },  
321 - { 'key': 10000, 'value': '10000' },  
322 - { 'key': 50000, 'value': '50000' },  
323 - { 'key': 100000, 'value': '100000' }  
324 - ],  
325 -  
326 - availableLinesStyles: [  
327 - { 'key': 'plain', 'value': 'Plain' },  
328 - { 'key': 'dot', 'value': 'Dot' },  
329 - { 'key': 'long-spaced-dot', 'value': 'Long spaced dot' },  
330 - { 'key': 'long-short-dot', 'value': 'Long short dot' }  
331 - ],  
332 -  
333 - availableSymbolsTypes: [  
334 - { 'key': 'dot', 'value': 'Dot' },  
335 - { 'key': 'plus', 'value': 'Plus' },  
336 - { 'key': 'wildcard', 'value': 'Wildcard' },  
337 - { 'key': 'circle', 'value': 'Circle' },  
338 - { 'key': 'crux', 'value': 'Crux' },  
339 - { 'key': 'square', 'value': 'Square' },  
340 - { 'key': 'triangle', 'value': 'Triangle' },  
341 - { 'key': 'crux-in-circle', 'value': 'Crux in circle' },  
342 - { 'key': 'dot-in-circle', 'value': 'Dot in circle' },  
343 - { 'key': 'diamond', 'value': 'Diamond' },  
344 - { 'key': 'star', 'value': 'Star' },  
345 - { 'key': 'david-star', 'value': 'David star' },  
346 - { 'key': 'full-square', 'value': 'Full square' },  
347 - { 'key': 'full-circle', 'value': 'Full circle' },  
348 - { 'key': 'full-star', 'value': 'Full star' }  
349 - ],  
350 -  
351 - availableColorMaps: [  
352 - { 'key': '0', 'value': 'Blue Red', 'svgFile':'cmap1_blue_red.svg' },  
353 - { 'key': '1', 'value': 'Default', 'svgFile':'cmap1_default.svg'},  
354 - { 'key': '2', 'value': 'Blue Yellow', 'svgFile':'cmap1_blue_yellow.svg' },  
355 - { 'key': '3', 'value': 'Grayscale', 'svgFile':'cmap1_gray.svg' },  
356 - { 'key': '4', 'value': 'AMDA Default', 'svgFile':'cmap1_amda_default.svg' },  
357 - { 'key': '5', 'value': 'GeoWhite', 'svgFile':'cmap1_geowhite.svg' },  
358 - { 'key': '6', 'value': 'GeoBlack', 'svgFile':'cmap1_geoblack.svg' },  
359 - { 'key': '7', 'value': 'Violet Yellow', 'svgFile':'cmap1_dark_violet_yellow.svg' },  
360 - { 'key': '8', 'value': 'Red Blue 4', 'svgFile':'cmap1_red_blue.svg' },  
361 - { 'key': '9', 'value': 'Acton', 'svgFile':'cmap1_acton.svg' },  
362 - { 'key': '11', 'value': 'Bamako', 'svgFile':'cmap1_bamako.svg' },  
363 - { 'key': '12', 'value': 'Batlow', 'svgFile':'cmap1_batlow.svg' },  
364 - { 'key': '13', 'value': 'BatlowK', 'svgFile':'cmap1_batlowK.svg' },  
365 - { 'key': '14', 'value': 'BatlowW', 'svgFile':'cmap1_batlowW.svg' },  
366 - { 'key': '15', 'value': 'Bilbao', 'svgFile':'cmap1_bilbao.svg' },  
367 - { 'key': '16', 'value': 'Buda', 'svgFile':'cmap1_buda.svg' },  
368 - { 'key': '17', 'value': 'Davos', 'svgFile':'cmap1_davos.svg' },  
369 - { 'key': '18', 'value': 'Devon', 'svgFile':'cmap1_devon.svg' },  
370 - { 'key': '19', 'value': 'GrayC', 'svgFile':'cmap1_grayC.svg' },  
371 - { 'key': '20', 'value': 'Hawaii', 'svgFile':'cmap1_hawaii.svg' },  
372 - { 'key': '21', 'value': 'Imola', 'svgFile':'cmap1_imola.svg' },  
373 - { 'key': '22', 'value': 'Lajolla', 'svgFile':'cmap1_lajolla.svg' },  
374 - { 'key': '23', 'value': 'Lapaz', 'svgFile':'cmap1_lapaz.svg' },  
375 - { 'key': '24', 'value': 'Nuuk', 'svgFile':'cmap1_nuuk.svg' },  
376 - { 'key': '25', 'value': 'Oslo', 'svgFile':'cmap1_oslo.svg' },  
377 - { 'key': '26', 'value': 'Tokyo', 'svgFile':'cmap1_tokyo.svg' },  
378 - { 'key': '27', 'value': 'Turku', 'svgFile':'cmap1_turku.svg' },  
379 -  
380 - { 'key': '28', 'value': 'Bam', 'svgFile':'cmap1_div_bam.svg' },  
381 - { 'key': '29', 'value': 'Berlin', 'svgFile':'cmap1_div_berlin.svg' },  
382 - { 'key': '30', 'value': 'Broc', 'svgFile':'cmap1_div_broc.svg' },  
383 - { 'key': '31', 'value': 'Cork', 'svgFile':'cmap1_div_cork.svg' },  
384 - { 'key': '32', 'value': 'Lisbon', 'svgFile':'cmap1_div_lisbon.svg' },  
385 - { 'key': '33', 'value': 'Roma', 'svgFile':'cmap1_div_roma.svg' },  
386 - { 'key': '34', 'value': 'Tofino', 'svgFile':'cmap1_div_tofino.svg' },  
387 - { 'key': '35', 'value': 'Vanimo', 'svgFile':'cmap1_div_vanimo.svg' },  
388 - { 'key': '36', 'value': 'vik', 'svgFile':'cmap1_div_vik.svg' }  
389 -  
390 - ],  
391 -  
392 - availableColors: [  
393 - { 'key': 'auto', 'color': 'auto', 'value': 'auto' },  
394 - { 'key': '[0,0,0]', 'color': '#000000', 'value': 'Black' },  
395 - { 'key': '[0,0,255]', 'color': '#0000ff', 'value': 'Blue' },  
396 - { 'key': '[255,0,0]', 'color': '#ff0000', 'value': 'Red' },  
397 - { 'key': '[0,255,255]', 'color': '#00ffff', 'value': 'Cyan' },  
398 - { 'key': '[255,0,255]', 'color': '#ff00ff', 'value': 'Magenta' },  
399 - { 'key': '[0,128,0]', 'color': '#008000', 'value': 'Green' },  
400 - { 'key': '[128,128,128]', 'color': '#808080', 'value': 'Gray' },  
401 - { 'key': '[0,255,0]', 'color': '#00ff00', 'value': 'Lime' },  
402 - { 'key': '[128,0,0]', 'color': '#800000', 'value': 'Maroon' },  
403 - { 'key': '[0,0,128]', 'color': '#000080', 'value': 'Navy' },  
404 - { 'key': '[128,128,0]', 'color': '#808000', 'value': 'Olive' },  
405 - { 'key': '[128,0,128]', 'color': '#800080', 'value': 'Purple' },  
406 - { 'key': '[192,192,192]', 'color': '#c0c0c0', 'value': 'Silver' },  
407 - { 'key': '[0,128,128]', 'color': '#008080', 'value': 'Teal' },  
408 - { 'key': '[255,255,0]', 'color': '#ffff00', 'value': 'Yellow' },  
409 - { 'key': '[0,64,64]', 'color': '#004040', 'value': 'Cyprus' }  
410 - ],  
411 -  
412 - availableColorsNew: [  
413 - "#000000", "#0000ff", "#ff0000", "#00ffff", "#ff00ff", "#008000", "#800000",  
414 - "#000080", "#808000", "#800080", "#c0c0c0", "#008080", "#ffff00", "#004040",  
415 - "#29d8d7", "#6b9842", "#73a9b4", "#1c883d", "#808080", "#4342dd", "#e84130",  
416 - "#dee2e6", "#ced4da", "#adb5bd", "#868e96", "#495057", "#343a40", "#212529",  
417 - "#ffa8a8", "#ff8787", "#ff6b6b", "#fa5252", "#f03e3e", "#e03131", "#c92a2a",  
418 - "#faa2c1", "#f783ac", "#f06595", "#e64980", "#d6336c", "#c2255c", "#a61e4d",  
419 - "#e599f7", "#da77f2", "#cc5de8", "#be4bdb", "#ae3ec9", "#9c36b5", "#862e9c",  
420 - "#b197fc", "#9775fa", "#845ef7", "#7950f2", "#7048e8", "#6741d9", "#5f3dc4",  
421 - "#91a7ff", "#748ffc", "#5c7cfa", "#4c6ef5", "#4263eb", "#3b5bdb", "#364fc7",  
422 - "#74c0fc", "#4dabf7", "#339af0", "#228be6", "#1c7ed6", "#1971c2", "#1864ab",  
423 - "#66d9e8", "#3bc9db", "#22b8cf", "#15aabf", "#1098ad", "#0c8599", "#0b7285",  
424 - "#63e6be", "#38d9a9", "#20c997", "#12b886", "#0ca678", "#099268", "#087f5b",  
425 - "#8ce99a", "#69db7c", "#51cf66", "#40c057", "#37b24d", "#2f9e44", "#2b8a3e",  
426 - "#c0eb75", "#a9e34b", "#94d82d", "#82c91e", "#74b816", "#66a80f", "#5c940d",  
427 - "#ffe066", "#ffd43b", "#fcc419", "#fab005", "#f59f00", "#f08c00", "#e67700",  
428 - "#ffc078", "#ffa94d", "#ff922b", "#fd7e14", "#f76707", "#e8590c", "#d9480f"  
429 - ],  
430 -  
431 - availableBackgroundColors: [  
432 - { 'color': 'none', 'value': 'None' },  
433 - { 'key': '[0,0,0]', 'color': '#000000', 'value': 'Black' },  
434 - { 'key': '[0,0,255]', 'color': '#0000FF', 'value': 'Blue' },  
435 - { 'key': '[255,0,0]', 'color': '#FF0000', 'value': 'Red' },  
436 - { 'key': '[0,255,255]', 'color': '#00FFFF', 'value': 'Cyan' },  
437 - { 'key': '[255,0,255]', 'color': '#FF00FF', 'value': 'Magenta' },  
438 - { 'key': '[0,128,0]', 'color': '#008000', 'value': 'Green' },  
439 - { 'key': '[128,128,128]', 'color': '#808080', 'value': 'Gray' },  
440 - { 'key': '[0,255,0]', 'color': '#00FF00', 'value': 'Lime' },  
441 - { 'key': '[128,0,0]', 'color': '#800000', 'value': 'Maroon' },  
442 - { 'key': '[0,0,128]', 'color': '#000080', 'value': 'Navy' },  
443 - { 'key': '[128,128,0]', 'color': '#808000', 'value': 'Olive' },  
444 - { 'key': '[128,0,128]', 'color': '#800080', 'value': 'Purple' },  
445 - { 'key': '[192,192,192]', 'color': '#C0C0C0', 'value': 'Silver' },  
446 - { 'key': '[0,128,128]', 'color': '#008080', 'value': 'Teal' },  
447 - { 'key': '[255,255,0]', 'color': '#FFFF00', 'value': 'Yellow' },  
448 - { 'key': '[0,64,64]', 'color': '#004040', 'value': 'Cyprus' }  
449 - ],  
450 -  
451 - availableStatusBarPositions: [  
452 - { 'key': 'top', 'value': 'Top' },  
453 - { 'key': 'bottom', 'value': 'Bottom' }  
454 - ],  
455 -  
456 - availableStatusBarColorMaps: [  
457 - { 'key': '0', 'value': '0' },  
458 - { 'key': '1', 'value': '1' },  
459 - { 'key': '2', 'value': '2' }  
460 - ],  
461 -  
462 - availablePageLayouts: [  
463 - { 'key': 'vertical', 'value': 'Vertical' },  
464 - { 'key': 'auto', 'value': 'Auto' },  
465 - { 'key': 'manual', 'value': 'Manual' }  
466 - ],  
467 -  
468 - availableResamplingModes: [  
469 - { 'key': 'xparam', 'value': 'X Parameter' },  
470 - { 'key': 'yparam', 'value': 'Y Parameter' }  
471 - ],  
472 -  
473 - availableOrbitSerieProjections: [  
474 - { 'key': 'XY', 'value': 'XY' },  
475 - { 'key': 'XZ', 'value': 'XZ' },  
476 - { 'key': 'YZ', 'value': 'YZ' },  
477 - { 'key': 'XR', 'value': 'XR' },  
478 - { 'key': 'YR', 'value': 'YR' },  
479 - { 'key': 'ZR', 'value': 'ZR' }  
480 - ],  
481 -  
482 - availableHistogram2DFunctions: [  
483 - { 'key': 'density', 'value': 'Density' },  
484 - { "key": "normdensity", "value": "Normalised Density" },  
485 - { 'key': 'mean', 'value': 'Mean' },  
486 - { 'key': 'min', 'value': 'Minimum' },  
487 - { 'key': 'max', 'value': 'Maximum' },  
488 - { 'key': 'median', 'value': 'Median' },  
489 - { 'key': 'stadev', 'value': 'Standard Deviation' }  
490 - ],  
491 -  
492 - availableDimsOnXAxis: [  
493 - { 'key': '0', 'value': 'First dimension' },  
494 - { 'key': '1', 'value': 'Second dimension' }  
495 - ],  
496 -  
497 - availableTimeTickTypes: [  
498 - { 'key': 'auto', 'value': 'Auto' },  
499 - { 'key': 'time-step', 'value': 'Time step' },  
500 - { 'key': 'nb-major', 'value': 'Num. of major symb.' }  
501 - ],  
502 -  
503 - availableIntervalTickModes: [  
504 - { 'key': 'symbol-only', 'value': 'Symbol only' },  
505 - { 'key': 'interval-index', 'value': 'Interval index' },  
506 - { 'key': 'start-time', 'value': 'Start time' },  
507 - { 'key': 'start-stop-time', 'value': 'Start/Stop times' }  
508 - ],  
509 -  
510 - availableErrorBarTypes: [  
511 - { 'key': 'min-max', 'value': 'Min./Max. Parameters' },  
512 - { 'key': 'delta', 'value': 'Delta parameter' }  
513 - ],  
514 -  
515 - availableLegendSeriesTypes: [  
516 - { 'key': 'text-line-symbol', 'value': 'Text, Line & Symbols' },  
517 - { 'key': 'text-only', 'value': 'Text only' }  
518 - ],  
519 -  
520 - availableLegendSeriesPositions: [  
521 - { 'key': 'inside', 'value': 'Inside' },  
522 - { 'key': 'outside', 'value': 'Outside' }  
523 - ],  
524 -  
525 - availableLegendSeriesIntervalInfoTypes: [  
526 - { 'key': 'index', 'value': 'Interval Index' },  
527 - { 'key': 'start-stop', 'value': 'Interval Start/Stop' }  
528 - ],  
529 -  
530 - availableLegendTextPositions: [  
531 - { 'key': 'right', 'value': 'Right' },  
532 - { 'key': 'left', 'value': 'Left' },  
533 - { 'key': 'top', 'value': 'Top' },  
534 - { 'key': 'bottom', 'value': 'Bottom' }  
535 - ],  
536 -  
537 - availableConstantAxes: [  
538 - { 'key': 'x', 'value': 'X / Time / Epoch' },  
539 - { 'key': 'y-left', 'value': 'Y Left' },  
540 - { 'key': 'y-right', 'value': 'Y Right' }  
541 - ],  
542 -  
543 - availableTextAlignments: [  
544 - { 'key': 'left', 'value': 'Left' },  
545 - { 'key': 'center', 'value': 'Center' },  
546 - { 'key': 'right', 'value': 'Right' }  
547 - ],  
548 -  
549 - availableFillTypes: [  
550 - { 'key': 'serie-constant', 'value': 'Serie / Constant' },  
551 - { 'key': 'serie-serie', 'value': 'Serie / Serie' }  
552 - ],  
553 - availableSpectroNormalization: [  
554 - { 'key': 'none', 'value': 'None' },  
555 - { 'key': 'linear', 'value': 'Linear' },  
556 - { 'key': 'log', 'value': 'Logarithmic' }  
557 - ],  
558 -  
559 - availableFilteringLevel: [  
560 - { 'key': 1, 'value': 'Weak' },  
561 - { 'key': 2, 'value': 'Intermediate/moderated' },  
562 - { 'key': 3, 'value': 'Strong' }  
563 - ],  
564 30
565 fieldComboBox: { 31 fieldComboBox: {
566 key: 'key', 32 key: 'key',
js/app/models/PlotObjects/PlotOrbitSerieObject.js
  Diff comments   View file @9b67ae6
@@ -27,7 +27,7 @@ Ext.define(&#39;amdaPlotObj.PlotOrbitSerieObject&#39;, { @@ -27,7 +27,7 @@ Ext.define(&#39;amdaPlotObj.PlotOrbitSerieObject&#39;, {
27 27
28 setDefaultValues: function() 28 setDefaultValues: function()
29 { 29 {
30 - this.set('serie-projection', amdaPlotObj.PlotObjectConfig.defaultValues.serie.projection); 30 + this.set('serie-projection', amdaDefaultValues.plot.serie.projection);
31 this.callParent(arguments); 31 this.callParent(arguments);
32 }, 32 },
33 33
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @9b67ae6
@@ -557,22 +557,22 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, { @@ -557,22 +557,22 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
557 557
558 setDefaultValues: function() 558 setDefaultValues: function()
559 { 559 {
560 - this.set('panel-background-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor);  
561 - this.set('panel-plotareabackground-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor); 560 + this.set('panel-background-color', amdaDefaultValues.plot.panel.backgroundColor);
  561 + this.set('panel-plotareabackground-color', amdaDefaultValues.plot.panel.backgroundColor);
562 this.set('panel-title-text', ''); 562 this.set('panel-title-text', '');
563 - this.set('panel-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.color);  
564 - this.set('panel-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.position);  
565 - this.set('panel-title-alignment', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.alignment); 563 + this.set('panel-title-color', amdaDefaultValues.plot.panel.title.color);
  564 + this.set('panel-title-position', amdaDefaultValues.plot.panel.title.position);
  565 + this.set('panel-title-alignment', amdaDefaultValues.plot.panel.title.alignment);
566 566
567 this.set('panel-title-font-activated', false); 567 this.set('panel-title-font-activated', false);
568 - this.set('panel-title-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.name);  
569 - this.set('panel-title-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.size); 568 + this.set('panel-title-font-name', amdaDefaultValues.plot.panel.font.name);
  569 + this.set('panel-title-font-size', amdaDefaultValues.plot.panel.font.size);
570 this.set('panel-title-font-bold', false); 570 this.set('panel-title-font-bold', false);
571 this.set('panel-title-font-italic', false); 571 this.set('panel-title-font-italic', false);
572 572
573 this.set('panel-font-activated', false); 573 this.set('panel-font-activated', false);
574 - this.set('panel-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.name);  
575 - this.set('panel-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.panel.font.size); 574 + this.set('panel-font-name', amdaDefaultValues.plot.panel.font.name);
  575 + this.set('panel-font-size', amdaDefaultValues.plot.panel.font.size);
576 this.set('panel-font-bold', false); 576 this.set('panel-font-bold', false);
577 this.set('panel-font-italic', false); 577 this.set('panel-font-italic', false);
578 578
@@ -587,21 +587,21 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, { @@ -587,21 +587,21 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
587 this.set('panel-prefered-width', null); 587 this.set('panel-prefered-width', null);
588 this.set('panel-prefered-height', null); 588 this.set('panel-prefered-height', null);
589 589
590 - this.set('panel-scatter-isotropic', amdaPlotObj.PlotObjectConfig.defaultValues.panel.isotropic); 590 + this.set('panel-scatter-isotropic', amdaDefaultValues.plot.panel.isotropic);
591 591
592 - this.set('panel-status-position', amdaPlotObj.PlotObjectConfig.defaultValues.panel.status.position);  
593 - this.set('panel-status-colormap', amdaPlotObj.PlotObjectConfig.defaultValues.panel.status.colorMap); 592 + this.set('panel-status-position', amdaDefaultValues.plot.panel.status.position);
  593 + this.set('panel-status-colormap', amdaDefaultValues.plot.panel.status.colorMap);
594 594
595 this.set('panel-tick-format', ""); 595 this.set('panel-tick-format', "");
596 596
597 this.set('panel-epoch-centertimeid', ""); 597 this.set('panel-epoch-centertimeid', "");
598 598
599 - this.changePlotType(amdaPlotObj.PlotObjectConfig.defaultValues.panel.plotType); 599 + this.changePlotType(amdaDefaultValues.plot.panel.plotType);
600 }, 600 },
601 601
602 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 @9b67ae6
@@ -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 @9b67ae6
@@ -158,45 +158,45 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, { @@ -158,45 +158,45 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
158 158
159 setDefaultValues: function() 159 setDefaultValues: function()
160 { 160 {
161 - this.set('file-format', amdaPlotObj.PlotObjectConfig.defaultValues.file.format);  
162 - this.set('file-output', amdaPlotObj.PlotObjectConfig.defaultValues.file.output); 161 + this.set('file-format', amdaDefaultValues.plot.file.format);
  162 + this.set('file-output', amdaDefaultValues.plot.file.output);
163 this.set('file-prefix', ''); 163 this.set('file-prefix', '');
164 - this.set('one-file-per-interval', amdaPlotObj.PlotObjectConfig.defaultValues.file.oneFilePerInterval); 164 + this.set('one-file-per-interval', amdaDefaultValues.plot.file.oneFilePerInterval);
165 this.set('name', ''); 165 this.set('name', '');
166 166
167 - this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView); 167 + this.set('tree-full-view', amdaDefaultValues.plot.tree.fullView);
168 168
169 this.set('page-title-text', ''); 169 this.set('page-title-text', '');
170 - this.set('page-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.color);  
171 - this.set('page-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.position);  
172 - this.set('page-title-alignment', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.alignment); 170 + this.set('page-title-color', amdaDefaultValues.plot.page.title.color);
  171 + this.set('page-title-position', amdaDefaultValues.plot.page.title.position);
  172 + this.set('page-title-alignment', amdaDefaultValues.plot.page.title.alignment);
173 173
174 this.set('page-title-font-activated', false); 174 this.set('page-title-font-activated', false);
175 - this.set('page-title-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);  
176 - this.set('page-title-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size); 175 + this.set('page-title-font-name', amdaDefaultValues.plot.page.font.name);
  176 + this.set('page-title-font-size', amdaDefaultValues.plot.page.font.size);
177 this.set('page-title-font-bold', false); 177 this.set('page-title-font-bold', false);
178 this.set('page-title-font-italic', false); 178 this.set('page-title-font-italic', false);
179 179
180 this.set('page-margins-activated', false); 180 this.set('page-margins-activated', false);
181 - this.set('page-margin-x', amdaPlotObj.PlotObjectConfig.defaultValues.page.xMargin);  
182 - this.set('page-margin-y', amdaPlotObj.PlotObjectConfig.defaultValues.page.yMargin);  
183 - this.set('page-mode', amdaPlotObj.PlotObjectConfig.defaultValues.page.mode);  
184 - this.set('page-orientation', amdaPlotObj.PlotObjectConfig.defaultValues.page.orientation);  
185 - this.set('page-dimension', amdaPlotObj.PlotObjectConfig.defaultValues.page.dimension); 181 + this.set('page-margin-x', amdaDefaultValues.plot.page.xMargin);
  182 + this.set('page-margin-y', amdaDefaultValues.plot.page.yMargin);
  183 + this.set('page-mode', amdaDefaultValues.plot.page.mode);
  184 + this.set('page-orientation', amdaDefaultValues.plot.page.orientation);
  185 + this.set('page-dimension', amdaDefaultValues.plot.page.dimension);
186 this.set('page-superpose-mode', false); 186 this.set('page-superpose-mode', false);
187 this.set('page-font-activated', false); 187 this.set('page-font-activated', false);
188 - this.set('page-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);  
189 - this.set('page-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size); 188 + this.set('page-font-name', amdaDefaultValues.plot.page.font.name);
  189 + this.set('page-font-size', amdaDefaultValues.plot.page.font.size);
190 this.set('page-font-bold', false); 190 this.set('page-font-bold', false);
191 this.set('page-font-italic', false); 191 this.set('page-font-italic', false);
192 192
193 - this.setLayout(amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.type); 193 + this.setLayout(amdaDefaultValues.plot.page.layout.type);
194 }, 194 },
195 195
196 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/models/PlotObjects/PlotSauvaudObject.js
  Diff comments   View file @9b67ae6
@@ -32,10 +32,10 @@ Ext.define(&#39;amdaPlotObj.PlotSauvaudObject&#39;, { @@ -32,10 +32,10 @@ Ext.define(&#39;amdaPlotObj.PlotSauvaudObject&#39;, {
32 { name: 'filtering-level', type: 'int' }, 32 { name: 'filtering-level', type: 'int' },
33 { name: 'right_dim', type: 'int' }, 33 { name: 'right_dim', type: 'int' },
34 34
35 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.name, type: 'boolean' },  
36 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, type: 'string' },  
37 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key, type: 'string' },  
38 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey, type: 'string' } 35 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.name, type: 'boolean' },
  36 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, type: 'string' },
  37 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key, type: 'string' },
  38 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey, type: 'string' }
39 ], 39 ],
40 40
41 constructor: function () { 41 constructor: function () {
@@ -59,13 +59,13 @@ Ext.define(&#39;amdaPlotObj.PlotSauvaudObject&#39;, { @@ -59,13 +59,13 @@ Ext.define(&#39;amdaPlotObj.PlotSauvaudObject&#39;, {
59 }, 59 },
60 60
61 setDefaultValues: function () { 61 setDefaultValues: function () {
62 - this.set('spectro-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.yAxis);  
63 - this.set('spectro-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.resolution); 62 + this.set('spectro-yaxis', amdaDefaultValues.plot.spectro.yAxis);
  63 + this.set('spectro-resolution', amdaDefaultValues.plot.spectro.resolution);
64 this.set('spectro-log0-as-min', false); 64 this.set('spectro-log0-as-min', false);
65 this.set('spectro-normalization', "none"); 65 this.set('spectro-normalization', "none");
66 // filtering 66 // filtering
67 this.set('filtering-activated', false); 67 this.set('filtering-activated', false);
68 - this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level); 68 + this.set('filtering-level', amdaDefaultValues.plot.filtering.level);
69 this.set('right_dim', 0); 69 this.set('right_dim', 0);
70 70
71 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false); 71 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false);
js/app/models/PlotObjects/PlotSerieObject.js
  Diff comments   View file @9b67ae6
@@ -42,16 +42,16 @@ Ext.define(&#39;amdaPlotObj.PlotSerieObject&#39;, { @@ -42,16 +42,16 @@ Ext.define(&#39;amdaPlotObj.PlotSerieObject&#39;, {
42 setDefaultValues: function() 42 setDefaultValues: function()
43 { 43 {
44 this.set('serie-errorbar-activated', false); 44 this.set('serie-errorbar-activated', false);
45 - this.set('serie-errorbar-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.type);  
46 - this.set('serie-errorbar-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.lines.style);  
47 - this.set('serie-errorbar-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.lines.width);  
48 - this.set('serie-errorbar-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.errorbar.lines.color); 45 + this.set('serie-errorbar-type', amdaDefaultValues.plot.serie.errorbar.type);
  46 + this.set('serie-errorbar-lines-style', amdaDefaultValues.plot.serie.errorbar.lines.style);
  47 + this.set('serie-errorbar-lines-width', amdaDefaultValues.plot.serie.errorbar.lines.width);
  48 + this.set('serie-errorbar-lines-color', amdaDefaultValues.plot.serie.errorbar.lines.color);
49 this.set('serie-errorbar-minparam', ''); 49 this.set('serie-errorbar-minparam', '');
50 this.set('serie-errorbar-maxparam', ''); 50 this.set('serie-errorbar-maxparam', '');
51 this.set('serie-errorbar-deltaparam', ''); 51 this.set('serie-errorbar-deltaparam', '');
52 52
53 this.set('serie-xaxis-param', ''); 53 this.set('serie-xaxis-param', '');
54 - this.set('serie-resampling-mode', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resamplingMode); 54 + this.set('serie-resampling-mode', amdaDefaultValues.plot.serie.resamplingMode);
55 55
56 this.callParent(arguments); 56 this.callParent(arguments);
57 }, 57 },
js/app/models/PlotObjects/PlotSpectroObject.js
  Diff comments   View file @9b67ae6
@@ -31,10 +31,10 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, { @@ -31,10 +31,10 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
31 { name: 'filtering-activated', type: 'boolean' }, 31 { name: 'filtering-activated', type: 'boolean' },
32 { name: 'filtering-level', type: 'int' }, 32 { name: 'filtering-level', type: 'int' },
33 33
34 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.name, type: 'boolean' },  
35 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, type: 'string' },  
36 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key, type: 'string' },  
37 - { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey, type: 'string' } 34 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.name, type: 'boolean' },
  35 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, type: 'string' },
  36 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key, type: 'string' },
  37 + // { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey, type: 'string' }
38 ], 38 ],
39 39
40 constructor: function () { 40 constructor: function () {
@@ -58,13 +58,13 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, { @@ -58,13 +58,13 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
58 }, 58 },
59 59
60 setDefaultValues: function () { 60 setDefaultValues: function () {
61 - this.set('spectro-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.yAxis);  
62 - this.set('spectro-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.resolution); 61 + this.set('spectro-yaxis', amdaDefaultValues.plot.spectro.yAxis);
  62 + this.set('spectro-resolution', amdaDefaultValues.plot.spectro.resolution);
63 this.set('spectro-log0-as-min', false); 63 this.set('spectro-log0-as-min', false);
64 this.set('spectro-normalization', "none"); 64 this.set('spectro-normalization', "none");
65 // filtering 65 // filtering
66 this.set('filtering-activated', false); 66 this.set('filtering-activated', false);
67 - this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level); 67 + this.set('filtering-level', amdaDefaultValues.plot.filtering.level);
68 68
69 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false); 69 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false);
70 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, null); 70 this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, null);
js/app/models/PlotObjects/PlotStatusBarObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotStatusBarObject', { 16 Ext.define('amdaPlotObj.PlotStatusBarObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields: [ 19 fields: [
24 { name: 'statusbar-color', type: 'string', defaultValue: "none", }, 20 { name: 'statusbar-color', type: 'string', defaultValue: "none", },
25 ], 21 ],
@@ -40,7 +36,7 @@ Ext.define(&#39;amdaPlotObj.PlotStatusBarObject&#39;, { @@ -40,7 +36,7 @@ Ext.define(&#39;amdaPlotObj.PlotStatusBarObject&#39;, {
40 36
41 setDefaultValues: function() 37 setDefaultValues: function()
42 { 38 {
43 - this.set('statusbar-color', amdaPlotObj.PlotObjectConfig.defaultValues.statusbar.color); 39 + this.set('statusbar-color', amdaDefaultValues.plot.statusbar.color);
44 }, 40 },
45 41
46 getJsonValues : function() 42 getJsonValues : function()
js/app/models/PlotObjects/PlotTextObject.js
  Diff comments   View file @9b67ae6
@@ -17,10 +17,6 @@ Ext.define(&#39;amdaPlotObj.PlotTextObject&#39;, { @@ -17,10 +17,6 @@ Ext.define(&#39;amdaPlotObj.PlotTextObject&#39;, {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 idProperty: 'id', 18 idProperty: 'id',
19 19
20 - requires: [  
21 - 'amdaPlotObj.PlotObjectConfig'  
22 - ],  
23 -  
24 fields : [ 20 fields : [
25 {name: 'id', type: 'int'}, 21 {name: 'id', type: 'int'},
26 {name: 'text-value', type: 'string'}, 22 {name: 'text-value', type: 'string'},
@@ -67,17 +63,17 @@ Ext.define(&#39;amdaPlotObj.PlotTextObject&#39;, { @@ -67,17 +63,17 @@ Ext.define(&#39;amdaPlotObj.PlotTextObject&#39;, {
67 setDefaultValues: function() 63 setDefaultValues: function()
68 { 64 {
69 this.set('text-value', ''); 65 this.set('text-value', '');
70 - this.set('text-y-axis', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.yAxisId);  
71 - this.set('text-x-relative', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.xRelative); 66 + this.set('text-y-axis', amdaDefaultValues.plot.textObjs.yAxisId);
  67 + this.set('text-x-relative', amdaDefaultValues.plot.textObjs.xRelative);
72 this.set('text-x-floatvalue', 0.); 68 this.set('text-x-floatvalue', 0.);
73 - this.set('text-y-relative', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.yRelative); 69 + this.set('text-y-relative', amdaDefaultValues.plot.textObjs.yRelative);
74 this.set('text-y-value', 0.); 70 this.set('text-y-value', 0.);
75 this.set('text-angle', 0.); 71 this.set('text-angle', 0.);
76 - this.set('text-color', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.color);  
77 - this.set('text-align', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.align); 72 + this.set('text-color', amdaDefaultValues.plot.textObjs.color);
  73 + this.set('text-align', amdaDefaultValues.plot.textObjs.align);
78 this.set('text-font-activated', false); 74 this.set('text-font-activated', false);
79 - this.set('text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.font.name);  
80 - this.set('text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.font.size); 75 + this.set('text-font-name', amdaDefaultValues.plot.textObjs.font.name);
  76 + this.set('text-font-size', amdaDefaultValues.plot.textObjs.font.size);
81 this.set('text-font-bold', false); 77 this.set('text-font-bold', false);
82 this.set('text-font-italic', false); 78 this.set('text-font-italic', false);
83 }, 79 },
js/app/models/PlotObjects/PlotTickBarObject.js
  Diff comments   View file @9b67ae6
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 Ext.define('amdaPlotObj.PlotTickBarObject', { 16 Ext.define('amdaPlotObj.PlotTickBarObject', {
17 extend: 'Ext.data.Model', 17 extend: 'Ext.data.Model',
18 18
19 - requires: [  
20 - 'amdaPlotObj.PlotObjectConfig'  
21 - ],  
22 -  
23 fields : [ 19 fields : [
24 ], 20 ],
25 21
js/app/models/PlotObjects/PlotTreeNode.js
  Diff comments   View file @9b67ae6
@@ -14,10 +14,6 @@ @@ -14,10 +14,6 @@
14 14
15 Ext.define('amdaPlotObj.PlotTreeNode', { 15 Ext.define('amdaPlotObj.PlotTreeNode', {
16 extend: 'Ext.data.Model', 16 extend: 'Ext.data.Model',
17 -  
18 - requires: [  
19 - 'amdaPlotObj.PlotObjectConfig'  
20 - ],  
21 17
22 //Node type 18 //Node type
23 type: '', 19 type: '',
js/app/views/CatalogUI.js
  Diff comments   View file @9b67ae6
@@ -19,7 +19,6 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, { @@ -19,7 +19,6 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
19 'Ext.ux.grid.filter.StringFilter', 19 'Ext.ux.grid.filter.StringFilter',
20 'amdaUI.OperationsTT', 20 'amdaUI.OperationsTT',
21 'Ext.grid.plugin.BufferedRenderer', 21 'Ext.grid.plugin.BufferedRenderer',
22 - 'amdaPlotObj.PlotObjectConfig',  
23 'amdaUI.StatusGrid', 22 'amdaUI.StatusGrid',
24 'amdaUI.StatisticalPlug', 23 'amdaUI.StatisticalPlug',
25 'amdaDesktop.AmdaStateProvider', 24 'amdaDesktop.AmdaStateProvider',
js/app/views/CatalogVisuHistogram.js
  Diff comments   View file @9b67ae6
@@ -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 @9b67ae6
@@ -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/ColorMap.js 0 → 100644
  Diff comments   View file @9b67ae6
@@ -0,0 +1,78 @@ @@ -0,0 +1,78 @@
  1 +Ext.define('amdaUI.ColorMap', {
  2 + extend: 'Ext.form.ComboBox',
  3 + alias: 'widget.colormap',
  4 +
  5 +
  6 + data : [],
  7 + onChange: null,
  8 +
  9 + constructor:function(config){
  10 + this.getData();
  11 + this.init(config);
  12 + this.callParent();
  13 + },
  14 +
  15 + getData:function(){
  16 + var me = this;
  17 + amdaDefaultConfigs.availableColorMaps.forEach(function(color){
  18 + me.data.push({key:color.key,name:color.value, iconUrl:'generic_data/colormaps/'+ color.svgFile})
  19 + });
  20 + },
  21 + init: function(config){
  22 + var me = this;
  23 + var size = (typeof config !== "undefined" && config.size) ? config.size : '12';
  24 + Ext.apply(this,{
  25 + xtype:'combobox',
  26 + name: (typeof config !== "undefined" && config.name) ? config.name:null,
  27 + fieldLabel: 'Color Map&nbsp;<img amda_clicktip="colourMaps" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"',
  28 + store: new Ext.data.Store({
  29 + fields: ['key','name', 'iconUrl'],
  30 + data: me.data
  31 + }),
  32 + displayField: 'name',
  33 + valueField: 'key',
  34 + tpl: '<tpl for="."><div class="x-boundlist-item"><span data-qtip="{name}"> \
  35 + <img src="{iconUrl}" class="svg-icon" style="height:'+size+'px;"> \
  36 + </span>\
  37 + </div></tpl>',
  38 + editable: false,
  39 + queryMode: 'local',
  40 + listeners: {
  41 + change: function (combo, newValue, oldValue, eOpts) {
  42 + var iconUrl="";
  43 + var colorName = "";
  44 + me.data.forEach(function(colorData){
  45 + if(colorData.key == newValue ){
  46 + iconUrl= colorData.iconUrl;
  47 + colorName = colorData.name;
  48 + }
  49 + });
  50 + combo.inputEl.setStyle('background-image', 'url(' + iconUrl + ')');
  51 + combo.inputEl.setStyle('background-size', '100%');
  52 + combo.inputEl.setStyle('background-repeat', 'no-repeat');
  53 + combo.inputEl.setStyle('background-position', 'center');
  54 + combo.inputEl.setStyle('font-size', '0');
  55 +
  56 + combo.inputEl.set({ "data-qtip": Ext.String.htmlDecode(colorName) });
  57 +
  58 + if (me.onChange)
  59 + me.onChange(me.name, newValue, oldValue);
  60 + },
  61 + click: {
  62 + element: 'el',
  63 + fn: function(e,t) {
  64 + var me = t,
  65 + text = me.getAttribute('amda_clicktip');
  66 + if (text) {
  67 + e.preventDefault();
  68 + AmdaAction.getInfo({name : text}, function(res,e) {
  69 + if (res.success) myDesktopApp.infoMsg(res.result);
  70 + });
  71 + }
  72 + }
  73 + },
  74 + scope:this
  75 + },
  76 + })
  77 + }
  78 +});
0 \ No newline at end of file 79 \ No newline at end of file
js/app/views/ColorPicker.js 0 → 100644
  Diff comments   View file @9b67ae6
@@ -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 0 → 100644
  Diff comments   View file @9b67ae6
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
  1 +Ext.define('amdaUI.DefaultTreeGrid', {
  2 + extend: 'Ext.tree.Panel',
  3 +
  4 + requires: [
  5 + 'Ext.data.*',
  6 + 'Ext.grid.*',
  7 + 'Ext.tree.*',
  8 + 'amdaModel.DefaultValuesModel',
  9 + 'amdaUI.ColorPicker',
  10 + 'amdaUI.ColorMap'
  11 + ],
  12 + xtype: 'tree-grid',
  13 +
  14 + reserveScrollbar: true,
  15 +
  16 + height: 300,
  17 + useArrows: true,
  18 + rootVisible: false,
  19 + multiSelect: true,
  20 + singleExpand: true,
  21 +
  22 + modifiedDefaults : {},
  23 +
  24 + constructor: function() {
  25 + this.init();
  26 + this.callParent();
  27 + },
  28 +
  29 + getFullParentName:function(record){
  30 + var parentNode = record;
  31 + var parameter ="";
  32 + while (parentNode.parentNode) {
  33 + parentNode = parentNode.parentNode;
  34 + if(parentNode.get('parameter'))
  35 + parameter = parentNode.get('parameter')+'.'.concat(parameter);
  36 + }
  37 + return parameter;
  38 + },
  39 +
  40 + extractData : function(node=null,parentName = '',) {
  41 + var me =this;
  42 + if(node === null){
  43 + node = me.store.getRootNode();
  44 + }
  45 + if(node.data.leaf && node.data.modified){
  46 + if(node.data.value !== node.data.default){
  47 + me.modifiedDefaults[parentName] = node.data.value;
  48 + }
  49 + }
  50 + else{
  51 + Ext.each(node.childNodes, function(childNode) {
  52 + me.extractData(childNode, (parentName !== '') ? parentName+'.'+childNode.data.parameter : childNode.data.parameter );
  53 + });
  54 + }
  55 + },
  56 +
  57 + isHexCode: function(str) {
  58 + return /^#[0-9a-fA-F]{6}$/.test(str);
  59 + },
  60 + init: function() {
  61 + var me = this;
  62 + me.cellEditing = Ext.create('Ext.grid.plugin.CellEditing', {clicksToEdit: 1,
  63 + listeners:{
  64 + beforeedit:function(editor, context,e){
  65 + if(!context.record.data.leaf)
  66 + {
  67 + return false;
  68 + }
  69 + var value = context.record.get(context.field);
  70 + if (me.isHexCode(value)) {
  71 + var colorPicker = Ext.create('amdaUI.ColorPicker', {
  72 + pickerField: context.field,
  73 + value: value,
  74 + listeners: {
  75 + select: function(picker, color) {
  76 + context.record.set(context.field, '#' + color);
  77 + me.getView().refresh();
  78 + }
  79 + }
  80 + });
  81 + editor.field = colorPicker;
  82 + }
  83 + },
  84 + afteredit:function(editor, context,e){
  85 + if(context.record.get('value') !== context.record.get('default')){
  86 + context.record.set('modified',true);
  87 + }
  88 + else{
  89 + context.record.set('modified',false);
  90 + }
  91 + me.getView().refresh();
  92 + }
  93 + }
  94 + });
  95 +
  96 + Ext.apply(this, {
  97 + store: new Ext.data.TreeStore({
  98 + model: amdaModel.DefaultValuesModel,
  99 + proxy: {
  100 + type: 'direct',
  101 + directFn: AmdaAction.getDefaultValueTree
  102 + },
  103 + folderSort: true
  104 + }),
  105 + plugins: [me.cellEditing],
  106 + columns: [
  107 + {
  108 + xtype: 'treecolumn', //this is so we know which column will show the tree
  109 + text: 'Parameters',
  110 + flex: 2,
  111 + sortable: true,
  112 + dataIndex: 'parameter',
  113 + renderer: function(value, metaData, record) {
  114 + if (record.get('modified')) {
  115 + return '<b style="color: blue;">'+value+'</b>';
  116 + }
  117 + return value;
  118 + }
  119 + },{
  120 + xtype: 'gridcolumn',
  121 + getEditor: function(record) {
  122 + var grid = this.up().grid,
  123 + cellediting = grid.findPlugin('cellediting'),
  124 + editors = cellediting.editors,
  125 + editor = editors.getByKey(this.id),
  126 + fieldType;
  127 +
  128 + if (editor) {
  129 + // Do this to avoid memory leaks
  130 + editors.remove(editor);
  131 + }
  132 +
  133 + var option = amdaDefaultOptions[me.getFullParentName(record)+record.get('parameter')];
  134 + var value = record.get('value');
  135 + var store = null;
  136 +
  137 + if (option && option.type){
  138 + fieldType = option.type;
  139 + var myStore = Ext.create('Ext.data.Store', {
  140 + fields: ['key', 'value'],
  141 + data: option.store
  142 + });
  143 + store = myStore;
  144 +
  145 + }
  146 + else{
  147 + if(me.isHexCode(value)){
  148 + fieldType = 'colorpicker'
  149 + }
  150 + else if(value === true || value === false){
  151 + fieldType = 'combobox'
  152 + store= [[true, 'True'], [false, 'False']];
  153 + }
  154 + else{
  155 + fieldType = isNaN(parseFloat(record.get('value'))) ? 'textfield' : 'numberfield';
  156 + }
  157 + }
  158 + return {
  159 + xtype: fieldType,
  160 + store: store,
  161 + queryMode: 'local',
  162 + displayField: 'value',
  163 + valueField: 'key',
  164 + value: (fieldType=='combobox') ? value : null,
  165 + allowBlank: false
  166 + };
  167 + },
  168 + text: 'Values',
  169 + flex: 1,
  170 + sortable: true,
  171 + dataIndex: 'value',
  172 + align: 'center',
  173 + renderer: function(value, meta,record) {
  174 + if (me.isHexCode(value)){
  175 + value = value.substring(1, 7);
  176 + return '<div style="background-color:#' + value + '; margin-left: auto; \
  177 + margin-right: auto;width:15px;height:15px;"></div>';
  178 + }
  179 + if( record.get('parameter') === 'colorMap'){
  180 + var iconUrl="";
  181 + var colorMap = Ext.create('amdaUI.ColorMap');
  182 + colorMap.data.forEach(function(colorData){
  183 + if(colorData.key == value ){
  184 + iconUrl= colorData.iconUrl;
  185 + }
  186 + });
  187 + return '<div style="background-image:url(' + iconUrl + ');background-size:100%;\
  188 + background-repeat:no-repeat; background-position:center; \
  189 + font-size:0;width:90px;height:15px;"></div>';
  190 + }
  191 +
  192 + var option = amdaDefaultOptions[me.getFullParentName(record)+record.get('parameter')];
  193 +
  194 + if(option){
  195 + Ext.each(option.store, function(line){
  196 + if (line.key === value)
  197 + value = line.value;
  198 + })
  199 + }
  200 + return value;
  201 + },
  202 + },{
  203 + text: 'Reset',
  204 + width: 55,
  205 + menuDisabled: true,
  206 + xtype: 'actioncolumn',
  207 + tooltip: 'Reset to the default value',
  208 + align: 'center',
  209 + icon: 'js/resources/images/16x16/arrow_circle_double.png',
  210 + handler: function(grid, rowIndex, colIndex, actionItem, event, record, row) {
  211 + record.set('value', record.get('default'));
  212 + record.set('modified', false);
  213 + me.getView().refresh();
  214 + },
  215 + // Only leaf level tasks may be edited
  216 + isDisabled: function(view, rowIdx, colIdx, item, record) {
  217 + return !record.data.leaf || !record.data.modified;
  218 + }
  219 + }
  220 + ],
  221 + viewConfig: {
  222 + preserveScrollOnRefresh: true
  223 + }
  224 + });
  225 + }
  226 +});
js/app/views/DefaultValuesWindow.js 0 → 100644
  Diff comments   View file @9b67ae6
@@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
  1 +
  2 +
  3 +Ext.define('amdaUI.DefaultValuesWindow',{
  4 + extend: 'Ext.window.Window',
  5 + alias: 'widget.defaultvalueswindow',
  6 +
  7 + requires:[
  8 + 'amdaUI.DefaultTreeGrid',
  9 + ],
  10 + defaultValuesGrid: null,
  11 + constructor:function(){
  12 + this.defaultValuesGrid = Ext.create('amdaUI.DefaultTreeGrid');
  13 + this.init();
  14 + this.callParent();
  15 + },
  16 +
  17 + init:function(config){
  18 +
  19 + var me=this;
  20 + Ext.apply(this, {
  21 + title: 'Default Values Grid',
  22 + width: 350,
  23 + height: 380,
  24 + closable:false,
  25 + modal:true,
  26 + resizable: false,
  27 + items: [
  28 + {
  29 + xtype: 'form',
  30 + renderTo: Ext.getBody(),
  31 + layout:'hbox',
  32 + frame: false,
  33 + items: [
  34 + {
  35 + flex:1,
  36 + items:[me.defaultValuesGrid],
  37 + },
  38 + ],
  39 +
  40 + buttons: [{
  41 + text: 'Save',
  42 + handler: function() {
  43 +
  44 + me.defaultValuesGrid.modifiedDefaults = {};
  45 + me.defaultValuesGrid.extractData();
  46 + if (Object.keys(me.defaultValuesGrid.modifiedDefaults).length >= 1){
  47 + AmdaAction.setUserDefaultValues(me.defaultValuesGrid.modifiedDefaults, function(res) {
  48 + if(res['success']){
  49 + AmdaAction.getDefaultValueTree(false, function(defaults){
  50 + if(defaults['success'])
  51 + amdaDefaultValues=defaults['defaultValues'];
  52 + });
  53 + me.defaultValuesGrid.removeAll();
  54 + me.defaultValuesGrid.destroy();
  55 + me.close();
  56 + }
  57 + });
  58 + }
  59 + },
  60 + },
  61 + {
  62 + // To quit the window
  63 + text: 'Cancel',
  64 + handler: function() {
  65 + me.defaultValuesGrid.removeAll();
  66 + me.defaultValuesGrid.destroy();
  67 + me.close();
  68 + }
  69 + }]
  70 + }
  71 + ]
  72 + });
  73 + }
  74 +});
  75 +
js/app/views/ParamArgumentsUI.js
  Diff comments   View file @9b67ae6
@@ -21,10 +21,6 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, { @@ -21,10 +21,6 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
21 pluginOwner: null, 21 pluginOwner: null,
22 inRebuild: false, 22 inRebuild: false,
23 23
24 - requires: [  
25 - 'amdaPlotObj.PlotObjectConfig'  
26 - ],  
27 -  
28 constructor: function (config) { 24 constructor: function (config) {
29 this.init(config); 25 this.init(config);
30 this.callParent(arguments); 26 this.callParent(arguments);
js/app/views/PlotComponents/PlotBaseAxisForm.js
  Diff comments   View file @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
10 10
11 Ext.define('amdaPlotComp.PlotColorAxisForm', { 11 Ext.define('amdaPlotComp.PlotColorAxisForm', {
12 extend: 'amdaPlotComp.PlotBaseAxisForm', 12 extend: 'amdaPlotComp.PlotBaseAxisForm',
  13 +
  14 + requires:['amdaUI.ColorMap'],
13 15
14 showColorOption : false, 16 showColorOption : false,
15 showTickGridOptions : false, 17 showTickGridOptions : false,
js/app/views/PlotComponents/PlotConstantForm.js
  Diff comments   View file @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -96,8 +96,8 @@ Ext.define(&#39;amdaPlotComp.PlotHistogram2DSerieForm&#39;, { @@ -96,8 +96,8 @@ Ext.define(&#39;amdaPlotComp.PlotHistogram2DSerieForm&#39;, {
96 me.crtTree.refresh(); 96 me.crtTree.refresh();
97 }), 97 }),
98 me.getRangeForms(), 98 me.getRangeForms(),
99 - this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaPlotObj.PlotObjectConfig.availableResamplingModes),  
100 - this.addStandardCombo('histo2d-function', 'Function to apply', amdaPlotObj.PlotObjectConfig.availableHistogram2DFunctions, function(name, value, oldValue) { 99 + this.addStandardCombo('serie-resampling-mode', 'Reference parameter for resampling', amdaDefaultConfigs.availableResamplingModes),
  100 + this.addStandardCombo('histo2d-function', 'Function to apply', amdaDefaultConfigs.availableHistogram2DFunctions, function(name, value, oldValue) {
101 me.object.set('histo2d-function', value); 101 me.object.set('histo2d-function', value);
102 me.updateOptions(value); 102 me.updateOptions(value);
103 }), 103 }),
js/app/views/PlotComponents/PlotInstantSpectroForm.js
  Diff comments   View file @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -39,7 +39,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, { @@ -39,7 +39,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
39 }, 39 },
40 getFilteringItems: function () { 40 getFilteringItems: function () {
41 return [ 41 return [
42 - this.addStandardCombo('filtering-level', 'Level', amdaPlotObj.PlotObjectConfig.availableFilteringLevel) 42 + this.addStandardCombo('filtering-level', 'Level', amdaDefaultConfigs.availableFilteringLevel)
43 ]; 43 ];
44 }, 44 },
45 45
@@ -280,10 +280,10 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, { @@ -280,10 +280,10 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
280 this.addColorMapCombo('spectro-color-map', function(name, newValue, oldValue){ 280 this.addColorMapCombo('spectro-color-map', function(name, newValue, oldValue){
281 ref.parentObject.axes().getById('color').set('axis-color-map', newValue); 281 ref.parentObject.axes().getById('color').set('axis-color-map', newValue);
282 }), 282 }),
283 - this.addStandardCombo('spectro-resolution', 'Points per plot', amdaPlotObj.PlotObjectConfig.availableResolutions, function (name, value, oldValue) { 283 + this.addStandardCombo('spectro-resolution', 'Points per plot', amdaDefaultConfigs.availableResolutions, function (name, value, oldValue) {
284 ref.object.set('spectro-resolution', value); 284 ref.object.set('spectro-resolution', value);
285 }), 285 }),
286 - this.addStandardCombo('spectro-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function (name, value, oldValue) { 286 + this.addStandardCombo('spectro-yaxis', 'Y axis', amdaDefaultConfigs.availableYAxes, function (name, value, oldValue) {
287 ref.object.set('spectro-yaxis', value); 287 ref.object.set('spectro-yaxis', value);
288 ref.crtTree.refresh(); 288 ref.crtTree.refresh();
289 }), 289 }),
@@ -292,7 +292,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, { @@ -292,7 +292,7 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
292 this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function (name, value, oldValue) { 292 this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function (name, value, oldValue) {
293 ref.object.set('spectro-log0-as-min', value); 293 ref.object.set('spectro-log0-as-min', value);
294 }), 294 }),
295 - this.addStandardCombo('spectro-normalization', 'Normalization', amdaPlotObj.PlotObjectConfig.availableSpectroNormalization, function (name, value, oldValue) { 295 + this.addStandardCombo('spectro-normalization', 'Normalization', amdaDefaultConfigs.availableSpectroNormalization, function (name, value, oldValue) {
296 if (ref.object.get('spectro-normalization') != value) { 296 if (ref.object.get('spectro-normalization') != value) {
297 ref.object.set('spectro-normalization', value); 297 ref.object.set('spectro-normalization', value);
298 } 298 }
js/app/views/PlotComponents/PlotStandardForm.js
  Diff comments   View file @9b67ae6
@@ -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
@@ -436,66 +436,13 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, { @@ -436,66 +436,13 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
436 }, 436 },
437 437
438 addColorMapCombo: function (name, onChange) { 438 addColorMapCombo: function (name, onChange) {
439 - var data = [];  
440 - amdaPlotObj.PlotObjectConfig.availableColorMaps.forEach(function(color){  
441 - data.push({key:color.key,name:color.value, iconUrl:'generic_data/colormaps/'+ color.svgFile})  
442 - });  
443 -  
444 - var combo = new Ext.form.ComboBox({ 439 + return {
  440 + xtype: 'colormap',
445 name: name, 441 name: name,
446 - fieldLabel: 'Colour Map&nbsp;<img amda_clicktip="colourMaps" style="vertical-align:bottom" src="js/resources/images/16x16/info_mini.png"',  
447 - store: new Ext.data.Store({  
448 - fields: ['key','name', 'iconUrl'],  
449 - data: data  
450 - }),  
451 - displayField: 'name',  
452 - valueField: 'key',  
453 - tpl: '<tpl for="."><div class="x-boundlist-item"><span data-qtip="{name}"> \  
454 - <img src="{iconUrl}" class="svg-icon" style="height: 26px;"> \  
455 - </span>\  
456 - </div></tpl>',  
457 - editable: false,  
458 - queryMode: 'local',  
459 - listeners: {  
460 - change: function (combo, newValue, oldValue, eOpts) {  
461 - var iconUrl="";  
462 - var colorName = "";  
463 - data.forEach(function(colorData){  
464 - if(colorData.key == newValue ){  
465 - iconUrl= colorData.iconUrl;  
466 - colorName = colorData.name;  
467 - }  
468 - });  
469 - combo.inputEl.setStyle('background-image', 'url(' + iconUrl + ')');  
470 - combo.inputEl.setStyle('background-size', '100%');  
471 - combo.inputEl.setStyle('background-repeat', 'no-repeat');  
472 - combo.inputEl.setStyle('background-position', 'center');  
473 - combo.inputEl.setStyle('font-size', '0');  
474 -  
475 - combo.inputEl.set({ "data-qtip": Ext.String.htmlDecode(colorName) });  
476 -  
477 - this.object.set(name, newValue);  
478 - if (onChange != null)  
479 - onChange(name, newValue, oldValue);  
480 - },  
481 - click: {  
482 - element: 'el',  
483 - fn: function(e,t) {  
484 - var me = t,  
485 - text = me.getAttribute('amda_clicktip');  
486 - if (text) {  
487 - e.preventDefault();  
488 - AmdaAction.getInfo({name : text}, function(res,e) {  
489 - if (res.success) myDesktopApp.infoMsg(res.result);  
490 - });  
491 - }  
492 - }  
493 - },  
494 - scope:this  
495 - },  
496 - });  
497 -  
498 - return combo; 442 + onChange: function(name, newValue, oldValue) {
  443 + this.object.set(name, newValue);
  444 + }
  445 + };
499 }, 446 },
500 447
501 init: function (config) { 448 init: function (config) {
js/app/views/PlotComponents/PlotStatusBarForm.js
  Diff comments   View file @9b67ae6
@@ -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 @9b67ae6
@@ -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 @9b67ae6
@@ -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());
js/app/views/StatusGrid.js
  Diff comments   View file @9b67ae6
1 -Ext.define('StatusColorPicker', {  
2 - extend: 'Ext.form.field.Picker',  
3 - alias: 'widget.statuscolorpicker',  
4 -  
5 - toUpper : function(x){  
6 - return x.toUpperCase();  
7 - },  
8 - replaceColor : function(x){  
9 - return x.replace("#","")  
10 - },  
11 - createPicker: function() {  
12 - var me = this;  
13 - return Ext.create('Ext.picker.Color', {  
14 - pickerField: me,  
15 - renderTo: Ext.getBody(),  
16 - floating: true,  
17 - minWidth: 133,  
18 - maxWidth: 200,  
19 - minHeight: 225,  
20 - autoScroll:true,  
21 - focusOnShow: true,  
22 - colors: amdaPlotObj.PlotObjectConfig.availableColorsNew.map(this.replaceColor).map(this.toUpper),  
23 - listeners: {  
24 - select: function(picker, color) {  
25 - me.setValue(color);  
26 - me.picker.hide();  
27 - },  
28 - scope: me  
29 - }  
30 - });  
31 - }  
32 -});  
33 1
34 Ext.define('StatusColorEditor', { 2 Ext.define('StatusColorEditor', {
35 extend: 'Ext.grid.CellEditor', 3 extend: 'Ext.grid.CellEditor',
36 alias: 'widget.statuscoloreditor', 4 alias: 'widget.statuscoloreditor',
37 5
38 requires: [ 6 requires: [
39 - 'StatusColorPicker' 7 + 'amdaUI.ColorPicker'
40 ], 8 ],
41 9
42 field: { 10 field: {
43 - xtype: 'statuscolorpicker' 11 + xtype: 'colorpicker'
44 }, 12 },
45 }); 13 });
46 14
@@ -48,7 +16,6 @@ Ext.define(&#39;StatusColorEditor&#39;, { @@ -48,7 +16,6 @@ Ext.define(&#39;StatusColorEditor&#39;, {
48 Ext.define('amdaUI.StatusGrid', { 16 Ext.define('amdaUI.StatusGrid', {
49 extend: 'Ext.grid.Panel', 17 extend: 'Ext.grid.Panel',
50 alias: 'widget.statusgrid', 18 alias: 'widget.statusgrid',
51 - requires:['amdaPlotObj.PlotObjectConfig'],  
52 type: '', 19 type: '',
53 20
54 catFields:['value','label','color'], 21 catFields:['value','label','color'],
@@ -91,9 +58,9 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, { @@ -91,9 +58,9 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, {
91 onAddClick: function(grid){ 58 onAddClick: function(grid){
92 // Create a model instance 59 // Create a model instance
93 if(this.isCat) 60 if(this.isCat)
94 - var rec = {'value':0, 'label':'', 'color':'000000'}; 61 + var rec = {'value':0, 'label':'', 'color':'#000000'};
95 else 62 else
96 - var rec = {'minVal':0, 'maxVal':0, 'label':'', 'color':'000000'}; 63 + var rec = {'minVal':0, 'maxVal':0, 'label':'', 'color':'#000000'};
97 64
98 this.statusStore.insert(0, rec); 65 this.statusStore.insert(0, rec);
99 this.cellEditing.startEditByPosition({ 66 this.cellEditing.startEditByPosition({
@@ -120,9 +87,9 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, { @@ -120,9 +87,9 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, {
120 return hex.toUpperCase(); 87 return hex.toUpperCase();
121 }, 88 },
122 hexToRgb: function(hex) { 89 hexToRgb: function(hex) {
123 - var r = parseInt(hex.substring(0,2), 16);  
124 - var g = parseInt(hex.substring(2,4), 16);  
125 - var b = parseInt(hex.substring(4,6), 16); 90 + var r = parseInt(hex.substring(1,3), 16);
  91 + var g = parseInt(hex.substring(3,5), 16);
  92 + var b = parseInt(hex.substring(5,7), 16);
126 return [r, g, b]; 93 return [r, g, b];
127 }, 94 },
128 95
@@ -153,7 +120,7 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, { @@ -153,7 +120,7 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, {
153 me.statusStore.insert(i,{ 120 me.statusStore.insert(i,{
154 'value': parseInt(parts[0]), 121 'value': parseInt(parts[0]),
155 'label': parts[1].split(" [")[0], 122 'label': parts[1].split(" [")[0],
156 - 'color': this.rgbToHex(parts[1].split(" [")[1].slice(0, -1).split(", ")) 123 + 'color': "#"+this.rgbToHex(parts[1].split(" [")[1].slice(0, -1).split(", "))
157 }); 124 });
158 } 125 }
159 else{ 126 else{
@@ -162,7 +129,7 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, { @@ -162,7 +129,7 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, {
162 'minVal':minMaxVals[0], 129 'minVal':minMaxVals[0],
163 'maxVal':minMaxVals[1], 130 'maxVal':minMaxVals[1],
164 'label': parts[1].split(" [")[0], 131 'label': parts[1].split(" [")[0],
165 - 'color': this.rgbToHex(parts[1].split(" [")[1].slice(0, -1).split(", ")) 132 + 'color': "#"+this.rgbToHex(parts[1].split(" [")[1].slice(0, -1).split(", "))
166 }); 133 });
167 } 134 }
168 } 135 }
@@ -191,7 +158,8 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, { @@ -191,7 +158,8 @@ Ext.define(&#39;amdaUI.StatusGrid&#39;, {
191 return { 158 return {
192 text: 'Color',dataIndex: 'color', width: 40, menuDisabled: true, 159 text: 'Color',dataIndex: 'color', width: 40, menuDisabled: true,
193 renderer: function(value) { 160 renderer: function(value) {
194 - return '<div style="background-color:#' + value + '; margin-left: auto; \ 161 + console.log(value);
  162 + return '<div style="background-color:' + value + '; margin-left: auto; \
195 margin-right: auto;width:15px;height:15px;"></div>'; 163 margin-right: auto;width:15px;height:15px;"></div>';
196 }, 164 },
197 editor: { xtype: 'statuscoloreditor' } 165 editor: { xtype: 'statuscoloreditor' }
php/classes/AmdaAction.php
  Diff comments   View file @9b67ae6
@@ -1694,5 +1694,114 @@ class AmdaAction @@ -1694,5 +1694,114 @@ class AmdaAction
1694 $cacheMgr = new CatalogCacheMgr(); 1694 $cacheMgr = new CatalogCacheMgr();
1695 return $cacheMgr->editColumn($id,$name, $type,$size,$description, $status); 1695 return $cacheMgr->editColumn($id,$name, $type,$size,$description, $status);
1696 } 1696 }
  1697 +
  1698 + public function getNodeValues($data,&$transformed){
  1699 + $iconCls = "task-folder";
  1700 + foreach ($data as $parameter => $value) {
  1701 + if(is_array($value) && !$value['modified']){
  1702 + $child = [
  1703 + "parameter" => $parameter,
  1704 + "value" => "",
  1705 + "iconCls" => $iconCls,
  1706 + "expanded" => false,
  1707 + "children" => []
  1708 + ];
  1709 +
  1710 + $this->getNodeValues($value,$child['children']);
  1711 + $transformed[] = $child;
  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 + }
  1724 + else{
  1725 + $child =[
  1726 + "parameter" => $parameter,
  1727 + "value" => $value,
  1728 + "iconCls" => "task",
  1729 + "leaf" => true,
  1730 + "modified" => false,
  1731 + "default" =>$value
  1732 + ];
  1733 + $transformed[] = $child;
  1734 + }
  1735 + }
  1736 + }
  1737 + public function getDefaultValueConfigs(){
  1738 + if (file_exists(DATAPATH.'defaultValuesConfig.json'))
  1739 + return array('success' => true , 'configs' => json_decode(file_get_contents(DATAPATH.'defaultValuesConfig.json'), true));
  1740 + else
  1741 + return array('success' => false , 'configs' => array(), 'message'=>'Error : No default value configs file.');
  1742 + }
  1743 +
  1744 + public function getDefaultValueLinks(){
  1745 + if (!file_exists(DATAPATH.'defaultValuesLinks.json'))
  1746 + return array('success' => false , 'links' => array(), 'message'=>'Error : No default value links file.');
  1747 +
  1748 + $json_links = json_decode(file_get_contents(DATAPATH.'defaultValuesLinks.json'), true);
  1749 + if (!file_exists(DATAPATH.'defaultValuesConfig.json'))
  1750 + return array('success' => false , 'links' => array(), 'message'=>'Error : No default value configs file.');
  1751 +
  1752 + $json_configs= json_decode(file_get_contents(DATAPATH.'defaultValuesConfig.json'), true);
  1753 + foreach ($json_links as $parameter => &$links){
  1754 + if(!empty($links['store']))
  1755 + $links['store']= $json_configs[$links['store']];
  1756 + }
  1757 + return array('success' => true , 'links' => $json_links);
  1758 +
  1759 + }
  1760 +
  1761 + public function getDefaultValueTree($isTree=TRUE){
  1762 + $childrenToReturn = array();
  1763 + $children = [];
  1764 + if (!file_exists(DATAPATH.'defaultValues.json'))
  1765 + return array('success' => false , 'defaultValues' => array(), 'message'=>'efaultvalues file not found.');
  1766 + $json_o = json_decode(file_get_contents(DATAPATH.'defaultValues.json'), true);
  1767 + if (empty($json_o))
  1768 + return array('success' => false , 'defaultValues' => array(), 'message'=>'Error : defaultValues file empty.');
  1769 +
  1770 + if (!file_exists(USERDIR.'userDefaults.json'))
  1771 + return array('success' => true , 'defaultValues' => $json_o, 'message'=>'No modification on defaultvalues.');
  1772 +
  1773 + $json_user = json_decode(file_get_contents(USERDIR.'userDefaults.json'), true);
  1774 + if (empty($json_user))
  1775 + return array('success' => true , 'defaultValues' => $json_o, 'message'=>'No modification on defaultvalues.');
  1776 +
  1777 + foreach($json_user as $key => $value){
  1778 + $keys = explode(".", $key);
  1779 + $results = &$json_o; // Use a reference to update the original array
  1780 + foreach($keys as $parameter){
  1781 + $results = &$results[$parameter];
  1782 + }
  1783 + if($isTree)
  1784 + $results = array("value" => $value, "modified" => true, "defaultValue" => $results);
  1785 + else
  1786 + $results = $value;
  1787 + }
  1788 +
  1789 + if($isTree){
  1790 + $this->getNodeValues($json_o,$children);
  1791 + return [ "text" => ".", "children" => $children ];
  1792 + }
  1793 +
  1794 + return array('success' => true , 'defaultValues' => $json_o);
  1795 + }
  1796 +
  1797 + public function setUserDefaultValues($data){
  1798 + $json_user = json_encode($data, true);
  1799 + if (empty($json_user))
  1800 + return array('success' => false , 'message'=>'Error : No modifications to write.');
  1801 +
  1802 + file_put_contents(USERDIR.'userDefaults.json',$json_user);
  1803 +
  1804 + return array('success' => true);
  1805 + }
1697 } 1806 }
1698 ?> 1807 ?>
php/config.php
  Diff comments   View file @9b67ae6
@@ -205,7 +205,13 @@ $API = array( @@ -205,7 +205,13 @@ $API = array(
205 'deleteColumn' => array('len'=> 1), 205 'deleteColumn' => array('len'=> 1),
206 'addColumn' => array('len' => 6), 206 'addColumn' => array('len' => 6),
207 'getCatColumnInfo' => array('len' => 1), 207 'getCatColumnInfo' => array('len' => 1),
208 - 'editColumn' => array('len' => 6) 208 + 'editColumn' => array('len' => 6),
  209 + // Default Values options
  210 + 'getDefaultValueLinks' => array('len' => 0),
  211 + 'getDefaultValueTree' => array('len'=>1),
  212 + 'getDefaultValueConfigs' => array('len' => 0),
  213 + 'setUserDefaultValues' => array('len' => 1)
  214 +
209 ) 215 )
210 ) 216 )
211 ); 217 );