hlp:荆州版本

InkJetPrinter.cpp

@@ -325,6 +325,7 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
     removeTab(indexOf(ui->tabDacAdjust));
     removeTab(indexOf(ui->tabFpgaDebug));
     ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tab_3));
+    removeTab(indexOf(ui->tab_pressure));
 
     ui->vol0SpinBox->setMinimum(0);
     ui->vol1SpinBox->setMinimum(0);
@@ -723,6 +724,63 @@ void InkJetPrinter::initCntGroup()
             SectionalManager::instance(), &SectionalManager::sig_updateCntGroupDisp);
 }
 
+void InkJetPrinter::appendPressureRecord(int pressure, int targetPressure)
+{
+    QTextBrowser *browser = ui->textBrowser;   // tab_pressure 里的控件
+    if (!browser) return;
+
+    QString line = QString("[%1] 压力:%2 / 目标:%3 %4")
+            .arg(QDateTime::currentDateTime().toString("hh:mm:ss.zzz"))
+            .arg(pressure)
+            .arg(targetPressure)
+            .arg(getValvePumpStatusString());
+
+    appendLineToBrowser(line);
+
+    if (pressure > 700) {
+            if (!m_pressureAlarmActive) {
+                m_pressureAlarmActive = true;
+                QMessageBox::warning(this, tr("超压报警"),
+                                     tr("当前压力 %1 超过 700！").arg(pressure));
+            }
+    } else {
+        m_pressureAlarmActive = false;
+    }
+}
+
+void InkJetPrinter::appendLineToBrowser(const QString &line)
+{
+    QTextBrowser *browser = ui->textBrowser;
+    if (!browser) return;
+
+    browser->append(line);
+
+    if (browser->document()->blockCount() > 500) {
+        QTextCursor cursor(browser->document());
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::Down, QTextCursor::KeepAnchor,
+                            browser->document()->blockCount() - 500);
+        cursor.removeSelectedText();
+    }
+}
+
+static int numLine = 0;
+QString InkJetPrinter::getValvePumpStatusString()
+{
+    if (!sysPara || !sysPara->devOp) return QString();
+
+    return QString("[供墨:%1 循环:%2 混合:%3 泄压:%4 回收:%5 粘度:%6 主墨:%7 压缩:%8]-%9")
+            .arg(sysPara->devOp->isInkValveOpen()        ? 1 : 0)
+            .arg(sysPara->devOp->isCycleValveOpen()      ? 1 : 0)
+            .arg(sysPara->devOp->isMixValveOpen()        ? 1 : 0)
+            .arg(sysPara->devOp->isReleaseValveOpen()    ? 1 : 0)
+            .arg(sysPara->devOp->isReclaimPumpOpen()     ? 1 : 0)
+            .arg(sysPara->devOp->isViscosityPumpOpen()   ? 1 : 0)
+            .arg(sysPara->devOp->isMainInkPumpOpen()     ? 1 : 0)
+            .arg(sysPara->devOp->isCompressPumpOpen()    ? 1 : 0)
+            .arg(numLine++);
+}
+
 float PID_realize(float speed);
 
 struct _pid{
@@ -1774,6 +1832,14 @@ void InkJetPrinter::timerHandler(void){
             if(widget == ui->tabMainWindow && pulse_100ms) {
                 ui->tabMainWindow->updateSysStatusToUI();
             }
+
+//            if (pulse_100ms &&
+//                    (sysPara->status.PRESSURE > sysPara->para.pressure + 10
+//                    ||sysPara->status.PRESSURE < sysPara->para.pressure - 10)) {
+//                //压力记录
+//                appendPressureRecord(sysPara->status.PRESSURE, sysPara->para.pressure);
+//            }
+
             else if(widget == ui->tabTriggerMode){
                 ui->tabTriggerMode->updateSysStatusToUI();
                 if(sysPara->status.fpgaVersionNum != 0){