wangxx1809/GrpcPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配置信息部分修改

Browse Source
This commit is contained in:
wangxx1809 2024-06-27 16:08:07 +08:00
parent 38536b8739
commit 56137774d8
10 changed files with 163 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
PrintS/Config/bean/CorrectParamCfg.cpp
View File

@ -1,5 +1,6 @@
#include "CorrectParamCfg.h"
#include "ScanCfg.h"
#include "../utils/ConverType.hpp"
CorrectParamCfg::CorrectParamCfg()
@ -144,6 +145,38 @@ void CorrectParamCfg::SetCorrectCfg(stream::CorrectParamCfg* cp) {
}
void CorrectParamCfg::Update(const ReadData& rd){
for (auto start = rd.its.begin(); start != rd.its.end(); ++start) {
if (start->nameKey == "xmeasure_min") m_xmeasure_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "xmeasure_max") m_xmeasure_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "ymeasure_min") m_ymeasure_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "ymeasure_max") m_ymeasure_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "xposfix") m_xposfix = ConverType::TryToD(start->strValue);
else if (start->nameKey == "yposfix") m_yposfix = ConverType::TryToD(start->strValue);
else if (start->nameKey == "scan_angle") m_scan_angle = ConverType::TryToD(start->strValue);
else if (start->nameKey == "scan_angle_min") m_scan_angle_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "scan_angle_max") m_scan_angle_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "fix_angle") m_fix_angle = ConverType::TryToD(start->strValue);
else if (start->nameKey == "fix_angle_min") m_fix_angle_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "fix_angle_max") m_fix_angle_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "xcorrect") m_xcorrect = ConverType::TryToD(start->strValue);
else if (start->nameKey == "ycorrect") m_ycorrect = ConverType::TryToD(start->strValue);
else if (start->nameKey == "xcorrect_min") m_xcorrect_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "xcorrect_max") m_xcorrect_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "ycorrect_min") m_ycorrect_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "ycorrect_max") m_ycorrect_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "realXOffset") m_realXOffset = ConverType::TryToD(start->strValue);
else if (start->nameKey == "realYOffset") m_realYOffset = ConverType::TryToD(start->strValue);
else if (start->nameKey == "FactorK") m_FactorK = ConverType::TryToD(start->strValue);
else if (start->nameKey == "IsCorrectFile3D") m_IsCorrectFile3D = ConverType::TryToD(start->strValue);
else if (start->nameKey == "IsDynamicFocus") m_IsDynamicFocus = (bool)ConverType::TryToI(start->strValue);
else if (start->nameKey == "DefocusRatio") m_DefocusRatio = ConverType::TryToD(start->strValue);
else if (start->nameKey == "DefocusRatioMin") m_DefocusRatioMin = ConverType::TryToD(start->strValue);
else if (start->nameKey == "DefocusRatioMax") m_DefocusRatioMax = ConverType::TryToD(start->strValue);
}
}
string CorrectParamCfg::CONFIG_NAME = "CorrectParamCfg";
string CorrectParamCfg::FIELD_X_MEASURE_MIN = "XMeasureMin";
string CorrectParamCfg::FIELD_X_MEASURE_MAX = "XMeasureMax";

2
PrintS/Config/bean/CorrectParamCfg.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <string>
#include <vector>
#include "../DataManage/RWData.h"
#include "../protobuf/stream.pb.h"
using namespace std;
@ -12,6 +13,7 @@ public:
void GetUpdateSql(int cno,vector<string>& ups);
void SetCorrectCfg(stream::CorrectParamCfg* cp);
void Update(const ReadData& rd);
public:
double m_xmeasure_min; //x可打印最小位置
double m_xmeasure_max; //x可打印最大位置

41
PrintS/Config/bean/ScanParamCfg.cpp
View File

