Changeset 3138

Timestamp:

Feb 20, 2007, 8:34:13 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #497: Floating point numbers with leading zeroes in the decimal part are not correctly displayed

Also added an option in the File/Preferences?... dialog to allow a user to specify the number
of decimals to display. This solves the 0.004 issue. Another (better) solution would be to make
it possible to specify a default number of decimals to display for each annotation type. But it
requires a lot more work and should be a tast of it's own.

Location:

branches/2.2.2

Files:

• src/clients/web/net/sf/basedb/clients/web/formatter/FormatterSettings.java (modified) (1 diff)
• src/core/net/sf/basedb/util/Values.java (modified) (2 diffs)
• www/my_base/user/preferences.jsp (modified) (1 diff)
• www/my_base/user/submit_user.jsp (modified) (1 diff)

branches/2.2.2/src/clients/web/net/sf/basedb/clients/web/formatter/FormatterSettings.java

@@ -80 +80 @@
   {
     sc.setUserClientSetting("formatter.number.decimals", Integer.toString(numDecimals));
-    sc.setSessionSetting("formatter.number", null);
+    sc.setSessionSetting("formatter.double", null);
+    sc.setSessionSetting("formatter.float", null);
   }
   

branches/2.2.2/src/core/net/sf/basedb/util/Values.java

@@ -628 +628 @@
       result.append(lNumber).append(".");
       String theDecimals = Long.toString(Math.round(fNumber*exp-lNumber*exp)); 
-      result.append(theDecimals);
       if (theDecimals.length() < decimals) 
       {
@@ -636 +635 @@
         }
       }
+      result.append(theDecimals);
     }
     if (unit != null) result.append(unit);

branches/2.2.2/www/my_base/user/preferences.jsp

@@ -390 +390 @@
       </td>
     </tr>
+    <%
+    int numDecimals = FormatterSettings.getNumDecimals(sc);
+    %>
+    <tr>
+      <td class="prompt">Decimals</td>
+      <td>
+        <select name="decimals">
+        <%
+        for (int i = 0; i < 8; i++)
+        {
+          %>
+          <option value="<%=i%>" <%=numDecimals == i ? "selected" : ""%>><%=i%>
+          <%
+        }
+        %>
+        <option value="-1" <%=numDecimals < 0 ? "selected" : ""%>>all
+        </select>
+      </td>
+    </tr>
     
     </table>

branches/2.2.2/www/my_base/user/submit_user.jsp

@@ -126 +126 @@
     cc.setRecent("dateFormats", dateFormat, maxRecent);
     cc.setRecent("dateTimeFormats", dateTimeFormat, maxRecent);
+
+    int numDecimals = Values.getInt(request.getParameter("decimals"), 2);
+    FormatterSettings.setNumDecimals(sc, numDecimals);
     
     sc.setUserClientSetting("plugins.sendmessage", Values.getString(request.getParameter("sendmessage"), "0"));