xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: xiaohuimin:2c75c8f0bd55519da32f224e009b184cbb245e6e
Branches Tags
xiaohuimin:dev_xiao
xiaohuimin:KM
xiaohuimin:dev_update
xiaohuimin:dev_newtest
xiaohuimin:main
xiaohuimin:test
..
compare: xiaohuimin:073d8fff6cd51967bb1aefe8f6cef028e84ee899
Branches Tags
xiaohuimin:KM
xiaohuimin:dev_update
xiaohuimin:dev_newtest
xiaohuimin:dev_xiao
xiaohuimin:main
xiaohuimin:test

No commits in common. "2c75c8f0bd55519da32f224e009b184cbb245e6e" and "073d8fff6cd51967bb1aefe8f6cef028e84ee899" have entirely different histories.
2c75c8f0bd ... 073d8fff6c

1 changed files with 2 additions and 13 deletions
Show Stats Expand all files Collapse all files

15
DHSoftware/Views/MainWindow.cs
View File

@ -597,7 +597,7 @@ namespace DHSoftware
//计数清零 //计数清零
PieceCount = 0; PieceCount = 0;
Thread.Sleep(100);
if (PLC?.Enable == true) if (PLC?.Enable == true)
{ {
PLC.OnNewPieces -= MainMotion_NewPieces; PLC.OnNewPieces -= MainMotion_NewPieces;
@ -611,18 +611,7 @@ namespace DHSoftware
cam.SnapshotCount = 0; cam.SnapshotCount = 0;
} }
}); });
Cameras.ForEach(d => {
if (d is CameraBase cam)
{
cam.SnapshotCount = 0;
}
});
HKCameras.ForEach(d => {
if (d is CameraBase cam)
{
cam.SnapshotCount = 0;
}
});
//PrepareBatchNO(); //PrepareBatchNO();
// isInPositionChecking = false; // isInPositionChecking = false;
//isFullTrayChecking = false; //isFullTrayChecking = false;