Changeset 79:37ae7c70f961

Timestamp:

Oct 28, 2008, 6:19:18 PM (16 years ago)

Author:

fnevgeny

Branch:

default

Phase:

public

Message:

sprintf moved to pf.Util.Format.

Files:

• config.json (modified) (1 diff)
• source/class/pf/Application.js (modified) (3 diffs)
• source/class/pf/ui/TextField.js (modified) (2 diffs)
• source/class/pf/ui/canvas/Plotter.js (modified) (2 diffs)
• source/class/pf/util/Format.js (added)
• source/pf.html (modified) (1 diff)
• source/sprintf.js (deleted)

config.json

@@ -45 +45 @@
       "copy-files" :
       {
-        "files" : ["index.html", "pf.html", "sprintf.js", "wz_jsgraphics.js",
-                   "entities.js"],
+        "files" : ["index.html", "pf.html", "wz_jsgraphics.js", "entities.js"],
         "target" : "${BUILD_PATH}"
       }

source/class/pf/Application.js

@@ -1 +1 @@
 /* ************************************************************************
 
-   Copyright:
-
-   License:
-
-   Authors:
+   Copyright: Weizmann Institute of Science
+
+   License: GPL
+
+   Authors: Evgeny Stambulchik
 
 ************************************************************************ */
@@ -16 +16 @@
 ************************************************************************ */
 
-
-function NumPrint(v, prec)
-{
-    var s;
-    
-    if (prec == null) {
-        prec = 3;
-    }
-    
-    if (v == 0.0) {
-        s = "0";
-    } else
-    if (!isFinite(v)) {
-        s = v;
-    } else
-    if (Math.abs(v) < 1.e6 && Math.abs(v) >= 0.1) {
-        s = sprintf("%." + prec.toString() + "f", v);
-    } else {
-        s = sprintf("%." + prec.toString() + "e", v);
-    }
-    
-    return s;
-}
 
 function changeN_e(ev)
@@ -909 +886 @@
                 var value = scale*this.evaluateEntityValue(entity, species);
 
-                rowData.push({ s_icon   : {icon       : icon,
-                                           iconWidth  : 16, 
-                                           iconHeight : 16             },
-                               name     : {text       : name           },
-                               section  : {text       : entity.section },
-                               value    : {text       : NumPrint(value)}
+                rowData.push({ s_icon  : {icon       : icon,
+                                          iconWidth  : 16, 
+                                          iconHeight : 16             },
+                               name    : {text       : name           },
+                               section : {text       : entity.section },
+                               value   : {text       : pf.util.Format.numPrint(value)}
                              });
             }

source/class/pf/ui/TextField.js

@@ -5 +5 @@
     
     construct: function(v) {
-        this.base(arguments, NumPrint(v));
+        this.base(arguments, pf.util.Format.numPrint(v));
     },
     
@@ -12 +12 @@
         setNumValue: function(v)
         {
-            this.setValue(NumPrint(v));
+            this.setValue(pf.util.Format.numPrint(v));
         },
 

source/class/pf/ui/canvas/Plotter.js

@@ -83 +83 @@
                 this.dPoint2vPoint(tracker.dp, tracker.vp);
                 this.vPoint2wPoint(tracker.vp, tracker.wp);
-                tracker.setLabel("X: " + NumPrint(tracker.wp.x) +
-                    "<br>Y: " + NumPrint(tracker.wp.y));
+                tracker.setLabel("X: " + pf.util.Format.numPrint(tracker.wp.x) +
+                    "<br>Y: " + pf.util.Format.numPrint(tracker.wp.y));
                 tracker.setLeft(tracker.dp.x + 12);
                 tracker.setTop(tracker.dp.y - 12);
@@ -361 +361 @@
                 
                 if (major_tick) {
-                    this.drawStringV(vp1, NumPrint(wval, prec), halign, valign);
+                    this.drawStringV(vp1,
+                        pf.util.Format.numPrint(wval, prec), halign, valign);
                 }
             }

source/pf.html

@@ -4 +4 @@
     <title>Plasma Formulary Interactive</title>
     <script type="text/javascript" src="script/pf.js"></script>
-    <script type="text/javascript" src="sprintf.js"></script>
     <script type="text/javascript" src="wz_jsgraphics.js"></script>
     <script type="text/javascript" src="entities.js"></script>