Alarm 부분 제외 데이터쪽 확인
main
DESKTOP-999R8N3\CJY 2023-03-27 18:00:47 +09:00
parent bf0a0e7e6a
commit a5aa9c1dd8
24 changed files with 1239 additions and 1171 deletions

View File

@ -15,5 +15,7 @@ namespace INT_PT002.Controls.Bottom
{ {
InitializeComponent(); InitializeComponent();
} }
} }
} }

View File

@ -66,7 +66,7 @@ namespace INT_PT002.Controls
this.treeViewLogAlarm.Nodes.Clear(); this.treeViewLogAlarm.Nodes.Clear();
this.ListAlarmFile.Clear(); this.ListAlarmFile.Clear();
DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataInspectionFolder); DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataAlarmFolder);
List<string> fileNames = new List<string>(); List<string> fileNames = new List<string>();
// 폴더 체크 // 폴더 체크
@ -78,7 +78,7 @@ namespace INT_PT002.Controls
// year 폴더 정렬 // year 폴더 정렬
years = this.ParentForm.DirectorySort(yearDirectorys); years = this.ParentForm.DirectorySort(yearDirectorys);
// Inspection File 리스트 생성 // Alarm File 리스트 생성
if (years.Count != 0) if (years.Count != 0)
{ {
// Year // Year
@ -98,7 +98,7 @@ namespace INT_PT002.Controls
DirectoryInfo dayDir = new DirectoryInfo(string.Format("{0}{1}\\{2}", this.ParentForm.ParentForm.PathDataAlarmFolder, year, month)); DirectoryInfo dayDir = new DirectoryInfo(string.Format("{0}{1}\\{2}", this.ParentForm.ParentForm.PathDataAlarmFolder, year, month));
FileInfo[] dayFiles = dayDir.GetFiles(); FileInfo[] dayFiles = dayDir.GetFiles();
days = this.DayInspectionDirectorySort(dayFiles); days = this.DayAlarmDirectorySort(dayFiles);
DataBackupMonth m = new DataBackupMonth(month); DataBackupMonth m = new DataBackupMonth(month);
m.Days = days; m.Days = days;
@ -136,12 +136,12 @@ namespace INT_PT002.Controls
this.labelCount.Text = fileCount.ToString(); this.labelCount.Text = fileCount.ToString();
} }
private List<string> DayInspectionDirectorySort(FileInfo[] files) private List<string> DayAlarmDirectorySort(FileInfo[] files)
{ {
List<string> listFile = new List<string>(); List<string> listFile = new List<string>();
Dictionary<string, int> dirNames = new Dictionary<string, int>(); Dictionary<string, int> dirNames = new Dictionary<string, int>();
#region File List 품번 순서로 정렬 #region File List 품번 순서로 정렬
foreach (FileInfo file in files) foreach (FileInfo file in files)
dirNames.Add(file.Name, int.Parse(file.Name.Substring(10, 1))); dirNames.Add(file.Name, int.Parse(file.Name.Substring(10, 1)));
@ -150,7 +150,7 @@ namespace INT_PT002.Controls
listFile.Add(v.Key); listFile.Add(v.Key);
#endregion #endregion
#region File List 날짜 순서로 정렬 #region File List 날짜 순서로 정렬
dirNames = new Dictionary<string, int>(); dirNames = new Dictionary<string, int>();
foreach (string f in listFile) foreach (string f in listFile)
dirNames.Add(f, int.Parse(f.Substring(1, 8))); dirNames.Add(f, int.Parse(f.Substring(1, 8)));
@ -166,6 +166,9 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormAlarmList;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.SelecteDataType = Define.E_DataType.None; this.SelecteDataType = Define.E_DataType.None;
this.UpdateDisplayFile(); this.UpdateDisplayFile();

View File

@ -191,6 +191,9 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormCheckLog;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.SelecteDataType = Define.E_DataType.None; this.SelecteDataType = Define.E_DataType.None;
this.UpdateDisplayFile(); this.UpdateDisplayFile();

View File

@ -291,6 +291,9 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormEquipmentLog;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.SelecteDataType = Define.E_DataType.None; this.SelecteDataType = Define.E_DataType.None;
this.UpdateDisplayFile(); this.UpdateDisplayFile();
@ -353,6 +356,9 @@ namespace INT_PT002.Controls
private void treeViewInspection_AfterSelect(object sender, TreeViewEventArgs e) private void treeViewInspection_AfterSelect(object sender, TreeViewEventArgs e)
{ {
this.labelPath.Text = e.Node.Text; this.labelPath.Text = e.Node.Text;
for (int i = 0; i < FormMain.Lane; i++)
this.CollectionListBox[i].ClearAll();
this.listBoxTime.ClearAll();
this.LoadFile(this.ParentForm.ParentForm.PathDataInspectionFolder + this.treeViewInspection.SelectedNode.FullPath); this.LoadFile(this.ParentForm.ParentForm.PathDataInspectionFolder + this.treeViewInspection.SelectedNode.FullPath);
} }

View File

@ -153,7 +153,8 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.DisplayEquipmentTest; this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormIOTest;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.IOTest);
} }
#endregion #endregion

View File

@ -144,7 +144,8 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.DisplayRecipe; this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormProduct;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.UpdateDisplayRecipeData(this.ParentForm.ParentForm.SystemConfig.RECIPE_NUMBER); this.UpdateDisplayRecipeData(this.ParentForm.ParentForm.SystemConfig.RECIPE_NUMBER);
} }
#endregion #endregion

View File

@ -635,7 +635,7 @@
this.smartLabel9.RoundRectFillColor = System.Drawing.Color.LightBlue; this.smartLabel9.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.smartLabel9.Size = new System.Drawing.Size(150, 24); this.smartLabel9.Size = new System.Drawing.Size(150, 24);
this.smartLabel9.TabIndex = 10; this.smartLabel9.TabIndex = 10;
this.smartLabel9.Text = "00000"; this.smartLabel9.Text = "IBD902M";
this.smartLabel9.TextColor = System.Drawing.Color.Black; this.smartLabel9.TextColor = System.Drawing.Color.Black;
this.smartLabel9.TextColorDisable = System.Drawing.Color.Gray; this.smartLabel9.TextColorDisable = System.Drawing.Color.Gray;
this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;

View File

