CDPP / AMDA_IHM

Commit 2fb8bbf3dbfccc6d80f40073dc2f80475767500c

Authored by Erdogan Furkan
1 parent c2cc7749
Exists in master and in 56 other branches 10178, 5390, 9016Bis, 9505, 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, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, mlplasmas, openam

#5390 - First modifications

Showing 2 changed files with 4 additions and 0 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotPanelObject.js
  Diff comments   View file @2fb8bbf
@@ -41,6 +41,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', { @@ -41,6 +41,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
41 {name: 'fills-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 41 {name: 'fills-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set
42 {name: 'panel-index', type: 'int'}, 42 {name: 'panel-index', type: 'int'},
43 {name: 'panel-background-color', type: 'string'}, 43 {name: 'panel-background-color', type: 'string'},
  44 + { name: 'panel-plotareabackground-color', type: 'string' },
44 {name: 'panel-title-text', type: 'string'}, 45 {name: 'panel-title-text', type: 'string'},
45 {name: 'panel-title-color', type: 'string'}, 46 {name: 'panel-title-color', type: 'string'},
46 {name: 'panel-title-position', type: 'string'}, 47 {name: 'panel-title-position', type: 'string'},
@@ -551,6 +552,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', { @@ -551,6 +552,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
551 setDefaultValues: function() 552 setDefaultValues: function()
552 { 553 {
553 this.set('panel-background-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor); 554 this.set('panel-background-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor);
  555 + this.set('panel-plotareabackground-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.backgroundColor);
554 this.set('panel-title-text', ''); 556 this.set('panel-title-text', '');
555 this.set('panel-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.color); 557 this.set('panel-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.color);
556 this.set('panel-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.position); 558 this.set('panel-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.panel.title.position);
@@ -691,6 +693,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', { @@ -691,6 +693,7 @@ Ext.define('amdaPlotObj.PlotPanelObject', {
691 panelValues['panel-index'] = this.get('panel-index'); 693 panelValues['panel-index'] = this.get('panel-index');
692 694
693 panelValues['panel-background-color'] = this.get('panel-background-color'); 695 panelValues['panel-background-color'] = this.get('panel-background-color');
  696 + panelValues['panel-plotareabackground-color'] = this.get('panel-plotareabackground-color');
694 panelValues['panel-title-text'] = this.get('panel-title-text'); 697 panelValues['panel-title-text'] = this.get('panel-title-text');
695 panelValues['panel-title-color'] = this.get('panel-title-color'); 698 panelValues['panel-title-color'] = this.get('panel-title-color');
696 panelValues['panel-title-position'] = this.get('panel-title-position'); 699 panelValues['panel-title-position'] = this.get('panel-title-position');
js/app/views/PlotComponents/PlotPanelForm.js
  Diff comments   View file @2fb8bbf
@@ -142,6 +142,7 @@ Ext.define('amdaPlotComp.PlotPanelForm', { @@ -142,6 +142,7 @@ Ext.define('amdaPlotComp.PlotPanelForm', {
142 me.crtTree.refresh(); 142 me.crtTree.refresh();
143 }), 143 }),
144 this.addColorsPicker('panel-background-color', 'Background Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'), 144 this.addColorsPicker('panel-background-color', 'Background Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'),
  145 + this.addColorsPicker('panel-plotareabackground-color', 'Plot Area Background Color', amdaPlotObj.PlotObjectConfig.availableColorsNew, 'none'),
145 this.addStandardFieldSet('Manual Bounds', '', boundsItems), 146 this.addStandardFieldSet('Manual Bounds', '', boundsItems),
146 this.addStandardFieldSet('Manual Margins', '', marginItems), 147 this.addStandardFieldSet('Manual Margins', '', marginItems),
147 this.addStandardFieldSet('Preferred Dimensions', '', preferedDimItems), 148 this.addStandardFieldSet('Preferred Dimensions', '', preferedDimItems),