Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-13 54f0329172de152cf95644f6d427971542e9f42c

 src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.cs

@@ -37,21 +37,8 @@
            groupBoxAxisOperration.Text = $"运动轴：{axisIndex}-{axisName}";
        }

        private void buttonPositive_Click(object sender, EventArgs e)
        {
            var opConfig = new MotionOperationCollection();
            MovingOption movingOption = new MovingOption();
            movingOption.AxisIndex = _axisIndex;
            movingOption.MoveMode = MotionMode.Jog;
            movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
            movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
            movingOption.VelocityPara.Velocity= Convert.ToDouble(textBoxJogVel.Text);

            opConfig.MovingOps.Add(movingOption);
            MotionCard.MoveToPoint(opConfig);
        }

        private void buttonNegative_Click(object sender, EventArgs e)
        private void buttonPositive_MouseDown(object sender, MouseEventArgs e)
        {
            var opConfig = new MotionOperationCollection();
            MovingOption movingOption = new MovingOption();
@@ -60,6 +47,30 @@
            movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
            movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
            movingOption.VelocityPara.Velocity = Convert.ToDouble(textBoxJogVel.Text);

            opConfig.MovingOps.Add(movingOption);
            MotionCard.MoveToPoint(opConfig);
        }

        private void buttonPositive_MouseUp(object sender, MouseEventArgs e)
        {
            MotionCard.MoveStop(_axisIndex, 0);
        }

        private void buttonNegative_MouseUp(object sender, MouseEventArgs e)
        {
            MotionCard.MoveStop(_axisIndex, 0);
        }

        private void buttonNegative_MouseDown(object sender, MouseEventArgs e)
        {
            var opConfig = new MotionOperationCollection();
            MovingOption movingOption = new MovingOption();
            movingOption.AxisIndex = _axisIndex;
            movingOption.MoveMode = MotionMode.Jog;
            movingOption.VelocityPara.Acc = Convert.ToDouble(textBoxJogAcc.Text);
            movingOption.VelocityPara.Dec = Convert.ToDouble(textBoxJogDec.Text);
            movingOption.VelocityPara.Velocity = -Convert.ToDouble(textBoxJogVel.Text);

            opConfig.MovingOps.Add(movingOption);
            MotionCard.MoveToPoint(opConfig);
@@ -82,7 +93,7 @@

        private void buttonStop_Click(object sender, EventArgs e)
        {
            MotionCard.StateChange(DeviceState.DSPause);
            MotionCard.MoveStop(_axisIndex, 0);
        }
    }
}