diff --git a/help/MinMaxThreshold b/help/MinMaxThreshold new file mode 100644 index 0000000..44801a1 --- /dev/null +++ b/help/MinMaxThreshold @@ -0,0 +1,5 @@ +<h3>Min/Max Thresholds</h3> +Values out of Min/Max thresholds are not shown on the plot but this does not impact the X/Y axis range. +To have access to axis control you should uncheck <i>Simplified View</i> checkbox. +<br/> + diff --git a/help/VerticalLayout b/help/VerticalLayout new file mode 100644 index 0000000..e407b4b --- /dev/null +++ b/help/VerticalLayout @@ -0,0 +1,18 @@ +<h3>Implemented Layouts</h3> + + <i>Vertical</i> ( default ): vertical stack of panels;<br/> + all time panels are of the same width;<br/> + one XY panel in the line;<br/> + generic panel height (for Time and XY panel)<br/> + and width (for XY panel) can be defined at this level<br/><br/> + + <i>Auto</i> : automatic layout - if possible combines<br/> + several XY panels at the same level; + only panel height can be defined (XY panel is 'square')<br/><br/> + + <i>Manual</i> : everything is to be defined by user + + <hr> +Two generic panel types : 'Time/Epoch' and 'XY (Scatter/Instant)'; +<br/> + \ No newline at end of file diff --git a/js/app/AmdaApp.js b/js/app/AmdaApp.js index ef678dc..72cf34b 100755 --- a/js/app/AmdaApp.js +++ b/js/app/AmdaApp.js @@ -268,6 +268,33 @@ Ext.define('amdaApp.AmdaApp', { }); }, + // add info icon; onCick AmdaHelp is shown + addAmdaInfo : function(help, style) { + if (style) { + help += '" style="' + style; + } + var html = '<img amda_clicktip="' + help + '" src="js/resources/images/16x16/info_mini.png"' + return { + xtype: 'label', + html: html, + listeners: { + click: { + element: 'el', + fn: function(e,t) { + var me = t, + text = me.getAttribute('amda_clicktip'); + if (text) { + e.preventDefault(); + AmdaAction.getInfo({name : text}, function(res,e) { + if (res.success) myDesktopApp.infoMsg(res.result); + }); + } + } + } + } + }; + }, + getModules : function(){ var allModules = []; diff --git a/js/app/views/PlotComponents/PlotBaseSerieForm.js b/js/app/views/PlotComponents/PlotBaseSerieForm.js index 8cd7d28..8b7ef38 100644 --- a/js/app/views/PlotComponents/PlotBaseSerieForm.js +++ b/js/app/views/PlotComponents/PlotBaseSerieForm.js @@ -90,12 +90,13 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { me.object.set('serie-yaxis', value); me.crtTree.refresh(); }), + myDesktopApp.addAmdaInfo('MinMaxThreshold','vertical-align:bottom'), this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()), this.addStandardParamDropTarget('serie-colored-param', 'Colored Parameter'), this.addStandardFieldSet('Lines', 'serie-lines-activated', this.addStandardLineItems('serie-lines')), this.addStandardFieldSet('Symbols', 'serie-symbols-activated', this.addStandardSymbolsItems('serie-symbols')), this.addStandardFieldSet('Time ticks', 'serie-timetick-activated', this.getTimeTickItems()), - this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()) + this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems()) ]; } }); diff --git a/js/app/views/PlotComponents/PlotSpectroForm.js b/js/app/views/PlotComponents/PlotSpectroForm.js index 71e0454..86481d7 100644 --- a/js/app/views/PlotComponents/PlotSpectroForm.js +++ b/js/app/views/PlotComponents/PlotSpectroForm.js @@ -18,22 +18,23 @@ Ext.define('amdaPlotComp.PlotSpectroForm', { getValuesRangeItems: function() { return [ - this.addStandardFloat2('spectro-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true), - this.addStandardFloat2('spectro-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true) + this.addStandardFloat2('spectro-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true), + this.addStandardFloat2('spectro-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true) ]; }, getFormItems: function() { var me = this; return [ - this.addStandardCombo('spectro-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function(name, value, oldValue) { - me.object.set('spectro-yaxis', value); - me.crtTree.refresh(); - }), - this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()), - this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function(name, value, oldValue) { - me.object.set('spectro-log0-as-min', value); - }) + this.addStandardCombo('spectro-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function(name, value, oldValue) { + me.object.set('spectro-yaxis', value); + me.crtTree.refresh(); + }), + myDesktopApp.addAmdaInfo('MinMaxThreshold','vertical-align:bottom'), + this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()), + this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function(name, value, oldValue) { + me.object.set('spectro-log0-as-min', value); + }) ]; } }); diff --git a/js/app/views/PlotUI.js b/js/app/views/PlotUI.js index 5e38a67..5a26d3d 100644 --- a/js/app/views/PlotUI.js +++ b/js/app/views/PlotUI.js @@ -271,7 +271,7 @@ Ext.define('amdaUI.PlotUI', { this.resetProcess(); } }, - '->', { + '->', '-', { xtype: 'button', text: 'Save Request', scope: this, @@ -321,7 +321,9 @@ Ext.define('amdaUI.PlotUI', { }) } } - },' ', { + }, ' ', + myDesktopApp.addAmdaInfo('plotSaveRequest','vertical-align:top'), + ' ', { xtype: 'checkbox', boxLabel: 'All Plot Tabs', name : 'all-in-one', -- libgit2 0.21.2