hlp:新建文件,内容从左下角开始,使用状态机,报警内容在自检和关机时不爆红提示
This commit is contained in:
+32
-17
@@ -136,10 +136,6 @@ TestPrintWidget::TestPrintWidget(QWidget* parent)
|
||||
connect(ui.btnArrow, &QPushButton::clicked, this, &TestPrintWidget::onBtnArrowClicked);
|
||||
|
||||
connect(ui.btnNum,&QPushButton::clicked,[this](){
|
||||
// on_addButton_pressed();
|
||||
// m_TextEdit->clear();
|
||||
// emit sendButtonClickedSignal(17);
|
||||
|
||||
pPicScene->clearSelection();
|
||||
|
||||
QFont font("WenQuanYi7");
|
||||
@@ -273,10 +269,11 @@ void TestPrintWidget::on_addButton_pressed(const SourceType type)
|
||||
QRectF itemRect= items.at(1)->boundingRect();
|
||||
textItem->setPos( items.at(1)->scenePos().x()+itemRect.width()+20, items.at(1)->scenePos().y());
|
||||
}
|
||||
else textItem->setPos(this->pViewer->mapToScene(0,0));//edit@12-07
|
||||
else {
|
||||
int y = pViewer->height() - textItem->boundingRect().height();
|
||||
textItem->setPos(this->pViewer->mapToScene(0,y));//edit@12-07
|
||||
}
|
||||
|
||||
// textItem->setPlainText("Vernon Bach Printer");
|
||||
// ui->saveButton->setEnabled(true);
|
||||
textItem->setPlainText("");
|
||||
textItem->setSelected(true);
|
||||
}
|
||||
@@ -696,10 +693,13 @@ void TestPrintWidget::onImageLoaderAccepted()
|
||||
PicTextItem* item = new PicImageItem(0, 0, SourceType::IMAGE);
|
||||
item->setHtml(htmlImg);
|
||||
pPicScene->addItem(item);
|
||||
auto boundingRect = pPicScene->itemsBoundingRect();
|
||||
item->setPos(boundingRect.right(), 0.0);
|
||||
item->setSelected(true);
|
||||
item->setSource(imgPath);
|
||||
auto boundingRect = pPicScene->itemsBoundingRect();
|
||||
int y = sysPara->para.canvasHeight - item->boundingRect().height();
|
||||
item->setPos(x_item, y);
|
||||
x_item = x_item + boundingRect.right() + 5;
|
||||
item->setSelected(true);
|
||||
|
||||
}
|
||||
|
||||
void TestPrintWidget::onBtnItemConfigClicked()
|
||||
@@ -795,8 +795,11 @@ void TestPrintWidget::onSceneFocusedItemPosChanged(QPoint p)
|
||||
ui.m_lblY->setText(QString::asprintf("Y:%d", p.y()));
|
||||
}
|
||||
|
||||
|
||||
void TestPrintWidget::on_newfileButton_pressed()
|
||||
{
|
||||
x_item = 0;
|
||||
|
||||
// if (maybeSave()) {
|
||||
pPicScene->clear();
|
||||
pViewer->viewport()->update();
|
||||
@@ -835,12 +838,17 @@ void TestPrintWidget::slt_BarCodeItemDone()
|
||||
// 添加条形码或二维码
|
||||
pPicScene->clearSelection();
|
||||
codeItem = new PicCodeItem(0, 0, SourceType::CODE);
|
||||
codeItem->setBarcodeViewModel(vm);
|
||||
|
||||
auto boundingRect = pPicScene->itemsBoundingRect();
|
||||
pPicScene->addItem(codeItem);
|
||||
codeItem->setPos(boundingRect.right(), 0.0);
|
||||
int y = sysPara->para.canvasHeight - codeItem->boundingRect().height();
|
||||
codeItem->setPos(x_item, y);
|
||||
x_item = x_item + boundingRect.right() + 5;
|
||||
} else {
|
||||
codeItem->setBarcodeViewModel(vm);
|
||||
}
|
||||
|
||||
codeItem->setBarcodeViewModel(vm);
|
||||
codeItem->setSelected(true);
|
||||
|
||||
m_printSettingModel.cnt1Settings = vm.counterViewModel.cnt1Settings;
|
||||
@@ -998,7 +1006,9 @@ void TestPrintWidget::addDateTimeItem(const DateItemModel &model, const TextItem
|
||||
item->setHtml(htmlStr);
|
||||
pPicScene->addItem(item);
|
||||
auto boundingRect = pPicScene->itemsBoundingRect();
|
||||
item->setPos(boundingRect.right(), 0.0);
|
||||
int y = sysPara->para.canvasHeight - item->boundingRect().height();
|
||||
item->setPos(x_item, y);
|
||||
x_item = x_item + boundingRect.right() + 5;
|
||||
item->setSelected(true);
|
||||
item->setModel(model);
|
||||
}
|
||||
@@ -1023,11 +1033,14 @@ void TestPrintWidget::addScheduleShiftsItem(QVector<ScheduleModel> schedules, Te
|
||||
PicScheduleShiftItem* item = new PicScheduleShiftItem();
|
||||
item->setHtml(htmlStr);
|
||||
pPicScene->addItem(item);
|
||||
item->setTextItemModel(txtModel);
|
||||
auto boundingRect = pPicScene->itemsBoundingRect();
|
||||
item->setPos(boundingRect.right(), 0.0);
|
||||
int y = sysPara->para.canvasHeight - item->boundingRect().height();
|
||||
item->setPos(x_item, y+3);
|
||||
x_item = x_item + boundingRect.right() + 5;
|
||||
item->setSelected(true);
|
||||
item->setSchedules(std::move(schedules));
|
||||
item->setTextItemModel(txtModel);
|
||||
|
||||
}
|
||||
|
||||
void TestPrintWidget::addCounterItem(CounterViewModel vm, QSharedPointer<QFont> f)
|
||||
@@ -1075,12 +1088,14 @@ void TestPrintWidget::addCounterItem(CounterViewModel vm, QSharedPointer<QFont>
|
||||
pPicScene->clearSelection();
|
||||
PicCounterItem* item = new PicCounterItem();
|
||||
pPicScene->addItem(item);
|
||||
item->setCounter(static_cast<COUNTER_TYPE>(vm.counterType), vm.digitalNum);
|
||||
auto boundingRect = pPicScene->itemsBoundingRect();
|
||||
item->setPos(boundingRect.right(), 0.0);
|
||||
int y = sysPara->para.canvasHeight - item->boundingRect().height();
|
||||
item->setPos(x_item, y);
|
||||
x_item = x_item + boundingRect.right() + 5;
|
||||
item->setSelected(true);
|
||||
item->setLetterSpace(static_cast<int>(font.letterSpacing()));
|
||||
// item->setCustomFont(font.family());
|
||||
item->setCounter(static_cast<COUNTER_TYPE>(vm.counterType), vm.digitalNum);
|
||||
if(vm.enbCustomCharWidth) {
|
||||
item->setCharWidth(vm.charWidth);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user