Changeset 212:99534b6c5b50

Timestamp:

Feb 15, 2011, 12:39:32 PM (13 years ago)

Author:

fnevgeny

Branch:

default

Phase:

public

Message:

Implemented support for 2-species entities.

Location:

source

Files:

• class/pf/Application.js (modified) (15 diffs)
• resource/pf/image/ee_small.png (added)
• resource/pf/image/ei_small.png (added)
• resource/pf/image/er_small.png (added)
• resource/pf/image/ii_small.png (added)
• resource/pf/image/ir_small.png (added)
• resource/pf/image/rr_small.png (added)

source/class/pf/Application.js

@@ -315 +315 @@
     // Add to the list of favorites
     var fav = new Object;
-    fav.entity  = leaf.getUserData("entity");
-    fav.species = leaf.getUserData("species");
-    fav.color   = this.nextColor();
+    fav.entity = leaf.getUserData("entity");
+    fav.s1     = leaf.getUserData("s1");
+    fav.s2     = leaf.getUserData("s2");
+    fav.color  = this.nextColor();
     this.favorites.push(fav);
     
@@ -339 +340 @@
     leaf.setTextColor(this.leafColor);
 
-    var entity  = leaf.getUserData("entity");
-    var species = leaf.getUserData("species");
+    var entity = leaf.getUserData("entity");
+    var s1     = leaf.getUserData("s1");
+    var s2     = leaf.getUserData("s2");
 
     // Remove from the list of favorites
     for (var k = 0; k < this.favorites.length; k++) {
         var fav = this.favorites[k];
-        if (fav.entity  == entity && fav.species == species) {
+        if (fav.entity  == entity && fav.s1 == s1 && fav.s2 == s2) {
             this.favorites.splice(k, 1);
             break;
@@ -454 +456 @@
         
 
-        getEntityFullName : function (entity, species)
+        getSpeciesName : function(species) {
+            var name;
+            
+            switch (species.id) {
+            case "e":
+                name = "electrons";
+                break;
+            case "i":
+                name = "ions";
+                break;
+            case "r":
+                name = "radiators";
+                break;
+            default:
+                name = null;
+                break;
+            }
+            
+            return name;
+        },
+        
+        getEntityFullName : function(entity, s1, s2)
         {
             var name = entity.name;
-            if (entity.nspecies == 1) {
+            switch (entity.nspecies) { 
+            case 2:
+                name += " (" + this.getSpeciesName(s1) + "/" +
+                               this.getSpeciesName(s2) + ")";
+                break;
+            case 1:
                 var prepos = entity.prepos;
                 if (!prepos) {
                     prepos = "of";
                 }
-                name += " " + prepos + " ";
-                switch (species.id) {
-                case "e":
-                    name += "electrons";
-                    break;
-                case "i":
-                    name += "ions";
-                    break;
-                case "r":
-                    name += "radiators";
-                    break;
-                }
+                name += " " + prepos + " " + this.getSpeciesName(s1);
+                break;
+            default:
+                break;
             }
             
@@ -479 +499 @@
         },
         
-        evaluateEntityValue : function(entity, species)
+        evaluateEntityValue : function(entity, s1, s2)
         {
             var formula;
-            if (entity.nspecies == 1) {
-                var species_str = "this.plasma." + species.id;
-                formula = entity.formula.replace(/\%s1/g, species_str);
-            } else {
+            switch (entity.nspecies) {
+            case 1:
+                var s1_str = "this.plasma." + s1.id;
+                formula = entity.formula.replace(/\%s1/g, s1_str);
+                break;
+            case 2:
+                var s1_str = "this.plasma." + s1.id;
+                var s2_str = "this.plasma." + s2.id;
+                formula = entity.formula.replace(/\%s1/g, s1_str);
+                formula = formula.replace(/\%s2/g, s2_str);
+                break;
+            default:
                 formula = entity.formula;
+                break;
             }
             var v = eval(formula);
@@ -502 +531 @@
             }
             
-            var entity  = leaf.getUserData("entity");
-            var species = leaf.getUserData("species");
+            var entity = leaf.getUserData("entity");
+            var s1     = leaf.getUserData("s1");
+            var s2     = leaf.getUserData("s2");
             
             var name, section, value;
             if (entity) {
-                var v     = this.evaluateEntityValue(entity, species);
+                var v     = this.evaluateEntityValue(entity, s1, s2);
                 var scale = this.gui_entity_units.getSelectedValue();
                 
-                name    = this.getEntityFullName(entity, species);
+                name    = this.getEntityFullName(entity, s1, s2);
                 section = entity.section;
                 value   = v*scale
@@ -538 +568 @@
         isFavorite : function(leaf)
         {
-            var entity  = leaf.getUserData("entity");
-            var species = leaf.getUserData("species");
+            var entity = leaf.getUserData("entity");
+            var s1     = leaf.getUserData("s1");
+            var s2     = leaf.getUserData("s2");
 
             for (var k = 0; k < this.favorites.length; k++) {
                 var fav = this.favorites[k];
-                if (fav.entity  == entity && fav.species == species) {
+                if (fav.entity  == entity && fav.s1 == s1 && fav.s2 == s2) {
                     return true;
                     break;
@@ -552 +583 @@
         },
         
-        addEntityLeaf : function(entity, species)
+        addEntityLeaf : function(entity, s1, s2)
         {
             var icon;
-            if (species) {
-                icon = "pf/image/" + species.id + "_small.png";
+            
+            if (s1 && s2) {
+                icon = "pf/image/" + s1.id + s2.id + "_small.png";
+            } else
+            if (s1) {
+                icon = "pf/image/" + s1.id + "_small.png";
             } else {
                 icon = "pf/image/all_small.png";
@@ -564 +599 @@
             leaf.setIcon(icon);
             leaf.addListener("contextmenu", treeMenuCB, this);
+
             leaf.setUserData("entity", entity);
-
-            if (species) {
-                leaf.setUserData("species", species);
-            }
+            leaf.setUserData("s1", s1);
+            leaf.setUserData("s2", s2);
 
             if (this.isFavorite(leaf)) {
@@ -657 +691 @@
                     for (var j = 0; j < sa.length; j++) {
                         var s = sa[j];
-                        leaf = this.addEntityLeaf(entity, s);
+                        leaf = this.addEntityLeaf(entity, s, null);
                         folder.add(leaf);
                     }
                     break;
+                case 2:
+                    for (var j = 0; j < sa.length; j++) {
+                        var s1 = sa[j];
+                        for (var k = j; k < sa.length; k++) {
+                            var s2 = sa[k];
+                            leaf = this.addEntityLeaf(entity, s1, s2);
+                            folder.add(leaf);
+                        }
+                    }
+                    break;
                 default:
-                    leaf = this.addEntityLeaf(entity, null);
+                    leaf = this.addEntityLeaf(entity, null, null);
                     folder.add(leaf);
                     break;
@@ -719 +763 @@
                 }
                 
-                var species = fav.species;
+                var s1 = fav.s1;
+                var s2 = fav.s2;
 
                 var icon;
-                if (species) {
-                    icon = "pf/image/" + species.id + "_small.png";
+                if (s1 && s2) {
+                    icon = "pf/image/" + s1.id + s2.id + "_small.png";
+                } else
+                if (s1) {
+                    icon = "pf/image/" + s1.id + "_small.png";
                 } else {
                     icon = "pf/image/all_small.png";
                 }
-                var name = this.getEntityFullName(entity, species);
-                var value = scale*this.evaluateEntityValue(entity, species);
+                var name = this.getEntityFullName(entity, s1, s2);
+                var value = scale*this.evaluateEntityValue(entity, s1, s2);
 
                 rowData.push([icon, name, entity.section,
@@ -760 +808 @@
                 }
                 
-                var species = fav.species;
-
-                var name  = this.getEntityFullName(entity, species);
+                var s1    = fav.s1;
+                var s2    = fav.s2;
+
+                var name  = this.getEntityFullName(entity, s1, s2);
                 var color = fav.color;
 
@@ -1350 +1399 @@
                 }
                 
-                var species = fav.species;
-                var vname = this.getEntityFullName(entity, species);
+                var s1    = fav.s1;
+                var s2    = fav.s2;
+                var vname = this.getEntityFullName(entity, s1, s2);
 
                 var set   = new Object;
@@ -1386 +1436 @@
                     }
                     
-                    var value = scale*this.evaluateEntityValue(entity, species);
+                    var value = scale*this.evaluateEntityValue(entity, s1, s2);
                     
                     if (first) {
@@ -2068 +2118 @@
                 var sfav = new Object;
                 sfav.entity_id  = fav.entity.id;
-                if (fav.species) {
-                    sfav.species_id = fav.species.id;
+                if (fav.s1) {
+                    sfav.s1_id = fav.s1.id;
                 } else {
-                    sfav.species_id = null;
+                    sfav.s1_id = null;
+                }
+                if (fav.s2) {
+                    sfav.s2_id = fav.s2.id;
+                } else {
+                    sfav.s2_id = null;
                 }
                 sfav.color      = fav.color;
@@ -2098 +2153 @@
                     var fav  = new Object;
                     fav.entity = this.getEntityById(sfav.entity_id);
+                    // old format
                     if (sfav.species_id) {
-                        fav.species = this.getSpeciesById(sfav.species_id);
+                        fav.s1 = this.getSpeciesById(sfav.species_id);
+                    } else
+                    if (sfav.s1_id) {
+                        fav.s1 = this.getSpeciesById(sfav.s1_id);
+                    }
+
+                    if (sfav.s2_id) {
+                        fav.s2 = this.getSpeciesById(sfav.s2_id);
                     }
                     fav.color = sfav.color;