diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 6a86ed6..06d7df7 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -26,7 +26,7 @@ { QPen pen; pen.setColor(QColor("#2ed573")); // 曲线颜色(绿色) - pen.setWidth(2); //曲线线宽 + pen.setWidth(1); //曲线线宽 QCPGraph * graph = ui->dataPlot->addGraph(); graph->setName("钟差(ns)"); @@ -49,12 +49,8 @@ ui->analysisPlot->yAxis->setNumberFormat("gbc"); // Y 轴:g灵活的格式,b漂亮的指数形式,c乘号改成× ui->analysisPlot->yAxis->setNumberPrecision(12); // Y 轴:精度,有效数字的位数 - QLinearGradient gradient(0, 0, 0, 400); - gradient.setColorAt(0, QColor(90, 90, 90)); - gradient.setColorAt(0.38, QColor(105, 105, 105)); - gradient.setColorAt(1, QColor(70, 70, 70)); - ui->dataPlot->setBackground(QBrush(gradient)); // 背景色 - ui->analysisPlot->setBackground(QBrush(gradient)); // 背景色 + ui->dataPlot->setBackground(QColor("#0B1425")); + ui->analysisPlot->setBackground(QColor("#0B1425")); // 背景色 ui->dataPlot->xAxis->setBasePen(QPen(Qt::white)); ui->dataPlot->xAxis->setTickPen(QPen(Qt::white)); @@ -78,23 +74,23 @@ ui->dataPlot->yAxis->setLabel("钟差(ns)"); ui->dataPlot->yAxis->setBasePen(QPen(Qt::white)); ui->dataPlot->yAxis->setTickPen(QPen(Qt::white)); - ui->dataPlot->yAxis->setSubTickPen(QPen(Qt::white)); - ui->dataPlot->yAxis->grid()->setSubGridVisible(true); + //ui->dataPlot->yAxis->setSubTickPen(QPen(Qt::white)); + //ui->dataPlot->yAxis->grid()->setSubGridVisible(true); ui->dataPlot->yAxis->setTickLabelColor(Qt::white); ui->dataPlot->yAxis->setLabelColor(Qt::white); ui->dataPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); - ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); + //ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); ui->analysisPlot->yAxis->setPadding(5); // a bit more space to the left border ui->analysisPlot->yAxis->setLabel("钟差(ns)"); ui->analysisPlot->yAxis->setBasePen(QPen(Qt::white)); ui->analysisPlot->yAxis->setTickPen(QPen(Qt::white)); - ui->analysisPlot->yAxis->setSubTickPen(QPen(Qt::white)); - ui->analysisPlot->yAxis->grid()->setSubGridVisible(true); + //ui->analysisPlot->yAxis->setSubTickPen(QPen(Qt::white)); + //ui->analysisPlot->yAxis->grid()->setSubGridVisible(true); ui->analysisPlot->yAxis->setTickLabelColor(Qt::white); ui->analysisPlot->yAxis->setLabelColor(Qt::white); ui->analysisPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); - ui->analysisPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); + //ui->analysisPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); double minTm = hisDataVect.first().at(0).toLongLong() / 1000; double maxTm = hisDataVect.last().at(0).toLongLong() / 1000; diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 6a86ed6..06d7df7 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -26,7 +26,7 @@ { QPen pen; pen.setColor(QColor("#2ed573")); // 曲线颜色(绿色) - pen.setWidth(2); //曲线线宽 + pen.setWidth(1); //曲线线宽 QCPGraph * graph = ui->dataPlot->addGraph(); graph->setName("钟差(ns)"); @@ -49,12 +49,8 @@ ui->analysisPlot->yAxis->setNumberFormat("gbc"); // Y 轴:g灵活的格式,b漂亮的指数形式,c乘号改成× ui->analysisPlot->yAxis->setNumberPrecision(12); // Y 轴:精度,有效数字的位数 - QLinearGradient gradient(0, 0, 0, 400); - gradient.setColorAt(0, QColor(90, 90, 90)); - gradient.setColorAt(0.38, QColor(105, 105, 105)); - gradient.setColorAt(1, QColor(70, 70, 70)); - ui->dataPlot->setBackground(QBrush(gradient)); // 背景色 - ui->analysisPlot->setBackground(QBrush(gradient)); // 背景色 + ui->dataPlot->setBackground(QColor("#0B1425")); + ui->analysisPlot->setBackground(QColor("#0B1425")); // 背景色 ui->dataPlot->xAxis->setBasePen(QPen(Qt::white)); ui->dataPlot->xAxis->setTickPen(QPen(Qt::white)); @@ -78,23 +74,23 @@ ui->dataPlot->yAxis->setLabel("钟差(ns)"); ui->dataPlot->yAxis->setBasePen(QPen(Qt::white)); ui->dataPlot->yAxis->setTickPen(QPen(Qt::white)); - ui->dataPlot->yAxis->setSubTickPen(QPen(Qt::white)); - ui->dataPlot->yAxis->grid()->setSubGridVisible(true); + //ui->dataPlot->yAxis->setSubTickPen(QPen(Qt::white)); + //ui->dataPlot->yAxis->grid()->setSubGridVisible(true); ui->dataPlot->yAxis->setTickLabelColor(Qt::white); ui->dataPlot->yAxis->setLabelColor(Qt::white); ui->dataPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); - ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); + //ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); ui->analysisPlot->yAxis->setPadding(5); // a bit more space to the left border ui->analysisPlot->yAxis->setLabel("钟差(ns)"); ui->analysisPlot->yAxis->setBasePen(QPen(Qt::white)); ui->analysisPlot->yAxis->setTickPen(QPen(Qt::white)); - ui->analysisPlot->yAxis->setSubTickPen(QPen(Qt::white)); - ui->analysisPlot->yAxis->grid()->setSubGridVisible(true); + //ui->analysisPlot->yAxis->setSubTickPen(QPen(Qt::white)); + //ui->analysisPlot->yAxis->grid()->setSubGridVisible(true); ui->analysisPlot->yAxis->setTickLabelColor(Qt::white); ui->analysisPlot->yAxis->setLabelColor(Qt::white); ui->analysisPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); - ui->analysisPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); + //ui->analysisPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); double minTm = hisDataVect.first().at(0).toLongLong() / 1000; double maxTm = hisDataVect.last().at(0).toLongLong() / 1000; diff --git a/CounterRealTime/ChannelChartForm.ui b/CounterRealTime/ChannelChartForm.ui index dda1aa7..ccc7bca 100644 --- a/CounterRealTime/ChannelChartForm.ui +++ b/CounterRealTime/ChannelChartForm.ui @@ -54,7 +54,7 @@ 0 - 0 + 5 0 @@ -78,7 +78,7 @@ - + :/images/chartClose.png:/images/chartClose.png @@ -109,7 +109,7 @@ - + diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 6a86ed6..06d7df7 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -26,7 +26,7 @@ { QPen pen; pen.setColor(QColor("#2ed573")); // 曲线颜色(绿色) - pen.setWidth(2); //曲线线宽 + pen.setWidth(1); //曲线线宽 QCPGraph * graph = ui->dataPlot->addGraph(); graph->setName("钟差(ns)"); @@ -49,12 +49,8 @@ ui->analysisPlot->yAxis->setNumberFormat("gbc"); // Y 轴:g灵活的格式,b漂亮的指数形式,c乘号改成× ui->analysisPlot->yAxis->setNumberPrecision(12); // Y 轴:精度,有效数字的位数 - QLinearGradient gradient(0, 0, 0, 400); - gradient.setColorAt(0, QColor(90, 90, 90)); - gradient.setColorAt(0.38, QColor(105, 105, 105)); - gradient.setColorAt(1, QColor(70, 70, 70)); - ui->dataPlot->setBackground(QBrush(gradient)); // 背景色 - ui->analysisPlot->setBackground(QBrush(gradient)); // 背景色 + ui->dataPlot->setBackground(QColor("#0B1425")); + ui->analysisPlot->setBackground(QColor("#0B1425")); // 背景色 ui->dataPlot->xAxis->setBasePen(QPen(Qt::white)); ui->dataPlot->xAxis->setTickPen(QPen(Qt::white)); @@ -78,23 +74,23 @@ ui->dataPlot->yAxis->setLabel("钟差(ns)"); ui->dataPlot->yAxis->setBasePen(QPen(Qt::white)); ui->dataPlot->yAxis->setTickPen(QPen(Qt::white)); - ui->dataPlot->yAxis->setSubTickPen(QPen(Qt::white)); - ui->dataPlot->yAxis->grid()->setSubGridVisible(true); + //ui->dataPlot->yAxis->setSubTickPen(QPen(Qt::white)); + //ui->dataPlot->yAxis->grid()->setSubGridVisible(true); ui->dataPlot->yAxis->setTickLabelColor(Qt::white); ui->dataPlot->yAxis->setLabelColor(Qt::white); ui->dataPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); - ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); + //ui->dataPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); ui->analysisPlot->yAxis->setPadding(5); // a bit more space to the left border ui->analysisPlot->yAxis->setLabel("钟差(ns)"); ui->analysisPlot->yAxis->setBasePen(QPen(Qt::white)); ui->analysisPlot->yAxis->setTickPen(QPen(Qt::white)); - ui->analysisPlot->yAxis->setSubTickPen(QPen(Qt::white)); - ui->analysisPlot->yAxis->grid()->setSubGridVisible(true); + //ui->analysisPlot->yAxis->setSubTickPen(QPen(Qt::white)); + //ui->analysisPlot->yAxis->grid()->setSubGridVisible(true); ui->analysisPlot->yAxis->setTickLabelColor(Qt::white); ui->analysisPlot->yAxis->setLabelColor(Qt::white); ui->analysisPlot->yAxis->grid()->setPen(QPen(QColor(130, 130, 130), 0, Qt::SolidLine)); - ui->analysisPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); + //ui->analysisPlot->yAxis->grid()->setSubGridPen(QPen(QColor(130, 130, 130), 0, Qt::DotLine)); double minTm = hisDataVect.first().at(0).toLongLong() / 1000; double maxTm = hisDataVect.last().at(0).toLongLong() / 1000; diff --git a/CounterRealTime/ChannelChartForm.ui b/CounterRealTime/ChannelChartForm.ui index dda1aa7..ccc7bca 100644 --- a/CounterRealTime/ChannelChartForm.ui +++ b/CounterRealTime/ChannelChartForm.ui @@ -54,7 +54,7 @@ 0 - 0 + 5 0 @@ -78,7 +78,7 @@ - + :/images/chartClose.png:/images/chartClose.png @@ -109,7 +109,7 @@ - + diff --git a/CounterRealTime/CounterDevice.cpp b/CounterRealTime/CounterDevice.cpp index 842c69d..4940039 100644 --- a/CounterRealTime/CounterDevice.cpp +++ b/CounterRealTime/CounterDevice.cpp @@ -203,7 +203,7 @@ if (SettingConfig::getInstance().NEED_KAFKA == 1) { kafkaUtil.produceMessage(QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact))); -// kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact))); + kafkaUtil.produceMessage(SettingConfig::getInstance().KAFKA_STATUS_TOPIC, QString(QJsonDocument(statusObj).toJson(QJsonDocument::Compact))); QLogUtil::writeChannelDataLogByDate(date, msgLogFilename, QString(QJsonDocument(messageArray).toJson(QJsonDocument::Compact))); }