@ -165,10 +165,10 @@ namespace INT_PT002.Controls
{ {
fileName = file.Name.ToLower(); fileName = file.Name.ToLower();
if (fileName == "itc81db_0h_main.int") if (fileName == "ibd902m.bin")
{ {
isUpdateFile = true; isUpdateFile = true;
this.UpdateFileMainboardPath += "itc81db_0h_main.int"; this.UpdateFileMainboardPath += "ibd902m.bin";
break; break;
} }
@ -260,6 +260,9 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormInformation;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.smartKeyboard1.Hide(); this.smartKeyboard1.Hide();
this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1502_ProgramVersion, ""); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1502_ProgramVersion, "");

View File

@ -289,6 +289,7 @@
this.smartLabel69 = new SmartX.SmartLabel(); this.smartLabel69 = new SmartX.SmartLabel();
this.smartSeparatorLine16 = new SmartX.SmartSeparatorLine(); this.smartSeparatorLine16 = new SmartX.SmartSeparatorLine();
this.labelResult6 = new SmartX.SmartLabel(); this.labelResult6 = new SmartX.SmartLabel();
this.buttonStart = new SmartX.SmartButton();
this.smartGroupBox1.SuspendLayout(); this.smartGroupBox1.SuspendLayout();
this.smartGroupBox4.SuspendLayout(); this.smartGroupBox4.SuspendLayout();
this.smartGroupBox2.SuspendLayout(); this.smartGroupBox2.SuspendLayout();
@ -307,6 +308,7 @@
this.smartGroupBox1.BackGround = null; this.smartGroupBox1.BackGround = null;
this.smartGroupBox1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.smartGroupBox1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.smartGroupBox1.BackImage = null; this.smartGroupBox1.BackImage = null;
this.smartGroupBox1.Controls.Add(this.buttonStart);
this.smartGroupBox1.Controls.Add(this.labelProgress5); this.smartGroupBox1.Controls.Add(this.labelProgress5);
this.smartGroupBox1.Controls.Add(this.smartGroupBox4); this.smartGroupBox1.Controls.Add(this.smartGroupBox4);
this.smartGroupBox1.Controls.Add(this.smartGroupBox5); this.smartGroupBox1.Controls.Add(this.smartGroupBox5);
@ -6215,6 +6217,41 @@
this.labelResult6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelResult6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelResult6.Wordwrap = false; this.labelResult6.Wordwrap = false;
// //
// buttonStart
//
this.buttonStart.BackGround = this.smartGroupBox1;
this.buttonStart.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.buttonStart.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165)))));
this.buttonStart.ButtonDownColor = System.Drawing.Color.SlateGray;
this.buttonStart.ButtonImageAutoSize = true;
this.buttonStart.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound;
this.buttonStart.ButtonText = "Start";
this.buttonStart.ColorKeySamplePosition = new System.Drawing.Point(0, 0);
this.buttonStart.GroupID = 0;
this.buttonStart.ImageDisable = null;
this.buttonStart.ImageDown = null;
this.buttonStart.ImageUp = null;
this.buttonStart.Location = new System.Drawing.Point(819, 37);
this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL;
this.buttonStart.Name = "buttonStart";
this.buttonStart.NestedClickEventPrevent = false;
this.buttonStart.OutlinePixel = 2;
this.buttonStart.OverlapOptimize = true;
this.buttonStart.RepeatInterval = 200;
this.buttonStart.RepeatIntervalAccelerate = null;
this.buttonStart.RoundSize = 10;
this.buttonStart.SafeInterval = 200;
this.buttonStart.Size = new System.Drawing.Size(84, 40);
this.buttonStart.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE;
this.buttonStart.TabIndex = 91;
this.buttonStart.Text = null;
this.buttonStart.TextColor = System.Drawing.Color.White;
this.buttonStart.TextColorDisable = System.Drawing.Color.Gray;
this.buttonStart.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255)))));
this.buttonStart.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle;
this.buttonStart.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click);
//
// ControlMenuSystemStatus // ControlMenuSystemStatus
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -6500,5 +6537,6 @@
private SmartX.SmartLabel smartLabel69; private SmartX.SmartLabel smartLabel69;
private SmartX.SmartSeparatorLine smartSeparatorLine16; private SmartX.SmartSeparatorLine smartSeparatorLine16;
private SmartX.SmartLabel labelResult6; private SmartX.SmartLabel labelResult6;
private SmartX.SmartButton buttonStart;
} }
} }

View File

@ -8,6 +8,7 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using INT_PT002.Forms; using INT_PT002.Forms;
using INT_PT002.DataStore;
namespace INT_PT002.Controls namespace INT_PT002.Controls
{ {
@ -43,12 +44,16 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormStatus;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Normal);
} }
#endregion #endregion
#region Event Handler #region Event Handler
private void buttonStart_Click(object sender, EventArgs e)
{
this.ParentForm.ParentForm.TransferData(CommunicationCommand.CutInpupt, CommunicationID.MainBoard);
}
#endregion #endregion
} }
} }

View File

@ -142,6 +142,9 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormUserGroupEditor;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.UpdateDisplay(this.ParentForm.ParentForm.CurrentUserGroup, this.ParentForm.ParentForm.SystemConfig); this.UpdateDisplay(this.ParentForm.ParentForm.CurrentUserGroup, this.ParentForm.ParentForm.SystemConfig);
this.buttonSave.Visible = false; this.buttonSave.Visible = false;

View File

@ -737,6 +737,9 @@ namespace INT_PT002.Controls
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormUserEditor;
this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu);
this.UpdateInitializeUserDisplay(this.ParentForm.ParentForm.SystemConfig); this.UpdateInitializeUserDisplay(this.ParentForm.ParentForm.SystemConfig);
this.UpdateUserListBoxDisplay(this.ParentForm.ParentForm.ListDllUserName); this.UpdateUserListBoxDisplay(this.ParentForm.ParentForm.ListDllUserName);
this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged); this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged);

View File

