Skip to content

Commit 7d21bda

Browse files
Merge pull request #1 from B-Ballesteros/Development
Development to v1.1
2 parents 84ab75e + fd5a689 commit 7d21bda

11 files changed

+246
-71
lines changed

BasicOCR/BasicOCR.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,14 @@
8787
<ItemGroup>
8888
<None Include="Resources\noImage.png" />
8989
</ItemGroup>
90+
<ItemGroup>
91+
<None Include="Resources\placeholder-image.png" />
92+
</ItemGroup>
93+
<ItemGroup>
94+
<None Include="Resources\close.png" />
95+
</ItemGroup>
96+
<ItemGroup>
97+
<None Include="Resources\minimize.png" />
98+
</ItemGroup>
9099
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91100
</Project>

BasicOCR/Form1.Designer.cs

+56-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BasicOCR/Form1.cs

+28-3
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,46 @@ private void selectImage()
3636

3737
private void doOCR()
3838
{
39-
if(imageBox.Image != null)
39+
if (imageBox.Image != null)
4040
{
4141
var engine = new OCREngine();
4242
resultTextBox.Text = engine.Recognize(imageBox.Image);
43+
} else
44+
{
45+
throw new Exception("Image not selected");
4346
}
4447
}
4548

4649
private void imageBox_Click(object sender, EventArgs e)
4750
{
48-
selectImage();
51+
try
52+
{
53+
selectImage();
54+
}catch(Exception ex)
55+
{
56+
MessageBox.Show(ex.Message);
57+
}
4958
}
5059

5160
private void convertButton_Click(object sender, EventArgs e)
5261
{
53-
doOCR();
62+
try
63+
{
64+
doOCR();
65+
}catch (Exception ex)
66+
{
67+
MessageBox.Show(ex.Message);
68+
}
69+
}
70+
71+
private void closeBox_Click(object sender, EventArgs e)
72+
{
73+
Close();
74+
}
75+
76+
private void minimizeBox_Click(object sender, EventArgs e)
77+
{
78+
WindowState = FormWindowState.Minimized;
5479
}
5580
}
5681
}

BasicOCR/Form1.resx

+17
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,21 @@
120120
<metadata name="ofDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>17, 17</value>
122122
</metadata>
123+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124+
<data name="minimizeBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
125+
<value>
126+
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
127+
YQUAAAAJcEhZcwAAAcIAAAHCAeg8fVQAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwa
128+
AAACBUlEQVRYR82Xzy8DQRTH94Ko2tlWxI9IHEhESPw3DsLFX+EgcXByEXEQEUT9F0hU7G5ps3HjgAM9
129+
SBHa2UUVyXqzfQk7prJrt1vf5NOkO+/HdOd1Zp7kVcW0olBVnqKanKIayQEF4BEpUJVkYWyL6vLko5Eg
130+
6BZclpYcobqyDUnKgO0RsJVT1lF8GMP41126M041ZRmCfXDB/fAOb2TJzvS1YlhvMrX2IXilZ4KAfyX3
131+
fBjrwfC/q6gqY+BwywUIg7ylJ0YxjVg0Iw+CISsuUYAwyD+l27oxnVsPx0mZ6uRc4BQ2J4WdrjZM+yWo
132+
2kWBcX3QlXlMW5VTdKxiRcb14clVlCWdbAiM6s2Kk9zZ4fxtMqFQ0siLs2PC2k+IDKIAJjEuwce6aDAK
133+
TI2swhsgBj8QGXCAsQnc/xiIjls2gQr30MXMdEsgRDG/8com8MY9dCEK6gdRzG84E2jwEjg3GeFgFGT+
134+
w9+wwRsROxrhi8UPRoB5Y/TGnPOgEYeRqZI1JzlTA47jCvzoAUxfVZQXkpJKFjDtl+xTqRlmdSByCBOo
135+
/H3bkJowrVtmtr0DjC55pxC5YDkwnVjs6gyG15xjGFyxLgvT/C64nifBYY8LEIRdWPcEhvcmVhPQjM6C
136+
c5A9ogyt2VzNNfcidnvF7dpXcwq/eLOoK/0YJrhqtOescWX8sT2XpE9OUur7EgLQkgAAAABJRU5ErkJg
137+
gg==
138+
</value>
139+
</data>
123140
</root>

0 commit comments

Comments
 (0)