Skip to content

G
GC_Branch
Commit edda63be authored by wangwanxh@sina.com's avatar wangwanxh@sina.com
Browse files
Options

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

parents cefe2d79 9beb7646
Expand all Show whitespace changes
Inline Side-by-side
Showing with 300 additions and 285 deletions
.gitignore
View file @ edda63be
...@@ -253,3 +253,4 @@ paket-files/ ...@@ -253,3 +253,4 @@ paket-files/
.idea/ .idea/
*.sln.iml *.sln.iml
VocAnalyzer/ VocAnalyzer/
VocsMonitor/
GcDevicePc.sln
View file @ edda63be
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013 # Visual Studio 15
VisualStudioVersion = 12.0.21005.1 VisualStudioVersion = 15.0.27428.2002
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcDevicePc", "GcDevicePc\GcDevicePc.csproj", "{BBCD58CB-247D-4108-A135-F36F8ABA3289}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GcDevicePc", "GcDevicePc\GcDevicePc.csproj", "{BBCD58CB-247D-4108-A135-F36F8ABA3289}"
EndProject EndProject
...@@ -9,6 +9,8 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "VocAnalyzer", "VocAnalyzer\ ...@@ -9,6 +9,8 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "VocAnalyzer", "VocAnalyzer\
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedSpace", "SharedSpace\SharedSpace.csproj", "{5498F944-5721-461B-B07F-3105EF0BF643}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedSpace", "SharedSpace\SharedSpace.csproj", "{5498F944-5721-461B-B07F-3105EF0BF643}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocsMonitor", "VocsMonitor\VocsMonitor\VocsMonitor.csproj", "{25AB743D-235C-4F11-96C3-2356AC90BF81}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -47,6 +49,18 @@ Global ...@@ -47,6 +49,18 @@ Global
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.Build.0 = Release|Any CPU {5498F944-5721-461B-B07F-3105EF0BF643}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5498F944-5721-461B-B07F-3105EF0BF643}.Release|x86.ActiveCfg = Release|Any CPU {5498F944-5721-461B-B07F-3105EF0BF643}.Release|x86.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|x86.ActiveCfg = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Debug|x86.Build.0 = Debug|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Any CPU.Build.0 = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|x86.ActiveCfg = Release|Any CPU
{25AB743D-235C-4F11-96C3-2356AC90BF81}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
GcDevicePc/App.config
View file @ edda63be
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
......
GcDevicePc/Common/GCModbusSlave.cs
View file @ edda63be
This diff is collapsed.
GcDevicePc/DataState.cs
View file @ edda63be
...@@ -520,7 +520,7 @@ namespace GcDevicePc ...@@ -520,7 +520,7 @@ namespace GcDevicePc
tempshow = new ListViewItem(); tempshow = new ListViewItem();
tempshow.Text = "FID1"; tempshow.Text = "FID1";
if (globaldata.m_signalbuffer.Draw_Port.Count > 1) // if (globaldata.m_signalbuffer.Draw_Port.Count > 1)
{ {
fDetvalue = globaldata.m_dpbuffer.ShowList.showDet.fDetValue; fDetvalue = globaldata.m_dpbuffer.ShowList.showDet.fDetValue;
...@@ -532,10 +532,10 @@ namespace GcDevicePc ...@@ -532,10 +532,10 @@ namespace GcDevicePc
if (fDetvalue != 0.0f) if (fDetvalue != 0.0f)
tempshow.SubItems.Add(fDetvalue.ToString("0.000") + " mV"); tempshow.SubItems.Add(fDetvalue.ToString("0.000") + " mV");
} }
else //else
{ //{
tempshow.SubItems.Add(fDetvalueold.ToString("0.000") + " mV"); // tempshow.SubItems.Add(fDetvalueold.ToString("0.000") + " mV");
} //}
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
......
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