@ -7,11 +7,13 @@ namespace INT_PT002.DataStore
{ {
public class CommunicationCommand public class CommunicationCommand
{ {
// 노멀모드 // 노멀 모드 : 메인화면, Status 화면
public static readonly string ModeNormal = "Csn00"; public static readonly string ModeNormal = "Csn00";
// 메뉴 모드 : 메뉴화면
public static readonly string ModeMenu = "Csm00";
// IO 테스트모드 // IO 테스트모드
public static readonly string ModeIOTest = "Cst00"; public static readonly string ModeIOTest = "Cst00";
// 장비 테스트모드 // 장비 테스트모드 : 매뉴얼
public static readonly string ModeEquipmentTest = "Csy00"; public static readonly string ModeEquipmentTest = "Csy00";
// Cut 신호 // Cut 신호

View File

@ -13,7 +13,15 @@ namespace INT_PT002.DataStore
{ {
Stop = 0, Stop = 0,
Start = 1, Start = 1,
}; }
public enum E_DisplayMode
{
Normal,
Menu,
IOTest,
EquipmentTest,
}
public enum E_TopMenuStore public enum E_TopMenuStore
{ {
@ -27,39 +35,30 @@ namespace INT_PT002.DataStore
{ {
_0_None, _0_None,
_1_Setting, _1_Setting,
}; }
public enum E_MenuUserStore public enum E_MenuUserStore
{ {
_0_None, _0_None,
_1_UserEditor, _1_UserEditor,
_2_GroupEditor, _2_GroupEditor,
}; }
public enum E_MenuManualStore public enum E_MenuManualStore
{ {
_0_None, _0_None,
_1_IoTest, _1_IoTest,
}; }
public enum E_MenuLogStore public enum E_MenuLogStore
{ {
_0_None, _0_None,
_1_Inspection, _1_Inspection,
_2_History, _2_History,
_3_Alarm, _3_Alarm,
}; }
public enum E_MenuSystemStore public enum E_MenuSystemStore
{ {
_0_None, _0_None,
_1_Information, _1_Information,
_2_Status, _2_Status,
};
public enum E_DisplayStore
{
DisplayMain,
DisplayRecipe,
DisplayEquipmentTest,
DisplayUser,
DisplayUserEditor,
} }
public enum E_ProcessStatus public enum E_ProcessStatus
@ -74,7 +73,7 @@ namespace INT_PT002.DataStore
_7_VacuumBreak, _7_VacuumBreak,
_8_ChamberSeparation, _8_ChamberSeparation,
_9_ProductRelease, _9_ProductRelease,
}; }
public enum E_JudgmentStatus public enum E_JudgmentStatus
{ {
@ -82,13 +81,13 @@ namespace INT_PT002.DataStore
Pass, Pass,
Ng, Ng,
Error, Error,
}; }
public enum E_ResponseData public enum E_ResponseData
{ {
NAK = 0, NAK = 0,
ACK = 1, ACK = 1,
}; }
public enum E_UpdateCheck public enum E_UpdateCheck
{ {
@ -136,6 +135,7 @@ namespace INT_PT002.DataStore
f1_Level2 = 1, f1_Level2 = 1,
f2_Level3 = 2, f2_Level3 = 2,
f3_Default = 3, f3_Default = 3,
f4_Developer = 4,
} }
public enum E_UserStatus public enum E_UserStatus
@ -148,7 +148,7 @@ namespace INT_PT002.DataStore
Developer, Developer,
NotLogin, NotLogin,
LogOff, LogOff,
}; }
public enum E_TrackingOperation public enum E_TrackingOperation
{ {

View File

@ -130,20 +130,20 @@ namespace INT_PT002.DataStore
this.NAME = "INTECH 1"; this.NAME = "INTECH 1";
this.LOT = "LOT 1"; this.LOT = "LOT 1";
this.DISP_JUDG_STD_LEVEL = "0.30"; this.DISP_JUDG_STD_LEVEL = "0.15";
this.DISP_JUDG_MIN_LEVEL = "1.00"; this.DISP_JUDG_MIN_LEVEL = "2.50";
this.DISP_JUDG_EMPTY_LEVEL = "75.00"; this.DISP_JUDG_EMPTY_LEVEL = "80.00";
this.DISP_HOLD_DELAY_MSEC = 100; this.DISP_HOLD_DELAY_MSEC = 100;
this.DIFF_LR_SECOND = "500.00"; this.DIFF_LR_SECOND = "500.00";
this.DIFF_LR_TOTAL = "5000.00"; this.DIFF_LR_TOTAL = "5000.00";
this.DIFF_LR_MEAN = "2.00"; this.DIFF_LR_MEAN = "2.00";
this.DIFF_HOLD_DELAY_MSEC = 100; this.DIFF_HOLD_DELAY_MSEC = 1500;
this.VACUUM_RELIEF = 20; this.VACUUM_RELIEF = 20;
this.VACUUM_HOLD1 = 40; this.VACUUM_HOLD1 = 40;
this.VACUUM_HOLD2 = 1; this.VACUUM_HOLD2 = 1;
this.VACUUM_BLOWOFF = 10; this.VACUUM_BLOWOFF = 5;
this.VACUUM_GUAGE_LEVEL = "88.0"; this.VACUUM_GUAGE_LEVEL = "88.0";
} }
#endregion #endregion

View File

@ -186,11 +186,11 @@ namespace INT_PT002.DataStore
this.BUZZER_OP = 1000; this.BUZZER_OP = 1000;
this.SB_DIFF_FILTER = 15; this.SB_DIFF_FILTER = 15;
this.SB_DIFF_MODE = 1;
this.SB_DATA_MODE = 2; this.SB_DATA_MODE = 2;
this.SB_DATA_PERIOD = 100; this.SB_DATA_PERIOD = 100;
this.SB_DIFF_MODE = 1;
this.SERIAL_NUMBER = "23C0000"; this.SERIAL_NUMBER = "23D0000";
this.AUTOMATIC_LOGOUT = 10; this.AUTOMATIC_LOGOUT = 10;
@ -638,6 +638,80 @@ namespace INT_PT002.DataStore
get { return this.m_IsMenuStatus; } get { return this.m_IsMenuStatus; }
set { this.m_IsMenuStatus = value; } set { this.m_IsMenuStatus = value; }
} }
public bool IsMainEnable
{
get
{
bool ret = false;
if (this.IsMainDisplayProductChange == true || this.IsMainDisplayWeightSetting == true
|| this.IsMainDisplayClear == true || this.IsMainDisplaySubMenu == true)
ret = true;
return ret;
}
}
public bool IsRecipeEnable
{
get
{
bool ret = false;
if (this.IsMenuProduct == true)
ret = true;
return ret;
}
}
public bool IsUserEnable
{
get
{
bool ret = false;
if (this.IsMenuUserSetting == true || this.IsMenuUserGroupEditor == true)
ret = true;
return ret;
}
}
public bool IsManualEnable
{
get
{
bool ret = false;
if (this.IsMenuIOTest == true)
ret = true;
return ret;
}
}
public bool IsLogEnable
{
get
{
bool ret = false;
if (this.IsMenuEquipmentLog == true || this.IsMenuCheckLog == true || this.IsMenuAlarmList == true)
ret = true;
return ret;
}
}
public bool IsSystemEnable
{
get
{
bool ret = false;
if (this.IsMenuInformation == true || this.IsMenuStatus == true)
ret = true;
return ret;
}
}
#endregion #endregion
#region Method #region Method

