Skip to content

G
GC_Branch
Commit bda0276b authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

parents 4948c134 0ef0d12f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
GcDevicePc/FormUser.Designer.cs
View file @ bda0276b
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
this.userCtl1.Location = new System.Drawing.Point(0, 16); this.userCtl1.Location = new System.Drawing.Point(0, 16);
this.userCtl1.Name = "userCtl1"; this.userCtl1.Name = "userCtl1";
this.userCtl1.Size = new System.Drawing.Size(758, 468); this.userCtl1.Size = new System.Drawing.Size(758, 468);
this.userCtl1.Systemtype = 1; this.userCtl1.Systemtype = 2;
this.userCtl1.TabIndex = 0; this.userCtl1.TabIndex = 0;
// //
// buttonFID // buttonFID
......
GcDevicePc/MDIBase.cs
View file @ bda0276b
...@@ -73,6 +73,7 @@ namespace GcDevicePc ...@@ -73,6 +73,7 @@ namespace GcDevicePc
if (CKVocAnalyzer.Config.Instance.ReadPath()) if (CKVocAnalyzer.Config.Instance.ReadPath())
{ {
CKVocAnalyzer.VOCEntityConfig.Instance.vocinit(); CKVocAnalyzer.VOCEntityConfig.Instance.vocinit();
CKVocAnalyzer.VOCEntityConfig.Instance.SetAutoAdjust();
CKVocAnalyzer.Config.Instance.ReadAxisRange(); CKVocAnalyzer.Config.Instance.ReadAxisRange();
LogOperate.LogInit.Instance.path = CKVocAnalyzer.GlobalCKV.FolderLog; LogOperate.LogInit.Instance.path = CKVocAnalyzer.GlobalCKV.FolderLog;
LogOperate.LogInit.Instance.Init(); LogOperate.LogInit.Instance.Init();
......
dll/CKVocAnalyzer.dll
View file @ bda0276b
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment