code improvements
This commit is contained in:
parent
4776764b46
commit
74cf26ac60
|
@ -103,36 +103,19 @@ namespace Mk0.Software.ImageSorter
|
||||||
{
|
{
|
||||||
uint numer = BitConverter.ToUInt32(value, i);
|
uint numer = BitConverter.ToUInt32(value, i);
|
||||||
uint denom = BitConverter.ToUInt32(value, i + BYTEJUMP_LONG);
|
uint denom = BitConverter.ToUInt32(value, i + BYTEJUMP_LONG);
|
||||||
//if (formatInstr == FormatInstr.FRACTION)
|
double dbl;
|
||||||
if(false)
|
if (denom == 0)
|
||||||
{
|
dbl = 0.0;
|
||||||
UFraction frac = new UFraction(numer, denom);
|
|
||||||
ev += frac.ToString();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
dbl = (double)numer / (double)denom;
|
||||||
double dbl;
|
ev += dbl.ToString(DOUBLETYPE_FORMAT);
|
||||||
if (denom == 0)
|
|
||||||
dbl = 0.0;
|
|
||||||
else
|
|
||||||
dbl = (double)numer / (double)denom;
|
|
||||||
ev += dbl.ToString(DOUBLETYPE_FORMAT);
|
|
||||||
}
|
|
||||||
if (i + BYTEJUMP_RATIONAL < len)
|
if (i + BYTEJUMP_RATIONAL < len)
|
||||||
ev += " ";
|
ev += " ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (type == 6)
|
else if (type == 6)
|
||||||
{
|
{
|
||||||
//if (formatInstr == FormatInstr.ALLCHAR)
|
ev = BitConverter.ToString(value, 0, len);
|
||||||
if (false)
|
|
||||||
{
|
|
||||||
ev = encoding.GetString(value, 0, len);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ev = BitConverter.ToString(value, 0, len);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (type == 7)
|
else if (type == 7)
|
||||||
{
|
{
|
||||||
|
@ -157,21 +140,12 @@ namespace Mk0.Software.ImageSorter
|
||||||
{
|
{
|
||||||
int numer = BitConverter.ToInt32(value, i);
|
int numer = BitConverter.ToInt32(value, i);
|
||||||
int denom = BitConverter.ToInt32(value, i + BYTEJUMP_SLONG);
|
int denom = BitConverter.ToInt32(value, i + BYTEJUMP_SLONG);
|
||||||
//if (formatInstr == FormatInstr.FRACTION)
|
double dbl;
|
||||||
if (false)
|
if (denom == 0)
|
||||||
{
|
dbl = 0.0;
|
||||||
Fraction frac = new Fraction(numer, denom);
|
|
||||||
ev += frac.ToString();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
dbl = (double)numer / (double)denom;
|
||||||
double dbl;
|
ev += dbl.ToString(DOUBLETYPE_FORMAT);
|
||||||
if (denom == 0)
|
|
||||||
dbl = 0.0;
|
|
||||||
else
|
|
||||||
dbl = (double)numer / (double)denom;
|
|
||||||
ev += dbl.ToString(DOUBLETYPE_FORMAT);
|
|
||||||
}
|
|
||||||
if (i + BYTEJUMP_SRATIONAL < len)
|
if (i + BYTEJUMP_SRATIONAL < len)
|
||||||
ev += " ";
|
ev += " ";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue