Compare commits

..

No commits in common. "94c10a62f658449422ea4d414d250220e9ddb89e" and "f52f72812a4ca3f95a768a1bc9fba1d9dfd42ee6" have entirely different histories.

2 changed files with 21 additions and 21 deletions

View File

@ -5,7 +5,7 @@
"collector_mode": "MANUAL", "collector_mode": "MANUAL",
"console_out": false, "console_out": false,
"file_out": true, "file_out": true,
"log_save_dir": "D:\\ILSOSConfig\\_log", "log_save_dir": "_log",
"log_save_level": 0, "log_save_level": 0,
"log_file_prefix": "Aurora", "log_file_prefix": "Aurora",
"log_file_size": 5, "log_file_size": 5,
@ -20,7 +20,7 @@
"collector_mode": "MANUAL", "collector_mode": "MANUAL",
"console_out": false, "console_out": false,
"file_out": true, "file_out": true,
"log_save_dir": "D:\\ILSOSConfig\\_process", "log_save_dir": "_process",
"log_save_level": 0, "log_save_level": 0,
"log_file_prefix": "process", "log_file_prefix": "process",
"log_file_size": 5, "log_file_size": 5,
@ -35,7 +35,7 @@
"collector_mode": "MANUAL", "collector_mode": "MANUAL",
"console_out": false, "console_out": false,
"file_out": true, "file_out": true,
"log_save_dir": "D:\\ILSOSConfig\\_vision", "log_save_dir": "_vision",
"log_save_level": 0, "log_save_level": 0,
"log_file_prefix": "vision", "log_file_prefix": "vision",
"log_file_size": 5, "log_file_size": 5,

View File

@ -91,34 +91,34 @@ namespace ILSOS_CCW_H52A
var seq = AuroraEnv.SequenceEntry[SequenceIds.SeqAutoRunCCWH52A] as ISequence; var seq = AuroraEnv.SequenceEntry[SequenceIds.SeqAutoRunCCWH52A] as ISequence;
seq.RunStateChanged += AutoRunSeq_RunStateChanged; seq.RunStateChanged += AutoRunSeq_RunStateChanged;
} }
private void ApplyRecipeByState(bool bON)
{
Application.Current.Dispatcher.Invoke(() => {
if (bON == false)
WeldingRecipeManager.OnActiveReloaded();
else
WeldingRecipeManager.ReloadWeldingRecipe(WeldingRecipeManager.SelectedRecipe.name);
});
}
private void AutoRunSeq_RunStateChanged(object sender, (string sequenceId, SequenceRunState state) e) private void AutoRunSeq_RunStateChanged(object sender, (string sequenceId, SequenceRunState state) e)
{ {
//AutoRun 상황에서 Recipe Save Lock //AutoRun 상황에서 Recipe Save Lock
AuroraEnv.RecipeManager.SaveLock(CommonRecipeIds.ScannerObjectTeaching, e.state != SequenceRunState.Idle); AuroraEnv.RecipeManager.SaveLock(CommonRecipeIds.ScannerObjectTeaching, e.state != SequenceRunState.Idle);
bool AutoRunState = e.state == SequenceRunState.Running; //AutoRun 상황에서 Reicpe 화면 수정할 수 없도록 함
ApplyRecipeByState(AutoRunState); Application.Current.Dispatcher.Invoke(() => {
_UCRecipe.IsEnabled = e.state != SequenceRunState.Running; // Running으로 변경되면 Active된 레시피로 변경하도록 함
if (e.state == SequenceRunState.Running) {
WeldingRecipeManager.OnActiveReloaded();
}
_UCRecipe.IsEnabled = e.state != SequenceRunState.Running;
});
} }
private void OnPermissionChanged(EventMessage message) private void OnPermissionChanged(EventMessage message)
{ {
bool permissionOn = ApplicationExt.PermissionLevel <= (ushort)PermissionLevel.LEVEL3; bool LoginState = ApplicationExt.PermissionLevel <= (ushort)PermissionLevel.LEVEL3;
AuroraEnv.RecipeManager.SaveLock(CommonRecipeIds.ScannerObjectTeaching, !permissionOn); if (LoginState == false) {
// Login 권한이 없어지면 Active된 레시피로 변경하도록 함
// Login 권한이 없어지면 Active된 레시피로 변경하도록 함 Application.Current.Dispatcher.Invoke(() => {
ApplyRecipeByState(permissionOn); WeldingRecipeManager.OnActiveReloaded();
});
}
//LogOut 상황에서 Recipe Save Lock //LogOut 상황에서 Recipe Save Lock
AuroraEnv.RecipeManager.SaveLock(CommonRecipeIds.ScannerObjectTeaching, !LoginState);
//LogOut 상황에서 Reicpe 화면 수정할 수 없도록 함 //LogOut 상황에서 Reicpe 화면 수정할 수 없도록 함
Application.Current.Dispatcher.Invoke(() => { _UCRecipe.IsEnabled = permissionOn; }); Application.Current.Dispatcher.Invoke(() => { _UCRecipe.IsEnabled = LoginState; });
} }
// For Selection LaserDevice // For Selection LaserDevice