Revert "hlp:荆州版本"

This reverts commit 065b146998.
2026-10-19 17:48:03 +08:00
parent 065b146998
commit baa8882d09
438 changed files with 185387 additions and 163143 deletions
@@ -1,120 +1,120 @@
-#include "dialogshowcounter.h"
-#include "ui_dialogshowcounter.h"
-#include <QDebug>
-
-DialogShowCounter::DialogShowCounter(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::DialogShowCounter)
-{
-    ui->setupUi(this);
-
-    cycle_flag = true;
-    cycleTimecount = 0;
-    savecnt1CurrValue = 0;
-
-    dialogcycleprint = new DialogCycleprint(parent);
-    connect(dialogcycleprint,SIGNAL(accepted()),this,SLOT(ondialogcycleprintAccepted()));
-//    ui->CycleprintpushButton->hide();
-    setWindowFlags(Qt::FramelessWindowHint);
-}
-
-DialogShowCounter::~DialogShowCounter()
-{
-    delete ui;
-}
-
-void DialogShowCounter::init_arg()
-{
-    dialogcycleprint->getSpinboxValue(cycleprintarg);
-
-    dialogcycleprint->SetSpinboxValue(cycleprintarg);
-
-//    qDebug()<<"[init_arg]cycleprintarg.area_end1="<<cycleprintarg.area_end1;
-}
-
-void DialogShowCounter::refreshdate(int currCnt1Value, int cn1StartValue, int cn1EndValue,int currGroupIndex, int currGroupLoop/*当前循环次数*/)
-{
-    // 当前米标
-    ui->lcdNumber->display(currCnt1Value);
-
-    // 结束值
-    ui->lcdCycleEndNumber->display(cn1EndValue);
-
-    // 起始值
-//    temp_str = QString::number(cn1StartValue);
-    ui->lcdCycleStartNumber->display(cn1StartValue);
-
-    // 循环
-    ui->lcdCycleTimeNumber->display(currGroupLoop + 1);
-
-    // 剩余米数
-    int remainValue = cn1EndValue - currCnt1Value;
-    ui->lcdLessNumber->display(remainValue);
-
-}
-
-void DialogShowCounter::setLCDframe()
-{
-    ui->lcdNumber->setDigitCount(4);
-    ui->lcdNumber->setMode(QLCDNumber::Dec);
-    ui->lcdNumber->setSegmentStyle(QLCDNumber::Flat);
-    QPalette lcdpat = ui->lcdNumber->palette();
-    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
-    ui->lcdNumber->setPalette(lcdpat);
-
-    ui->lcdCycleEndNumber->setDigitCount(4);
-    ui->lcdCycleEndNumber->setMode(QLCDNumber::Dec);
-    ui->lcdCycleEndNumber->setSegmentStyle(QLCDNumber::Flat);
-    lcdpat = ui->lcdCycleEndNumber->palette();
-    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
-    ui->lcdCycleEndNumber->setPalette(lcdpat);
-
-    ui->lcdCycleStartNumber->setDigitCount(4);
-    ui->lcdCycleStartNumber->setMode(QLCDNumber::Dec);
-    ui->lcdCycleStartNumber->setSegmentStyle(QLCDNumber::Flat);
-    lcdpat = ui->lcdCycleStartNumber->palette();
-    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
-    ui->lcdCycleStartNumber->setPalette(lcdpat);
-
-    ui->lcdCycleTimeNumber->setDigitCount(4);
-    ui->lcdCycleTimeNumber->setMode(QLCDNumber::Dec);
-    ui->lcdCycleTimeNumber->setSegmentStyle(QLCDNumber::Flat);
-    lcdpat = ui->lcdCycleTimeNumber->palette();
-    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
-    ui->lcdCycleTimeNumber->setPalette(lcdpat);
-
-    ui->lcdLessNumber->setDigitCount(4);
-    ui->lcdLessNumber->setMode(QLCDNumber::Dec);
-    ui->lcdLessNumber->setSegmentStyle(QLCDNumber::Flat);
-    lcdpat = ui->lcdLessNumber->palette();
-    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
-    ui->lcdLessNumber->setPalette(lcdpat);
-
-}
-
-int DialogShowCounter::getResetMetreState(int &area_end)
-{
-    int t_reset;
-    t_reset = reset_meter;
-    reset_meter = false;
-
-    //qDebug()<<"cycleprintarg.area_end1="<<cycleprintarg.area_end1;
-    area_end = cycleprintarg.area_end1;
-
-    return t_reset;
-}
-
-void DialogShowCounter::on_pushButton_clicked()
-{
-    reset_meter = true;
-}
-
-void DialogShowCounter::ondialogcycleprintAccepted()
-{
-    dialogcycleprint->getSpinboxValue(cycleprintarg);
-}
-
-void DialogShowCounter::on_CycleprintpushButton_clicked()
-{
-    dialogcycleprint->show();
-}
+#include "dialogshowcounter.h"
+#include "ui_dialogshowcounter.h"
+#include <QDebug>
+
+DialogShowCounter::DialogShowCounter(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DialogShowCounter)
+{
+    ui->setupUi(this);
+
+    cycle_flag = true;
+    cycleTimecount = 0;
+    savecnt1CurrValue = 0;
+
+    dialogcycleprint = new DialogCycleprint(parent);
+    connect(dialogcycleprint,SIGNAL(accepted()),this,SLOT(ondialogcycleprintAccepted()));
+//    ui->CycleprintpushButton->hide();
+    setWindowFlags(Qt::FramelessWindowHint);
+}
+
+DialogShowCounter::~DialogShowCounter()
+{
+    delete ui;
+}
+
+void DialogShowCounter::init_arg()
+{
+    dialogcycleprint->getSpinboxValue(cycleprintarg);
+
+    dialogcycleprint->SetSpinboxValue(cycleprintarg);
+
+//    qDebug()<<"[init_arg]cycleprintarg.area_end1="<<cycleprintarg.area_end1;
+}
+
+void DialogShowCounter::refreshdate(int currCnt1Value, int cn1StartValue, int cn1EndValue,int currGroupIndex, int currGroupLoop/*当前循环次数*/)
+{
+    // 当前米标
+    ui->lcdNumber->display(currCnt1Value);
+
+    // 结束值
+    ui->lcdCycleEndNumber->display(cn1EndValue);
+
+    // 起始值
+//    temp_str = QString::number(cn1StartValue);
+    ui->lcdCycleStartNumber->display(cn1StartValue);
+
+    // 循环
+    ui->lcdCycleTimeNumber->display(currGroupLoop + 1);
+
+    // 剩余米数
+    int remainValue = cn1EndValue - currCnt1Value;
+    ui->lcdLessNumber->display(remainValue);
+
+}
+
+void DialogShowCounter::setLCDframe()
+{
+    ui->lcdNumber->setDigitCount(4);
+    ui->lcdNumber->setMode(QLCDNumber::Dec);
+    ui->lcdNumber->setSegmentStyle(QLCDNumber::Flat);
+    QPalette lcdpat = ui->lcdNumber->palette();
+    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
+    ui->lcdNumber->setPalette(lcdpat);
+
+    ui->lcdCycleEndNumber->setDigitCount(4);
+    ui->lcdCycleEndNumber->setMode(QLCDNumber::Dec);
+    ui->lcdCycleEndNumber->setSegmentStyle(QLCDNumber::Flat);
+    lcdpat = ui->lcdCycleEndNumber->palette();
+    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
+    ui->lcdCycleEndNumber->setPalette(lcdpat);
+
+    ui->lcdCycleStartNumber->setDigitCount(4);
+    ui->lcdCycleStartNumber->setMode(QLCDNumber::Dec);
+    ui->lcdCycleStartNumber->setSegmentStyle(QLCDNumber::Flat);
+    lcdpat = ui->lcdCycleStartNumber->palette();
+    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
+    ui->lcdCycleStartNumber->setPalette(lcdpat);
+
+    ui->lcdCycleTimeNumber->setDigitCount(4);
+    ui->lcdCycleTimeNumber->setMode(QLCDNumber::Dec);
+    ui->lcdCycleTimeNumber->setSegmentStyle(QLCDNumber::Flat);
+    lcdpat = ui->lcdCycleTimeNumber->palette();
+    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
+    ui->lcdCycleTimeNumber->setPalette(lcdpat);
+
+    ui->lcdLessNumber->setDigitCount(4);
+    ui->lcdLessNumber->setMode(QLCDNumber::Dec);
+    ui->lcdLessNumber->setSegmentStyle(QLCDNumber::Flat);
+    lcdpat = ui->lcdLessNumber->palette();
+    lcdpat.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
+    ui->lcdLessNumber->setPalette(lcdpat);
+
+}
+
+int DialogShowCounter::getResetMetreState(int &area_end)
+{
+    int t_reset;
+    t_reset = reset_meter;
+    reset_meter = false;
+
+    //qDebug()<<"cycleprintarg.area_end1="<<cycleprintarg.area_end1;
+    area_end = cycleprintarg.area_end1;
+
+    return t_reset;
+}
+
+void DialogShowCounter::on_pushButton_clicked()
+{
+    reset_meter = true;
+}
+
+void DialogShowCounter::ondialogcycleprintAccepted()
+{
+    dialogcycleprint->getSpinboxValue(cycleprintarg);
+}
+
+void DialogShowCounter::on_CycleprintpushButton_clicked()
+{
+    dialogcycleprint->show();
+}