2026年6月25日 暂存

This commit is contained in:
2026-06-25 11:04:34 +08:00
parent 0fb69c2897
commit 864b60020e
32 changed files with 6806 additions and 5974 deletions
+27 -2
View File
@@ -104,6 +104,7 @@ void InkJetPrinter::init()
connect(m_MainWidget, &MainWidget::sendButtonClickedSignal, this, &InkJetPrinter::getMainWidgetButtonClickedSlot);
connect(m_MainWidget,SIGNAL(setDisableAll()),this,SLOT(disableTabClick()));
connect (m_MainWidget,SIGNAL(CloseJd()),this,SLOT(close_jd_timer()));
connect(m_MainWidget, &MainWidget::newFileAcquired, this, &InkJetPrinter::createNewJobFile);
connect(m_TestPrintWidget, &TestPrintWidget::sendButtonClickedSignal, this, &InkJetPrinter::getTestPrintWidgetButtonClickedSlot);
// TestPrintWidget::sendButtonClickedSignal(16) 转由 openDatetimeEditor 处理
@@ -1404,9 +1405,12 @@ void InkJetPrinter::getTestPrintWidgetButtonClickedSlot(int index)
m_MainWidget->onPreviewScene();
break;
}
// 哪个天才写的? 有什么用?
case 21:
{
m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
// 没用的切换,不讲逻辑的嘛?
// m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
break;
}
default:
@@ -1639,7 +1643,6 @@ void InkJetPrinter::getCounterVarSetWidgetButtonClickSlot(int index){
void InkJetPrinter::slt_counterVarUpdate()
{
// m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
// m_TestPrintWidget->onEditItemCounterDone();
}
void InkJetPrinter::showScheduleShiftsEditor(QVector<ScheduleModel> schedules, TextItemModel txtModel)
@@ -2676,6 +2679,28 @@ void InkJetPrinter::warningShow(int type,int num){
qDebug()<<str;
}
}
/**
* @brief 创建新的工作文件
*
*/
void InkJetPrinter::createNewJobFile()
{
auto currentFile = m_TestPrintWidget->currentFile();
if(!currentFile.isEmpty()) {
QFileInfo fileInfo(currentFile);
auto ret = QMessageBox::information(nullptr, "", tr("当前正在使用\r\n %1 \r\n确定要新建文件吗?").arg(fileInfo.baseName()),
QMessageBox::Ok, QMessageBox::Cancel);
if(ret == QMessageBox::Cancel) {
LogInfo::setRunStatusText("Canceled create new job file.");
return;
}
}
LogInfo::setRunStatusText("Create new job file...");
qInfo() << "Switch to job edit widget...";
m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
m_TestPrintWidget->on_newfileButton_pressed();
}
int InkJetPrinter::dateTimeElasped(int type,QString str){
QFile file;