View File

@ -10,8 +10,11 @@ namespace INT_PT002.DataStore
#region Field #region Field
private int m_EquipmentColumn; private int m_EquipmentColumn;
private UserItem m_CurrentUser;
private Define.E_DisplayMode m_CurrentMode;
private Define.E_EquipmentStatus m_EquipmentStatus; private Define.E_EquipmentStatus m_EquipmentStatus;
private Define.E_DisplayStore m_CurrentDisplay; private Define.E_FormStore m_CurrentDisplay;
#endregion #endregion
#region Constructor #region Constructor
@ -28,12 +31,23 @@ namespace INT_PT002.DataStore
set { this.m_EquipmentColumn = value; } set { this.m_EquipmentColumn = value; }
} }
public UserItem CurrentUser
{
get { return this.m_CurrentUser; }
set { this.m_CurrentUser = value; }
}
public Define.E_DisplayMode CurrentMode
{
get { return this.m_CurrentMode; }
set { this.m_CurrentMode = value; }
}
public Define.E_EquipmentStatus EquipmentStatus public Define.E_EquipmentStatus EquipmentStatus
{ {
get { return this.m_EquipmentStatus; } get { return this.m_EquipmentStatus; }
set { this.m_EquipmentStatus = value; } set { this.m_EquipmentStatus = value; }
} }
public Define.E_DisplayStore CurrentDisplay public Define.E_FormStore CurrentDisplay
{ {
get { return this.m_CurrentDisplay; } get { return this.m_CurrentDisplay; }
set { this.m_CurrentDisplay = value; } set { this.m_CurrentDisplay = value; }
@ -45,8 +59,14 @@ namespace INT_PT002.DataStore
{ {
this.EquipmentColumn = 10; this.EquipmentColumn = 10;
this.CurrentUser = new UserItem();
this.CurrentUser.ID = "";
this.CurrentUser.Password = "";
this.CurrentUser.UserGroup = Define.E_UserGroup.f0_Level1;
this.CurrentMode = Define.E_DisplayMode.Normal;
this.EquipmentStatus = Define.E_EquipmentStatus.Stop; this.EquipmentStatus = Define.E_EquipmentStatus.Stop;
this.CurrentDisplay = Define.E_DisplayStore.DisplayMain; this.CurrentDisplay = Define.E_FormStore.FormMainDisplay;
} }
#endregion #endregion
} }

View File

