Improvements

- Better painting graphics
- Better timing sampling
- Disabling (for now) DirectML
- Updated GIF

Author: SimoSbara

HandOCRVeryfier.aps

@@ -124,10 +124,12 @@ void CSetupDlg::OnBnClickedOk()
 	UpdateData(1);
 	theApp.ocr.LoadModel(netPath, labelsPath);
 
+	ShowWindow(0);
+
 	CHandOCRVeryfierDlg dlg;
 	dlg.DoModal();
 
-	CDialog::OnOK();
+	ShowWindow(1);
 }
 
 

HandOCRVeryfier.rc

@@ -8,10 +8,16 @@
 #include "HandOCRVeryfierDlg.h"
 #include "afxdialogex.h"
 
+#include <chrono>
+
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
 
+typedef std::chrono::high_resolution_clock Time;
+typedef std::chrono::milliseconds ms;
+typedef std::chrono::duration<float> fsec;
+
 extern CHandOCRVeryfierApp theApp;
 
 // Finestra di dialogo CHandOCRVeryfierDlg
@@ -142,11 +148,12 @@ void CHandOCRVeryfierDlg::OnBnClickedDetect()
 	int best = 0;
 	bool success;
 
-	INT64 start, end;
-
-	start = GetTickCount64();
+	auto start = Time::now();
 	success = theApp.ocr.Predict(img, &scores, best);
-	end = GetTickCount64();
+	auto end = Time::now();
+	
+	fsec fs = end - start;
+	ms d = std::chrono::duration_cast<ms>(fs);
 
 	if (success)
 	{
@@ -155,7 +162,7 @@ void CHandOCRVeryfierDlg::OnBnClickedDetect()
 
 		text.Format(_T("%s %.2f"), theApp.ocr.labels[best], score);
 		text += _T("% (");
-		text += std::to_wstring(end - start).c_str();
+		text += std::to_wstring(d.count()).c_str();
 		text += "ms)";
 
 		SetWindowText(text);

example_ocr.gif

@@ -73,23 +73,28 @@ bool OCR::Predict(BYTE* buffer, float** scores, int& best)
 	best = bestInd;
 	*scores = probs;
 
+	delete inputNet;
+
 	return true;
 }
 
 bool OCR::StartModel(CString netPath, CString labelPath)
 {
+	if (session)
+		StopModel();
+
 	Ort::SessionOptions sessionOptions;
 
-	OrtStatus* onnxStatus = OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0);
-	
-	if (onnxStatus)
-	{
-		const OrtApi* g_ort = OrtGetApiBase()->GetApi(ORT_API_VERSION);
+	//OrtStatus* onnxStatus = OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0);
+	//
+	//if (onnxStatus)
+	//{
+	//	const OrtApi* g_ort = OrtGetApiBase()->GetApi(ORT_API_VERSION);
 
-		CString msg(g_ort->GetErrorMessage(onnxStatus));
+	//	CString msg(g_ort->GetErrorMessage(onnxStatus));
 
-		MessageBox(NULL, msg, _T("Error DirectML"), MB_OK);
-	}
+	//	MessageBox(NULL, msg, _T("Error DirectML"), MB_OK);
+	//}
 
 	sessionOptions.SetGraphOptimizationLevel(GraphOptimizationLevel::ORT_ENABLE_ALL);
 

src/CSetupDlg.cpp

@@ -4,6 +4,9 @@
 
 PaintCtrl::PaintCtrl(HWND pParent, int width, int height, int wPaint, int hPaint)
 {
+	if (pParent)
+		SubclassWindow(pParent);
+
 	if (width < 0)
 		width = 1;
 
@@ -16,28 +19,29 @@ PaintCtrl::PaintCtrl(HWND pParent, int width, int height, int wPaint, int hPaint
 	if (hPaint < 0)
 		hPaint = 1;
 
-	this->width = width;
-	this->height = height;
+	GetClientRect(&rectClient);
+
+	this->width = rectClient.Width();
+	this->height = rectClient.Height();
 	this->wPaint = wPaint;
 	this->hPaint = hPaint;
 
-	if (pParent)
-		SubclassWindow(pParent);
 
-	GetClientRect(&rectClient);
 
-	drawLUT = new bool* [width];
 
-	for (int x = 0; x < width; x++)
+
+	drawLUT = new bool* [this->width];
+
+	for (int x = 0; x < this->width; x++)
 	{
-		drawLUT[x] = new bool[height];
+		drawLUT[x] = new bool[this->height];
 
-		for (int y = 0; y < height; y++)
+		for (int y = 0; y < this->height; y++)
 			drawLUT[x][y] = 0;
 	}
 
-	coeffX = (double)width / (double)rectClient.Width();
-	coeffY = (double)height / (double)rectClient.Height();
+	coeffX = (double)this->width / (double)rectClient.Width();
+	coeffY = (double)this->height / (double)rectClient.Height();
 
 	CDC* pDC = this->GetDC();
 
@@ -169,8 +173,8 @@ void PaintCtrl::OnMouseMove(UINT nFlags, CPoint point)
 	if (!isPressing)
 		return;
 
-	int x = coeffX * point.x;
-	int y = coeffY * point.y;
+	int x = (int)(coeffX * (double)point.x + 0.5);
+	int y = (int)(coeffY * (double)point.y + 0.5);
 
 	for (int i = max(0, x - wPaint / 2); i <= min(width - 1, x + wPaint / 2); i++)
 		for (int j = max(0, y - hPaint / 2); j <= min(height - 1, y + hPaint / 2); j++)
@@ -203,18 +207,18 @@ void PaintCtrl::UpdateDisplay()
 		{
 			if (drawLUT[x][y])
 			{
-				point.x = x / coeffX;
-				point.y = y / coeffY;
+				point.x = x;// (int)((double)x / coeffX + 0.5);
+				point.y = y;// (int)((double)y / coeffY + 0.5);
 
-				//shadowMem.FillSolidRect(point.x - widthPaint / 2, point.y - heightPaint / 2, widthPaint, heightPaint, RGB(0, 0, 0));
+				//shadowMem.FillSolidRect(point.x - wPaint / 2, point.y - hPaint / 2, wPaint, hPaint, RGB(0, 0, 0));
 				//shadowMem.SetPixel(point, RGB(0, 0, 0));
 
 				ptr = &curBuffer[point.y * rectClient.Width() * 4 + point.x * 4];
 
 				*ptr++ = 0;
 				*ptr++ = 0;
 				*ptr++ = 0;
-				*ptr++ = 0;
+				*ptr++ = 255;
 			}
 		}