SJ84
/
INT63DC_2C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.11.65:3000/SJ84/INT63DC_2C 

# Conflicts:
#	INT63DC_2C.suo
master
Seonjae 2024-04-23 09:33:51 +09:00
parent 49602a108c bc2b012313
commit f1706a454b
15 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
INT63DC_2C.suo 100644
View File

Binary file not shown.

BIN
INT63DC_2C.suo~bc2b0123135d6dd81127353a56d6d77288beb9af 100644
View File

Binary file not shown.

8
INT63DC_2C/Controls/ControlDynamicSetting.cs
View File

@ -149,10 +149,10 @@ namespace INT63DC_2C.Controls
{ {
this.smartGroupBox1.Text = "動的定数"; this.smartGroupBox1.Text = "動的定数";
this.labelStaticForcedZeroDelayTime.Text = "強制ゼロ遅延時間"; this.labelStaticForcedZeroDelayTime.Text = "強制ゼロ遅延時間";
this.labelStaticEntryGateDelayTime.Text = "エントリーゲートの遅延時間"; this.labelStaticEntryGateDelayTime.Text = "エントリㅡゲㅡトの遅延時間";
this.labelStaticEntryGateRunTime.Text = "エントリーゲートの運転時間"; this.labelStaticEntryGateRunTime.Text = "エントリㅡゲㅡトの運転時間";
this.labelStaticDischargeStopperDelayTime.Text = "排出ストッパーの遅延時間"; this.labelStaticDischargeStopperDelayTime.Text = "排出ストッパㅡの遅延時間";
this.labelStaticDischargeStopperRunTime.Text = "排出ストッパーの運転時間"; this.labelStaticDischargeStopperRunTime.Text = "排出ストッパㅡの運転時間";
} }
else else
{ {

2
INT63DC_2C/DialogForms/DialogFormDataStatistics.cs
View File

@ -85,7 +85,7 @@ namespace INT63DC_2C.DialogForms
this.labelTitleID.Text = "ID"; this.labelTitleID.Text = "ID";
this.buttonRead.Text = "読む"; this.buttonRead.Text = "読む";
this.buttonClose.Text = "クローズ"; this.buttonClose.Text = "クロㅡズ";
#endregion #endregion
break; break;
default: default:

2
INT63DC_2C/DialogForms/DialogFormLogOn.cs
View File

@ -108,7 +108,7 @@ namespace INT63DC_2C.DialogForms
#region Japanese #region Japanese
this.labelTitle1.Text = "ログイン"; this.labelTitle1.Text = "ログイン";
this.labelTitle2.Text = "ID"; this.labelTitle2.Text = "ID";
this.labelTitle3.Text = "パスワード"; this.labelTitle3.Text = "パスワㅡド";
this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginDisable)); this.buttonLogOn.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginDisable));
this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginDown)); this.buttonLogOn.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnMainLoginLoginDown));

2
INT63DC_2C/DialogForms/DialogFormPasswordKeyPad.cs
View File

@ -144,7 +144,7 @@ namespace INT63DC_2C.DialogForms
this.buttonEnter.Text = "Enter"; this.buttonEnter.Text = "Enter";
break; break;
case DataStore.LanguageID.Japanese: case DataStore.LanguageID.Japanese:
this.labelSubject.Text = "パスワード"; this.labelSubject.Text = "パスワㅡド";
this.buttonCancel.Text = "X"; this.buttonCancel.Text = "X";
this.buttonEnter.Text = "入力"; this.buttonEnter.Text = "入力";

2
INT63DC_2C/DialogForms/DialogFormPasswordKeyPad1.cs
View File

