This commit is contained in:
chi
2025-04-24 16:24:01 +09:00
parent f71b963851
commit 20dd87a9d0
55 changed files with 961 additions and 1085 deletions

View File

@@ -7,12 +7,10 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using static Project.StateMachine;
using Microsoft.Speech.Synthesis;
using Microsoft.Speech;
using COMM;
using System.CodeDom;
using AR;
using Project.StateMachine;
namespace Project
{
@@ -159,7 +157,7 @@ namespace Project
}
short[] FlagMapValue;
private Dictionary<string, int> FlagMap = new Dictionary<string, int>();
private void __Load(object sender, EventArgs e)
{
this.Text = Application.ProductName + " ver " + Application.ProductVersion;
@@ -228,7 +226,7 @@ namespace Project
PUB.sm.SetMsgOptOff(); //모든 메세지출력을 해제한다. (이벤트는 동작함)
PUB.log.Add("State Machine Start");
PUB.sm = new StateMachine();
PUB.sm = new StateMachine.StateMachine();
PUB.sm.StepChanged += sm_StepChanged;
PUB.sm.Message += sm_Message;
PUB.sm.Running += sm_Running;
@@ -690,8 +688,7 @@ namespace Project
using (var f = new fSetup())
if (f.ShowDialog() == DialogResult.OK)
{
//music volume200522
PUB.mplayer.Volume = PUB.setting.musicvol / 100.0;
//AGV정보 싱크
PUB.sm.ResetRunStepSeq();
@@ -719,7 +716,7 @@ namespace Project
PUB.sm.ClearRunStep();
PUB.sm.SetNewStep(eSMStep.RESET);
PUB.sm.bPause = false;
if (PUB.mplayer != null && PUB.mplayer.HasAudio)
if (PUB.mplayer != null && PUB.mplayer.SoundLocation.isEmpty() == false)
{
PUB.mplayer.Stop();
PUB.bPlayMusic = false;