Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
G
GC_Branch
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
周磊
GC_Branch
Commits
bda0276b
Commit
bda0276b
authored
Jun 21, 2018
by
wangjunqiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wang_master' of
https://gitee.com/wangwanxh/Vocs
into wang_master
parents
4948c134
0ef0d12f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
1 deletion
+2
-1
FormUser.Designer.cs
GcDevicePc/FormUser.Designer.cs
+1
-1
MDIBase.cs
GcDevicePc/MDIBase.cs
+1
-0
CKVocAnalyzer.dll
dll/CKVocAnalyzer.dll
+0
-0
No files found.
GcDevicePc/FormUser.Designer.cs
View file @
bda0276b
...
...
@@ -42,7 +42,7 @@
this
.
userCtl1
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
16
);
this
.
userCtl1
.
Name
=
"userCtl1"
;
this
.
userCtl1
.
Size
=
new
System
.
Drawing
.
Size
(
758
,
468
);
this
.
userCtl1
.
Systemtype
=
1
;
this
.
userCtl1
.
Systemtype
=
2
;
this
.
userCtl1
.
TabIndex
=
0
;
//
// buttonFID
...
...
GcDevicePc/MDIBase.cs
View file @
bda0276b
...
...
@@ -73,6 +73,7 @@ namespace GcDevicePc
if
(
CKVocAnalyzer
.
Config
.
Instance
.
ReadPath
())
{
CKVocAnalyzer
.
VOCEntityConfig
.
Instance
.
vocinit
();
CKVocAnalyzer
.
VOCEntityConfig
.
Instance
.
SetAutoAdjust
();
CKVocAnalyzer
.
Config
.
Instance
.
ReadAxisRange
();
LogOperate
.
LogInit
.
Instance
.
path
=
CKVocAnalyzer
.
GlobalCKV
.
FolderLog
;
LogOperate
.
LogInit
.
Instance
.
Init
();
...
...
dll/CKVocAnalyzer.dll
View file @
bda0276b
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment