diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Util/SenderClass.cs b/Correlator/Util/SenderClass.cs index 699eada..ce91393 100644 --- a/Correlator/Util/SenderClass.cs +++ b/Correlator/Util/SenderClass.cs @@ -66,7 +66,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -139,7 +139,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -225,7 +225,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -309,7 +309,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音结束指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音结束指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); @@ -383,7 +383,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪测距指令" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪测距指令" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Util/SenderClass.cs b/Correlator/Util/SenderClass.cs index 699eada..ce91393 100644 --- a/Correlator/Util/SenderClass.cs +++ b/Correlator/Util/SenderClass.cs @@ -66,7 +66,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -139,7 +139,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -225,7 +225,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -309,7 +309,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音结束指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音结束指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); @@ -383,7 +383,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪测距指令" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪测距指令" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 5548941..8a9381b 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -36,8 +36,7 @@ if (receiveData != null) { - LogWithConsole.WriteLine("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""), - "SerialPortManager"); + "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", "")); var deviceId = new byte[6]; Array.Copy(receiveData, 4, deviceId, 0, 6); @@ -66,7 +65,7 @@ HandleListenData(tags); break; default: - LogWithConsole.WriteLine("receiveData.Length：" + receiveData.Length, "SerialPortManager"); + "SerialPortManager".WriteLog("receiveData.Length：" + receiveData.Length); break; } @@ -230,7 +229,7 @@ var diffTime = Convert.ToInt32( Math.Abs((_dataModel.LeftReceiveDataTime - _dataModel.RightReceiveDataTime).TotalSeconds) ); - LogWithConsole.WriteLine("左右两边接收到的数据时间差：" + diffTime + "s", "SerialPortManager"); + "SerialPortManager".WriteLog("左右两边接收到的数据时间差：" + diffTime + "s"); //左右两边接收到的数据时间差超过10s，认为不是同一次此指令返回的，舍弃 if (diffTime >= 10) return; @@ -242,7 +241,7 @@ } else { - LogWithConsole.WriteLine("数据未收集完整，无法计算", "SerialPortManager"); + "SerialPortManager".WriteLog("数据未收集完整，无法计算"); } } } diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Util/SenderClass.cs b/Correlator/Util/SenderClass.cs index 699eada..ce91393 100644 --- a/Correlator/Util/SenderClass.cs +++ b/Correlator/Util/SenderClass.cs @@ -66,7 +66,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -139,7 +139,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -225,7 +225,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -309,7 +309,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音结束指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音结束指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); @@ -383,7 +383,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪测距指令" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪测距指令" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 5548941..8a9381b 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -36,8 +36,7 @@ if (receiveData != null) { - LogWithConsole.WriteLine("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""), - "SerialPortManager"); + "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", "")); var deviceId = new byte[6]; Array.Copy(receiveData, 4, deviceId, 0, 6); @@ -66,7 +65,7 @@ HandleListenData(tags); break; default: - LogWithConsole.WriteLine("receiveData.Length：" + receiveData.Length, "SerialPortManager"); + "SerialPortManager".WriteLog("receiveData.Length：" + receiveData.Length); break; } @@ -230,7 +229,7 @@ var diffTime = Convert.ToInt32( Math.Abs((_dataModel.LeftReceiveDataTime - _dataModel.RightReceiveDataTime).TotalSeconds) ); - LogWithConsole.WriteLine("左右两边接收到的数据时间差：" + diffTime + "s", "SerialPortManager"); + "SerialPortManager".WriteLog("左右两边接收到的数据时间差：" + diffTime + "s"); //左右两边接收到的数据时间差超过10s，认为不是同一次此指令返回的，舍弃 if (diffTime >= 10) return; @@ -242,7 +241,7 @@ } else { - LogWithConsole.WriteLine("数据未收集完整，无法计算", "SerialPortManager"); + "SerialPortManager".WriteLog("数据未收集完整，无法计算"); } } } diff --git a/Correlator/Util/WaveOut.cs b/Correlator/Util/WaveOut.cs index 6131836..df51931 100644 --- a/Correlator/Util/WaveOut.cs +++ b/Correlator/Util/WaveOut.cs @@ -43,7 +43,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "WaveOut"); + "WaveOut".WriteLog(e.Message); } } @@ -91,7 +91,7 @@ private void GetMemory(string title) { - LogWithConsole.WriteLine($"{title}: {_mPlaying}, {_mark}", "WaveOut"); + "WaveOut".WriteLog($"{title}: {_mPlaying}, {_mark}"); } public bool Play() diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Util/SenderClass.cs b/Correlator/Util/SenderClass.cs index 699eada..ce91393 100644 --- a/Correlator/Util/SenderClass.cs +++ b/Correlator/Util/SenderClass.cs @@ -66,7 +66,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -139,7 +139,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -225,7 +225,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -309,7 +309,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音结束指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音结束指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); @@ -383,7 +383,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪测距指令" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪测距指令" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 5548941..8a9381b 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -36,8 +36,7 @@ if (receiveData != null) { - LogWithConsole.WriteLine("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""), - "SerialPortManager"); + "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", "")); var deviceId = new byte[6]; Array.Copy(receiveData, 4, deviceId, 0, 6); @@ -66,7 +65,7 @@ HandleListenData(tags); break; default: - LogWithConsole.WriteLine("receiveData.Length：" + receiveData.Length, "SerialPortManager"); + "SerialPortManager".WriteLog("receiveData.Length：" + receiveData.Length); break; } @@ -230,7 +229,7 @@ var diffTime = Convert.ToInt32( Math.Abs((_dataModel.LeftReceiveDataTime - _dataModel.RightReceiveDataTime).TotalSeconds) ); - LogWithConsole.WriteLine("左右两边接收到的数据时间差：" + diffTime + "s", "SerialPortManager"); + "SerialPortManager".WriteLog("左右两边接收到的数据时间差：" + diffTime + "s"); //左右两边接收到的数据时间差超过10s，认为不是同一次此指令返回的，舍弃 if (diffTime >= 10) return; @@ -242,7 +241,7 @@ } else { - LogWithConsole.WriteLine("数据未收集完整，无法计算", "SerialPortManager"); + "SerialPortManager".WriteLog("数据未收集完整，无法计算"); } } } diff --git a/Correlator/Util/WaveOut.cs b/Correlator/Util/WaveOut.cs index 6131836..df51931 100644 --- a/Correlator/Util/WaveOut.cs +++ b/Correlator/Util/WaveOut.cs @@ -43,7 +43,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "WaveOut"); + "WaveOut".WriteLog(e.Message); } } @@ -91,7 +91,7 @@ private void GetMemory(string title) { - LogWithConsole.WriteLine($"{title}: {_mPlaying}, {_mark}", "WaveOut"); + "WaveOut".WriteLog($"{title}: {_mPlaying}, {_mark}"); } public bool Play() diff --git a/Correlator/View/HomePageWindow.xaml.cs b/Correlator/View/HomePageWindow.xaml.cs index f25c302..25780a1 100644 --- a/Correlator/View/HomePageWindow.xaml.cs +++ b/Correlator/View/HomePageWindow.xaml.cs @@ -26,7 +26,7 @@ //渲染数据波形图 Messenger.Default.Register(this, MessengerToken.RenderOscillogram, array => { - LogWithConsole.WriteLine("开始渲染波形图", "HomePageWindow"); + "HomePageWindow".WriteLog("开始渲染波形图"); //柱状图横坐标集合 var xDoubles = GetArray((MWNumericArray)array[5]); //柱状图纵坐标集合 @@ -46,7 +46,7 @@ Messenger.Default.Register(this, MessengerToken.ClearOscillogram, s => { - LogWithConsole.WriteLine("清空波形图", "HomePageWindow"); + "HomePageWindow".WriteLog("清空波形图"); ScottplotView.Plot.Clear(); ScottplotView.Refresh(); }); @@ -151,7 +151,7 @@ SnapShotButton.Click += delegate { var filePath = Constant.GetPictureDir() + "\\快照_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".png"; - ImageHelper.SnapShot(filePath); + filePath.SnapShot(); }; OpenMenuButton.Click += delegate diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Util/SenderClass.cs b/Correlator/Util/SenderClass.cs index 699eada..ce91393 100644 --- a/Correlator/Util/SenderClass.cs +++ b/Correlator/Util/SenderClass.cs @@ -66,7 +66,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -139,7 +139,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -225,7 +225,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -309,7 +309,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音结束指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音结束指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); @@ -383,7 +383,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪测距指令" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪测距指令" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 5548941..8a9381b 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -36,8 +36,7 @@ if (receiveData != null) { - LogWithConsole.WriteLine("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""), - "SerialPortManager"); + "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", "")); var deviceId = new byte[6]; Array.Copy(receiveData, 4, deviceId, 0, 6); @@ -66,7 +65,7 @@ HandleListenData(tags); break; default: - LogWithConsole.WriteLine("receiveData.Length：" + receiveData.Length, "SerialPortManager"); + "SerialPortManager".WriteLog("receiveData.Length：" + receiveData.Length); break; } @@ -230,7 +229,7 @@ var diffTime = Convert.ToInt32( Math.Abs((_dataModel.LeftReceiveDataTime - _dataModel.RightReceiveDataTime).TotalSeconds) ); - LogWithConsole.WriteLine("左右两边接收到的数据时间差：" + diffTime + "s", "SerialPortManager"); + "SerialPortManager".WriteLog("左右两边接收到的数据时间差：" + diffTime + "s"); //左右两边接收到的数据时间差超过10s，认为不是同一次此指令返回的，舍弃 if (diffTime >= 10) return; @@ -242,7 +241,7 @@ } else { - LogWithConsole.WriteLine("数据未收集完整，无法计算", "SerialPortManager"); + "SerialPortManager".WriteLog("数据未收集完整，无法计算"); } } } diff --git a/Correlator/Util/WaveOut.cs b/Correlator/Util/WaveOut.cs index 6131836..df51931 100644 --- a/Correlator/Util/WaveOut.cs +++ b/Correlator/Util/WaveOut.cs @@ -43,7 +43,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "WaveOut"); + "WaveOut".WriteLog(e.Message); } } @@ -91,7 +91,7 @@ private void GetMemory(string title) { - LogWithConsole.WriteLine($"{title}: {_mPlaying}, {_mark}", "WaveOut"); + "WaveOut".WriteLog($"{title}: {_mPlaying}, {_mark}"); } public bool Play() diff --git a/Correlator/View/HomePageWindow.xaml.cs b/Correlator/View/HomePageWindow.xaml.cs index f25c302..25780a1 100644 --- a/Correlator/View/HomePageWindow.xaml.cs +++ b/Correlator/View/HomePageWindow.xaml.cs @@ -26,7 +26,7 @@ //渲染数据波形图 Messenger.Default.Register(this, MessengerToken.RenderOscillogram, array => { - LogWithConsole.WriteLine("开始渲染波形图", "HomePageWindow"); + "HomePageWindow".WriteLog("开始渲染波形图"); //柱状图横坐标集合 var xDoubles = GetArray((MWNumericArray)array[5]); //柱状图纵坐标集合 @@ -46,7 +46,7 @@ Messenger.Default.Register(this, MessengerToken.ClearOscillogram, s => { - LogWithConsole.WriteLine("清空波形图", "HomePageWindow"); + "HomePageWindow".WriteLog("清空波形图"); ScottplotView.Plot.Clear(); ScottplotView.Refresh(); }); @@ -151,7 +151,7 @@ SnapShotButton.Click += delegate { var filePath = Constant.GetPictureDir() + "\\快照_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".png"; - ImageHelper.SnapShot(filePath); + filePath.SnapShot(); }; OpenMenuButton.Click += delegate diff --git a/Correlator/ViewModel/EditFilterViewModel.cs b/Correlator/ViewModel/EditFilterViewModel.cs index c78e813..ba98333 100644 --- a/Correlator/ViewModel/EditFilterViewModel.cs +++ b/Correlator/ViewModel/EditFilterViewModel.cs @@ -122,8 +122,8 @@ var soundVelocity = _dataService.GetSoundVelocity( _materialModel.ChineseMaterial, Convert.ToInt32(_materialModel.Diameter) ); - LogWithConsole.WriteLine("正在修改的管材是：" + _materialModel.Diameter + "m的" + _materialModel.ChineseMaterial + - "声速是 => " + soundVelocity, "EditFilterViewModel"); + "EditFilterViewModel".WriteLog("正在修改的管材是：" + _materialModel.Diameter + "m的" + + _materialModel.ChineseMaterial + "声速是 => " + soundVelocity); _materialModel.SoundSpeed = soundVelocity; _materialModel.LowFrequency = low; diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj index 0d9a844..94e86c2 100644 --- a/Correlator/Correlator.csproj +++ b/Correlator/Correlator.csproj @@ -242,7 +242,6 @@ - diff --git a/Correlator/ServiceImpl/MaterialNameDataService.cs b/Correlator/ServiceImpl/MaterialNameDataService.cs index ad923c6..d4d91a4 100644 --- a/Correlator/ServiceImpl/MaterialNameDataService.cs +++ b/Correlator/ServiceImpl/MaterialNameDataService.cs @@ -13,8 +13,7 @@ using (var manager = new DataBaseManager()) { var material = manager.Table().First(x => x.Id == materialId); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(material), - "MaterialNameDataService"); + "MaterialNameDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(material)); //判断是否是英文 var regEnglish = new Regex("^[a-zA-Z]"); diff --git a/Correlator/ServiceImpl/PipeMaterialDataService.cs b/Correlator/ServiceImpl/PipeMaterialDataService.cs index 3a8fc73..516b352 100644 --- a/Correlator/ServiceImpl/PipeMaterialDataService.cs +++ b/Correlator/ServiceImpl/PipeMaterialDataService.cs @@ -14,8 +14,7 @@ { materialData.SoundSpeed = 0; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialData), - "PipeMaterialDataService"); + "PipeMaterialDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialData)); manager.Update(materialData); } diff --git a/Correlator/ServiceImpl/SoundSpeedDataService.cs b/Correlator/ServiceImpl/SoundSpeedDataService.cs index 959dabe..aee7b42 100644 --- a/Correlator/ServiceImpl/SoundSpeedDataService.cs +++ b/Correlator/ServiceImpl/SoundSpeedDataService.cs @@ -48,8 +48,7 @@ .FirstOrDefault(x => x.ChineseMaterial == materialName); materialModel.SoundSpeed = velocity.Velocity; - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(materialModel)); manager.Update(materialModel); } @@ -140,8 +139,7 @@ velocity.HighDiameter = Convert.ToInt32(maxDiameter); velocity.Velocity = Convert.ToInt32(soundSpeed); - LogWithConsole.WriteLine("正在修改的管材是：" + JsonConvert.SerializeObject(velocity), - "SoundSpeedDataService"); + "SoundSpeedDataService".WriteLog("正在修改的管材是：" + JsonConvert.SerializeObject(velocity)); manager.Update(velocity); } diff --git a/Correlator/Util/ImageHelper.cs b/Correlator/Util/ImageHelper.cs deleted file mode 100644 index f8d217b..0000000 --- a/Correlator/Util/ImageHelper.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Drawing; -using System.Drawing.Imaging; -using System.IO; -using System.Windows.Forms; -using HandyControl.Controls; - -namespace Correlator.Util -{ - public class ImageHelper - { - /// - /// 截屏 - /// - /// 图片保存路径 - public static void SnapShot(string filePath) - { - var width = Screen.PrimaryScreen.Bounds.Width; - var height = Screen.PrimaryScreen.Bounds.Height; - var memoryImage = new Bitmap(width, height); - var memoryGraphics = Graphics.FromImage(memoryImage); - memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); - var data = new MemoryStream(); - memoryImage.Save(data, ImageFormat.Png); - - var fs = new FileStream(filePath, FileMode.OpenOrCreate); - var w = new BinaryWriter(fs); - w.Write(data.ToArray()); - fs.Close(); - data.Close(); - - Growl.Success("快照已保存"); - } - } -} \ No newline at end of file diff --git a/Correlator/Util/LogWithConsole.cs b/Correlator/Util/LogWithConsole.cs index 479f2fc..a61a659 100644 --- a/Correlator/Util/LogWithConsole.cs +++ b/Correlator/Util/LogWithConsole.cs @@ -5,14 +5,12 @@ { public static class LogWithConsole { - - /// /// Log本地化，并输出在Console，便于Debug /// - /// log内容 - /// 当前类名 - public static void WriteLine(string log, string className) + /// + /// + public static void WriteLog(this string className, string log) { LogHelper.Info(log); Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + $" {className} => " + log); diff --git a/Correlator/Util/MessengerToken.cs b/Correlator/Util/MessengerToken.cs index b29fa01..b2c98ac 100644 --- a/Correlator/Util/MessengerToken.cs +++ b/Correlator/Util/MessengerToken.cs @@ -50,6 +50,7 @@ //渲染相关系数关系图 public const string RenderOscillogram = "202301130101"; public const string ClearOscillogram = "202301150101"; + #endregion } } \ No newline at end of file diff --git a/Correlator/Util/MethodExtensions.cs b/Correlator/Util/MethodExtensions.cs index 3b7b48c..15307ca 100644 --- a/Correlator/Util/MethodExtensions.cs +++ b/Correlator/Util/MethodExtensions.cs @@ -1,5 +1,10 @@ using System.Collections.Generic; +using System.Drawing; +using System.Drawing.Imaging; +using System.IO; using System.Linq; +using System.Windows.Forms; +using HandyControl.Controls; namespace Correlator.Util { @@ -31,17 +36,17 @@ return fileSize; } - + public static int ConvertBytes2Int(this IEnumerable bytes) { return bytes.Aggregate(0, (current, b) => 16 * 16 * current + b); } - + public static string ConvertBytes2String(this IEnumerable bytes) { return bytes.Aggregate("", (current, t) => current + t.ToString("X2")); } - + /// /// 数据补零，保持长度一致 /// @@ -52,7 +57,7 @@ //数据固定长度16 return ((decimal)d).ToString("G").PadRight(16, '0'); } - + public static string To16HexString(this string src) { if (src.Length == 4) @@ -68,5 +73,24 @@ return temp + src; } + + public static void SnapShot(this string filePath) + { + var width = Screen.PrimaryScreen.Bounds.Width; + var height = Screen.PrimaryScreen.Bounds.Height; + var memoryImage = new Bitmap(width, height); + var memoryGraphics = Graphics.FromImage(memoryImage); + memoryGraphics.CopyFromScreen(0, 0, 0, 0, new Size(width, height), CopyPixelOperation.SourceCopy); + var data = new MemoryStream(); + memoryImage.Save(data, ImageFormat.Png); + + var fs = new FileStream(filePath, FileMode.OpenOrCreate); + var w = new BinaryWriter(fs); + w.Write(data.ToArray()); + fs.Close(); + data.Close(); + + Growl.Success("快照已保存"); + } } } \ No newline at end of file diff --git a/Correlator/Util/PlayWav.cs b/Correlator/Util/PlayWav.cs index 32784f1..54de70a 100644 --- a/Correlator/Util/PlayWav.cs +++ b/Correlator/Util/PlayWav.cs @@ -47,7 +47,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "PlayWav"); + "PlayWav".WriteLog(e.Message); } } diff --git a/Correlator/Util/SenderClass.cs b/Correlator/Util/SenderClass.cs index 699eada..ce91393 100644 --- a/Correlator/Util/SenderClass.cs +++ b/Correlator/Util/SenderClass.cs @@ -66,7 +66,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪唤醒指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -139,7 +139,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("设备" + devId + " 下发状态采集指令 => " + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -225,7 +225,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } @@ -309,7 +309,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发听音结束指令：" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发听音结束指令：" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); @@ -383,7 +383,7 @@ result.CopyTo(afCrc, 0); crcByte.CopyTo(afCrc, result.Length); - LogWithConsole.WriteLine("下发相关仪测距指令" + BitConverter.ToString(afCrc), "SenderClass"); + "SenderClass".WriteLog("下发相关仪测距指令" + BitConverter.ToString(afCrc)); sp.Write(afCrc, 0, afCrc.Length); } diff --git a/Correlator/Util/SerialPortManager.cs b/Correlator/Util/SerialPortManager.cs index 5548941..8a9381b 100644 --- a/Correlator/Util/SerialPortManager.cs +++ b/Correlator/Util/SerialPortManager.cs @@ -36,8 +36,7 @@ if (receiveData != null) { - LogWithConsole.WriteLine("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", ""), - "SerialPortManager"); + "SerialPortManager".WriteLog("接收到的数据：" + BitConverter.ToString(receiveData).Replace("-", "")); var deviceId = new byte[6]; Array.Copy(receiveData, 4, deviceId, 0, 6); @@ -66,7 +65,7 @@ HandleListenData(tags); break; default: - LogWithConsole.WriteLine("receiveData.Length：" + receiveData.Length, "SerialPortManager"); + "SerialPortManager".WriteLog("receiveData.Length：" + receiveData.Length); break; } @@ -230,7 +229,7 @@ var diffTime = Convert.ToInt32( Math.Abs((_dataModel.LeftReceiveDataTime - _dataModel.RightReceiveDataTime).TotalSeconds) ); - LogWithConsole.WriteLine("左右两边接收到的数据时间差：" + diffTime + "s", "SerialPortManager"); + "SerialPortManager".WriteLog("左右两边接收到的数据时间差：" + diffTime + "s"); //左右两边接收到的数据时间差超过10s，认为不是同一次此指令返回的，舍弃 if (diffTime >= 10) return; @@ -242,7 +241,7 @@ } else { - LogWithConsole.WriteLine("数据未收集完整，无法计算", "SerialPortManager"); + "SerialPortManager".WriteLog("数据未收集完整，无法计算"); } } } diff --git a/Correlator/Util/WaveOut.cs b/Correlator/Util/WaveOut.cs index 6131836..df51931 100644 --- a/Correlator/Util/WaveOut.cs +++ b/Correlator/Util/WaveOut.cs @@ -43,7 +43,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "WaveOut"); + "WaveOut".WriteLog(e.Message); } } @@ -91,7 +91,7 @@ private void GetMemory(string title) { - LogWithConsole.WriteLine($"{title}: {_mPlaying}, {_mark}", "WaveOut"); + "WaveOut".WriteLog($"{title}: {_mPlaying}, {_mark}"); } public bool Play() diff --git a/Correlator/View/HomePageWindow.xaml.cs b/Correlator/View/HomePageWindow.xaml.cs index f25c302..25780a1 100644 --- a/Correlator/View/HomePageWindow.xaml.cs +++ b/Correlator/View/HomePageWindow.xaml.cs @@ -26,7 +26,7 @@ //渲染数据波形图 Messenger.Default.Register(this, MessengerToken.RenderOscillogram, array => { - LogWithConsole.WriteLine("开始渲染波形图", "HomePageWindow"); + "HomePageWindow".WriteLog("开始渲染波形图"); //柱状图横坐标集合 var xDoubles = GetArray((MWNumericArray)array[5]); //柱状图纵坐标集合 @@ -46,7 +46,7 @@ Messenger.Default.Register(this, MessengerToken.ClearOscillogram, s => { - LogWithConsole.WriteLine("清空波形图", "HomePageWindow"); + "HomePageWindow".WriteLog("清空波形图"); ScottplotView.Plot.Clear(); ScottplotView.Refresh(); }); @@ -151,7 +151,7 @@ SnapShotButton.Click += delegate { var filePath = Constant.GetPictureDir() + "\\快照_" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".png"; - ImageHelper.SnapShot(filePath); + filePath.SnapShot(); }; OpenMenuButton.Click += delegate diff --git a/Correlator/ViewModel/EditFilterViewModel.cs b/Correlator/ViewModel/EditFilterViewModel.cs index c78e813..ba98333 100644 --- a/Correlator/ViewModel/EditFilterViewModel.cs +++ b/Correlator/ViewModel/EditFilterViewModel.cs @@ -122,8 +122,8 @@ var soundVelocity = _dataService.GetSoundVelocity( _materialModel.ChineseMaterial, Convert.ToInt32(_materialModel.Diameter) ); - LogWithConsole.WriteLine("正在修改的管材是：" + _materialModel.Diameter + "m的" + _materialModel.ChineseMaterial + - "声速是 => " + soundVelocity, "EditFilterViewModel"); + "EditFilterViewModel".WriteLog("正在修改的管材是：" + _materialModel.Diameter + "m的" + + _materialModel.ChineseMaterial + "声速是 => " + soundVelocity); _materialModel.SoundSpeed = soundVelocity; _materialModel.LowFrequency = low; diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs index 54067da..3f36675 100644 --- a/Correlator/ViewModel/HomePageViewModel.cs +++ b/Correlator/ViewModel/HomePageViewModel.cs @@ -573,8 +573,8 @@ _snapShotTimer.Stop(); if (!string.IsNullOrEmpty(_snapShotPath)) { - ImageHelper.SnapShot(_snapShotPath); - LogWithConsole.WriteLine("截屏路径：" + _snapShotPath, "HomePageViewModel"); + _snapShotPath.SnapShot(); + "HomePageViewModel".WriteLog("截屏路径：" + _snapShotPath); } }; } @@ -628,7 +628,7 @@ { Messenger.Default.Register(this, MessengerToken.SensorADevStatus, dev => { - LogWithConsole.WriteLine("SensorA收到消息：" + JsonConvert.SerializeObject(dev), "HomePageViewModel"); + "HomePageViewModel".WriteLog("SensorA收到消息：" + JsonConvert.SerializeObject(dev)); TransmitterABattery = Convert.ToDouble(dev.Cell); var signalIntensity = SerialPortManager.Instance.SetSignalIntensity(Convert.ToInt32(dev.Signal)); @@ -642,7 +642,7 @@ Messenger.Default.Register(this, MessengerToken.SensorBDevStatus, dev => { - LogWithConsole.WriteLine("SensorB收到消息：" + JsonConvert.SerializeObject(dev), "HomePageViewModel"); + "HomePageViewModel".WriteLog("SensorB收到消息：" + JsonConvert.SerializeObject(dev)); TransmitterBBattery = Convert.ToDouble(dev.Cell); var signalIntensity = SerialPortManager.Instance.SetSignalIntensity(Convert.ToInt32(dev.Signal)); @@ -660,7 +660,7 @@ Messenger.Default.Register(this, MessengerToken.StartCalculate, it => { if (!it.IsReady) return; - LogWithConsole.WriteLine("需要测算的管材是：" + JsonConvert.SerializeObject(it), "HomePageViewModel"); + "HomePageViewModel".WriteLog("需要测算的管材是：" + JsonConvert.SerializeObject(it)); FlowStatus.SelectedMaterialModel = it; //{"Id":0,"EnglishMaterial":null,"ChineseMaterial":"球铁","Diameter":20.0,"Length":150.0,"SoundSpeed":1320,"LowFrequency":100,"HighFrequency":1000,"IsReady":true} @@ -716,7 +716,7 @@ var fileName = _locateDataDir + "\\测试数据." + _locateTimes + "." + DateTime.Now.ToString("HHmmss") + ".txt"; StringUtil.SaveLocateData(it, fileName); - LogWithConsole.WriteLine("定位数据路径：" + fileName, "HomePageViewModel"); + "HomePageViewModel".WriteLog("定位数据路径：" + fileName); //同步保存截图，需要等待Task出结果并且渲染完成，才能保存截图 _snapShotPath = _locateDataDir + "\\快照." + _locateTimes + "." + @@ -733,7 +733,7 @@ } catch (Exception e) { - LogWithConsole.WriteLine(e.Message, "HomePageViewModel"); + "HomePageViewModel".WriteLog(e.Message); } } }); @@ -743,8 +743,8 @@ FlowStatus.SelectedMaterialModel.LowFrequency = frequency[0]; FlowStatus.SelectedMaterialModel.HighFrequency = frequency[1]; - LogWithConsole.WriteLine("需要重新测算的管材是：" + JsonConvert.SerializeObject(FlowStatus.SelectedMaterialModel), - "HomePageViewModel"); + "HomePageViewModel".WriteLog("需要重新测算的管材是：" + + JsonConvert.SerializeObject(FlowStatus.SelectedMaterialModel)); var task = new Task(() => CalculateData(FlowStatus.CorrelatorData)); task.Start(); @@ -857,7 +857,7 @@ /// 计算结果 private bool CalculateData(CorrelatorDataModel dataModel) { - LogWithConsole.WriteLine("开始计算", "HomePageViewModel"); + "HomePageViewModel".WriteLog("开始计算"); var array = _correlator.locating(11, (MWNumericArray)dataModel.LeftDeviceDataArray, (MWNumericArray)dataModel.RightDeviceDataArray, Constant.SamplingRate,