@ -78,7 +78,7 @@ namespace INT63DC_2C.DialogForms
} }
else if (language == DataStore.LanguageID.Japanese) else if (language == DataStore.LanguageID.Japanese)
{ {
this.labelSubject.Text = "パスワード"; this.labelSubject.Text = "パスワㅡド";
this.buttonCancel.Text = "X"; this.buttonCancel.Text = "X";
this.buttonEnter.Text = "入力"; this.buttonEnter.Text = "入力";

3
INT63DC_2C/Forms/FormCalibration.Designer.cs generated
View File

@ -315,6 +315,7 @@
this.buttonCancel.TextLocation = new System.Drawing.Point(0, 0); this.buttonCancel.TextLocation = new System.Drawing.Point(0, 0);
this.buttonCancel.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonCancel.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonCancel.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.UpImage"))); this.buttonCancel.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.UpImage")));
this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
// //
// buttonBalance // buttonBalance
// //
@ -347,6 +348,7 @@
this.buttonBalance.TextLocation = new System.Drawing.Point(0, 0); this.buttonBalance.TextLocation = new System.Drawing.Point(0, 0);
this.buttonBalance.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonBalance.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonBalance.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.UpImage"))); this.buttonBalance.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.UpImage")));
this.buttonBalance.Click += new System.EventHandler(this.buttonBalance_Click);
// //
// buttonStart // buttonStart
// //
@ -379,6 +381,7 @@
this.buttonStart.TextLocation = new System.Drawing.Point(0, 0); this.buttonStart.TextLocation = new System.Drawing.Point(0, 0);
this.buttonStart.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonStart.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle;
this.buttonStart.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.UpImage"))); this.buttonStart.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.UpImage")));
this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click);
// //
// FormCalibration // FormCalibration
// //

6
INT63DC_2C/Forms/FormConfiguration.cs
View File

@ -308,7 +308,7 @@ namespace INT63DC_2C.Forms
this.labelStaticTime.Text = "時間"; this.labelStaticTime.Text = "時間";
this.labelStaticRange.Text = "範囲"; this.labelStaticRange.Text = "範囲";
this.labelStaticVariable.Text = "変化"; this.labelStaticVariable.Text = "変化";
this.labelStaticMode.Text = "モード"; this.labelStaticMode.Text = "モㅡド";
this.groupBoxOption.Text = "オプション設定"; this.groupBoxOption.Text = "オプション設定";
this.labelStaticEmptyWeight.Text = "空重量セット"; this.labelStaticEmptyWeight.Text = "空重量セット";
@ -401,8 +401,8 @@ namespace INT63DC_2C.Forms
this.comboBoxZeroParameterMode.Items.Add("Modus2"); this.comboBoxZeroParameterMode.Items.Add("Modus2");
break; break;
case DataStore.LanguageID.Japanese: case DataStore.LanguageID.Japanese:
this.comboBoxZeroParameterMode.Items.Add("モード1"); this.comboBoxZeroParameterMode.Items.Add("モㅡド1");
this.comboBoxZeroParameterMode.Items.Add("モード2"); this.comboBoxZeroParameterMode.Items.Add("モㅡド2");
break; break;
default: default:
break; break;

2
INT63DC_2C/Forms/FormDataStatistics.cs
View File

@ -155,7 +155,7 @@ namespace INT63DC_2C.Forms
break; break;
case DataStore.LanguageID.Japanese: case DataStore.LanguageID.Japanese:
#region Japanese #region Japanese
this.labelTitle.Text = "データ統計"; this.labelTitle.Text = "デㅡタ統計";
this.buttonBackup.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDisable)); this.buttonBackup.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDisable));
this.buttonBackup.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDown)); this.buttonBackup.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackupDown));

6
INT63DC_2C/Forms/FormMainDisplay.Designer.cs generated
View File

@ -445,7 +445,7 @@
this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BackPictureBox2 = null;
this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderColor = System.Drawing.Color.Black;
this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelTotalCount.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Regular); this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold);
this.labelTotalCount.InitVisible = true; this.labelTotalCount.InitVisible = true;
this.labelTotalCount.LineSpacing = 0F; this.labelTotalCount.LineSpacing = 0F;
this.labelTotalCount.Location = new System.Drawing.Point(144, 704); this.labelTotalCount.Location = new System.Drawing.Point(144, 704);
@ -465,7 +465,7 @@
this.labelProductionSpeed.BackPictureBox2 = null; this.labelProductionSpeed.BackPictureBox2 = null;
this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black; this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black;
this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelProductionSpeed.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Regular); this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Bold);
this.labelProductionSpeed.InitVisible = true; this.labelProductionSpeed.InitVisible = true;
this.labelProductionSpeed.LineSpacing = 0F; this.labelProductionSpeed.LineSpacing = 0F;
this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704); this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704);
@ -503,7 +503,7 @@
this.labelNGCount.BackPictureBox2 = null; this.labelNGCount.BackPictureBox2 = null;
this.labelNGCount.BorderColor = System.Drawing.Color.Black; this.labelNGCount.BorderColor = System.Drawing.Color.Black;
this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelNGCount.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Regular); this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold);
this.labelNGCount.InitVisible = true; this.labelNGCount.InitVisible = true;
this.labelNGCount.LineSpacing = 0F; this.labelNGCount.LineSpacing = 0F;
this.labelNGCount.Location = new System.Drawing.Point(384, 704); this.labelNGCount.Location = new System.Drawing.Point(384, 704);

