|
|
@@ -786,8 +786,6 @@ Frames::handleGrab(bool sta_cam){
|
|
|
{
|
|
|
param::ptlist.append(pic_name);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/*z3x7*/
|
|
|
if(z_step==3&&x_step==7){
|
|
|
emit stopGrabbing(false);
|
|
|
@@ -795,7 +793,7 @@ Frames::handleGrab(bool sta_cam){
|
|
|
|
|
|
if(z_step<=2&&x_step==7){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","b80","50"));
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -805,11 +803,11 @@ Frames::handleGrab(bool sta_cam){
|
|
|
//emit stopGrabbing(false);
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
if(z_step<=2&&x_step==6){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","b55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","f80","50"));
|
|
|
}
|
|
|
|
|
|
/*z3x5*/
|
|
|
@@ -818,11 +816,11 @@ Frames::handleGrab(bool sta_cam){
|
|
|
//emit stopGrabbing(false);
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","b55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
if(z_step<=2&&x_step==5){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","b80","50"));
|
|
|
}
|
|
|
|
|
|
/*z3x4*/
|
|
|
@@ -830,11 +828,11 @@ Frames::handleGrab(bool sta_cam){
|
|
|
{
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
if(z_step<=2&&x_step==4){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","b55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","f80","50"));
|
|
|
}
|
|
|
|
|
|
/*z3x3*/
|
|
|
@@ -842,11 +840,11 @@ Frames::handleGrab(bool sta_cam){
|
|
|
{
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
if(z_step<=2&&x_step==3){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","b80","50"));
|
|
|
}
|
|
|
/**/
|
|
|
|
|
|
@@ -855,11 +853,11 @@ Frames::handleGrab(bool sta_cam){
|
|
|
{
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
if(z_step<=2&&x_step==2){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","b55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","f80","50"));
|
|
|
}
|
|
|
/**/
|
|
|
|
|
|
@@ -868,12 +866,12 @@ Frames::handleGrab(bool sta_cam){
|
|
|
{
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
|
|
|
if(z_step<=2&&x_step==1){
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","b80","50"));
|
|
|
}
|
|
|
|
|
|
/*z3x0*/
|
|
|
@@ -881,12 +879,12 @@ Frames::handleGrab(bool sta_cam){
|
|
|
{
|
|
|
x_step++;
|
|
|
z_step = 0;
|
|
|
- emit serial_data(m_json.MotorMove("movx","f55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movx","f80","50"));
|
|
|
}
|
|
|
if(z_step<=2&&x_step==0)
|
|
|
{
|
|
|
z_step++;
|
|
|
- emit serial_data(m_json.MotorMove("movz","b55","50"));
|
|
|
+ emit serial_data(m_json.MotorMove("movz","f80","50"));
|
|
|
}
|
|
|
}
|
|
|
}
|