@ -318,9 +318,9 @@ namespace INT_PT002.DialogForms
if (this.UpdateForMain.IsLastData == false) if (this.UpdateForMain.IsLastData == false)
{ {
this.UpdateForMain.ByteData = new byte[beforeData.Length - 100]; this.UpdateForMain.ByteData = new byte[beforeData.Length - 128];
for (int i = 0; i < beforeData.Length - 100; i++) for (int i = 0; i < beforeData.Length - 128; i++)
this.UpdateForMain.ByteData[i] = beforeData[100 + i]; this.UpdateForMain.ByteData[i] = beforeData[128 + i];
this.UpdateForMain.Index++; this.UpdateForMain.Index++;
this.SendUpdateForMain(this.UpdateForMain.ByteData); this.SendUpdateForMain(this.UpdateForMain.ByteData);
@ -509,12 +509,12 @@ namespace INT_PT002.DialogForms
if (datas.Length == 0) if (datas.Length == 0)
return; return;
count = datas.Length / 100; count = datas.Length / 128;
if (count != 0) if (count != 0)
{ {
this.UpdateForMain.SendData = new byte[100]; this.UpdateForMain.SendData = new byte[128];
for (int i = 0; i < 100; i++) for (int i = 0; i < 128; i++)
this.UpdateForMain.SendData[i] = datas[i]; this.UpdateForMain.SendData[i] = datas[i];
} }
else else
@ -560,7 +560,7 @@ namespace INT_PT002.DialogForms
byteCount = int.Parse(a.ToString()); byteCount = int.Parse(a.ToString());
this.UpdateForMain.ByteData = br.ReadBytes(byteCount); this.UpdateForMain.ByteData = br.ReadBytes(byteCount);
count = byteCount / 100; count = byteCount / 128;
this.UpdateForMain.SendDataCount = count; this.UpdateForMain.SendDataCount = count;
this.UpdateLabelStatus(this.Language); this.UpdateLabelStatus(this.Language);

View File

@ -296,6 +296,36 @@ namespace INT_PT002.Forms
this.smartForm1.Show(index); this.smartForm1.Show(index);
} }
/// <summary>
/// Set Mode
/// </summary>
/// <param name="mode"></param>
public void SetDisplayMode(Define.E_DisplayMode mode)
{
if (this.CurrentSystemStatus.CurrentMode == mode)
return;
else
this.CurrentSystemStatus.CurrentMode = mode;
switch (mode)
{
case Define.E_DisplayMode.Normal:
this.TransferData(CommunicationCommand.ModeNormal, CommunicationID.MainBoard);
break;
case Define.E_DisplayMode.Menu:
this.TransferData(CommunicationCommand.ModeMenu, CommunicationID.MainBoard);
break;
case Define.E_DisplayMode.IOTest:
this.TransferData(CommunicationCommand.ModeIOTest, CommunicationID.MainBoard);
break;
case Define.E_DisplayMode.EquipmentTest:
this.TransferData(CommunicationCommand.ModeEquipmentTest, CommunicationID.MainBoard);
break;
default:
break;
}
}
#region SmartFile #region SmartFile
public void OpenSmartFileIO() public void OpenSmartFileIO()
{ {
@ -1352,7 +1382,7 @@ namespace INT_PT002.Forms
for (int i = 0; i < this.CurrentSystemStatus.EquipmentColumn; i++) for (int i = 0; i < this.CurrentSystemStatus.EquipmentColumn; i++)
this.CurrentLeakData.CollJudgment[i] = Helper.StringToJudgmentStatus(receiveData.Substring(i * 1, 1)); this.CurrentLeakData.CollJudgment[i] = Helper.StringToJudgmentStatus(receiveData.Substring(i * 1, 1));
#endregion #endregion
if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayMain) if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay)
this.ChildFormMainDisplay.UpdateDisplayJudgmentData(this.CurrentLeakData); this.ChildFormMainDisplay.UpdateDisplayJudgmentData(this.CurrentLeakData);
break; break;
default: default:
@ -1379,7 +1409,7 @@ namespace INT_PT002.Forms
#region Value Assign #region Value Assign
this.CurrentLeakData.ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 1)); this.CurrentLeakData.ProcessStatus = Helper.StringToProcessStatus(receiveData.Substring(0, 1));
#endregion #endregion
if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayMain) if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay)
this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakData.ProcessStatus); this.ChildFormMainDisplay.UpdateProcessStatusDisplay(this.CurrentLeakData.ProcessStatus);
break; break;
default: default:
@ -1412,9 +1442,9 @@ namespace INT_PT002.Forms
this.CurrentLeakData.CollDiffData[i].DiffMean = receiveData.Substring((i * 32) + 24, 8).Trim(); this.CurrentLeakData.CollDiffData[i].DiffMean = receiveData.Substring((i * 32) + 24, 8).Trim();
} }
#endregion #endregion
if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayMain) if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay)
this.ChildFormMainDisplay.UpdateDisplayDiffData(this.CurrentLeakData.CollDiffData); this.ChildFormMainDisplay.UpdateDisplayDiffData(this.CurrentLeakData.CollDiffData);
else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayEquipmentTest) else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest)
this.ChildFormMenu.UpdateDisplayEquipmentTestDiffData(this.CurrentLeakData.CollDiffData); this.ChildFormMenu.UpdateDisplayEquipmentTestDiffData(this.CurrentLeakData.CollDiffData);
break; break;
default: default:
@ -1447,9 +1477,9 @@ namespace INT_PT002.Forms
this.CurrentLeakData.CollDispData[i].STD = receiveData.Substring((i * 24) + 18, 6).Trim(); this.CurrentLeakData.CollDispData[i].STD = receiveData.Substring((i * 24) + 18, 6).Trim();
} }
#endregion #endregion
if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayMain) if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay)
this.ChildFormMainDisplay.UpdateDisplayDispData(this.CurrentLeakData.CollDispData); this.ChildFormMainDisplay.UpdateDisplayDispData(this.CurrentLeakData.CollDispData);
else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayEquipmentTest) else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest)
this.ChildFormMenu.UpdateDisplayEquipmentTestDispData(this.CurrentLeakData.CollDispData); this.ChildFormMenu.UpdateDisplayEquipmentTestDispData(this.CurrentLeakData.CollDispData);
break; break;
default: default:
@ -1482,9 +1512,9 @@ namespace INT_PT002.Forms
string.Format("{0}{1}", receiveData.Substring((i * 6) + 60, 1), receiveData.Substring((i * 6) + 61, 5).Trim()); string.Format("{0}{1}", receiveData.Substring((i * 6) + 60, 1), receiveData.Substring((i * 6) + 61, 5).Trim());
} }
#endregion #endregion
//if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayMain) if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormMainDisplay)
// this.ChildFormMainDisplay.UpdateDisplayPresData(this.CurrentLeakData.CollPresData); this.ChildFormMainDisplay.UpdateDisplayPresData(this.CurrentLeakData.CollPresData);
if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayEquipmentTest) else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest)
this.ChildFormMenu.UpdateDisplayEquipmentTestPresData(this.CurrentLeakData.CollPresData); this.ChildFormMenu.UpdateDisplayEquipmentTestPresData(this.CurrentLeakData.CollPresData);
break; break;
default: default:
@ -1514,7 +1544,7 @@ namespace INT_PT002.Forms
//if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormIOTest) //if (this.SystemConfig.CURRENT_FORM == Define.E_FormStore.FormIOTest)
// this.ChildFormIOTest.UpdateInputRead(this.CollectionIOTest_InputData); // this.ChildFormIOTest.UpdateInputRead(this.CollectionIOTest_InputData);
if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.DisplayEquipmentTest) if (this.CurrentSystemStatus.CurrentDisplay == Define.E_FormStore.FormIOTest)
this.ChildFormMenu.UpdateDisplayEquipmentTestInputData(this.CollectionIOTest_InputData); this.ChildFormMenu.UpdateDisplayEquipmentTestInputData(this.CollectionIOTest_InputData);
break; break;
default: default:
@ -1613,7 +1643,7 @@ namespace INT_PT002.Forms
{ {
DateTime time = DateTime.Now; DateTime time = DateTime.Now;
folder = this.PathDataInspectionFolder + string.Format("{0:yyyy}\\", time) + string.Format("{0:M}\\", time); folder = string.Format("{0}{1}\\{2}\\", this.PathDataInspectionFolder, time.Year, time.Month);
fileName = string.Format("{0:yyyyMMdd}_Inspection_{1}", time, this.CurrentRecipe.NUMBER); fileName = string.Format("{0:yyyyMMdd}_Inspection_{1}", time, this.CurrentRecipe.NUMBER);
} }
public void TrackingInspectionData(LeakData item) public void TrackingInspectionData(LeakData item)
@ -2592,6 +2622,8 @@ namespace INT_PT002.Forms
// 초기 파라미터 전송 // 초기 파라미터 전송
this.TransferSystemParameter9039(); this.TransferSystemParameter9039();
//DialogFormLogOn loginForm = new DialogFormLogOn(
// 화면 시계 표시 타이머 // 화면 시계 표시 타이머
this.timer.Enabled = true; this.timer.Enabled = true;
} }

View File

@ -716,7 +716,7 @@ namespace INT_PT002.Forms
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.DisplayMain; this.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormMainDisplay;
} }
#endregion #endregion
@ -731,7 +731,7 @@ namespace INT_PT002.Forms
} }
private void buttonMenu_Click(object sender, EventArgs e) private void buttonMenu_Click(object sender, EventArgs e)
{ {
this.ParentForm.ChildFormMenu.DisplayRefresh(); this.ParentForm.ChildFormMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.ParentForm.FormChange((int)Define.E_FormStore.FormMenu); this.ParentForm.FormChange((int)Define.E_FormStore.FormMenu);
} }
private void buttonDisplayGraph_Click(object sender, EventArgs e) private void buttonDisplayGraph_Click(object sender, EventArgs e)