26
INT63DC_2C/Forms/FormMainDisplay.cs
View File

@ -479,15 +479,15 @@ namespace INT63DC_2C.Forms
this.buttonSamplingOnce.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuContinueUp)); this.buttonSamplingOnce.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuContinueUp));
this.buttonSamplingOnce.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuOnceUp)); this.buttonSamplingOnce.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnSubMenuOnceUp));
this.groupBoxSorter.Text = "ソーター設定"; this.groupBoxSorter.Text = "ソㅡタㅡ設定";
this.labelStaticSorter1DelayTime.Text = "ソーター1 遅延時間"; this.labelStaticSorter1DelayTime.Text = "ソㅡタㅡ1 遅延時間";
this.labelStaticSorter1RunTime.Text = "ソーター1 運転時間"; this.labelStaticSorter1RunTime.Text = "ソㅡタㅡ1 運転時間";
this.labelStaticSorter2DelayTime.Text = "ソーター2 遅延時間"; this.labelStaticSorter2DelayTime.Text = "ソㅡタㅡ2 遅延時間";
this.labelStaticSorter2RunTime.Text = "ソーター2 運転時間"; this.labelStaticSorter2RunTime.Text = "ソㅡタㅡ2 運転時間";
this.labelStaticSorter3DelayTime.Text = "ソーター3 遅延時間"; this.labelStaticSorter3DelayTime.Text = "ソㅡタㅡ3 遅延時間";
this.labelStaticSorter3RunTime.Text = "ソーター3 運転時間"; this.labelStaticSorter3RunTime.Text = "ソㅡタㅡ3 運転時間";
this.labelStaticEntryGateDelayTime.Text = "エントリーゲートの遅延時間"; this.labelStaticEntryGateDelayTime.Text = "エントリㅡゲㅡトの遅延時間";
this.labelStaticEntryGateRunTime.Text = "エントリーゲートの運転時間"; this.labelStaticEntryGateRunTime.Text = "エントリㅡゲㅡトの運転時間";
this.labelStaticDischargeStopperDelayTime.Font = font; this.labelStaticDischargeStopperDelayTime.Font = font;
this.labelStaticDischargeStopperDelayTime.Text = "排出ストッパㅡの遅延時間"; this.labelStaticDischargeStopperDelayTime.Text = "排出ストッパㅡの遅延時間";
@ -507,11 +507,11 @@ namespace INT63DC_2C.Forms
this.labelTitleScreen.Text = "画面"; this.labelTitleScreen.Text = "画面";
this.labelTitleSampling.Text = "サンプリング"; this.labelTitleSampling.Text = "サンプリング";
this.labelMessage1.Text = "インバーターアラーム"; this.labelMessage1.Text = "インバㅡタㅡアラㅡム";
this.labelMessage3.Text = "ピンチポイントアラーム"; this.labelMessage3.Text = "ピンチポイントアラㅡム";
this.labelMessage5.Text = "サㅡボモㅡタの原点を設定してください"; this.labelMessage5.Text = "サㅡボモㅡタの原点を設定してください";
this.buttonClose.Text = "クローズ"; this.buttonClose.Text = "クロㅡズ";
this.labelTitleTotalCount.Font = font1; this.labelTitleTotalCount.Font = font1;
this.labelTitleTotalCount.Text = "総カウント"; this.labelTitleTotalCount.Text = "総カウント";
@ -2065,7 +2065,7 @@ namespace INT63DC_2C.Forms
message = "Pinch point!"; message = "Pinch point!";
break; break;
case DataStore.LanguageID.Japanese: case DataStore.LanguageID.Japanese:
message = "ピンチポイントアラーム!"; message = "ピンチポイントアラㅡム!";
break; break;
default: default:
break; break;

