iconCls

Elena.Budnik
1 parent bafc2a52
Showing 6 changed files with 28 additions and 13 deletions Show diff stats
js/app/models/AliasNode.js
js/app/models/InteractiveNode.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/views/PlotComponents/PlotTree.js
php/classes/AliasMgr.php
php/classes/AmdaAction.php
@@ -17,13 +17,17 @@ Ext.define(&#39;amdaModel.AliasNode&#39;, {
 		objectName: 'Alias',
 		deletedAliases : null
 	},
-    
+	
+   fields: [
+		{name: 'component_info', type: 'object', persist: false},
+		{name: 'iconCls', type: 'string',  defaultValue: 'icon-scalar', persist: false}
+	],
+      
 	constructor : function(config) {
-		this.callParent(arguments);     
-// 		if (this.get('leaf')) 
-// 			this.set('iconCls', 'icon-scalar');
-		if (this.get('leaf') && (!this.get('iconCls') || this.get('iconCls') == ""))
-			this.set('iconCls', 'icon-scalar');
+		this.callParent(arguments);
+		if (this.get('leaf') && 
+			(!this.get('iconCls') || this.get('iconCls') == ""))
+				this.set('iconCls', 'icon-scalar');
 	},
  
 	allMenuItems : function() {
@@ -22,8 +22,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		{name: 'moduleId', type: 'string', persist: false},
 		{name: 'filtered', type: 'boolean', defaultValue: false, persist: false},
 		{name: 'needsArgs', type:'boolean', defaultValue: false},
-		{name: 'disable', type: 'boolean', defaultValue: false, persist: false},
-		{name: 'component_info', type: 'object', persist: false}
+		{name: 'disable', type: 'boolean', defaultValue: false, persist: false}
 	],
  
 	statics: {
@@ -324,8 +324,12 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
 				recs[0].set('real-type', 1);
     		}
     	}
+    	
+    	// alias
 	if (realparamid) {
-		recs[0].set('real-paramid',realparamid); // aliases
+		recs[0].set('real-paramid',realparamid);  
+		var iconCls = (typeof data.iconCls !== "undefined") ? data.iconCls : null;
+		isVector = iconCls == 'icon-vector';
 	}
  
 	recs[0].set('param-type', isTTCat ? 'ttcat' : 'param');
@@ -707,6 +707,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                             return false;
                                         var component_info = record.get('component_info');
                                         var components = null;
+                                        var iconCls = null;
                                         if (component_info && component_info.parentId) {
                                           //It's a component 
                                           components = [];
@@ -718,8 +719,10 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                           if (component_info.index2)
                                              components['index2'] = component_info.index2;
                                           }
-                                      
-                                        this.dropParamToCreate(targetNode, position, "#" + record.get('text'), { 'components': components, 'realparamid' :  record.get('info') });
+                                        if (record.get('iconCls')) 
+                                           iconCls = record.get('iconCls');
+													 
+                                        this.dropParamToCreate(targetNode, position, "#" + record.get('text'), { 'components': components, 'realparamid' :  record.get('info'), 'iconCls' : iconCls });
                                         return true;
                                     case 'amdaModel.DerivedParamNode' :
                                             if (!record.get('isParameter'))
@@ -29,12 +29,13 @@ class AliasMgr extends AmdaObjectMgr {
 	* Add Alias in Alias.xml
 	*/      
 	protected function addAlias($obj) {
+
 		$objList = $this->contentDom->getElementById($this->contentRootId); 		
 		$newObj = $this->contentDom->createElement($this->objTagName);
 		$newObj->setAttribute('xml:id',$this->id);
 		$obj_arr = (array)$obj;
 		foreach ($this->attributes as $key => $value) {
-			if ($key == 'name') $newObj->setAttribute($key, $obj_arr[$key]);
+			$newObj->setAttribute($key, $obj_arr[$key]);
 		}
  
 		if (count($obj_arr['component_info']) > 0) {
@@ -198,6 +198,9 @@ class AmdaAction
 							if ($child->hasAttribute("parentId"))
 								$component_info["parentId"] = $child->getAttribute("parentId");
  
+							if ($child->hasAttribute("iconCls"))
+								$iconCls = $child->getAttribute("iconCls");
+							
 							if ($isLeaf) $isParameter = true;
  
 						break;
@@ -572,7 +575,8 @@ class AmdaAction
  
 						$childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info,
 													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2,
-													"component_info" => isset($component_info) ? $component_info : NULL);
+													'component_info' => isset($component_info) ? $component_info : NULL, 
+													'iconCls' => isset($iconCls) ? $iconCls : NULL );
 					}
 				}
 				// if $childrenToReturn we have to return []