Apple-2-Tools/dmolony-DiskBrowser
1
0
Fork 0
mirror of https://github.com/dmolony/DiskBrowser.git synced 2024-11-26 23:51:57 +00:00
Code Issues Projects Releases Wiki Activity

moved cell formatting to Cell

Browse Source
This commit is contained in:
Denis Molony 2016-03-12 09:32:19 +11:00
parent 9db35ede39
commit 0574780907
2 changed files with 57 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/com/bytezone/diskbrowser/visicalc/Cell.java
View File

@ -1,7 +1,11 @@
package com.bytezone.diskbrowser.visicalc;
import java.text.DecimalFormat;
class Cell implements Comparable<Cell>, Value
{
private static final DecimalFormat nf = new DecimalFormat ("$#####0.00");
final Address address;
private final Sheet parent;
@ -97,14 +101,56 @@ class Cell implements Comparable<Cell>, Value
return format;
}
// this should be called by Sheet when drawing, so do all formatting here
String getText ()
String getText (int colWidth, char defaultFormat)
{
if (hasValue ())
if (format == 'I')
{
String integerFormat = String.format ("%%%d.0f", colWidth);
return String.format (integerFormat, getValue ());
}
else if (format == '$')
{
String currencyFormat = String.format ("%%%d.%ds", colWidth, colWidth);
return String.format (currencyFormat, nf.format (getValue ()));
}
else if (format == '*')
{
String graphFormat = String.format ("%%-%d.%ds", colWidth, colWidth);
return String.format (graphFormat, "********************");
}
else
{
// this could be improved
String numberFormat = String.format ("%%%d.3f", colWidth + 4);
String val = String.format (numberFormat, getValue ());
while (val.endsWith ("0"))
val = ' ' + val.substring (0, val.length () - 1);
if (val.endsWith ("."))
val = ' ' + val.substring (0, val.length () - 1);
if (val.length () > colWidth)
val = val.substring (val.length () - colWidth);
return val;
}
String text;
if (label != null)
return label;
if (repeatingChar > 0)
return repeat;
return "?";
text = label;
else if (repeatingChar > 0)
text = repeat;
else
text = "?";
if (format == 'R')
{
String labelFormat = String.format ("%%%d.%ds", colWidth, colWidth);
return (String.format (labelFormat, text));
}
else
{
String labelFormat = String.format ("%%-%d.%ds", colWidth, colWidth);
return (String.format (labelFormat, text));
}
}
@Override
@ -132,7 +178,7 @@ class Cell implements Comparable<Cell>, Value
{
if (value == null)
createValue ();
return hasValue () ? "" : "@NA";
return value.getError ();
}
private void createValue ()
@ -143,7 +189,7 @@ class Cell implements Comparable<Cell>, Value
value = Function.getInstance (parent, "@ERROR()");
}
else
// System.out.printf ("%s Instantiating [%s]%n", address, expressionText);
// could use Number or Cell for simple Values
value = new Expression (parent, expressionText);
}

58
src/com/bytezone/diskbrowser/visicalc/Sheet.java
View File

@ -412,65 +412,13 @@ public class Sheet implements Iterable<Cell>
++lastColumn;
}
++lastColumn;
int colWidth = columnWidth;
if (columnWidths.containsKey (cell.address.column))
colWidth = columnWidths.get (cell.address.column);
++lastColumn;
char format = cell.getFormat ();
if (format == ' ')
format = defaultFormat;
// System.out.println (cell.address);
if (cell.hasValue ())
{
if (format == 'I')
{
String integerFormat = String.format ("%%%d.0f", colWidth);
// System.out.printf ("Integer format:%s%n", integerFormat);
text.append (String.format (integerFormat, cell.getValue ()));
}
else if (format == '$')
{
String currencyFormat = String.format ("%%%d.%ds", colWidth, colWidth);
// System.out.printf ("Currency format:%s%n", currencyFormat);
text.append (String.format (currencyFormat, nf.format (cell.getValue ())));
}
else if (format == '*')
{
String graphFormat = String.format ("%%-%d.%ds", colWidth, colWidth);
text.append (String.format (graphFormat, "********************"));
}
else
{
// this could be improved
String numberFormat = String.format ("%%%d.3f", colWidth + 4);
// System.out.printf ("Number format:%s%n", numberFormat);
String val = String.format (numberFormat, cell.getValue ());
while (val.endsWith ("0"))
val = ' ' + val.substring (0, val.length () - 1);
if (val.endsWith ("."))
val = ' ' + val.substring (0, val.length () - 1);
if (val.length () > colWidth)
val = val.substring (val.length () - colWidth);
text.append (val);
}
}
else
{
if (format == 'R')
{
String labelFormat = String.format ("%%%d.%ds", colWidth, colWidth);
// System.out.printf ("Label format:%s%n", labelFormat);
text.append (String.format (labelFormat, cell.getText ()));
}
else
{
String labelFormat = String.format ("%%-%d.%ds", colWidth, colWidth);
// System.out.printf ("Label format:%s%n", labelFormat);
text.append (String.format (labelFormat, cell.getText ()));
}
}
text.append (cell.getText (colWidth, defaultFormat));
}
return text.toString ();
}