@ -1,6 +1,7 @@
#include "ScanParamCfg.h"
#include "ScanCfg.h"
#include "../../utils/StringHelper.h"
#include "../../utils/ConverType.hpp"
ScanParamCfg::ScanParamCfg()
{
@ -126,6 +127,46 @@ void ScanParamCfg::SetScanParam(stream::ScanParamCfg* sp) {
}
void ScanParamCfg::Update(const ReadData& rd) {
for (auto start = rd.its.begin(); start != rd.its.end(); ++start) {
if (start->nameKey == "edge_level") m_edge_level = ConverType::TryToI(start->strValue);
else if (start->nameKey == "edge_level_min") m_edge_level_min = ConverType::TryToI(start->strValue);
else if (start->nameKey == "edge_level_max") m_edge_level_max = ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_delay") m_jump_delay = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_delay_min") m_jump_delay_min = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_delay_max") m_jump_delay_max = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "scan_delay") m_scan_delay = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "scan_delay_min") m_scan_delay_min = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "scan_delay_max") m_scan_delay_max = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "polygon_delay") m_polygon_delay = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "polygon_delay_min") m_polygon_delay_min = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "polygon_delay_max") m_polygon_delay_max = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "laseroff_delay") m_laseroff_delay = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "laseroff_delay_min") m_laseroff_delay_min = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "laseroff_delay_max") m_laseroff_delay_max = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "laseron_delay") m_laseron_delay = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "laseron_delay_min") m_laseron_delay_min = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "laseron_delay_max") m_laseron_delay_max = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "min_jump_delay") m_min_jump_delay = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "min_jump_delay_min") m_min_jump_delay_min = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "min_jump_delay_max") m_min_jump_delay_max = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_length_limit") m_jump_length_limit = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_length_limit_min") m_jump_length_limit_min = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_length_limit_max") m_jump_length_limit_max = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "jump_speed") m_jump_speed = ConverType::TryToD(start->strValue);
else if (start->nameKey == "jump_speed_min") m_jump_speed_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "jump_speed_max") m_jump_speed_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_speed") m_mark_speed = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_speed_min") m_mark_speed_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_speed_max") m_mark_speed_max = ConverType::TryToD(start->strValue);
}
}
//string ScanParamCfg::CONFIG_NAME = "ScanParamCfg";
string ScanParamCfg::FIELD_EDGE_LEVEL = "EdgeLevel";

3
PrintS/Config/bean/ScanParamCfg.h
View File

@ -2,6 +2,8 @@
#include <string>
#include <vector>
#include "../protobuf/stream.pb.h"
#include "../DataManage/RWData.h"
using namespace std;
class ScanParamCfg
{
@ -11,6 +13,7 @@ public:
void GetUpdateSql(int cno,vector<string>& ups);
void SetScanParam(stream::ScanParamCfg* sp);
void Update(const ReadData& rd);
public:
string CONFIG_NAME;
static string FIELD_EDGE_LEVEL;

30
PrintS/Config/bean/ScanTestCfg.cpp
View File

@ -1,6 +1,7 @@
#include "ScanTestCfg.h"
#include "ScanCfg.h"
#include "../../utils/StringHelper.h"
#include "../../utils/ConverType.hpp"
ScanTestCfg::ScanTestCfg()
@ -119,6 +120,35 @@ void ScanTestCfg::SetScanTestCfg(stream::ScanTestCfg* cp) {
}
void ScanTestCfg::Update(const ReadData& rd) {
for (auto start = rd.its.begin(); start != rd.its.end(); ++start) {
if (start->nameKey == "debug_shape") m_debug_shape = ConverType::TryToI(start->strValue);
else if (start->nameKey == "shape_size") m_shape_size = ConverType::TryToI(start->strValue);
else if (start->nameKey == "shape_size_min") m_shape_size_min = ConverType::TryToI(start->strValue);
else if (start->nameKey == "shape_size_max") m_shape_size_max = ConverType::TryToI(start->strValue);
else if (start->nameKey == "laser_power") m_laser_power = ConverType::TryToI(start->strValue);
else if (start->nameKey == "laser_power_min") m_laser_power_min = ConverType::TryToI(start->strValue);
else if (start->nameKey == "laser_power_max") m_laser_power_max = ConverType::TryToI(start->strValue);
else if (start->nameKey == "defocus") m_defocus = ConverType::TryToD(start->strValue);
else if (start->nameKey == "defocus_min") m_defocus_min = ConverType::TryToD(start->strValue);
else if (start->nameKey == "defocus_max") m_defocus_max = ConverType::TryToD(start->strValue);
else if (start->nameKey == "is_cycle") m_is_cycle = ConverType::TryToD(start->strValue);
else if (start->nameKey == "cross_x") m_cross_x = ConverType::TryToD(start->strValue);
else if (start->nameKey == "cross_y") m_cross_y = ConverType::TryToD(start->strValue);
else if (start->nameKey == "z_distance") m_z_distance = ConverType::TryToD(start->strValue);
else if (start->nameKey == "IsAutoHeatingScanner") m_IsAutoHeatingScanner = (bool)ConverType::TryToI(start->strValue);
else if (start->nameKey == "AutoHeatingScannerMinutes") m_AutoHeatingScannerMinutes = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "AutoHeatingScannerSize") m_AutoHeatingScannerSize = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "AutoHeatingScannerSpeed") m_AutoHeatingScannerSpeed = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_test_start_x") m_mark_test_start_x = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_test_start_y") m_mark_test_start_y = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_test_end_x") m_mark_test_end_x = ConverType::TryToD(start->strValue);
else if (start->nameKey == "mark_test_end_y") m_mark_test_end_y = ConverType::TryToD(start->strValue);
}
}
string ScanTestCfg::CONFIG_NAME="ScanTest";
string ScanTestCfg::FIELD_DEBUG_SHAPE = "DebugShape";
string ScanTestCfg::FIELD_SHAPE_SIZE = "ShapeSize";

