More HtmlWriter refactoring

zrh4 · zrh4 · commit 51966395d050 · 2019-04-01T23:49:54.000-04:00
diff --git a/CrossStitchProject/HtmlWriter.cs b/CrossStitchProject/HtmlWriter.cs
@@ -15,8 +15,8 @@ internal class HtmlWriter
         private readonly List<Bitmap> _imageChunks = new List<Bitmap>();
         private readonly Dictionary<Color, FlossInfo> _color2Floss;
         private readonly bool _isColored;
-        private const decimal ChunkWidth = 50.0M;
-        private const decimal ChunkHeight = 60.0M;
+        private const decimal DefaultChunkWidth = 50.0M;
+        private const decimal DefaultChunkHeight = 60.0M;
         private static string _outputPath;
         private const string LegendTableStart = "<table><thead><tr><th>Floss</th><th>Symbol</th></tr></thead><tbody>";
         private const string LegendTableEnd = "</tbody></table>";
@@ -37,31 +37,35 @@ public HtmlWriter(Bitmap b, Dictionary<Color, FlossInfo> c2F, bool colored, stri
 
         private void ChunkifyImage(Bitmap b)
         {
-            var numHorizontalChunks = (int)Math.Ceiling(b.Width / ChunkWidth);
-            var numVerticalChunks = (int)Math.Ceiling(b.Height / ChunkHeight);
+            var numHorizontalChunks = (int)Math.Ceiling(b.Width / DefaultChunkWidth);
+            var numVerticalChunks = (int)Math.Ceiling(b.Height / DefaultChunkHeight);
             for (var y = 0; y < numVerticalChunks;  y++)
             {
                 for (var x = 0; x < numHorizontalChunks; x++)
                 {
-                    var wLeft = b.Width - (x + 1) * ChunkWidth;
-                    var hLeft = b.Height - (y + 1) * ChunkHeight;
-                    var width = (int)(wLeft < 0 ? wLeft + ChunkWidth: ChunkWidth);
-                    var height = (int)(hLeft < 0 ? hLeft + ChunkHeight: ChunkHeight);
-                    _imageChunks.Add(b.Clone(new Rectangle(x * (int)ChunkWidth, y * (int)ChunkHeight, width, height), PixelFormat.Format32bppArgb));
+                    var widthLeft = b.Width - (x + 1) * DefaultChunkWidth;
+                    var heightLeft = b.Height - (y + 1) * DefaultChunkHeight;
+                    var curChunkWidth = (int)(widthLeft < 0 ? widthLeft + DefaultChunkWidth: DefaultChunkWidth);
+                    var curChunkHeight = (int)(heightLeft < 0 ? heightLeft + DefaultChunkHeight: DefaultChunkHeight);
+                    var chunk = b.Clone(
+                        new Rectangle(x * (int) DefaultChunkWidth, y * (int) DefaultChunkHeight, curChunkWidth,
+                            curChunkHeight), PixelFormat.Format32bppArgb);
+                    _imageChunks.Add(chunk);
                 }
             }
 
         }
-        //TODO: this is really dumb 
-        private void Save(StringBuilder outString, string filename="chunk",int fileNo=-1)
+        private void Save(StringBuilder outString, string filename)
         {
-            File.WriteAllText(
-                filename == "chunk"
-                    ? Path.Combine(_outputPath, $"chunk{fileNo}.html")
-                    : Path.Combine(_outputPath, filename), outString.ToString());
+            File.WriteAllText(Path.Combine(_outputPath, filename), outString.ToString());
             Process.Start(_outputPath);
         }
 
+        private void SaveChunk(StringBuilder outString, int fileNo)
+        {
+            File.WriteAllText(Path.Combine(_outputPath, $"chunk{fileNo}.html"), outString.ToString());
+        }
+
         private void GenerateHtmlLegend(IReadOnlyList<FlossInfo> flossInfos)
         {
             var tableEnded = false;
@@ -73,7 +77,7 @@ private void GenerateHtmlLegend(IReadOnlyList<FlossInfo> flossInfos)
 
                 htmlString.AppendLine($"<tr><td>{flossInfos[i].FlossId}</td><td>{flossInfos[i].FlossSymbol}</td></tr>");
 
-                if (i > 0 && (i+1) % ChunkWidth == 0)
+                if (i > 0 && (i+1) % DefaultChunkWidth == 0)
                 {
                     htmlString.AppendLine(LegendTableEnd);
                     htmlString.AppendLine(LegendTableStart);
@@ -89,11 +93,11 @@ private void GenerateHtmlLegend(IReadOnlyList<FlossInfo> flossInfos)
         }
         public void GenerateHtml()
         {
-            var distinctFlossesInImage = GenerateCrossStitch();
+            var distinctFlossesInImage = GenerateCrossStitchPattern();
             GenerateHtmlLegend(distinctFlossesInImage.ToList());
         }
 
-        public HashSet<FlossInfo> GenerateCrossStitch()
+        public HashSet<FlossInfo> GenerateCrossStitchPattern()
         {
             var chunkCount = 0;
             var flossesInImage = new HashSet<FlossInfo>();
@@ -135,7 +139,7 @@ public HashSet<FlossInfo> GenerateCrossStitch()
 
                 }
                 htmlString.AppendLine("</body></html>");
-                Save(htmlString,fileNo:chunkCount);
+                SaveChunk(htmlString,chunkCount);
                 chunkCount++;
             }
             return flossesInImage;

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ internal class HtmlWriter`
`15`	`15`	`private readonly List<Bitmap> _imageChunks = new List<Bitmap>();`
`16`	`16`	`private readonly Dictionary<Color, FlossInfo> _color2Floss;`
`17`	`17`	`private readonly bool _isColored;`
`18`		`- private const decimal ChunkWidth = 50.0M;`
`19`		`- private const decimal ChunkHeight = 60.0M;`
	`18`	`+ private const decimal DefaultChunkWidth = 50.0M;`
	`19`	`+ private const decimal DefaultChunkHeight = 60.0M;`
`20`	`20`	`private static string _outputPath;`
`21`	`21`	`private const string LegendTableStart = "<table><thead><tr><th>Floss</th><th>Symbol</th></tr></thead><tbody>";`
`22`	`22`	`private const string LegendTableEnd = "</tbody></table>";`
`@@ -37,31 +37,35 @@ public HtmlWriter(Bitmap b, Dictionary<Color, FlossInfo> c2F, bool colored, stri`
`37`	`37`
`38`	`38`	`private void ChunkifyImage(Bitmap b)`
`39`	`39`	`{`
`40`		`- var numHorizontalChunks = (int)Math.Ceiling(b.Width / ChunkWidth);`
`41`		`- var numVerticalChunks = (int)Math.Ceiling(b.Height / ChunkHeight);`
	`40`	`+ var numHorizontalChunks = (int)Math.Ceiling(b.Width / DefaultChunkWidth);`
	`41`	`+ var numVerticalChunks = (int)Math.Ceiling(b.Height / DefaultChunkHeight);`
`42`	`42`	`for (var y = 0; y < numVerticalChunks; y++)`
`43`	`43`	`{`
`44`	`44`	`for (var x = 0; x < numHorizontalChunks; x++)`
`45`	`45`	`{`
`46`		`- var wLeft = b.Width - (x + 1) * ChunkWidth;`
`47`		`- var hLeft = b.Height - (y + 1) * ChunkHeight;`
`48`		`- var width = (int)(wLeft < 0 ? wLeft + ChunkWidth: ChunkWidth);`
`49`		`- var height = (int)(hLeft < 0 ? hLeft + ChunkHeight: ChunkHeight);`
`50`		`- _imageChunks.Add(b.Clone(new Rectangle(x * (int)ChunkWidth, y * (int)ChunkHeight, width, height), PixelFormat.Format32bppArgb));`
	`46`	`+ var widthLeft = b.Width - (x + 1) * DefaultChunkWidth;`
	`47`	`+ var heightLeft = b.Height - (y + 1) * DefaultChunkHeight;`
	`48`	`+ var curChunkWidth = (int)(widthLeft < 0 ? widthLeft + DefaultChunkWidth: DefaultChunkWidth);`
	`49`	`+ var curChunkHeight = (int)(heightLeft < 0 ? heightLeft + DefaultChunkHeight: DefaultChunkHeight);`
	`50`	`+ var chunk = b.Clone(`
	`51`	`+ new Rectangle(x * (int) DefaultChunkWidth, y * (int) DefaultChunkHeight, curChunkWidth,`
	`52`	`+ curChunkHeight), PixelFormat.Format32bppArgb);`
	`53`	`+ _imageChunks.Add(chunk);`
`51`	`54`	`}`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`}`
`55`		`- //TODO: this is really dumb`
`56`		`- private void Save(StringBuilder outString, string filename="chunk",int fileNo=-1)`
	`58`	`+ private void Save(StringBuilder outString, string filename)`
`57`	`59`	`{`
`58`		`- File.WriteAllText(`
`59`		`- filename == "chunk"`
`60`		`- ? Path.Combine(_outputPath, $"chunk{fileNo}.html")`
`61`		`- : Path.Combine(_outputPath, filename), outString.ToString());`
	`60`	`+ File.WriteAllText(Path.Combine(_outputPath, filename), outString.ToString());`
`62`	`61`	`Process.Start(_outputPath);`
`63`	`62`	`}`
`64`	`63`
	`64`	`+ private void SaveChunk(StringBuilder outString, int fileNo)`
	`65`	`+ {`
	`66`	`+ File.WriteAllText(Path.Combine(_outputPath, $"chunk{fileNo}.html"), outString.ToString());`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`private void GenerateHtmlLegend(IReadOnlyList<FlossInfo> flossInfos)`
`66`	`70`	`{`
`67`	`71`	`var tableEnded = false;`
`@@ -73,7 +77,7 @@ private void GenerateHtmlLegend(IReadOnlyList<FlossInfo> flossInfos)`
`73`	`77`
`74`	`78`	`htmlString.AppendLine($"<tr><td>{flossInfos[i].FlossId}</td><td>{flossInfos[i].FlossSymbol}</td></tr>");`
`75`	`79`
`76`		`- if (i > 0 && (i+1) % ChunkWidth == 0)`
	`80`	`+ if (i > 0 && (i+1) % DefaultChunkWidth == 0)`
`77`	`81`	`{`
`78`	`82`	`htmlString.AppendLine(LegendTableEnd);`
`79`	`83`	`htmlString.AppendLine(LegendTableStart);`
`@@ -89,11 +93,11 @@ private void GenerateHtmlLegend(IReadOnlyList<FlossInfo> flossInfos)`
`89`	`93`	`}`
`90`	`94`	`public void GenerateHtml()`
`91`	`95`	`{`
`92`		`- var distinctFlossesInImage = GenerateCrossStitch();`
	`96`	`+ var distinctFlossesInImage = GenerateCrossStitchPattern();`
`93`	`97`	`GenerateHtmlLegend(distinctFlossesInImage.ToList());`
`94`	`98`	`}`
`95`	`99`
`96`		`- public HashSet<FlossInfo> GenerateCrossStitch()`
	`100`	`+ public HashSet<FlossInfo> GenerateCrossStitchPattern()`
`97`	`101`	`{`
`98`	`102`	`var chunkCount = 0;`
`99`	`103`	`var flossesInImage = new HashSet<FlossInfo>();`
`@@ -135,7 +139,7 @@ public HashSet<FlossInfo> GenerateCrossStitch()`
`135`	`139`
`136`	`140`	`}`
`137`	`141`	`htmlString.AppendLine("</body></html>");`
`138`		`- Save(htmlString,fileNo:chunkCount);`
	`142`	`+ SaveChunk(htmlString,chunkCount);`
`139`	`143`	`chunkCount++;`
`140`	`144`	`}`
`141`	`145`	`return flossesInImage;`