File diff suppressed because it is too large Load Diff

View File

@ -27,10 +27,13 @@ namespace INT_PT002.Forms
private Color ColorResultPass; private Color ColorResultPass;
private Color ColorResultNG; private Color ColorResultNG;
private Color ColorResultNone; private Color ColorResultNone;
private Color ColorSensorNormal;
private Color ColorSensorError;
private Collection<SmartX.SmartLabel> CollectionLabelResult; private Collection<SmartLabel> CollectionLabelResult;
private Collection<SmartX.SmartProgressBar> CollectionProgressBarPressure; private Collection<SmartLabel> CollectionLabelPressure;
private Collection<SmartX.SmartProgressBar> CollectionProgressBarMaxLeakValue; private Collection<SmartLabel> CollectionLabelSensorStatus;
private Collection<SmartProgressBar> CollectionProgressBarLeakRatePerSec;
private FormMain m_ParentForm; private FormMain m_ParentForm;
@ -67,6 +70,8 @@ namespace INT_PT002.Forms
this.ColorResultPass = Color.FromArgb(39, 200, 64); this.ColorResultPass = Color.FromArgb(39, 200, 64);
this.ColorResultNG = Color.FromArgb(254, 70, 70); this.ColorResultNG = Color.FromArgb(254, 70, 70);
this.ColorResultNone = Color.FromArgb(42, 43, 45); this.ColorResultNone = Color.FromArgb(42, 43, 45);
this.ColorSensorNormal = Color.FromArgb(39, 200, 64);
this.ColorSensorError = Color.FromArgb(254, 70, 70);
this.CollectionLabelResult = new Collection<SmartLabel>(); this.CollectionLabelResult = new Collection<SmartLabel>();
this.CollectionLabelResult.Clear(); this.CollectionLabelResult.Clear();
@ -81,31 +86,44 @@ namespace INT_PT002.Forms
this.CollectionLabelResult.Add(this.labelResult9); this.CollectionLabelResult.Add(this.labelResult9);
this.CollectionLabelResult.Add(this.labelResult10); this.CollectionLabelResult.Add(this.labelResult10);
this.CollectionProgressBarPressure = new Collection<SmartProgressBar>(); this.CollectionLabelPressure = new Collection<SmartLabel>();
this.CollectionProgressBarPressure.Clear(); this.CollectionLabelPressure.Clear();
this.CollectionProgressBarPressure.Add(this.progressBarPressure1); this.CollectionLabelPressure.Add(this.labelPressure1);
this.CollectionProgressBarPressure.Add(this.progressBarPressure2); this.CollectionLabelPressure.Add(this.labelPressure2);
this.CollectionProgressBarPressure.Add(this.progressBarPressure3); this.CollectionLabelPressure.Add(this.labelPressure3);
this.CollectionProgressBarPressure.Add(this.progressBarPressure4); this.CollectionLabelPressure.Add(this.labelPressure4);
this.CollectionProgressBarPressure.Add(this.progressBarPressure5); this.CollectionLabelPressure.Add(this.labelPressure5);
this.CollectionProgressBarPressure.Add(this.progressBarPressure6); this.CollectionLabelPressure.Add(this.labelPressure6);
this.CollectionProgressBarPressure.Add(this.progressBarPressure7); this.CollectionLabelPressure.Add(this.labelPressure7);
this.CollectionProgressBarPressure.Add(this.progressBarPressure8); this.CollectionLabelPressure.Add(this.labelPressure8);
this.CollectionProgressBarPressure.Add(this.progressBarPressure9); this.CollectionLabelPressure.Add(this.labelPressure9);
this.CollectionProgressBarPressure.Add(this.progressBarPressure10); this.CollectionLabelPressure.Add(this.labelPressure10);
this.CollectionProgressBarMaxLeakValue = new Collection<SmartProgressBar>(); this.CollectionLabelSensorStatus = new Collection<SmartLabel>();
this.CollectionProgressBarMaxLeakValue.Clear(); this.CollectionLabelSensorStatus.Clear();
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue1); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus1);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue2); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus2);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue3); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus3);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue4); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus4);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue5); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus5);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue6); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus6);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue7); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus7);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue8); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus8);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue9); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus9);
this.CollectionProgressBarMaxLeakValue.Add(this.progressBarMaxLeakValue10); this.CollectionLabelSensorStatus.Add(this.labelSensorStatus10);
this.CollectionProgressBarLeakRatePerSec = new Collection<SmartProgressBar>();
this.CollectionProgressBarLeakRatePerSec.Clear();
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec1);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec2);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec3);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec4);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec5);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec6);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec7);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec8);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec9);
this.CollectionProgressBarLeakRatePerSec.Add(this.progressBarLeakRatePerSec10);
this.ChildControl = new ControlMainDisplay(this.ParentForm); this.ChildControl = new ControlMainDisplay(this.ParentForm);
this.Controls.Add(this.ChildControl); this.Controls.Add(this.ChildControl);
@ -118,8 +136,8 @@ namespace INT_PT002.Forms
for (int i = 0; i < FormMain.Lane; i++) for (int i = 0; i < FormMain.Lane; i++)
{ {
this.CollectionLabelResult[i].Visible = false; this.CollectionLabelResult[i].Visible = false;
this.CollectionProgressBarPressure[i].Value = 0; this.CollectionLabelPressure[i].Text = "0";
this.CollectionProgressBarMaxLeakValue[i].Value = 0; this.CollectionProgressBarLeakRatePerSec[i].Value = 0;
} }
} }
@ -549,74 +567,48 @@ namespace INT_PT002.Forms
} }
} }
public void UpdateDisplayDiffData(Collection<DiffData> datas) private void UpdateProgressBarPressure()
{ {
}
private void UpdateProgressBarMaxLeakValue()
{
}
public void UpdateDisplayDiffData(Collection<DiffData> datas)
{
string[] temp;
for (int i = 0; i < FormMain.Lane; i++)
{
temp = datas[i].SecBufDiff.Split('.');
this.CollectionProgressBarLeakRatePerSec[i].Value = int.Parse(temp[0]);
}
} }
public void UpdateDisplayDispData(Collection<DispData> datas) public void UpdateDisplayDispData(Collection<DispData> datas)
{ {
} }
public void UpdateDisplayPresData(Collection<PressureData> datas)
{
for (int i = 0; i < FormMain.Lane; i++)
{
this.CollectionLabelPressure[i].Text = datas[i].WorkingChamber.Trim() + " kPa";
}
}
public void UpdateDisplayJudgmentData(LeakData datas) public void UpdateDisplayJudgmentData(LeakData datas)
{ {
this.UpdateDisplayJudgmentData1(datas);
this.UpdateDisplayJudgmentData2(datas);
this.UpdateDisplayJudgmentData3(datas);
this.UpdateDisplayJudgmentData4(datas);
this.UpdateDisplayJudgmentData5(datas);
this.UpdateDisplayJudgmentData6(datas);
this.UpdateDisplayJudgmentData7(datas);
this.UpdateDisplayJudgmentData8(datas);
this.UpdateDisplayJudgmentData9(datas);
this.UpdateDisplayJudgmentData10(datas);
for (int i = 0; i < FormMain.Lane; i++) for (int i = 0; i < FormMain.Lane; i++)
{
this.GetJudgmentResult(datas.CollJudgment[i], this.CollectionLabelResult[i]);
this.CollectionLabelResult[i].Visible = true; this.CollectionLabelResult[i].Visible = true;
}
this.ParentForm.TrackingInspectionData(datas); this.ParentForm.TrackingInspectionData(datas);
this.ChildControl.UpdateStartLeakDataDisplay(datas); this.ChildControl.UpdateStartLeakDataDisplay(datas);
} }
private void UpdateDisplayJudgmentData1(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[0], this.CollectionLabelResult[0]);
}
private void UpdateDisplayJudgmentData2(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[1], this.CollectionLabelResult[1]);
}
private void UpdateDisplayJudgmentData3(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[2], this.CollectionLabelResult[2]);
}
private void UpdateDisplayJudgmentData4(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[3], this.CollectionLabelResult[3]);
}
private void UpdateDisplayJudgmentData5(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[4], this.CollectionLabelResult[4]);
}
private void UpdateDisplayJudgmentData6(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[5], this.CollectionLabelResult[5]);
}
private void UpdateDisplayJudgmentData7(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[6], this.CollectionLabelResult[6]);
}
private void UpdateDisplayJudgmentData8(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[7], this.CollectionLabelResult[7]);
}
private void UpdateDisplayJudgmentData9(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[8], this.CollectionLabelResult[8]);
}
private void UpdateDisplayJudgmentData10(LeakData data)
{
this.GetJudgmentResult(data.CollJudgment[9], this.CollectionLabelResult[9]);
}
public void UpdateDisplayTime() public void UpdateDisplayTime()
{ {
this.labelTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); this.labelTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@ -624,7 +616,8 @@ namespace INT_PT002.Forms
public void DisplayRefresh() public void DisplayRefresh()
{ {
this.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_FormStore.FormMainDisplay;
this.ParentForm.SetDisplayMode(Define.E_DisplayMode.Normal);
} }
#endregion #endregion
@ -656,8 +649,11 @@ namespace INT_PT002.Forms
} }
private void buttonMenu_Click(object sender, EventArgs e) private void buttonMenu_Click(object sender, EventArgs e)
{ {
this.ParentForm.ChildFormMenu.DisplayRefresh(); if (this.ParentForm.CurrentSystemStatus.EquipmentStatus == Define.E_EquipmentStatus.Stop)
this.ParentForm.FormChange((int)Define.E_FormStore.FormMenu); {
this.ParentForm.ChildFormMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus);
this.ParentForm.FormChange((int)Define.E_FormStore.FormMenu);
}
} }
private void smartDraw1_Click(object sender, EventArgs e) private void smartDraw1_Click(object sender, EventArgs e)
@ -723,7 +719,5 @@ namespace INT_PT002.Forms
this.ParentForm.Close(); this.ParentForm.Close();
} }
#endregion #endregion
} }
} }

