|
@@ -88,13 +88,14 @@ void PrintThread::Print()
|
|
|
|
|
|
QCoreApplication::processEvents();
|
|
|
}
|
|
|
-
|
|
|
- // 开始打印任务
|
|
|
- int LL, CC, KK;
|
|
|
+ // 开始打印任务
|
|
|
+ //之前是s型路径打印 现在换成了从左往右的单向打印
|
|
|
+ int LL, CC;
|
|
|
string Format = ".bmp";
|
|
|
string sep = "/";
|
|
|
string Filename, PrintFullname;
|
|
|
string midl, midr;
|
|
|
+ OffsetX = PrintCSpacing;
|
|
|
OffsetY = PrintLSpacing;
|
|
|
for (LL = 1; LL <= PrintLine; LL++)
|
|
|
{
|
|
@@ -102,30 +103,12 @@ void PrintThread::Print()
|
|
|
|
|
|
for (CC = 1; CC <= PrintColumn; CC++)
|
|
|
{
|
|
|
- if (LL % 2 == 1)
|
|
|
- {
|
|
|
- KK = CC;
|
|
|
- midr = numberToString(KK);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- KK = PrintColumn - CC + 1;
|
|
|
- midr = numberToString(KK);
|
|
|
- }
|
|
|
+ midr = numberToString(CC);
|
|
|
|
|
|
Filename = PrintPrefix + midl + midr + Format;
|
|
|
PrintFullname = PrintResource + sep + Filename;
|
|
|
|
|
|
- if (LL % 2 == 1)
|
|
|
- {
|
|
|
- OffsetX = PrintCSpacing;
|
|
|
- PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- OffsetX = -1 * PrintCSpacing;
|
|
|
- PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
- }
|
|
|
+ PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
|
|
|
isMoving_sAxisX = TRUE;
|
|
|
isMoving_sAxisY = TRUE;
|
|
@@ -153,16 +136,8 @@ void PrintThread::Print()
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- if (LL % 2 == 1)
|
|
|
- {
|
|
|
- OffsetX = PrintCSpacing;
|
|
|
- PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- OffsetX = -1 * PrintCSpacing;
|
|
|
- PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
- }
|
|
|
+
|
|
|
+ PI_MOV(Devices[0], sAxis.c_str(), &initPrintX);
|
|
|
PI_MVR(Devices[1], sAxis.c_str(), &OffsetY);
|
|
|
|
|
|
isMoving_sAxisX = TRUE;
|
|
@@ -180,3 +155,95 @@ void PrintThread::Print()
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // // 开始打印任务
|
|
|
+ //int LL, CC, KK;
|
|
|
+ //string Format = ".bmp";
|
|
|
+ //string sep = "/";
|
|
|
+ //string Filename, PrintFullname;
|
|
|
+ //string midl, midr;
|
|
|
+ //OffsetY = PrintLSpacing;
|
|
|
+ //for (LL = 1; LL <= PrintLine; LL++)
|
|
|
+ //{
|
|
|
+ // midl = numberToString(LL);
|
|
|
+
|
|
|
+ // for (CC = 1; CC <= PrintColumn; CC++)
|
|
|
+ // {
|
|
|
+ // if (LL % 2 == 1)
|
|
|
+ // {
|
|
|
+ // KK = CC;
|
|
|
+ // midr = numberToString(KK);
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // KK = PrintColumn - CC + 1;
|
|
|
+ // midr = numberToString(KK);
|
|
|
+ // }
|
|
|
+
|
|
|
+ // Filename = PrintPrefix + midl + midr + Format;
|
|
|
+ // PrintFullname = PrintResource + sep + Filename;
|
|
|
+
|
|
|
+ // if (LL % 2 == 1)
|
|
|
+ // {
|
|
|
+ // OffsetX = PrintCSpacing;
|
|
|
+ // PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // OffsetX = -1 * PrintCSpacing;
|
|
|
+ // PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
+ // }
|
|
|
+
|
|
|
+ // isMoving_sAxisX = TRUE;
|
|
|
+ // isMoving_sAxisY = TRUE;
|
|
|
+ // while (isMoving_sAxisX || isMoving_sAxisY)
|
|
|
+ // {
|
|
|
+ // PI_IsMoving(Devices[0], sAxis.c_str(), &isMoving_sAxisX);
|
|
|
+ // PI_IsMoving(Devices[1], sAxis.c_str(), &isMoving_sAxisY);
|
|
|
+
|
|
|
+ // QCoreApplication::processEvents();
|
|
|
+ // }
|
|
|
+
|
|
|
+ // emit TransCGH(QString::fromStdString(PrintFullname));
|
|
|
+
|
|
|
+ // Sleep(PrintQuiet);// 静台
|
|
|
+
|
|
|
+ // MyShutter->open();
|
|
|
+ // Sleep(PrintExpose);
|
|
|
+ // MyShutter->close();
|
|
|
+
|
|
|
+ // emit TransPrintProgress(LL, CC);
|
|
|
+
|
|
|
+ // PRINTSTOP = m_Printer->Get_PRINTSTOP();
|
|
|
+ // if (PRINTSTOP)
|
|
|
+ // {
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if (LL % 2 == 1)
|
|
|
+ // {
|
|
|
+ // OffsetX = PrintCSpacing;
|
|
|
+ // PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // OffsetX = -1 * PrintCSpacing;
|
|
|
+ // PI_MVR(Devices[0], sAxis.c_str(), &OffsetX);
|
|
|
+ // }
|
|
|
+ // PI_MVR(Devices[1], sAxis.c_str(), &OffsetY);
|
|
|
+
|
|
|
+ // isMoving_sAxisX = TRUE;
|
|
|
+ // isMoving_sAxisY = TRUE;
|
|
|
+ // while (isMoving_sAxisX || isMoving_sAxisY)
|
|
|
+ // {
|
|
|
+ // PI_IsMoving(Devices[0], sAxis.c_str(), &isMoving_sAxisX);
|
|
|
+ // PI_IsMoving(Devices[1], sAxis.c_str(), &isMoving_sAxisY);
|
|
|
+
|
|
|
+ // QCoreApplication::processEvents();
|
|
|
+ // }
|
|
|
+ // if (PRINTSTOP)
|
|
|
+ // {
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+//}
|