hlp:荆州版本
This commit is contained in:
kite_lucs
@@ -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){
|
||||
|
||||
@@ -203,6 +203,11 @@ private:
|
||||
unsigned char rWarnViscoReady;
|
||||
|
||||
void initCntGroup();
|
||||
// 压力记录
|
||||
bool m_pressureAlarmActive = false;
|
||||
void appendPressureRecord(int pressure, int targetPressure);
|
||||
void appendLineToBrowser(const QString &line);
|
||||
QString getValvePumpStatusString();
|
||||
public:
|
||||
bool eventFilter(QObject *watched, QEvent *event);
|
||||
};
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
* Public.h
|
||||
*
|
||||
* Created on: Jul 16, 2013
|
||||
* Author: yiyu
|
||||
* QQ:1036184468
|
||||
* Descriptoin:
|
||||
|
||||
*/
|
||||
|
||||
#ifndef PUBLIC_H_
|
||||
#define PUBLIC_H_
|
||||
|
||||
#include <Qt>
|
||||
#include <QString>
|
||||
#include <stdlib.h>
|
||||
#include <QFont>
|
||||
|
||||
extern void MySleep(unsigned int msec);
|
||||
|
||||
class Public{
|
||||
public:
|
||||
Public();
|
||||
~Public();
|
||||
static int getMinFontPixelSize();
|
||||
static QString getFontFamily(int pixelSize);
|
||||
static QString getFontFamily(int pixelSize, int vartype);// 20160812
|
||||
static int derivePixelSizeFromHeight(int value);
|
||||
static int derivePixelSizeFromHeightNx(int value);
|
||||
static int getAdjustedPixelSize(int value);
|
||||
static void resetPara();
|
||||
static void backupPara();
|
||||
static QString readLanguageType();
|
||||
static QString ReadLanguageName();
|
||||
static int getNumberHeight(QFont font);
|
||||
static time_t getDateFromMacro(const char *time);
|
||||
static QString DateToString(const char *time);
|
||||
|
||||
static int getType(int vartype); // 将变量类型进行转换，以处理横向字体
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif /* PUBLIC_H_ */
|
||||
+1
-2
@@ -373,8 +373,7 @@ QString Public::DateToString(char const *time){
|
||||
|
||||
month = ((strstr(month_names, s_month)-month_names)/3)+1;
|
||||
QString s;
|
||||
// s.sprintf("%04d-%02d-%02d",year,month,day);
|
||||
s.sprintf("%02d%02d",month,day);
|
||||
s.sprintf("%02d%02d%02d",year%100,month,day);
|
||||
return s;
|
||||
}
|
||||
|
||||
|
||||
-433
@@ -1,433 +0,0 @@
|
||||
/*
|
||||
* Public.cpp
|
||||
*
|
||||
* Created on: Jul 16, 2013
|
||||
* Author: yiyu
|
||||
* QQ:1036184468
|
||||
* Descriptoin:
|
||||
|
||||
*/
|
||||
|
||||
#include "Public.h"
|
||||
#include <QFont>
|
||||
#include <QFontMetrics>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <QFile>
|
||||
#include <QFont>
|
||||
#include <QImage>
|
||||
#include <QTextEdit>
|
||||
#include <QPainter>
|
||||
#include <QDebug>
|
||||
|
||||
static QString FontName;
|
||||
|
||||
Public::Public(){
|
||||
|
||||
}
|
||||
// "Zfull-GB";break;/
|
||||
Public::~Public(){
|
||||
FontName="";
|
||||
}
|
||||
// 20160303 : #define FONTV "WenQuanYiCN" ; FONTV1 FONTV2 "WenQuanYiNX"
|
||||
//#define FONTV "DejaVuSansnx"//"DejaVu Sans"
|
||||
#define FONTV "WenQuanYiCN"
|
||||
//#define FONTV "WenQuanYiNX"
|
||||
#define FONTV1 "WenQuanYiNX"
|
||||
//#define FONTV1 "DejaVu Sans"
|
||||
//#define FONTV2 "DejaVu Sans"
|
||||
#define FONTV2 "WenQuanYiNX"//"WenQuanYi Micro Hei"
|
||||
//"Zfull-GB"
|
||||
#define FONTC "wenquanyi"
|
||||
|
||||
//#define FONTC "WenQuanYi"
|
||||
int Public::getMinFontPixelSize(){
|
||||
return 5;
|
||||
}
|
||||
QString Public::getFontFamily(int pixelSize){
|
||||
switch(pixelSize){
|
||||
|
||||
#ifdef VNLG
|
||||
case 5:
|
||||
case 6:
|
||||
case 7:
|
||||
case 9:
|
||||
return "biyang";break;
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
return (FontName=="Chinese" || FontName=="English")?FONTC:FONTV;break;//return "UnDotum";break;//
|
||||
//return "UnDotum";break;//Zfull-GB
|
||||
case 14:case 13:case 15:
|
||||
case 16:
|
||||
case 24:
|
||||
case 32:
|
||||
return (FontName=="Chinese" || FontName=="English")?FONTC:FONTV;break;//return "UnDotum";break;//return (FontName=="Chinese")?FONTC:"Zfull-GB";break;
|
||||
case 28:
|
||||
//case 32:
|
||||
case 36:
|
||||
return //(FontName=="Chinese")?FONTC:
|
||||
//FONTV1;//
|
||||
(FontName=="Chinese" || FontName=="English")?FONTV2:FONTV1;break;
|
||||
|
||||
// "Zfull-GB";break;//return "UnDotum";break;//return (FontName=="Chinese")?FONTC:"Zfull-GB";break;
|
||||
// 16点阵以上直接使用方正字体
|
||||
default:
|
||||
return
|
||||
(FontName=="Chinese" || FontName=="English")?FONTV2:FONTV1;break;
|
||||
//FONTC; //
|
||||
//"WenQuanYi Micro Hei";
|
||||
//"WenQuanYiMH";
|
||||
#else
|
||||
case 5://return "SerifL";break;
|
||||
case 6:
|
||||
case 7:
|
||||
case 9:return "biyang";break;
|
||||
default:return
|
||||
FONTC;
|
||||
#endif
|
||||
|
||||
break;//return "WenQuanYi Zen Hei"; break;
|
||||
}
|
||||
return FONTV2;
|
||||
}
|
||||
|
||||
QString Public::getFontFamily(int pixelSize, int vartype){
|
||||
switch(pixelSize){
|
||||
case 5:
|
||||
case 6:
|
||||
case 7:
|
||||
case 9:
|
||||
{
|
||||
if(vartype>19&& vartype<30)
|
||||
{
|
||||
return "SerifL";
|
||||
}
|
||||
else if(vartype>39&& vartype<50)
|
||||
{
|
||||
return "SerifR";
|
||||
}
|
||||
else if((vartype>29&& vartype<40) || vartype == 90 || vartype==91)
|
||||
{
|
||||
return "bangla";
|
||||
}
|
||||
else if((vartype>49&& vartype<60) || vartype == 100 || vartype==101)
|
||||
{
|
||||
return "biyangF";
|
||||
}
|
||||
else if((vartype>59&& vartype<70) || vartype == 110 || vartype==111)
|
||||
{
|
||||
return "Roman";
|
||||
}
|
||||
else
|
||||
{
|
||||
return "biyang";
|
||||
}
|
||||
// (vartype>19&& vartype<30)?"SerifL":
|
||||
// (vartype>39&& vartype<50)?"SerifR":
|
||||
// "biyang";
|
||||
}
|
||||
break;
|
||||
default:return
|
||||
FONTC;
|
||||
break;//return "WenQuanYi Zen Hei"; break;
|
||||
}
|
||||
|
||||
return FONTV2;
|
||||
}
|
||||
|
||||
static int pixel_size[] = {5,7,9,12,16,21,24};//,28,32};
|
||||
#define NUM 6
|
||||
int Public::derivePixelSizeFromHeight(int value){
|
||||
if(value > 9) return value+1;
|
||||
return value;
|
||||
static int init_done;
|
||||
static int height[NUM*2];
|
||||
//static int heightB[NUM];
|
||||
|
||||
// 12 -12 16--15 24 --19 28 -22 32 --25
|
||||
/*
|
||||
HEIL 0 6
|
||||
HEIL 1 8
|
||||
HEIL 2 10
|
||||
HEIL 3 13
|
||||
HEIL 4 17
|
||||
HEIL 5 32
|
||||
HEIL 6 37
|
||||
HEIL 7 42
|
||||
*/
|
||||
if(!init_done){
|
||||
for(int i = 0; i < NUM; i++){
|
||||
QFont font;
|
||||
font.setFamily(Public::getFontFamily(pixel_size[i]));
|
||||
font.setPixelSize(pixel_size[i]);
|
||||
font.setBold(0);
|
||||
height[2*i] = getNumberHeight(font);
|
||||
font.setBold(1);
|
||||
height[2*i+1] = getNumberHeight(font);
|
||||
//qDebug()<<"HEIL"<<i<<height[2*i]<<height[2*i+1]<<font;
|
||||
}
|
||||
init_done = 1;
|
||||
}
|
||||
/*
|
||||
HEIL 0 5
|
||||
HEIL 1 7
|
||||
HEIL 2 9
|
||||
HEIL 3 12
|
||||
HEIL 4 16
|
||||
HEIL 5 26
|
||||
HEIL 6 30
|
||||
HEIL 7 34
|
||||
HEIL 8 39
|
||||
HEIL 9 32
|
||||
* */
|
||||
for(int i = 0; i < (NUM) ; i ++){
|
||||
if(value <= height[2*i]){
|
||||
//qDebug()<<"pixel_size"<<pixel_size[i];
|
||||
return pixel_size[i];
|
||||
}
|
||||
if(value <= height[2*i+1]){
|
||||
//qDebug()<<"pixel_size"<<pixel_size[i];
|
||||
return pixel_size[i];
|
||||
}
|
||||
}
|
||||
return pixel_size[1];
|
||||
}
|
||||
// 12 -12 16--15 24 --19 28 -22 32 --25
|
||||
int Public::derivePixelSizeFromHeightNx(int value){
|
||||
static int init_done;
|
||||
static int height[sizeof(pixel_size)];
|
||||
//qDebug()<<"pixel_size"<<pixel_size;
|
||||
return pixel_size[1];
|
||||
}
|
||||
|
||||
int Public::getAdjustedPixelSize(int value){
|
||||
for(int i = 0; i < sizeof(pixel_size); i++){
|
||||
if(value <= pixel_size[i])
|
||||
return pixel_size[i];
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
void Public::resetPara()
|
||||
{
|
||||
char cmd[500];
|
||||
//snprintf(cmd,sizeof(cmd),"cp /home/plg/r_conf/*.bin /home/plg/r_conf/UP.dpn /home/plg/conf/");
|
||||
//system(cmd);
|
||||
//snprintf(cmd,sizeof(cmd),"cp /home/plg/r_conf/UP.png /home/plg/r_conf/UP.h* /home/plg/doc/ ");
|
||||
//system(cmd);
|
||||
//snprintf(cmd,sizeof(cmd),"cp /home/plg/r_conf/UP1.png /home/plg/r_conf/UP1.h* /home/plg/doc/ ");
|
||||
//system(cmd);
|
||||
}
|
||||
|
||||
void Public::backupPara()
|
||||
{
|
||||
char cmd[500];
|
||||
return ;
|
||||
QFile file("/home/plg/conf/sysPara.bin");
|
||||
// if(!file.exists())return ;
|
||||
snprintf(cmd,sizeof(cmd),"cp /home/plg/conf/*.bin /home/plg/conf/UP.dpn /home/plg/r_conf/");
|
||||
system(cmd);
|
||||
snprintf(cmd,sizeof(cmd),"cp /home/plg/doc/UP.png /home/plg/doc/UP.h* /home/plg/r_conf/ ");
|
||||
system(cmd);
|
||||
snprintf(cmd,sizeof(cmd),"cp /home/plg/doc/UP1.png /home/plg/doc/UP1.h* /home/plg/r_conf/ ");
|
||||
system(cmd);
|
||||
system("mkdir /opt/bak");
|
||||
system("mkdir /opt/bak/conf");
|
||||
snprintf(cmd,sizeof(cmd),"cp /home/plg/QtUI /opt/bak/");
|
||||
system(cmd);
|
||||
system("cp /home/plg/conf/sysPara.bin /opt/bak/");
|
||||
if(file.exists("/ect/init.d/rcS")){
|
||||
snprintf(cmd,sizeof(cmd),"cp /ect/init.d/rcS /opt/bak/ ");
|
||||
system(cmd);
|
||||
}
|
||||
if(file.exists("/home/plg/qt4")){
|
||||
snprintf(cmd,sizeof(cmd),"cp /home/plg/qt4 /opt/bak/");
|
||||
system(cmd);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
QString Public::readLanguageType(){
|
||||
QFile file1("/home/plg/UseEn");
|
||||
QString InputTxtFileName;
|
||||
char buf[256];
|
||||
InputTxtFileName = "WINPY_utf8.txt";
|
||||
if(file1.exists())
|
||||
{
|
||||
file1.open(QFile::ReadWrite);
|
||||
int len=file1.readLine((char*)buf,256);
|
||||
buf[len]='\0';
|
||||
//qDebug()<<"language:"<<buf<<len<<language.length();
|
||||
if(len>2) {
|
||||
len=file1.readLine((char*)buf,256);
|
||||
if(len){
|
||||
buf[len]='\0';
|
||||
QString s1 = buf;
|
||||
int n=s1.indexOf("\r\n");
|
||||
if(n)
|
||||
s1 = s1.mid(0,n);
|
||||
if(s1.endsWith("utf8.txt")) InputTxtFileName = s1;
|
||||
else InputTxtFileName = "WINPY_utf8.txt";
|
||||
}
|
||||
}
|
||||
if(file1.isOpen()) file1.close();
|
||||
}
|
||||
return InputTxtFileName;
|
||||
}
|
||||
|
||||
QString Public::ReadLanguageName()
|
||||
{
|
||||
QFile file1("/home/plg/UseEn");
|
||||
QString language="Chinese";
|
||||
char buf[256];
|
||||
|
||||
if(file1.exists())
|
||||
{
|
||||
file1.open(QFile::ReadWrite);
|
||||
int len=file1.readLine((char*)buf,256);
|
||||
buf[len]='\0';
|
||||
//qDebug()<<"language:"<<buf<<len<<language;
|
||||
if(len>2) {
|
||||
language = buf;
|
||||
int n=language.indexOf("\r\n");
|
||||
if(n>0)
|
||||
language = language.mid(0,n);
|
||||
}
|
||||
if(file1.isOpen())file1.close();
|
||||
}
|
||||
//qDebug()<<"language2:"<<buf<<language;
|
||||
// language="Chinese"; // 仅仅中文
|
||||
|
||||
FontName = language;
|
||||
return language;
|
||||
}
|
||||
|
||||
int Public::getNumberHeight(QFont font){
|
||||
QFontMetrics fontMetrics(font);
|
||||
//int width = (fontMetrics.width("0123456789"))/10 ;
|
||||
int height = fontMetrics.ascent()+ fontMetrics.descent();
|
||||
int width1 = (fontMetrics.width("ABH89"));
|
||||
QTextEdit text1;
|
||||
text1.setFont(font);
|
||||
//qDebug()<<font;
|
||||
text1.setText("F08H");
|
||||
text1.show();
|
||||
QImage image(width1,height+16,QImage::Format_ARGB32);
|
||||
image.fill(0x00ffffff);
|
||||
QPainter painter(&image);
|
||||
text1.document()->drawContents (&painter, image.rect()); /*将text写到pic*/
|
||||
text1.hide();
|
||||
#if 0
|
||||
QString s;
|
||||
s.sprintf("/home/ss%d-%d.jpg",font.pixelSize(),font.bold()?75:50);
|
||||
image.save(s);
|
||||
#endif
|
||||
|
||||
int imgHeight = image.height();
|
||||
int imgWidth = image.width();
|
||||
int FirstValidRow = 0;
|
||||
bool lastFlag=0;
|
||||
int k,j;
|
||||
for(k = 0; k <imgHeight - 1 ; k++){
|
||||
for( j = 0; j < imgWidth; j ++){
|
||||
QRgb rgb = image.pixel(j,k);
|
||||
if((rgb&0x00ffffff) < 0x50){
|
||||
FirstValidRow = k;
|
||||
lastFlag=1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(lastFlag)
|
||||
break;
|
||||
}
|
||||
int lastValidRow = 0;
|
||||
lastFlag=0;
|
||||
for( k = imgHeight - 1; k > 0 ; k--){
|
||||
for( j = 0; j < imgWidth; j ++){
|
||||
QRgb rgb = image.pixel(j,k);
|
||||
//qDebug()<<k<<QString().sprintf("%06X",rgb);
|
||||
if((rgb&0x00ffffff) < 0x50){
|
||||
lastValidRow = k +1;
|
||||
lastFlag=1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(lastFlag)
|
||||
break;
|
||||
}
|
||||
height = lastValidRow-FirstValidRow;
|
||||
//qDebug()<<"Var:"<<FirstValidRow<<lastValidRow<<height;
|
||||
return height;
|
||||
}
|
||||
|
||||
|
||||
time_t Public::getDateFromMacro(char const *time) {
|
||||
char s_month[5];
|
||||
int month, day, year;
|
||||
struct tm t = {0};
|
||||
static const char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
|
||||
|
||||
sscanf(time, "%s %d %d", s_month, &day, &year);
|
||||
|
||||
month = (strstr(month_names, s_month)-month_names)/3;
|
||||
|
||||
t.tm_mon = month;
|
||||
t.tm_mday = day;
|
||||
t.tm_year = year - 1900;
|
||||
t.tm_isdst = -1;
|
||||
|
||||
return mktime(&t);
|
||||
}
|
||||
|
||||
QString Public::DateToString(char const *time){
|
||||
char s_month[5];
|
||||
int month, day, year;
|
||||
//struct tm t = {0};
|
||||
static const char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
|
||||
//qDebug()<<time;
|
||||
sscanf(time, "%s %d %d", s_month, &day, &year);
|
||||
//qDebug()<<time<<s_month<<day<<year;
|
||||
|
||||
month = ((strstr(month_names, s_month)-month_names)/3)+1;
|
||||
//qDebug()<<month<<s_month;
|
||||
QString s;
|
||||
s.sprintf("%04d-%02d-%02d",year,month,day);
|
||||
return s;
|
||||
}
|
||||
|
||||
int Public::getType(int vartype){
|
||||
|
||||
int tmp = vartype ;
|
||||
if(tmp >= 60) tmp = vartype-60;
|
||||
else if(tmp >= 50) tmp = vartype-50;
|
||||
else if(tmp >= 40) tmp = vartype-40;
|
||||
else if(tmp >= 30) tmp = vartype-30;
|
||||
else if(tmp >= 20) tmp = vartype-20;
|
||||
return tmp;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
#ifdef MMVAR11
|
||||
// 同一行先排序: ，不同行分开排序，如何实现。
|
||||
int i,j;
|
||||
for(i=0;i<sysPara->status.variNum-1;i++){
|
||||
bool ch_flag=0;
|
||||
for(j=i+1;j<sysPara->status.variNum;j++){
|
||||
if(sysPara->status.vars[j].startColPos < sysPara->status.vars[j-1].startColPos ){
|
||||
int n=sysPara->status.vars[j].startRowPos;
|
||||
sysPara->status.vars[j].startRowPos = sysPara->status.vars[j-1].startRowPos;
|
||||
sysPara->status.vars[j-1].startRowPos = n;
|
||||
n=sysPara->status.vars[j].startColPos;
|
||||
sysPara->status.vars[j].startColPos = sysPara->status.vars[j-1].startColPos;
|
||||
sysPara->status.vars[j-1].startColPos = n;
|
||||
ch_flag =1;
|
||||
}
|
||||
}
|
||||
if(ch_flag==0) break;
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.1 KiB |
+2
-1
@@ -9,7 +9,8 @@
|
||||
#define PUMP_VER "D"
|
||||
//#define SUB_VER "0100"
|
||||
//#define SUB_VER "IND"
|
||||
#define SUB_VER "GuiL"
|
||||
//#define SUB_VER "GuiL"
|
||||
#define SUB_VER "JingZ"
|
||||
|
||||
#ifdef __RFID_OLD
|
||||
#define SUB_RFID "_RO"
|
||||
|
||||
-21660
File diff suppressed because it is too large
Load Diff
@@ -1,175 +0,0 @@
|
||||
|
||||
|
||||
20151127 修正二维码图案的下一行显示不全问题
|
||||
20151121 高压故障自动关闭回收槽
|
||||
20151119 增加打开文件，自动自动清零选项
|
||||
20151110 增加外部电眼自动清零且计数器2加1
|
||||
20151109 新增计数1和计数器2单独立即清零 版本号 No42
|
||||
20151017 二维码变量任意位置显示问题
|
||||
20151015 二维码变量可显示
|
||||
20151012 增加DataMatrix二维码功能
|
||||
|
||||
20151001 by20150127
|
||||
20150210 关闭主界面温度报警显示； 最新字库为20150210字库
|
||||
20150209 新增：温度、直径等部分特殊字符（需要升级字库）
|
||||
20150207 修改界面显示：墨水泄漏改为墨水缸满
|
||||
20150207 开机时，喷头温度延时30分钟报警
|
||||
20150127 新增同步方式下，电眼立即清零功能（ARM与FPGA一起更新No.28）
|
||||
20150124 修正原有“变量周”计算错误
|
||||
20150119 修正产品脉冲输出延时问题
|
||||
20150118 修正双计数器出现不同步问题
|
||||
20150114 修正超慢打印时，喷印延时数据溢出错误
|
||||
20150111 修改管材，电缆的时间方式喷印间隔（取值6～9999999ms），与旧版本不完全兼容。
|
||||
20150109 测试二维码喷印
|
||||
20141211 点阵方式9X6字库改为9X7
|
||||
20141211 修正插入某些图案出现多余点问题
|
||||
20141208 开发新版电脑编字软件
|
||||
20141127 完善了喷嘴逆清洗功能
|
||||
20141116 测试了AB双相同步器功能（未应用）
|
||||
20141110 测试了自动开机循环功能（未应用）
|
||||
20141106 增加了压力调整和高压重置的限制
|
||||
20141101 修正毫米脉冲数大时速度显示问题
|
||||
20141029 调整部分默认参数
|
||||
20141023 修正英文版本翻译不全
|
||||
20141017 FPGA修正同步方式利用电眼信号触发清0问题
|
||||
20141009 修正超速对话框与参数保存对话框冲突问题
|
||||
20141008
|
||||
1. 修正上一版本中存在的图形方式下，输入变量没有变绿底问题。打印时计数器显示正常。
|
||||
2. 注意测试的内容：系统参数是否还会出现丢失现象
|
||||
20140915
|
||||
* 修正了不同字体混编时，通过回车符上移光标问题。
|
||||
20140909
|
||||
* 机箱温度显示
|
||||
20140830
|
||||
* 修正点击权限按钮时出现信息显示行数错误问题
|
||||
20140731
|
||||
* 限制电眼误触发; 时间触发的行末到行首问题已修正.
|
||||
201400707
|
||||
* 解决下位灯影响粘度泵工作问题
|
||||
|
||||
20140628
|
||||
* 修正shift键影响中文输入问题
|
||||
* 计数器立即清零
|
||||
* 不同步走米功能修正：选择时不同步走米时，不受故障和停止键影响； 不选择时，由打印和停止键控制计米器
|
||||
|
||||
20140620
|
||||
* 最大可编辑信息长度为3100列
|
||||
* 墨水或溶剂空超过3小时，自动关机
|
||||
* 1/8电压调整
|
||||
* 整列电压调整
|
||||
20140620
|
||||
* 修正点阵模式部分中文符号不能输入问题
|
||||
* 修正回收故障动作不正常问题
|
||||
20140609
|
||||
* 部分中文加粗显示
|
||||
20140608
|
||||
* 部分变量加粗显示
|
||||
20140606
|
||||
* 部分字符加粗显示
|
||||
20140528
|
||||
* 新增不打印走米选择项
|
||||
20140527
|
||||
* 修正一处同步打印触发错误(FPGA)
|
||||
20140526
|
||||
* 增加立即清零按钮，不需等待上一米打印完成，也可以直接打印新行。 --测试中,未完成。
|
||||
* ARM与FPGA均需要升级.
|
||||
20140523
|
||||
* 修正回收故障恢复异常
|
||||
20140523
|
||||
* 修正文件不能删除问题(A3.05)
|
||||
20140506
|
||||
* 更换3.14字库
|
||||
2014/5/5
|
||||
*修正默认参数异常问题
|
||||
2014/4/28
|
||||
*修正泄压阀由FPGA控制控制时，不动作问题.(仅需FPGA)
|
||||
*计数器清0测试完成。
|
||||
|
||||
2014/4/26
|
||||
* 解决计数复位不正确；泄压阀由FPGA控制(需改变电阻连接)
|
||||
|
||||
20140423
|
||||
＊ 修正V4板泄压阀工作异常，由FPGA处理； 修正计数器复位异常（0有时不打印情况）； FPGA 需要升级
|
||||
20140418
|
||||
＊ 修正V4板主泵状态异常。
|
||||
20140417
|
||||
＊ 修正预览出现显示不全问题.修正暂停按钮英文拼写错误。
|
||||
20140415
|
||||
＊ 修正英文版翻译不全问题.
|
||||
20140411
|
||||
＊ 修正喷嘴逆清洗存在的黑屏问题; 修正V4版回收故障显示错误（FPGA需要升级）
|
||||
20140410
|
||||
＊ 优化系统界面字体,新增英文版本,要升级字库。
|
||||
20140407
|
||||
＊ 实现：点阵模式下变量可加粗
|
||||
20140328
|
||||
＊ 点距微调加到独立参数设置；解决删除图片存在的问题
|
||||
20140327
|
||||
＊ 更新版本号为A304：增加独立参数设置
|
||||
20140326
|
||||
＊修正图案上下倒置问题。
|
||||
20140319
|
||||
＊增加超速不打印设置选项。
|
||||
20140318
|
||||
＊更正字库编辑不能正常切换问题。
|
||||
20140317
|
||||
＊更正不打印走米提示信息。
|
||||
20140316
|
||||
＊修正不打印走米暂停逻辑。
|
||||
|
||||
20140315
|
||||
＊ 修正高压包最大容差为50
|
||||
＊ 新增同步方式下，不打印走米（测试）
|
||||
20140314
|
||||
＊ 修正交替打印字宽问题
|
||||
＊ 修正平字方编码错误
|
||||
20140312
|
||||
＊ 修正交替打印字高减半问题
|
||||
＊ 修正电机动作方式，改脉冲式
|
||||
＊ A3.03/Fx.1.3 No.7
|
||||
20140311
|
||||
＊ 完善键盘部分字符不能显示问题
|
||||
＊ 完善编辑状态下的键盘操作
|
||||
＊ 修正电机动作方式
|
||||
＊ 修正自然计数米界面显示
|
||||
|
||||
20140310
|
||||
＊ 修正变量（计数器）放置在信息最末尾时，出现保存后不能编辑的问题
|
||||
＊ 修正交替打印时，光栅高度显示值不正确问题
|
||||
＊ 修正交替打印与显示不一致问题
|
||||
＊ 版本标识：A3.03/Fx.1.3 No.6
|
||||
20140309
|
||||
＊＊ 注意A3.03必须与Fx.1.3配套使用 ＊＊
|
||||
＊ 交替打印功能移到FPGA实现，ARM软件也作相应修改
|
||||
＊ 交替打印信息按正常方式编辑，变量使用无特殊要求！
|
||||
＊ 新增版本信息记录界面
|
||||
＊ 修正文本－点阵界面切换存在的问题
|
||||
＊ 修正点阵界面下开机不能自动加载文件的问题
|
||||
＊ 修正字库编辑功能无法开启
|
||||
＊ 修正字库倒置问题
|
||||
＊ 完善了插入图案功能，点阵编辑界面也支持JPG、BMP等图片格式
|
||||
20140308
|
||||
＊ 版本号改为A3.03,识别码变更
|
||||
＊ 修正变量显示位置不正确问题
|
||||
20140307
|
||||
＊ 解决文本编辑方式平方不正常问题
|
||||
20140306
|
||||
＊ 两种编辑方式切换改为人工切换，在［系统设置］中进行设置
|
||||
20140305
|
||||
＊ 打印不完报警
|
||||
20140304
|
||||
＊ 修改完善12点阵和16点阵的文本字库
|
||||
20140301
|
||||
＊ 整合两种编辑方式（点阵方式与文件方式）
|
||||
20140228
|
||||
＊ 修改完善英文点阵字库
|
||||
20140226
|
||||
＊ 解决晶振电压调整出现的问题
|
||||
20140221
|
||||
＊ 文本方式编字，增加了以下主要功能：
|
||||
＊ FPGA控制主墨泵
|
||||
＊ FPGA控制电机
|
||||
＊ 回收故障关墨线
|
||||
＊ 交替打印
|
||||
＊ 自然数计米
|
||||
＊ 开喷头盖，相位故障仍能走米
|
||||
+16
-1
@@ -17,7 +17,7 @@
|
||||
</size>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>TabWidget</string>
|
||||
<string>压力测试</string>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">QTabBar::scroller
|
||||
@@ -2268,6 +2268,21 @@ background-color: rgb(186, 189, 182);</string>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_pressure">
|
||||
<attribute name="title">
|
||||
<string>压力测试</string>
|
||||
</attribute>
|
||||
<widget class="QTextBrowser" name="textBrowser">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>30</x>
|
||||
<y>40</y>
|
||||
<width>741</width>
|
||||
<height>411</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabFpgaDebug">
|
||||
<attribute name="title">
|
||||
<string notr="true">FpgaDebug</string>
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
#include <QTextBrowser>
|
||||
|
||||
#define MDTFLAG 0xff00FF10
|
||||
#define QRFLAG 0xff00FF20
|
||||
@@ -622,6 +623,7 @@ void MainWindow::RefreshStatusLight(){//100ms
|
||||
|
||||
// 20160620 新增主界面显示：压力，粘度，隔膜位置，晶振电压数，相位
|
||||
ui->labPress->setText(QString("%1/%2").arg(sysPara->status.PRESSURE).arg(sysPara->para.pressure));
|
||||
|
||||
ui->labViso->setText(QString("%1/%2").arg(sysPara->status.viscosity).arg(sysPara->para.viscosity) );
|
||||
if(sysPara->para.gearPumpEnable)
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#define LANINTERFACE_NAME "eth0"
|
||||
|
||||
// #define FPGATEST // 给韦工测试时启用，发布版本需要关闭
|
||||
// #define NETWORKQRCODE //二维码允许tcp客户端修改
|
||||
#define NETWORKQRCODE //二维码允许tcp客户端修改
|
||||
// #define __RFID_OLD //旧的加密算法
|
||||
// #define __RFID_CARD //刷卡功能
|
||||
// #define __RFID_IND //允许印度进行二次加密的宏
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">f</p></body></html>
|
||||
@@ -1,5 +0,0 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">fdafdsa</p></body></html>
|
||||
@@ -1,5 +0,0 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">化公为私于机构改革讨价还价液恭恭敬敬用同方</p></body></html>
|
||||
@@ -1,5 +0,0 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'songti'; font-size:12pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'helvetica'; font-size:8pt; font-weight:200;">yujhfdddeef</span><img src=":/6/image/digitalWidth2.png" width="10" height="8" /></p></body></html>
|
||||
Reference in New Issue
Block a user