CDPP / AMDA_IHM

Commit a618697791d2bcc6d059e150b39a57335eb9a2bb

Authored by Benjamin Renard
2 parents e0648247 fae756e0
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 9 changed files with 70 additions and 66 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/ExplorerModule.js
  Diff comments   View file @a618697
... ... @@ -37,7 +37,7 @@ Ext.define('amdaDesktop.ExplorerModule',
37 37 'amdaModel.Download',
38 38 'amdaModel.TimeTable',
39 39 'amdaModel.Catalog',
40   - 'amdaModel.Statistics',
  40 + 'amdaModel.Stats',
41 41 'amdaModel.FileObject',
42 42 'amdaModel.FileParamObject',
43 43 'amdaModel.FilterInfo'
... ...
js/app/controllers/StatisticsModule.js
  Diff comments   View file @a618697
... ... @@ -21,7 +21,7 @@ Ext.define('amdaDesktop.StatisticsModule', {
21 21 * @required
22 22 */
23 23 nodeDataModel : 'amdaModel.StatisticsNode',
24   - objectDataModel : 'amdaModel.Statistics',
  24 + objectDataModel : 'amdaModel.Stats',
25 25 /**
26 26 * @cfg {String} window definitions
27 27 * @required
... ...
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @a618697
... ... @@ -140,6 +140,8 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
140 140 }
141 141 ],
142 142  
  143 + isComponent : false,
  144 +
143 145 constructor: function(){
144 146 var me = this;
145 147 me.callParent(arguments);
... ... @@ -285,9 +287,10 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
285 287  
286 288 var recs = this.params().add({id : this.get('last-param-id')});
287 289 recs[0].set('paramid', paramId);
288   -
  290 +
289 291 if (paramComponents) {
290 292 if (paramComponents['index1']) {
  293 + this.isComponent = true;
291 294 recs[0].set('dim1-is-range', false);
292 295 recs[0].set('dim1-min-range', 0.);
293 296 recs[0].set('dim1-max-range', 0.);
... ... @@ -310,12 +313,13 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
310 313 var me = this;
311 314 amdaPlotObj.PlotObjectConfig.getParamConfig(paramId, function (success, data) {
312 315 var availableDrawingObjects = null;
313   -
  316 +
314 317 //Change type only if the panel is empty!
315 318 if (success) {
316   - if (emptyPanel)
  319 + if (emptyPanel && !me.isComponent)
317 320 me.changePlotType(data.panel.plotType);
318   - if (data.draw) {
  321 +
  322 + if (data.draw && !me.isComponent) {
319 323 availableDrawingObjects = recs[0].getAvailableDrawingObjectByPlotType(me.get('panel-plot-type'));
320 324  
321 325 Ext.each(availableDrawingObjects, function (drawingObj) {
... ...
js/app/models/Statistics.js renamed to js/app/models/Stats.js
  Diff comments   View file @a618697
1 1 /**
2 2 * Project : AMDA-NG
3   - * Name : Statistics.js
  3 + * Name : Stats.js
4 4 * Description : Statistics Object Definition
5   - * @class amdaModel.Statistics
  5 + * @class amdaModel.Stats
6 6 * @extends amdaModel.TimeTable
7 7 * @author elena
8 8 */
9 9  
10   -Ext.define('amdaModel.Statistics', {
  10 +Ext.define('amdaModel.Stats', {
11 11 extend: 'amdaModel.AmdaTimeObject',
12 12  
13 13 fields : [
... ... @@ -79,4 +79,4 @@ Ext.define('amdaModel.Statistics', {
79 79  
80 80 return values;
81 81 }
82   -});
83 82 \ No newline at end of file
  83 +});
... ...
php/classes/DerivedParamMgr.php
  Diff comments   View file @a618697
... ... @@ -360,8 +360,8 @@ class DerivedParamMgr extends AmdaObjectMgr
360 360 if (!$res['valid']) return $res;
361 361  
362 362 //only low case
363   - if (strtolower($p->name) != $p->name)
364   - return array('valid' => false, 'error' => 'Use only low case');
  363 +// if (strtolower($p->name) != $p->name)
  364 +// return array('valid' => false, 'error' => 'Use only low case');
365 365  
366 366 return array('valid' => true);
367 367 }
... ...
php/makeOrbitsList.php
  Diff comments   View file @a618697
... ... @@ -5,6 +5,7 @@
5 5 */
6 6  
7 7 $AMDA_IHM = getenv('AMDA_IHM');
  8 + error_reporting(E_ERROR);
8 9  
9 10 if (!isset($AMDA_IHM))
10 11 require_once __DIR__."/config.php";
... ...
update_amda/cleanExistingInstallation
  Diff comments   View file @a618697
1 1 #!/bin/bash
2 2  
3 3 if test $AMDAINSTALLATION/AMDA_IHM/generic_data
4   -then
  4 +then
  5 + rm $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo/*.xml
  6 + rm $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo/*.xml
  7 + rm $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo/*.xml
5 8 rm $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo/*.xml
6 9 rm $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate/*.xml
7 10 rm $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase/*.xml
... ... @@ -15,15 +18,6 @@ then
15 18 rm $AMDAINSTALLATION/AMDA_IHM/help/auto/img/*
16 19 fi
17 20  
18   -if test $AMDAINSTALLATION/AMDA_Kernel/config
19   -then
20   - rm $AMDAINSTALLATION/AMDA_Kernel/config/DataSetInfo/*.xml
21   - rm $AMDAINSTALLATION/AMDA_Kernel/config/InstrumentInfo/*.xml
22   - rm $AMDAINSTALLATION/AMDA_Kernel/config/MissionInfo/*.xml
23   -else
24   - "check if AMDA_Kernel/config directory exists"
25   -fi
26   -
27 21 if test $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo
28 22 then
29 23 rm -r $AMDAINSTALLATION/AMDA_Kernel/app-generate-paraminfo/src/*
... ...
update_amda/cp2amda
  Diff comments   View file @a618697
1 1 #!/bin/bash
2 2  
3   -cp $NEWMETA/datasets/*.xml $AMDAINSTALLATION/AMDA_Kernel/config/DataSetInfo
4   -cp $NEWMETA/instruments/*.xml $AMDAINSTALLATION/AMDA_Kernel/config/InstrumentInfo
5   -cp $NEWMETA/missions/*.xml $AMDAINSTALLATION/AMDA_Kernel/config/MissionInfo
  3 +# copy all info files
  4 +if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo ]; then
  5 + mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo
  6 +fi
  7 +cp $NEWMETA/datasets/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/DataSetInfo
6 8  
  9 +if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo ]; then
  10 + mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo
  11 +fi
  12 +cp $NEWMETA/instruments/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/InstrumentInfo
7 13  
8   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate ]; then
9   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate
10   -fi
  14 +if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo ]; then
  15 + mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo
  16 +fi
  17 +cp $NEWMETA/missions/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/MissionInfo
11 18  
12   -if [ -e $AMDAINTERNALDIR/ParamTemplateList.xml ]; then
13   - php $AMDA_SPASE_INTERFACE/mvTemplates.php
  19 +# copy all Templates if exist
  20 +if [ -e $AMDAINTERNALDIR/ParamTemplateList.xml ]; then
  21 + if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate ]; then
  22 + mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate
  23 + fi
  24 +
  25 + php ./mvTemplates.php
14 26 cp $AMDAINTERNALDIR/ParamTemplateList.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamTemplate
15   - fi
16   -
17   - if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase ]; then
  27 +fi
  28 +
  29 +# copy all parameter desctiptions
  30 +if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase ]; then
18 31 mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
19   - fi
20   -
21   - # if internal parameters not shown in the tree exist => copy them
22   - if [ -d $AMDAINTERNALDIR/INTERNAL_PARAM_DEF ]
23   - then
24   - cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $NEWMETA/final/
25   - fi
26   -
27   - cp $NEWMETA/final/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
28   -
29   -
30   -# if special help exitsts => copy it
31   -if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED ]
32   - then
  32 +fi
  33 +cp $NEWMETA/final/*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  34 +
  35 +# if internal parameters not shown in the tree exist => copy them to AMDA Installation without processing
  36 +if [ -d $AMDAINTERNALDIR/INTERNAL_PARAM_DEF ]; then
  37 + cp $AMDAINTERNALDIR/INTERNAL_PARAM_DEF/* $AMDAINSTALLATION/AMDA_IHM/generic_data/newKernelDDBase
  38 +fi
  39 +
  40 +# if special help exitsts => copy it to NEWMETA
  41 +if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED ]; then
33 42 cp $AMDAINTERNALDIR/HELP_PREDEFINED/* $NEWMETA/help
34   - fi
35   -
  43 +fi
36 44  
  45 +# copy all help files
37 46 if [ ! -d $AMDAINSTALLATION/AMDA_IHM/help/auto ]; then
38 47 mkdir $AMDAINSTALLATION/AMDA_IHM/help/auto
39 48 fi
40   -
41   -cp $NEWMETA/help/* $AMDAINSTALLATION/AMDA_IHM/help/auto
  49 +cp $NEWMETA/help/* $AMDAINSTALLATION/AMDA_IHM/help/auto
42 50  
43 51 if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED/img ]; then
44 52 if [ ! -d $AMDAINSTALLATION/AMDA_IHM/help/auto/img ]; then
... ... @@ -48,21 +56,17 @@ if [ -d $AMDAINTERNALDIR/HELP_PREDEFINED/img ]; then
48 56 fi
49 57  
50 58 # copy info for parameter arguments
51   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo ]; then
52   - mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  59 +if [ -d $NEWMETA/ParamInfo ]; then
  60 + if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo ]; then
  61 + mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
  62 + fi
  63 + cp $NEWMETA/ParamInfo/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
53 64 fi
54 65  
55   -if [ -d $NEWMETA/ParamInfo ]
56   - then
57   - cp $NEWMETA/ParamInfo/info*.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/ParamInfo
58   - fi
59   -
60   -if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ]
61   - then
  66 +# copy LocalParams.xml created by makeTree.php to AMDA installation
  67 +if [ ! -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ]; then
62 68 mkdir $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
63   - fi
64   -
65   -if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ]
66   - then
  69 +fi
  70 +if [ -d $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData ] && [ -e ./LocalParams.xml ]; then
67 71 mv ./LocalParams.xml $AMDAINSTALLATION/AMDA_IHM/generic_data/LocalData
68   - fi
69 72 \ No newline at end of file
  73 +fi
70 74 \ No newline at end of file
... ...
update_amda/makeTree.php
  Diff comments   View file @a618697
... ... @@ -2,8 +2,9 @@
2 2  
3 3 /*
4 4 * make local data tree from list of missions
5   - */
  5 + */
6 6  
  7 + error_reporting(E_ERROR);
7 8 define("AMDA_SPASE_INTERFACE", getenv("AMDA_SPASE_INTERFACE"));
8 9  
9 10 if ( AMDA_SPASE_INTERFACE == "" )
... ...