Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 190c39a1 由 几米阳光
选项

中英文切换修改

1 个父辈 a7e239d7
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 62 行增加 和 24 行删除
dll/CodeLibrary.dll
此文件类型无法预览
source/ACSingleStore/FrmStoreBox.cs
...@@ -117,7 +117,18 @@ namespace OnlineStore.ACSingleStore ...@@ -117,7 +117,18 @@ namespace OnlineStore.ACSingleStore
AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库："); AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库："); AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
学习二维码ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
// richTextBox1.Visible = CurrLanguage.Equals(ResourceCulture.China);
if (CurrLanguage.Equals(ResourceCulture.China))
{
LogUtil.logBox = this.richTextBox1;
}
else
{
LogUtil.ClearLog();
LogUtil.logBox = null;
}
ToolStripItemCollection collection = menuStrip1.Items; ToolStripItemCollection collection = menuStrip1.Items;
for (int i = 0; i < collection.Count; i++) for (int i = 0; i < collection.Count; i++)
{ {
...@@ -354,6 +365,7 @@ namespace OnlineStore.ACSingleStore ...@@ -354,6 +365,7 @@ namespace OnlineStore.ACSingleStore
lblOutPulse.Text = lblOutPulse1.Text; lblOutPulse.Text = lblOutPulse1.Text;
lblCountPulse.Text = lblCountPulse1.Text; lblCountPulse.Text = lblCountPulse1.Text;
} }
} }
if (ACServerManager.ServerOnStatus(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue())) if (ACServerManager.ServerOnStatus(store.Config.UpDown_Axis.DeviceName, store.Config.UpDown_Axis.GetAxisValue()))
{ {
...@@ -500,18 +512,7 @@ namespace OnlineStore.ACSingleStore ...@@ -500,18 +512,7 @@ namespace OnlineStore.ACSingleStore
txtAxisDeviceName.Text = SlvAddr.DeviceName; txtAxisDeviceName.Text = SlvAddr.DeviceName;
txtAxisValue.Text = SlvAddr.GetAxisValue().ToString(); txtAxisValue.Text = SlvAddr.GetAxisValue().ToString();
txtASpeed.Text = SlvAddr.TargetSpeed.ToString(); txtASpeed.Text = SlvAddr.TargetSpeed.ToString();
//if (SlvAddr.Equals(store.Config.InOut_Axis))
//{
// txtASpeed.Text = store.Config.InOutAxis_P1_Speed.ToString();
//}
//else if (SlvAddr.Equals(store.Config.Middle_Axis))
//{
// txtASpeed.Text = store.Config.MiddleAxis_P1_Speed.ToString();
//}
//else if (SlvAddr.Equals(store.Config.UpDown_Axis))
//{
// txtASpeed.Text = store.Config.UpDownAxis_P1_Speed.ToString();
//}
} }
} }
...@@ -522,11 +523,7 @@ namespace OnlineStore.ACSingleStore ...@@ -522,11 +523,7 @@ namespace OnlineStore.ACSingleStore
short SlvAddr = FormUtil.GetShortValue(txtAxisValue); short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition); int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed); int speed = FormUtil.GetIntValue(txtASpeed);
//if (axisC.PositionIsHasLimit() && (axisC.PositionMin > position || axisC.PositionMax < position))
//{
// MessageBox.Show("位置超出" + axisC.Explain + "上下限（" + axisC.PositionMin + "-" + axisC.PositionMax + "）");
// return;
//}
//if (portName.Equals(store.Config.InOut_Axis.DeviceName) && (store.LoacationIsDown().Equals(false))) //if (portName.Equals(store.Config.InOut_Axis.DeviceName) && (store.LoacationIsDown().Equals(false)))
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.LoacationIsDown().Equals(false))) if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.LoacationIsDown().Equals(false)))
{ {
...@@ -1204,7 +1201,8 @@ namespace OnlineStore.ACSingleStore ...@@ -1204,7 +1201,8 @@ namespace OnlineStore.ACSingleStore
string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName); string nameStr = ConfigAppSettings.GetValue(Setting_Init.CameraName);
string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType); string codeStr = ConfigAppSettings.GetValue(Setting_Init.CodeType);
HDCodeLearnHelper.LoadConfig(nameStr, codeStr); HDCodeLearnHelper.LoadConfig(nameStr, codeStr);
FrmCodeLearn learn = new FrmCodeLearn(); //FrmCodeLearn learn = new FrmCodeLearn();
FrmCodeDecode learn = new FrmCodeDecode();
learn.ShowDialog(); learn.ShowDialog();
store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW); store.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
} }
......
source/ACSingleStore/FrmStoreBox.resx
...@@ -1263,7 +1263,7 @@ ...@@ -1263,7 +1263,7 @@
<value>107, 16</value> <value>107, 16</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>162</value> <value>47</value>
</metadata> </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
<value>lifting axis</value> <value>lifting axis</value>
</data> </data>
<data name="FrmStoreBox_label43_Text" xml:space="preserve"> <data name="FrmStoreBox_label43_Text" xml:space="preserve">
<value>Output impulse valve:</value> <value>Output impulse:</value>
</data> </data>
<data name="FrmStoreBox_label42_Text" xml:space="preserve"> <data name="FrmStoreBox_label42_Text" xml:space="preserve">
<value>Encoder count:</value> <value>Encoder count:</value>
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
<value>Read position</value> <value>Read position</value>
</data> </data>
<data name="FrmStoreBox_label7_Text" xml:space="preserve"> <data name="FrmStoreBox_label7_Text" xml:space="preserve">
<value>Output impulse valve:</value> <value>Output impulse:</value>
</data> </data>
<data name="FrmStoreBox_label8_Text" xml:space="preserve"> <data name="FrmStoreBox_label8_Text" xml:space="preserve">
<value>Encoder count:</value> <value>Encoder count:</value>
...@@ -780,4 +780,37 @@ ...@@ -780,4 +780,37 @@
<data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve"> <data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve">
<value>Exit</value> <value>Exit</value>
</data> </data>
<data name="FrmCodeDecode_Text xml:space=preserve"> <value>Qr code recognition</value></data>
<data name="FrmCodeDecode_label4_Text xml:space=preserve"> <value>Parameters of the path</value></data>
<data name="FrmCodeDecode_chbUseParam_Text xml:space=preserve"> <value>operation parameter</value></data>
<data name="FrmCodeDecode_btnAn_Text xml:space=preserve"> <value>darken</value></data>
<data name="FrmCodeDecode_btnLight_Text xml:space=preserve"> <value>brighten</value></data>
<data name="FrmCodeDecode_label3_Text xml:space=preserve"> <value>Bar code type:</value></data>
<data name="FrmCodeDecode_label2_Text xml:space=preserve"> <value>Camera list:</value></data>
<data name="FrmCodeDecode_btnExit_Text xml:space=preserve"> <value>Exit</value></data>
<data name="FrmCodeDecode_btnCameraImage_Text xml:space=preserve"> <value>camera image</value></data>
<data name="FrmCodeDecode_lblCount_Text xml:space=preserve"> <value>Barcode number:</value></data>
<data name="FrmCodeDecode_btnClearLog_Text xml:space=preserve"> <value>Clear log</value></data>
<data name="FrmCodeDecode_btnDCode_Text xml:space=preserve"> <value>Qr code recognition</value></data>
<data name="FrmCodeDecode_btnLearn_Text xml:space=preserve"> <value>learn</value></data>
<data name="FrmCodeDecode_btnbarCode_Text xml:space=preserve"> <value>One dimensional code recognition</value></data>
<data name="FrmCodeDecode_btnGray_Text xml:space=preserve"> <value>Turning grey</value></data>
<data name="FrmCodeDecode_btnErZhi_Text xml:space=preserve"> <value>binaryzation </value></data>
<data name="FrmCodeDecode_btnSelImage_Text xml:space=preserve"> <value>Open local image</value></data>
<data name="FrmCodeDecode_label1_Text xml:space=preserve"> <value>Image path</value></data>
<data name="FrmCodeLearn_Text xml:space=preserve"> <value>Bar code parameter learning</value></data>
<data name="FrmCodeLearn_chbHalcon_Text xml:space=preserve"> <value>Halcon Get photo</value></data>
<data name="FrmCodeLearn_label4_Text xml:space=preserve"> <value>Image path</value></data>
<data name="FrmCodeLearn_btnDelOld_Text xml:space=preserve"> <value>Delete old parameter</value></data>
<data name="FrmCodeLearn_chbUseCamera_Text xml:space=preserve"> <value>camera image</value></data>
<data name="FrmCodeLearn_btnSelImage_Text xml:space=preserve"> <value>Open local image</value></data>
<data name="FrmCodeLearn_chbTest_Text xml:space=preserve"> <value>Automatic identification test</value></data>
<data name="FrmCodeLearn_btnClearLog_Text xml:space=preserve"> <value>Clear log</value></data>
<data name="FrmCodeLearn_lblCount_Text xml:space=preserve"> <value>Barcode number:</value></data>
<data name="FrmCodeLearn_label3_Text xml:space=preserve"> <value>Parameters of the path</value></data>
<data name="FrmCodeLearn_label2_Text xml:space=preserve"> <value>Type:</value></data>
<data name="FrmCodeLearn_label1_Text xml:space=preserve"> <value>camera:</value></data>
<data name="FrmCodeLearn_btnExit_Text xml:space=preserve"> <value>Exit</value></data>
<data name="FrmCodeLearn_btnStop_Text xml:space=preserve"> <value>End of learning</value></data>
<data name="FrmCodeLearn_btnOpen_Text xml:space=preserve"> <value>start to learn</value></data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/ResourceCulture.cs
...@@ -29,7 +29,11 @@ namespace OnlineStore.ACSingleStore ...@@ -29,7 +29,11 @@ namespace OnlineStore.ACSingleStore
{ {
ResourceControl.GetStrEvent += GetString; ResourceControl.GetStrEvent += GetString;
ResourceControl.GetStringEvent += GetString; ResourceControl.GetStringEvent += GetString;
CodeLibrary.CodeResourceControl.GetStrEvent += GetString;
CodeLibrary.CodeResourceControl.GetStringEvent += GetString;
CodeLibrary.CodeResourceControl.GetIdStrEvent += GetTextIdStr;
CodeLibrary.CodeResourceControl.GetProStrEvent += GetTextIdStr;
CodeLibrary.CodeResourceControl.GetLanguageEvent += GetLanguage;
//UserFromControl.UserControlResource.GetStrEvent += GetString; //UserFromControl.UserControlResource.GetStrEvent += GetString;
//UserFromControl.UserControlResource.GetStringEvent += GetString; //UserFromControl.UserControlResource.GetStringEvent += GetString;
if (string.IsNullOrEmpty(name)) if (string.IsNullOrEmpty(name))
...@@ -39,7 +43,10 @@ namespace OnlineStore.ACSingleStore ...@@ -39,7 +43,10 @@ namespace OnlineStore.ACSingleStore
CurrLanguage = name; CurrLanguage = name;
Thread.CurrentThread.CurrentCulture = new CultureInfo(name); Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
} }
public static string GetLanguage()
{
return CurrLanguage;
}
private static Assembly assembly = Assembly.GetExecutingAssembly(); private static Assembly assembly = Assembly.GetExecutingAssembly();
public static string GetString(string id,string defaultStr) public static string GetString(string id,string defaultStr)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!