2026年5月25日15:57:50

This commit is contained in:
2026-05-25 15:58:11 +08:00
parent 1cb9d5ac42
commit 358a56f602
20 changed files with 413 additions and 492 deletions
+9 -41
View File
@@ -106,7 +106,7 @@ void InkJetPrinter::init()
connect(m_TestPrintWidget, &TestPrintWidget::sendButtonClickedSignal, this, &InkJetPrinter::getTestPrintWidgetButtonClickedSlot);
// TestPrintWidget::sendButtonClickedSignal(16) 转由 openDatetimeEditor 处理
connect(m_TestPrintWidget, &TestPrintWidget::sig_showEditDataTime, this, &InkJetPrinter::openDatetimeEditor);
connect(m_TestPrintWidget, &TestPrintWidget::sig_showEditDateTime, this, &InkJetPrinter::openDatetimeEditor);
// 班时元素与编辑 连接
connect(m_TestPrintWidget, &TestPrintWidget::sig_showScheduleShiftsEditor, this, &InkJetPrinter::showScheduleShiftsEditor);
@@ -184,7 +184,6 @@ void InkJetPrinter::init()
m_MainWidget->bindTxTEdit(m_TestPrintWidget->getQTextEdit());
m_MainWidget->bindPicScene(m_TestPrintWidget->getPicScene());
m_FontSetWidget->bindTxTEdit(m_TestPrintWidget->getQTextEdit());
m_DateVarSet->bindTxTEdit(m_TestPrintWidget->getQTextEdit());
m_CounterVarSet->bindTxTEdit(m_TestPrintWidget->getQTextEdit());
m_BarCodeDlg->bindTxTEdit(m_TestPrintWidget->getQTextEdit());
m_QRCodeDlg->bindTxTEdit(m_TestPrintWidget->getQTextEdit());
@@ -1578,50 +1577,17 @@ void InkJetPrinter::getTestPrintWidgetButtonClickedSlot(int index)
}
}
void InkJetPrinter::openDatetimeEditor(PicDateItem* item)
void InkJetPrinter::openDatetimeEditor(DateItemModel dateModel, TextItemModel textItemModel)
{
m_DateVarSet->initUI();
m_DateVarSet->initReplaceValue();
if(item) {
m_DateVarSet->edit(item);
}
else
m_DateVarSet->setDateModel(DateItemModel::createDefaultReplaceModel());
m_DateVarSet->setTextItemModel(textItemModel);
m_DateVarSet->setDateModel(dateModel);
m_StackedWidget->setCurrentWidget(m_DateVarSet);
}
/*
void InkJetPrinter::getErCodeSettingsWidgetButtonClickedSlot(int index)
{
switch (index)
{
case 1:
case 2:
m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
break;
default:
break;
}
}
*/
/*
void InkJetPrinter::getMainInterfaceWidgetButtonClickedSlot(int index)
{
switch (index)
{
case 1:
m_StackedWidget->setCurrentWidget(m_MainWidget);
break;
default:
break;
}
}
*/
void InkJetPrinter::getFontSetWidgetButtonClickedSlot(int index)
{
switch (index)
@@ -1787,9 +1753,11 @@ void InkJetPrinter::getDateSetWidgetButtonClickSlot(int index){
{
m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
// m_TestPrintWidget->onEditItemVarDone();
DateItemModel model = m_DateVarSet->dateModel();
qDebug() << "A new datetime pattern: " << model.datetimePattern;
m_TestPrintWidget->addDateTimeItem(model);
DateItemModel model = m_DateVarSet->dateModel();
const auto textModel = m_DateVarSet->textItemModeL();
qInfo() << "A new datetime pattern: " << model.datetimePattern;
qInfo() << "Text model: " << TextItemModel::toString(textModel);
m_TestPrintWidget->addDateTimeItem(model, textModel);
break;
}
case 2: