info bulls Plot redmine 6296

Elena.Budnik
1 parent 663f6395
Showing 6 changed files with 67 additions and 13 deletions Show diff stats
help/MinMaxThreshold
help/VerticalLayout
js/app/AmdaApp.js
js/app/views/PlotComponents/PlotBaseSerieForm.js
js/app/views/PlotComponents/PlotSpectroForm.js
js/app/views/PlotUI.js
@@ -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/>
+
@@ -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
@@ -268,6 +268,33 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 		});
 	},
  
+	// 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 = [];
  
@@ -90,12 +90,13 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 		    	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())
 		];
 	}
 });
@@ -18,22 +18,23 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
  
 	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);
+			})
 		];
 	}
 });
@@ -271,7 +271,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 							this.resetProcess();
 						}
 					},
-					'->', {
+					'->', '-', {
 						xtype: 'button',
 						text: 'Save Request',
 						scope: this,
@@ -321,7 +321,9 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 								})
 							}
 						}
-					 },' ', {
+					 }, ' ', 
+						myDesktopApp.addAmdaInfo('plotSaveRequest','vertical-align:top'),
+						' ', {
 						xtype: 'checkbox',
 						boxLabel: 'All Plot Tabs',
 						name : 'all-in-one',