View File

@ -31,8 +31,8 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMenu)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMenu));
this.smartForm1 = new SmartX.SmartForm(); this.smartForm1 = new SmartX.SmartForm();
this.buttonUser = new SmartX.SmartButton(); this.buttonUser = new SmartX.SmartButton();
this.smartLabel3 = new SmartX.SmartLabel(); this.labelUserID = new SmartX.SmartLabel();
this.smartLabel2 = new SmartX.SmartLabel(); this.labelUserLevel = new SmartX.SmartLabel();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.smartLabel1 = new SmartX.SmartLabel(); this.smartLabel1 = new SmartX.SmartLabel();
this.buttonBottom4 = new SmartX.SmartButton(); this.buttonBottom4 = new SmartX.SmartButton();
@ -55,8 +55,8 @@
this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage"))); this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage")));
this.smartForm1.CenterLocation = false; this.smartForm1.CenterLocation = false;
this.smartForm1.Controls.Add(this.buttonUser); this.smartForm1.Controls.Add(this.buttonUser);
this.smartForm1.Controls.Add(this.smartLabel3); this.smartForm1.Controls.Add(this.labelUserID);
this.smartForm1.Controls.Add(this.smartLabel2); this.smartForm1.Controls.Add(this.labelUserLevel);
this.smartForm1.Controls.Add(this.pictureBox1); this.smartForm1.Controls.Add(this.pictureBox1);
this.smartForm1.Controls.Add(this.smartLabel1); this.smartForm1.Controls.Add(this.smartLabel1);
this.smartForm1.Controls.Add(this.buttonBottom4); this.smartForm1.Controls.Add(this.buttonBottom4);
@ -118,51 +118,51 @@
this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click); this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click);
// //
// smartLabel3 // labelUserID
// //
this.smartLabel3.BackGround = this.smartForm1; this.labelUserID.BackGround = this.smartForm1;
this.smartLabel3.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelUserID.BackGroundColor = System.Drawing.Color.SkyBlue;
this.smartLabel3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelUserID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.smartLabel3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelUserID.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
this.smartLabel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelUserID.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel3.LineSpacing = 0F; this.labelUserID.LineSpacing = 0F;
this.smartLabel3.Location = new System.Drawing.Point(743, 3); this.labelUserID.Location = new System.Drawing.Point(743, 3);
this.smartLabel3.Name = "smartLabel3"; this.labelUserID.Name = "labelUserID";
this.smartLabel3.OverlapOptimize = true; this.labelUserID.OverlapOptimize = true;
this.smartLabel3.PasswordChar = '\0'; this.labelUserID.PasswordChar = '\0';
this.smartLabel3.Radius = 3; this.labelUserID.Radius = 3;
this.smartLabel3.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelUserID.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.smartLabel3.Size = new System.Drawing.Size(100, 30); this.labelUserID.Size = new System.Drawing.Size(100, 30);
this.smartLabel3.TabIndex = 84; this.labelUserID.TabIndex = 84;
this.smartLabel3.Text = "Intech00"; this.labelUserID.Text = "Intech00";
this.smartLabel3.TextColor = System.Drawing.Color.White; this.labelUserID.TextColor = System.Drawing.Color.White;
this.smartLabel3.TextColorDisable = System.Drawing.Color.Gray; this.labelUserID.TextColorDisable = System.Drawing.Color.Gray;
this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelUserID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel3.Wordwrap = false; this.labelUserID.Wordwrap = false;
// //
// smartLabel2 // labelUserLevel
// //
this.smartLabel2.BackGround = this.smartForm1; this.labelUserLevel.BackGround = this.smartForm1;
this.smartLabel2.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelUserLevel.BackGroundColor = System.Drawing.Color.SkyBlue;
this.smartLabel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelUserLevel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82)))));
this.smartLabel2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; this.labelUserLevel.BorderStyle = SmartX.SmartLabel.BorderStyles.None;
this.smartLabel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); this.labelUserLevel.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold);
this.smartLabel2.LineSpacing = 0F; this.labelUserLevel.LineSpacing = 0F;
this.smartLabel2.Location = new System.Drawing.Point(849, 3); this.labelUserLevel.Location = new System.Drawing.Point(849, 3);
this.smartLabel2.Name = "smartLabel2"; this.labelUserLevel.Name = "labelUserLevel";
this.smartLabel2.OverlapOptimize = true; this.labelUserLevel.OverlapOptimize = true;
this.smartLabel2.PasswordChar = '\0'; this.labelUserLevel.PasswordChar = '\0';
this.smartLabel2.Radius = 3; this.labelUserLevel.Radius = 3;
this.smartLabel2.RoundRectFillColor = System.Drawing.Color.LightBlue; this.labelUserLevel.RoundRectFillColor = System.Drawing.Color.LightBlue;
this.smartLabel2.Size = new System.Drawing.Size(60, 30); this.labelUserLevel.Size = new System.Drawing.Size(60, 30);
this.smartLabel2.TabIndex = 83; this.labelUserLevel.TabIndex = 83;
this.smartLabel2.Text = "L3"; this.labelUserLevel.Text = "L3";
this.smartLabel2.TextColor = System.Drawing.Color.White; this.labelUserLevel.TextColor = System.Drawing.Color.White;
this.smartLabel2.TextColorDisable = System.Drawing.Color.Gray; this.labelUserLevel.TextColorDisable = System.Drawing.Color.Gray;
this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelUserLevel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.smartLabel2.Wordwrap = false; this.labelUserLevel.Wordwrap = false;
// //
// pictureBox1 // pictureBox1
// //
@ -581,8 +581,8 @@
private SmartX.SmartButton buttonBottom2; private SmartX.SmartButton buttonBottom2;
private SmartX.SmartLabel smartLabel1; private SmartX.SmartLabel smartLabel1;
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox pictureBox1;
private SmartX.SmartLabel smartLabel3; private SmartX.SmartLabel labelUserID;
private SmartX.SmartLabel smartLabel2; private SmartX.SmartLabel labelUserLevel;
private SmartX.SmartButton buttonUser; private SmartX.SmartButton buttonUser;
} }
} }

