|
@@ -368,7 +368,7 @@ std::string JsonToString(const Json::Value & root)
|
|
|
return stream.str();
|
|
|
}
|
|
|
|
|
|
-int dataCollectionPaper(int cols, int index, int fontSize, int lineGrayPix, bool engShow, std::vector<tuple<string, string>>& vecLines, CString dir, std::string& strPngPath) {
|
|
|
+int dataCollectionPaper(int cols, int index, int fontSize, int lineGrayPix, bool engShow, std::vector<tuple<string, string>>& vecLines, CString dir, std::string& strPngPath, std::string tips) {
|
|
|
/* 这里要做一些栏数 和 vecLines的对应值确认 */
|
|
|
if (2 == cols && 14 * 2 == vecLines.size())
|
|
|
; // ok
|
|
@@ -421,6 +421,10 @@ int dataCollectionPaper(int cols, int index, int fontSize, int lineGrayPix, bool
|
|
|
string strMesInfo = "1、请将各题结果书写于横线上,勿写到线下!\
|
|
|
\n\n2、请用黑色笔书写。☆\
|
|
|
\n\n3、如果本题书写有误,进行了涂抹修改等操作,请将题号前矩形框用任意笔进行填涂!☆☆\n";
|
|
|
+ if (tips.length() > 0)
|
|
|
+ {
|
|
|
+ strMesInfo = tips;
|
|
|
+ }
|
|
|
putTextZH(img, fSize, strMesInfo.c_str(), cv::Point(leftPos + 20, topPos + 20), Scalar(0), 25, "宋体");
|
|
|
int lineTop1 = topPos + 20 + fSize.height + 20;
|
|
|
cv::line(img, cv::Point(leftPos, lineTop1), cv::Point(rightPos + ptw - 300, topPos + 20 + fSize.height + 20), Scalar(0), 2, 8, 0);
|