12
INT63DC_2C/Forms/FormMotorSetting.cs
View File

@ -172,18 +172,20 @@ namespace INT63DC_2C.Forms
this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.jpnBackUp));
this.buttonOrigin.Text = "原点"; this.buttonOrigin.Text = "原点";
this.buttonAlarmReset.Text = "アラームリセット"; this.buttonAlarmReset.Text = "アラㅡムリセット";
this.labelTitle.Text = "モーター 設定"; this.labelTitle.Text = "モㅡタㅡ 設定";
this.labelTitleOriginOffsets.Text = "原点オフセット"; this.labelTitleOriginOffsets.Text = "原点オフセット";
this.labelTitleOriginSpeed.Text = "原点速度"; this.labelTitleOriginSpeed.Text = "原点速度";
this.labelTitleSpeed1.Text = "速度"; this.labelTitleSpeed1.Text = "速度";
this.labelTitleAcceleration1.Text = "加速度"; this.labelTitleAcceleration1.Text = "加速度";
this.labelTitleDeceleration1.Text = "減速"; this.labelTitleDeceleration1.Text = "減速";
this.buttonParameterRead.Text = "全て読む";
this.buttonStep.Text = "ステップ";
this.labelTitlePosition0.Text = "位置 0"; this.labelTitlePosition0.Text = "位置 0";
this.labelTitlePosition1.Text = "位置 1"; this.labelTitlePosition1.Text = "位置 1";
this.labelTitlePosition2.Text = "位置 2"; this.labelTitlePosition2.Text = "位置 2";
this.labelTitleMessage1.Text = "サーボドライバを設定したら、"; this.labelTitleMessage1.Text = "サㅡボドライバを設定したら、";
this.labelTitleMessage2.Text = "EEPROMを押して保存します。"; this.labelTitleMessage2.Text = "EEPROMを押して保存します。";
this.labelTitleMessage3.Text = "ジョグ動作後は必ず原点復帰を実行してください。"; this.labelTitleMessage3.Text = "ジョグ動作後は必ず原点復帰を実行してください。";
this.labelTitleMessage4.Text = ""; this.labelTitleMessage4.Text = "";
@ -247,7 +249,7 @@ namespace INT63DC_2C.Forms
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
this.labelModusStatus.Text = "开"; this.labelModusStatus.Text = "开";
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese)
this.labelModusStatus.Text = "オープン"; this.labelModusStatus.Text = "オㅡプン";
else else
this.labelModusStatus.Text = "OPEN"; this.labelModusStatus.Text = "OPEN";
this.labelModusStatus.BackColor = Color.DarkGreen; this.labelModusStatus.BackColor = Color.DarkGreen;
@ -262,7 +264,7 @@ namespace INT63DC_2C.Forms
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
this.labelModusStatus.Text = "关闭"; this.labelModusStatus.Text = "关闭";
else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese) else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Japanese)
this.labelModusStatus.Text = "クローズ"; this.labelModusStatus.Text = "クロㅡズ";
else else
this.labelModusStatus.Text = "CLOSE"; this.labelModusStatus.Text = "CLOSE";
this.labelModusStatus.BackColor = Color.Crimson; this.labelModusStatus.BackColor = Color.Crimson;

2
INT63DC_2C/Helper.cs
View File

@ -70,7 +70,7 @@ namespace INT63DC_2C
/// <param name="label">SmartLabel</param> /// <param name="label">SmartLabel</param>
public static void SetTableLabelProperty(Control label) public static void SetTableLabelProperty(Control label)
{ {
label.Font = new Font("Arial", 16, FontStyle.Bold); label.Font = new Font("Tahoma", 16, FontStyle.Bold);
} }
/// <summary> /// <summary>
/// 테이블 화면 Label Value Set /// 테이블 화면 Label Value Set

BIN
INT63DC_2C/obj/Release/INT63DC_2C.csproj.GenerateResource.Cache 100644
View File

Binary file not shown.