View File

@ -108,6 +108,72 @@ namespace INT_PT002.Forms
this.Child_System_Status.Location = new Point(0, 39); this.Child_System_Status.Location = new Point(0, 39);
} }
private void UpdateDisplayUser(UserItem user)
{
string id = "", group = "";
switch (user.UserGroup)
{
case Define.E_UserGroup.f0_Level1:
id = user.ID;
group = "Level1";
this.buttonRecipe.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsRecipeEnable;
this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsUserEnable;
this.buttonManual.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsManualEnable;
this.buttonLog.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsLogEnable;
this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsSystemEnable;
break;
case Define.E_UserGroup.f1_Level2:
id = user.ID;
group = "Level2";
this.buttonRecipe.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsRecipeEnable;
this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsUserEnable;
this.buttonManual.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsManualEnable;
this.buttonLog.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsLogEnable;
this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsSystemEnable;
break;
case Define.E_UserGroup.f2_Level3:
id = user.ID;
group = "Level3";
this.buttonRecipe.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsRecipeEnable;
this.buttonUser.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsUserEnable;
this.buttonManual.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsManualEnable;
this.buttonLog.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsLogEnable;
this.buttonSystem.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsSystemEnable;
break;
case Define.E_UserGroup.f4_Developer:
id = user.ID;
group = "Level4";
this.buttonRecipe.Enabled = true;
this.buttonUser.Enabled = true;
this.buttonManual.Enabled = true;
this.buttonLog.Enabled = true;
this.buttonSystem.Enabled = true;
//this.buttonHiddenMenu.Enabled = true;
break;
default:
id = "";
group = "Off";
this.buttonRecipe.Enabled = false;
this.buttonUser.Enabled = false;
this.buttonManual.Enabled = false;
this.buttonLog.Enabled = false;
this.buttonSystem.Enabled = true;
break;
}
if (this.labelUserLevel.Text != group)
this.labelUserLevel.Text = group;
if (this.labelUserID.Text != id)
this.labelUserID.Text = id;
}
#region Log #region Log
// Backup // Backup
private void Backup(Define.E_DataType type, TreeView view) private void Backup(Define.E_DataType type, TreeView view)
@ -547,8 +613,10 @@ namespace INT_PT002.Forms
this.Child_Manual_IoTest.UpdateDisplayPresData(datas); this.Child_Manual_IoTest.UpdateDisplayPresData(datas);
} }
public void DisplayRefresh() public void DisplayRefresh(SystemStatus status)
{ {
//this.UpdateDisplayUser(status.CurrentUser);
this.SelectedTopMenu = Define.E_TopMenuStore.Recipe; this.SelectedTopMenu = Define.E_TopMenuStore.Recipe;
this.SetTopMenu(this.SelectedTopMenu); this.SetTopMenu(this.SelectedTopMenu);
} }