3
PrintS/Config/bean/ScanTestCfg.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <string>
#include <vector>
#include "../DataManage/RWData.h"
#include "../protobuf/stream.pb.h"
using namespace std;
@ -12,6 +13,8 @@ public:
void GetUpdateSql(int cno,vector<string>& ups);
void SetScanTestCfg(stream::ScanTestCfg* cp);
void Update(const ReadData& rd);
public:
int m_debug_shape;
int m_shape_size;

25
PrintS/Config/bean/ScannerControlCfg.cpp
View File

@ -103,10 +103,33 @@ void ScannerControlCfg::Update(const ReadData& rd) {
++start;
}
}
else if (type == SCANPARAMCFG) {
m_ScanCfgWrapper.m_ScanParamCfg.Update(rd);
}
else if (type == HATCHINGPARAMS) {
m_ScanCfgWrapper.m_HatchingParams.Update(rd);
}
else if (type == BORDERPARAMS) {
m_ScanCfgWrapper.m_BorderParams.Update(rd);
}
else if (type == SUPPORTPARAMS) {
m_ScanCfgWrapper.m_SupportParams.Update(rd);
}
else if (type == CORRECTPARAMCFG) {
m_ScanCfgWrapper.m_CorrectParamCfg.Update(rd);
}
else if (type == SCANTESTCFG) {
m_ScanCfgWrapper.m_ScanTestCfg.Update(rd);
}
else if (type == SKYWRITINGCFG) {
m_ScanCfgWrapper.m_SkyWritingCfg.Update(rd);
}
else if (type == POWERCOMPENSATECFG) {
m_ScanCfgWrapper.m_PowerCompensateCfg.Update(rd);
}
//else if (type == TIMEPOWERCOMPENSATECFG) {
// m_ScanCfgWrapper.m_TimePowerCompensateCfg.Update(rd);
//}
}
const string ScannerControlCfg::TABLE_NAME="ScannerControlCfg";

25
PrintS/Config/bean/SkyWritingCfg.cpp
View File

@ -1,6 +1,6 @@
#include "SkyWritingCfg.h"
#include "ScanCfg.h"
#include "../utils/ConverType.hpp"
SkyWritingCfg::SkyWritingCfg()
{
@ -87,6 +87,29 @@ void SkyWritingCfg::SetSkyWritingCfg(stream::SkyWritingCfg * cp) {
cp->set_limitemax(m_LimiteMax);
}
void SkyWritingCfg::Update(const ReadData& rd) {
for (auto start = rd.its.begin(); start != rd.its.end(); ++start) {
if (start->nameKey == "IsEnable") m_IsEnable =(bool) ConverType::TryToI(start->strValue);
else if (start->nameKey == "Timelag") m_Timelag = ConverType::TryToI(start->strValue);
else if (start->nameKey == "TimelagMin") m_TimelagMin = ConverType::TryToI(start->strValue);
else if (start->nameKey == "TimelagMax") m_TimelagMax = ConverType::TryToI(start->strValue);
else if (start->nameKey == "LaserOnShift") m_LaserOnShift = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "LaserOnShiftMin") m_LaserOnShiftMin = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "LaserOnShiftMax") m_LaserOnShiftMax = (long)ConverType::TryToI(start->strValue);
else if (start->nameKey == "Nprev") m_Nprev = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "Npost") m_Npost = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "NprevMax") m_NprevMax = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "Npost") m_Npost = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "NpostMin") m_NpostMin = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "NpostMax") m_NpostMax = (unsigned int)ConverType::TryToI(start->strValue);
else if (start->nameKey == "m_Mode") m_Mode = ConverType::TryToI(start->strValue);
else if (start->nameKey == "Limite") m_Limite = (unsigned int)ConverType::TryToD(start->strValue);
else if (start->nameKey == "LimiteMin") m_LimiteMin = (unsigned int)ConverType::TryToD(start->strValue);
else if (start->nameKey == "LimiteMax") m_LimiteMax = (unsigned int)ConverType::TryToD(start->strValue);
}
}
string SkyWritingCfg::CONFIG_NAME = "SkyWriting";
string SkyWritingCfg::FIELD_IS_ENABLE = "is_enable";
string SkyWritingCfg::FIELD_TIMELAG = "timelag";

3
PrintS/Config/bean/SkyWritingCfg.h
View File

@ -2,6 +2,7 @@
#include <string>
#include <vector>
#include "../protobuf/stream.pb.h"
#include "../DataManage/RWData.h"
using namespace std;
@ -12,6 +13,8 @@ public:
~SkyWritingCfg();
void GetUpdateSql(int cno,vector<string>& ups);
void SetSkyWritingCfg(stream::SkyWritingCfg* cp);
void Update(const ReadData& rd);
public:
bool m_IsEnable;
double m_Timelag;

BIN
PrintS/output/Release/log/2024.hbd
View File

Binary file not shown.