code improvements

This commit is contained in:
Manuel Kamper 2024-01-15 10:42:22 +01:00
parent 4776764b46
commit 74cf26ac60
1 changed files with 11 additions and 37 deletions

View File

@ -103,37 +103,20 @@ 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)
if(false)
{
UFraction frac = new UFraction(numer, denom);
ev += frac.ToString();
}
else
{
double dbl; double dbl;
if (denom == 0) if (denom == 0)
dbl = 0.0; dbl = 0.0;
else else
dbl = (double)numer / (double)denom; dbl = (double)numer / (double)denom;
ev += dbl.ToString(DOUBLETYPE_FORMAT); 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)
if (false)
{
ev = encoding.GetString(value, 0, len);
}
else
{ {
ev = BitConverter.ToString(value, 0, len); ev = BitConverter.ToString(value, 0, len);
} }
}
else if (type == 7) else if (type == 7)
{ {
try try
@ -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)
if (false)
{
Fraction frac = new Fraction(numer, denom);
ev += frac.ToString();
}
else
{
double dbl; double dbl;
if (denom == 0) if (denom == 0)
dbl = 0.0; dbl = 0.0;
else else
dbl = (double)numer / (double)denom; dbl = (double)numer / (double)denom;
ev += dbl.ToString(DOUBLETYPE_FORMAT); ev += dbl.ToString(DOUBLETYPE_FORMAT);
}
if (i + BYTEJUMP_SRATIONAL < len) if (i + BYTEJUMP_SRATIONAL < len)
ev += " "; ev += " ";
} }