Skip to content

G
GC_Branch
Commit 00cc97e1 authored by liu's avatar liu
Browse files
Options

针对程序一对二仪器，进行小改变

parent f043db03
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 48 deletions
GcDevicePc/App.config
View file @ 00cc97e1
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
<runtime>
<legacyUnhandledExceptionPolicy enabled="true" />
<legacyUnhandledExceptionPolicy enabled="true"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0" />
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.104.0" newVersion="1.0.104.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<log4net>
<logger name="Log">
<level value="INFO" />
<appender-ref ref="RollingLog" />
<level value="INFO"/>
<appender-ref ref="RollingLog"/>
</logger>
<logger name="Err">
<level value="ERROR" />
<appender-ref ref="RollingErr" />
<level value="ERROR"/>
<appender-ref ref="RollingErr"/>
</logger>
<logger name="HmiInfo">
<level value="INFO" />
<appender-ref ref="HmiRollingLog" />
<level value="INFO"/>
<appender-ref ref="HmiRollingLog"/>
</logger>
<appender name="RollingLog" type="log4net.Appender.RollingFileAppender">
<file value="..\GC_User\Logs\InfoLog_" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd'.txt'" />
<staticLogFileName value="false" />
<file value="..\GC_User\Logs\InfoLog_"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyyMMdd'.txt'"/>
<staticLogFileName value="false"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Record Time：%d Thread ID:[%thread]- Info：%m%n" />
<conversionPattern value="Record Time：%d Thread ID:[%thread]- Info：%m%n"/>
</layout>
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="INFO" />
<param name="LevelMax" value="INFO" />
<param name="LevelMin" value="INFO"/>
<param name="LevelMax" value="INFO"/>
</filter>
</appender>
<appender name="HmiRollingLog" type="log4net.Appender.RollingFileAppender">
<file value="..\GC_User\Logs\HmiLog_" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd'.txt'" />
<staticLogFileName value="false" />
<file value="..\GC_User\Logs\HmiLog_"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyyMMdd'.txt'"/>
<staticLogFileName value="false"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Record Time：%d Info：%m%n" />
<conversionPattern value="Record Time：%d Info：%m%n"/>
</layout>
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="INFO" />
<param name="LevelMax" value="INFO" />
<param name="LevelMin" value="INFO"/>
<param name="LevelMax" value="INFO"/>
</filter>
</appender>
<appender name="RollingErr" type="log4net.Appender.RollingFileAppender">
<file value="..\GC_User\Logs\ErrLog_" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd'.txt'" />
<staticLogFileName value="false" />
<file value="..\GC_User\Logs\ErrLog_"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyyMMdd'.txt'"/>
<staticLogFileName value="false"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="Record Time：%d Thread ID:[%thread]- Error：%m%n" />
<conversionPattern value="Record Time：%d Thread ID:[%thread]- Error：%m%n"/>
</layout>
<filter type="log4net.Filter.LevelRangeFilter">
<param name="LevelMin" value="ERROR" />
<param name="LevelMax" value="ERROR" />
<param name="LevelMin" value="ERROR"/>
<param name="LevelMax" value="ERROR"/>
</filter>
</appender>
</log4net>
......
GcDevicePc/Program.cs
View file @ 00cc97e1
using System;
using System.Linq;
using System.Windows.Forms;
namespace GcDevicePc
......@@ -14,22 +15,36 @@ namespace GcDevicePc
bool createNew;
//Application.Run(new TestForm());
{
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{
if (createNew)
{
Application.Run(new StartForm());
mutex.ReleaseMutex();
}
else
int num = System.Diagnostics.Process.GetProcessesByName(Application.ProductName).ToList().Count;
if (num > 2)
{
MessageBox.Show("应用程序已经在运行中...");
MessageBox.Show("应用程序已多开...");
System.Threading.Thread.Sleep(1000);
Application.Exit();
System.Diagnostics.Process.GetCurrentProcess().Kill();
// System.Environment.Exit(1);
}
else
{
//存在
using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
{
//if (createNew)
//{
Application.Run(new StartForm());
mutex.ReleaseMutex();
//}
//else
//{
// MessageBox.Show("应用程序已经在运行中...");
// System.Threading.Thread.Sleep(1000);
// Application.Exit();
// System.Diagnostics.Process.GetCurrentProcess().Kill();
// // System.Environment.Exit(1);
//}
}
}
}
}
}
......
GcDevicePc/Properties/Settings.Designer.cs
View file @ 00cc97e1
......@@ -12,7 +12,7 @@ namespace GcDevicePc.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
GcDevicePc/StartForm.cs
View file @ 00cc97e1
......@@ -109,6 +109,7 @@ namespace GcDevicePc
_opacityTimer.Interval = 30;
_opacityTimer.Elapsed += new System.Timers.ElapsedEventHandler(OpacityTimerProcOpen);
_opacityTimer.Start();
//globaldata.ProgramCount = num;
}
private void MainFrmStartProc()
......
GcDevicePc/globaldata.cs
View file @ 00cc97e1
......@@ -95,7 +95,7 @@ namespace GcDevicePc
public static PCBuffer m_pcbuffer = new PCBuffer();
public static SignalBuffer m_signalbuffer = new SignalBuffer();
//public static int ProgramCount = 0;
//
public static HWConfig m_hwconfig = new HWConfig();
......
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