hlp/VX5-DiaphragmPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "hlp:荆州版本"

Browse Source 
This reverts commit 065b146998.
This commit is contained in:
kite_lucs
2026-10-19 17:48:03 +08:00
parent 065b146998
commit baa8882d09
438 changed files with 185387 additions and 163143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SectionalCounting/sectionalmanager.cpp
+36 -36
View File
@@ -1,36 +1,36 @@
#include "sectionalmanager.h"
SectionalManager *SectionalManager::instance()
{
static SectionalManager *instance = nullptr;
if(!instance) {
instance = new SectionalManager();
}
return instance;
}
void SectionalManager::emitUpdateCntShow(bool checked)
{
emit sig_updateCntShow(checked);
}
void SectionalManager::emitApplySetting()
{
emit sig_applySetting();
}
void SectionalManager::emitLoadUI()
{
emit sig_loadSettings2UI();
}
void SectionalManager::emitCancelSection()
{
emit sig_cancelSection();
}
SectionalManager::SectionalManager()
{
}
#include "sectionalmanager.h"
SectionalManager *SectionalManager::instance()
{
static SectionalManager *instance = nullptr;
if(!instance) {
instance = new SectionalManager();
}
return instance;
}
void SectionalManager::emitUpdateCntShow(bool checked)
{
emit sig_updateCntShow(checked);
}
void SectionalManager::emitApplySetting()
{
emit sig_applySetting();
}
void SectionalManager::emitLoadUI()
{
emit sig_loadSettings2UI();
}
void SectionalManager::emitCancelSection()
{
emit sig_cancelSection();
}
SectionalManager::SectionalManager()
{
}
SectionalCounting/sectionalmanager.h
+41 -41
View File
@@ -1,41 +1,41 @@
#ifndef SECTIONALMANAGER_H
#define SECTIONALMANAGER_H
#include <QObject>
#include <QTimer>
/**
迁移vx4桂林国际分段计米功能
**/
class SectionalManager : public QObject
{
Q_OBJECT
public:
static SectionalManager* instance();
virtual ~SectionalManager() = default;
// 更新计数器的可用
void emitUpdateCntShow(bool);
//应用配置1
void emitApplySetting();
//应用配置
void emitLoadUI();
// 取消分段计米
void emitCancelSection();
private:
SectionalManager();
signals:
void sig_updateCntShow(bool);
void sig_applySetting();
void sig_loadSettings2UI();
void sig_updateCntGroupDisp(bool);
void sig_cancelSection();
};
#endif // SECTIONALMANAGER_H
#ifndef SECTIONALMANAGER_H
#define SECTIONALMANAGER_H
#include <QObject>
#include <QTimer>
/**
迁移vx4桂林国际分段计米功能
**/
class SectionalManager : public QObject
{
Q_OBJECT
public:
static SectionalManager* instance();
virtual ~SectionalManager() = default;
// 更新计数器的可用
void emitUpdateCntShow(bool);
//应用配置1
void emitApplySetting();
//应用配置
void emitLoadUI();
// 取消分段计米
void emitCancelSection();
private:
SectionalManager();
signals:
void sig_updateCntShow(bool);
void sig_applySetting();
void sig_loadSettings2UI();
void sig_updateCntGroupDisp(bool);
void sig_cancelSection();
};
#endif // SECTIONALMANAGER_H
SectionalCounting/sectionalwid.h
+94 -94
View File
@@ -1,94 +1,94 @@
#ifndef SECTIONALWID_H
#define SECTIONALWID_H
#include <QTableWidget>
#include <QWidget>
#include "SysPara.h"
#include "sectionalmanager.h"
/**
迁移vx4桂林国际分段计米功能
**/
#define MAX_CNT1_GROUPS_NUM 50
namespace Ui {
class SectionalWid;
}
class SectionalWid : public QWidget
{
Q_OBJECT
public:
explicit SectionalWid(QWidget *parent = 0);
~SectionalWid();
void bindSysPara(SysPara* sysPara);
private slots:
#ifdef COUNTER1_BY_GROUP /* 分段计米 */
void on_Cnt3AddRowBtn_clicked();
void on_Cnt3InsertRowBtn_clicked();
void on_cnt3RemoveAllRowsBtn_clicked();
void on_Cnt3RemoveRowBtn_clicked();
void on_cnt3RemoveAllRowsBtn_3_clicked();
void on_checkBoxGroupCnt1_clicked(bool checked);
#endif
void on_pushButtonUpRow_clicked();
void on_pushButtonDownRow_clicked();
#ifdef COUNTER2_BY_GROUP /* 分段计米 */
void on_Cnt3AddRowBtn_2_clicked();
void on_Cnt3InsertRowBtn_2_clicked();
void on_cnt3RemoveAllRowsBtn_2_clicked();
void on_Cnt3RemoveRowBtn_2_clicked();
void on_cnt3RemoveAllRowsBtn_4_clicked();
void on_checkBoxGroupCnt_2_clicked(bool checked);
#endif
void on_pushButtonUpRow_2_clicked();
void on_pushButtonDownRow_2_clicked();
void slt_applySetting();
void slt_loadSettings2UI();
void slt_updateCntGroupDisp(bool bChangeToNext);
void slt_cancelSection();
private:
Ui::SectionalWid *ui;
SysPara* sysPara = nullptr;
void initUI();
#ifdef COUNTER1_BY_GROUP /* 分段计米 */
void rowWidgetCreate(int rowIndex);
void LoadCnt1GroupSettingsToUI();
void updateCnt1GroupsTblWgt();
void ApplyCnt1GroupSetting();
#endif
#ifdef COUNTER2_BY_GROUP /* 分段计米 */
void rowWidgetCreate2(int rowIndex);
void LoadCnt2GroupSettingsToUI();
void updateCnt2GroupsTblWgt();
void ApplyCnt2GroupSetting();
#endif
/**
type:选表格
**/
void moveRow(int currentRow, int toRow, QTableWidget* table);
};
#endif // SECTIONALWID_H
#ifndef SECTIONALWID_H
#define SECTIONALWID_H
#include <QTableWidget>
#include <QWidget>
#include "SysPara.h"
#include "sectionalmanager.h"
/**
迁移vx4桂林国际分段计米功能
**/
#define MAX_CNT1_GROUPS_NUM 50
namespace Ui {
class SectionalWid;
}
class SectionalWid : public QWidget
{
Q_OBJECT
public:
explicit SectionalWid(QWidget *parent = 0);
~SectionalWid();
void bindSysPara(SysPara* sysPara);
private slots:
#ifdef COUNTER1_BY_GROUP /* 分段计米 */
void on_Cnt3AddRowBtn_clicked();
void on_Cnt3InsertRowBtn_clicked();
void on_cnt3RemoveAllRowsBtn_clicked();
void on_Cnt3RemoveRowBtn_clicked();
void on_cnt3RemoveAllRowsBtn_3_clicked();
void on_checkBoxGroupCnt1_clicked(bool checked);
#endif
void on_pushButtonUpRow_clicked();
void on_pushButtonDownRow_clicked();
#ifdef COUNTER2_BY_GROUP /* 分段计米 */
void on_Cnt3AddRowBtn_2_clicked();
void on_Cnt3InsertRowBtn_2_clicked();
void on_cnt3RemoveAllRowsBtn_2_clicked();
void on_Cnt3RemoveRowBtn_2_clicked();
void on_cnt3RemoveAllRowsBtn_4_clicked();
void on_checkBoxGroupCnt_2_clicked(bool checked);
#endif
void on_pushButtonUpRow_2_clicked();
void on_pushButtonDownRow_2_clicked();
void slt_applySetting();
void slt_loadSettings2UI();
void slt_updateCntGroupDisp(bool bChangeToNext);
void slt_cancelSection();
private:
Ui::SectionalWid *ui;
SysPara* sysPara = nullptr;
void initUI();
#ifdef COUNTER1_BY_GROUP /* 分段计米 */
void rowWidgetCreate(int rowIndex);
void LoadCnt1GroupSettingsToUI();
void updateCnt1GroupsTblWgt();
void ApplyCnt1GroupSetting();
#endif
#ifdef COUNTER2_BY_GROUP /* 分段计米 */
void rowWidgetCreate2(int rowIndex);
void LoadCnt2GroupSettingsToUI();
void updateCnt2GroupsTblWgt();
void ApplyCnt2GroupSetting();
#endif
/**
type:选表格
**/
void moveRow(int currentRow, int toRow, QTableWidget* table);
};
#endif // SECTIONALWID_H
SectionalCounting/sectionalwid.ui
+245 -245
View File
@@ -1,245 +1,245 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SectionalWid</class>
<widget class="QWidget" name="SectionalWid">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>778</width>
<height>428</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>771</width>
<height>211</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxGroupCnt1">
<property name="text">
<string>分段计米1</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="Cnt3RemoveRowBtn">
<property name="text">
<string>删 除</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButtonUpRow">
<property name="text">
<string>上移</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButtonDownRow">
<property name="text">
<string>下移</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="Cnt3AddRowBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>添 加</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn">
<property name="text">
<string>全部删除</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="Cnt3InsertRowBtn">
<property name="text">
<string>插 入</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QTableWidget" name="tableWidget">
<property name="autoScroll">
<bool>true</bool>
</property>
<property name="rowCount">
<number>0</number>
</property>
<property name="columnCount">
<number>4</number>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>80</number>
</attribute>
<attribute name="horizontalHeaderHighlightSections">
<bool>true</bool>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>18</number>
</attribute>
<attribute name="verticalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<column/>
<column/>
<column/>
<column/>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn_3">
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>清零循环</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_21">
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxGroupCnt_2">
<property name="text">
<string>分段计米2</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="Cnt3RemoveRowBtn_2">
<property name="text">
<string>删 除</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButtonUpRow_2">
<property name="text">
<string>上移</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButtonDownRow_2">
<property name="text">
<string>下移</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="Cnt3AddRowBtn_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>添 加</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn_2">
<property name="text">
<string>全部删除</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="Cnt3InsertRowBtn_2">
<property name="text">
<string>插 入</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QTableWidget" name="tableWidget_2">
<property name="autoScroll">
<bool>true</bool>
</property>
<property name="rowCount">
<number>0</number>
</property>
<property name="columnCount">
<number>4</number>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>80</number>
</attribute>
<attribute name="horizontalHeaderHighlightSections">
<bool>true</bool>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>18</number>
</attribute>
<attribute name="verticalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<column/>
<column/>
<column/>
<column/>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn_4">
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>清零循环</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
</ui>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SectionalWid</class>
<widget class="QWidget" name="SectionalWid">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>778</width>
<height>428</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>771</width>
<height>211</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<layout class="QGridLayout" name="gridLayout_15">
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxGroupCnt1">
<property name="text">
<string>分段计米1</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="Cnt3RemoveRowBtn">
<property name="text">
<string>删 除</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButtonUpRow">
<property name="text">
<string>上移</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButtonDownRow">
<property name="text">
<string>下移</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="Cnt3AddRowBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>添 加</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn">
<property name="text">
<string>全部删除</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="Cnt3InsertRowBtn">
<property name="text">
<string>插 入</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QTableWidget" name="tableWidget">
<property name="autoScroll">
<bool>true</bool>
</property>
<property name="rowCount">
<number>0</number>
</property>
<property name="columnCount">
<number>4</number>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>80</number>
</attribute>
<attribute name="horizontalHeaderHighlightSections">
<bool>true</bool>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>18</number>
</attribute>
<attribute name="verticalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<column/>
<column/>
<column/>
<column/>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn_3">
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>清零循环</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_21">
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxGroupCnt_2">
<property name="text">
<string>分段计米2</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="Cnt3RemoveRowBtn_2">
<property name="text">
<string>删 除</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButtonUpRow_2">
<property name="text">
<string>上移</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QPushButton" name="pushButtonDownRow_2">
<property name="text">
<string>下移</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="Cnt3AddRowBtn_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>添 加</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn_2">
<property name="text">
<string>全部删除</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="Cnt3InsertRowBtn_2">
<property name="text">
<string>插 入</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QTableWidget" name="tableWidget_2">
<property name="autoScroll">
<bool>true</bool>
</property>
<property name="rowCount">
<number>0</number>
</property>
<property name="columnCount">
<number>4</number>
</property>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>false</bool>
</attribute>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>80</number>
</attribute>
<attribute name="horizontalHeaderHighlightSections">
<bool>true</bool>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>18</number>
</attribute>
<attribute name="verticalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>30</number>
</attribute>
<column/>
<column/>
<column/>
<column/>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="cnt3RemoveAllRowsBtn_4">
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>清零循环</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
</ui>