Fix features
This commit is contained in:
@@ -16,7 +16,9 @@ using static Step.Model.Constants;
|
||||
namespace Step.UI
|
||||
{
|
||||
public partial class ServerControlWindow : Form
|
||||
{
|
||||
{
|
||||
private DTONcGenericDataModel model;
|
||||
private NcHandler nc;
|
||||
private bool ncStatus = false;
|
||||
private bool isUpdatingThreads = false;
|
||||
private List<RegistrationInfo> MVVMListeners;
|
||||
@@ -232,18 +234,17 @@ namespace Step.UI
|
||||
}
|
||||
|
||||
if (ncStatus)
|
||||
{
|
||||
NcHandler nc = new NcHandler();
|
||||
DTONcGenericDataModel model;
|
||||
nc.Connect();
|
||||
nc.GetNcGenericData(out model);
|
||||
{
|
||||
if (!IsDisposed)
|
||||
Invoke((MethodInvoker)delegate ()
|
||||
{
|
||||
nc = new NcHandler();
|
||||
nc.Connect();
|
||||
nc.GetNcGenericData(out model);
|
||||
StepNotifyIcon.Icon = Properties.Resources.CMS_Icon;
|
||||
TXTMachId.Text = model.CmsMachineIdNumber;
|
||||
CHNcConnected.Checked = true;
|
||||
PswForm.setMatricola(model.CmsMachineIdNumber);
|
||||
PswForm.setNcData(model.CmsMachineIdNumber,nc);
|
||||
passwordToolStripMenuItem.Enabled = true;
|
||||
});
|
||||
}
|
||||
@@ -295,30 +296,54 @@ namespace Step.UI
|
||||
return false;
|
||||
}
|
||||
|
||||
private void adminMachineToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
private void ShowPasswordDialog()
|
||||
{
|
||||
}
|
||||
|
||||
private void passwordToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
DialogResult dr = PswForm.ShowDialog();
|
||||
DialogResult dr = PswForm.ShowDialog();
|
||||
if (dr == DialogResult.OK)
|
||||
{
|
||||
resetSpindleHoursToolStripMenuItem.Visible = true;
|
||||
resetSpindleHoursToolStripMenuItem1.Visible = true;
|
||||
goBackToStandardModeToolStripMenuItem.Visible = true;
|
||||
goBackToStandardModeToolStripMenuItem1.Visible = true;
|
||||
toolStripSeparator.Visible = true;
|
||||
toolStripSeparator1.Visible = true;
|
||||
passwordToolStripMenuItem.Enabled = false;
|
||||
passwordToolStripMenuItem1.Enabled = false;
|
||||
MessageBox.Show("Machine Unlocked for administrator use", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
}
|
||||
private void backStdMode()
|
||||
{
|
||||
resetSpindleHoursToolStripMenuItem.Visible = false;
|
||||
resetSpindleHoursToolStripMenuItem1.Visible = false;
|
||||
goBackToStandardModeToolStripMenuItem.Visible = false;
|
||||
goBackToStandardModeToolStripMenuItem1.Visible = false;
|
||||
toolStripSeparator.Visible = false;
|
||||
toolStripSeparator1.Visible = false;
|
||||
passwordToolStripMenuItem.Enabled = true;
|
||||
passwordToolStripMenuItem1.Enabled = true;
|
||||
MessageBox.Show("Machine Locked for standard use", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}
|
||||
|
||||
|
||||
private void passwordToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
ShowPasswordDialog();
|
||||
}
|
||||
|
||||
private void goBackToStandardModeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
resetSpindleHoursToolStripMenuItem.Visible = false;
|
||||
goBackToStandardModeToolStripMenuItem.Visible = false;
|
||||
toolStripSeparator.Visible = false;
|
||||
passwordToolStripMenuItem.Enabled = true;
|
||||
MessageBox.Show("Machine Locked for standard use", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
backStdMode();
|
||||
}
|
||||
|
||||
private void passwordToolStripMenuItem1_Click(object sender, EventArgs e)
|
||||
{
|
||||
ShowPasswordDialog();
|
||||
}
|
||||
|
||||
private void goBackToStandardModeToolStripMenuItem1_Click(object sender, EventArgs e)
|
||||
{
|
||||
backStdMode();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user