Merge branch 'dev'

Author: Equbuxu

Handwriting Generator/Font.cs

@@ -115,7 +115,7 @@ private void Load(string path)
 
             foreach (string folder in folders)
             {
-                FChar key = (FChar)int.Parse(Path.GetFileName(folder));
+                FChar key = (FChar)Enum.Parse(typeof(FChar), Path.GetFileName(folder));
                 List<Bitmap> value = new List<Bitmap>();
                 string[] imagePaths = Directory.GetFiles(folder);
                 foreach (string imagePath in imagePaths)
@@ -169,10 +169,10 @@ public void Save(string path)
             foreach (KeyValuePair<FChar, List<Bitmap>> bitmaps in images)
             {
                 int i = 0;
-                Directory.CreateDirectory("TempFontStorage/" + (int)bitmaps.Key);
+                Directory.CreateDirectory("TempFontStorage/" + bitmaps.Key.ToString());
                 foreach (Bitmap image in bitmaps.Value)
                 {
-                    image.Save("TempFontStorage/" + (int)bitmaps.Key + "/" + i.ToString() + ".png");
+                    image.Save("TempFontStorage/" + bitmaps.Key.ToString() + "/" + i.ToString() + ".png");
                     i++;
                 }
             }

Handwriting Generator/FontCreator.cs

@@ -48,7 +48,7 @@ public FontCreator()
             FChar.rus_25,FChar.rus_26,FChar.rus_27,FChar.rus_28,FChar.rus_29,FChar.rus_30,FChar.rus_31,FChar.rus_32,
 
             FChar.rus_33, FChar.dollar,FChar.ampersand,FChar.backslash,FChar.open_square_bracket,FChar.close_square_bracket,FChar.open_curly_bracket,FChar.close_curly_bracket,
-            FChar.less_than,FChar.greater_than,FChar.percent,FChar.tilde,FChar.underscore,FChar.comma,FChar.empty,FChar.empty,
+            FChar.less_than,FChar.greater_than,FChar.percent,FChar.tilde,FChar.underscore,FChar.comma,FChar.colon,FChar.empty,
             });
 
             formTranslationTables.Add(new FChar[48]

Handwriting Generator/FormPreparer.cs

@@ -44,11 +44,9 @@ public Bitmap CreatePrepared()
 
             //get rid of lines. The value has been found exprementally
             BitmapUtils.ChangeBrightness(fixedOrientationForm, 1.1);
-            fixedOrientationForm.Save("DebugOut/brightness.png");
             //fix under/overexposed images
             BitmapUtils.Autocontrast(fixedOrientationForm);
             Bitmap final = BitmapUtils.MakeGrayscale(fixedOrientationForm);
-            final.Save("DebugOut/final.png");
             result = final;
 
             return final;
@@ -227,9 +225,7 @@ private void PrepareData()
         private void CreateSmallExpandedBW(Bitmap smallForm)
         {
             smallBWForm = BitmapUtils.MakeBlackAndWhite(smallForm, BWThreshold);
-            smallBWForm.Save("DebugOut/blackwhite.png");
             smallBWForm = BitmapUtils.ExpandWhite(smallBWForm);
-            smallBWForm.Save("DebugOut/Expanded.png");
         }
 
         /// <summary>

Handwriting Generator/Resources/newForm1.pdf

@@ -8,13 +8,6 @@ namespace Handwriting_Generator
 {
     public class TextConverter
     {
-        private class TranslationUnit
-        {
-            //Either original text or translated text should contain only one character
-            public string originalText;
-            public FChar translatedText;
-        }
-
         private bool converted = false;
 
         private string origText;
@@ -104,6 +97,7 @@ private class TranslationUnit
             { '(', FChar.open_parenthesis},
             { ')', FChar.close_parenthesis},
             { ';', FChar.semicolon},
+            { ':', FChar.colon},
             { '@', FChar.email},
             { '#', FChar.hash},
             { '$', FChar.dollar},

Handwriting Generator/Resources/newForm1.svg

@@ -146,6 +146,9 @@ private static Paragraph FillOneParagraph(List<FChar> text, int startPos, out in
                     paragraph.centered = true;
 
                 startPos++;
+
+                if (startPos >= text.Count)
+                    break;
             }
             endPos = startPos - 1;
             for (int i = startPos; i < text.Count; i++)
@@ -208,6 +211,7 @@ private static List<RenderUnit> MakeLineRenderSequence(Paragraph text, Font font
 
                 if (generatedLine.Count > 0 && generatedLine.Last().rightBorderX >= lineWidth)
                 {
+                    bool notFirstIteration = false;
                     while (generatedLine.Last().rightBorderX >= lineWidth)
                     {
                         bool needsWrapping;
@@ -229,16 +233,21 @@ private static List<RenderUnit> MakeLineRenderSequence(Paragraph text, Font font
                         int count = generatedLine.Count - breakPos - 1;
                         generatedLine.RemoveRange(breakPos + 1, count);
                         end -= count;
+                        if (notFirstIteration && needsWrapping)
+                        {
+                            end++;//compensate for prev. inserted minus
+                        }
 
                         int uselessX;
                         if (needsWrapping)
                             InsertRenderUnit(generatedLine, FChar.minus, random, generatedLine.Last().rightBorderX, out uselessX, font);
+                        notFirstIteration = true;
                     }
                     break;
                 }
             }
 
-            if (text.centered)
+            if (text.centered && generatedLine.Count > 0)
             {
                 int rightDist = fullWidth - generatedLine.Last().rightBorderX;
                 foreach (RenderUnit unit in generatedLine)
@@ -254,6 +263,18 @@ private static void InsertRenderUnit(List<RenderUnit> list, FChar character, Ran
         {
             RenderUnit unit = new RenderUnit();
 
+            if (!font.images.ContainsKey(character))
+            {
+                unit.x = x;
+                unit.image = null;
+                unit.corrCharacter = character;
+                unit.rightBorderX = unit.x + (int)(0.3 * Font.pixelsPerCmH);
+                list.Add(unit);
+
+                newX = x + (int)(0.3 * Font.pixelsPerCmV);
+                return;
+            }
+
             int selectedImageIndex = random.Next(font.images[character].Count());
 
             unit.x = (int)(x - font.leftMargins[character][selectedImageIndex] * Font.pixelsPerCmV);

Handwriting Generator/TextConverter.cs

@@ -145,7 +145,7 @@ private void Render(object sender, RoutedEventArgs e)
             string text = TextToRender.Text;
             TextConverter textConverter = new TextConverter(text);
             renderer = new TextRenderer(textConverter.Convert(), sheets, selectedFont);
-
+            curPreviewPage = 0;
             UpdatePreview();
         }
 

Handwriting Generator/TextRenderer.cs

@@ -1,14 +1,10 @@
-mind the possible exceptions
-copy instead of passing a reference
+copy instead of passing a reference
 refactor constants
 refactor cm/pixel usage
 dispose bitmaps 
 make a separate cum hist function
 move form data into a file
 create debug mode (#define)
 
-fix crash on incorrect form order / findcoreregion should consider the situation where small russian characters are absent
-fix crash when \n is at the end of a text
-fix duplicate character which sometimes occur on line break
 fix single consonant syllables at word ends
 fix single letter syllables

Handwriting Generator/TextRenderingWindow.xaml.cs

@@ -88,6 +88,7 @@ public enum FChar
         slash,
         open_parenthesis,
         close_parenthesis,
+        colon,
         semicolon,
         email,
         hash,