Merge branch '测试2' of http://192.168.1.22:3000/zhangwen/front_linux into 测试2
This commit is contained in:
@@ -602,7 +602,7 @@ public:
|
|||||||
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT;
|
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT;
|
||||||
}
|
}
|
||||||
else if (j < 3) {
|
else if (j < 3) {
|
||||||
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT * 1000.0f;
|
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);
|
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ void* client_manager_thread(void* arg) {
|
|||||||
//// <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD>
|
//// <20><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0><EFBFBD>б<EFBFBD>
|
||||||
//std::vector<DeviceInfo> devices = {
|
//std::vector<DeviceInfo> devices = {
|
||||||
// {
|
// {
|
||||||
// "D001", "Primary Device", "Model-X", "00-B7-8D-00-BB-03",
|
// "D001", "Primary Device", "Model-X", "00-B7-8D-01-88-7f",
|
||||||
// 1, points1,true
|
// 1, points1,true
|
||||||
// }
|
// }
|
||||||
//};
|
//};
|
||||||
|
|||||||
Reference in New Issue
Block a user