Txgy.CSharp
/
Txgy.EWS.Client
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复非NuGet编译警告

Browse Source
master
tayttt 4 days ago
parent 651b3b0be7
commit 52a8e61db1
16 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File

1
Txgy.Controls/myListBox.cs
Unescape Escape View File

@ -12,7 +12,6 @@ namespace Txgy.Controls
public class myListBox : System.Windows.Controls.ListBox public class myListBox : System.Windows.Controls.ListBox
{ {
private ListBoxItem _lastSelectedItem;
protected override DependencyObject GetContainerForItemOverride() protected override DependencyObject GetContainerForItemOverride()
{ {
return new myListBoxItem(); return new myListBoxItem();

2
Txgy.EWS.Client.Common/Helpers/ReportPlanImage.cs
Unescape Escape View File

@ -44,8 +44,6 @@ namespace Txgy.EWS.Client.Common.Helpers
double yDrawUnit = 1; double yDrawUnit = 1;
double drawUnit = 1; double drawUnit = 1;
Point _downPoint = new Point(0, 0); Point _downPoint = new Point(0, 0);
bool _isMoving = false;
double left = 0, top = 0;
public bool IsShowGridText = true; public bool IsShowGridText = true;
public bool IsShowGrid = true; public bool IsShowGrid = true;
public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White; public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White;

4
Txgy.EWS.Client.Common/Helpers/ReportStereogramImage.cs
Unescape Escape View File

@ -20,7 +20,6 @@ namespace Txgy.EWS.Client.Common.Helpers
public class ReportStereogramImage : IDisposable public class ReportStereogramImage : IDisposable
{ {
string stereoImagePath; string stereoImagePath;
List<PointLineSeries3D> eventList;
public LightningChart lightChart = new LightningChart(); public LightningChart lightChart = new LightningChart();
View3D view3D = new View3D(); View3D view3D = new View3D();
@ -30,8 +29,6 @@ namespace Txgy.EWS.Client.Common.Helpers
double _sideRotationRS = 0; double _sideRotationRS = 0;
double _horizontalRotationRS = -30; double _horizontalRotationRS = -30;
double _verticalRotationRS = 30; double _verticalRotationRS = 30;
double _distanceRS = 150;
bool _clipDispaly = false;
WallXZ _topWall; WallXZ _topWall;
WallYZ _leftWall; WallYZ _leftWall;
WallYZ _rightWall; WallYZ _rightWall;
@ -41,7 +38,6 @@ namespace Txgy.EWS.Client.Common.Helpers
AxisX3D _axisXPri3D; AxisX3D _axisXPri3D;
AxisY3D _axisYPri3D; AxisY3D _axisYPri3D;
AxisZ3D _axisZPri3D; AxisZ3D _axisZPri3D;
ProjectionType _projectionTypeRS = ProjectionType.Perspective;
public double _scale = 1; public double _scale = 1;
SizeDoubleXYZ eventSize; SizeDoubleXYZ eventSize;

2
Txgy.EWS.Client.Common/Helpers/XMLHelper.cs
Unescape Escape View File

@ -25,7 +25,7 @@ namespace Txgy.EWS.Client.Common.Helpers
//CommonLogHelper.Debug("XML文件读取成功。"); //CommonLogHelper.Debug("XML文件读取成功。");
} }
catch (Exception ex) catch (Exception)
{ {
//CommonLogHelper.log.Error(string.Format("XML文件读取失败。{0}", ex)); //CommonLogHelper.log.Error(string.Format("XML文件读取失败。{0}", ex));
} }

8
Txgy.EWS.Client.DAL/RemoteMySQLDataAccess.cs
Unescape Escape View File

@ -129,7 +129,7 @@ namespace Txgy.EWS.Client.DAL
// //result.Data = Newtonsoft.Json.JsonConvert.SerializeObject(v.ToList()); // //result.Data = Newtonsoft.Json.JsonConvert.SerializeObject(v.ToList());
//} //}
} }
catch (Exception ex) catch (Exception)
{ {
return null; return null;
} }
@ -229,7 +229,7 @@ namespace Txgy.EWS.Client.DAL
return list; return list;
} }
} }
catch (Exception ex) catch (Exception)
{ {
//messagebox.show //messagebox.show
} }
@ -307,7 +307,7 @@ namespace Txgy.EWS.Client.DAL
return resultlist; return resultlist;
} }
} }
catch (Exception ex) catch (Exception)
{ {
//throw ex; //throw ex;
} }
@ -496,7 +496,7 @@ namespace Txgy.EWS.Client.DAL
} }
} }
} }
catch (Exception ex) catch (Exception)
{ {
//messagebox.show //messagebox.show
} }

2
Txgy.EWS.Client.PageModule/ViewModels/EarlyWarningViewModel.cs
Unescape Escape View File

@ -934,7 +934,7 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
} }
} }
} }
catch (Exception ex) catch (Exception)
{ {
return 0; return 0;
//throw ex; //throw ex;

1
Txgy.EWS.Client.PageModule/ViewModels/PlanViewModel.cs
Unescape Escape View File

@ -193,7 +193,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
} }
} }
private Fill _chartBackGround = new Fill(); private Fill _chartBackGround = new Fill();
private IEventAggregator _ea;
public Fill ChartBackGround public Fill ChartBackGround
{ {

3
Txgy.EWS.Client.PageModule/ViewModels/ReportViewModel.cs
Unescape Escape View File

@ -92,8 +92,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
double _sideRotationRS = 0; double _sideRotationRS = 0;
double _horizontalRotationRS = -30; double _horizontalRotationRS = -30;
double _verticalRotationRS = 30; double _verticalRotationRS = 30;
double _distanceRS = 150;
bool _clipDispaly = false;
WallXZ _topWall; WallXZ _topWall;
WallYZ _leftWall; WallYZ _leftWall;
WallYZ _rightWall; WallYZ _rightWall;
@ -103,7 +101,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
AxisX3D _axisXPri3D; AxisX3D _axisXPri3D;
AxisY3D _axisYPri3D; AxisY3D _axisYPri3D;
AxisZ3D _axisZPri3D; AxisZ3D _axisZPri3D;
ProjectionType _projectionTypeRS = ProjectionType.Perspective;
public double _scale = 1; public double _scale = 1;
SizeDoubleXYZ eventSize; SizeDoubleXYZ eventSize;
#endregion #endregion

29
Txgy.EWS.Client.PageModule/ViewModels/WaveformViewModel.cs
Unescape Escape View File

@ -43,7 +43,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
/// 当前采样数 /// 当前采样数
/// </summary> /// </summary>
public int CurPoints; public int CurPoints;
private DispatcherTimer _fitYTimer;
private readonly IEventAggregator _ea; private readonly IEventAggregator _ea;
private readonly ISearchMsEventBLL _searchMsEventBLL; private readonly ISearchMsEventBLL _searchMsEventBLL;
private int _selectResult = 0; private int _selectResult = 0;
@ -58,17 +57,12 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
} }
int _channelCount = 60; // Channel count. int _channelCount = 60; // Channel count.
double _samplingFrequency = 500; // Sampling frequency (Hz). double _samplingFrequency = 500; // Sampling frequency (Hz).
double _xLength = 10; // X axis length.
double _previousX = 0; // Latest X value on axis. double _previousX = 0; // Latest X value on axis.
long _now; // Latest time stamp. long _now; // Latest time stamp.
long _startTicks; // Controls timing. long _startTicks = DateTime.Now.Ticks; // Controls timing.
long _samplesOutput; // Generated samples quantity. long _samplesOutput; // Generated samples quantity.
// Constants private volatile bool _stop = false; // Stops thread work.
const double YMin = 30000; // Minimal y-value.
const double YMax = 33000; // Maximal y-value.
private volatile bool _stop; // Stops thread work.
internal bool IsRunning internal bool IsRunning
{ {
get get
@ -82,15 +76,12 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
/// Thread. /// Thread.
/// </summary> /// </summary>
private Thread _thread; private Thread _thread;
private Thread _threadWrite;
private delegate void ChartUpdateFromThreadHandler(double[][] samples); private delegate void ChartUpdateFromThreadHandler(double[][] samples);
private ChartUpdateFromThreadHandler _chartUpdate; private ChartUpdateFromThreadHandler _chartUpdate;
private Random _rand = new Random((int)DateTime.Now.Ticks);
#region "属性" #region "属性"
private int _lChartCount = 1; private int _lChartCount = 1;
/// <summary> /// <summary>
@ -192,7 +183,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
/// 文件数据位置 /// 文件数据位置
/// </summary> /// </summary>
public string FileDataPath { get; set; } = @"D:\TaySystemPath\Downloads"; public string FileDataPath { get; set; } = @"D:\TaySystemPath\Downloads";
private string _cachePath;
private int _cacheSize; private int _cacheSize;
/// <summary> /// <summary>
@ -265,7 +255,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
set { gridChart = value; } set { gridChart = value; }
} }
private string _btnContrlContent = "开始"; private string _btnContrlContent = "开始";
private int channelCount;
public string BtnContrlContent public string BtnContrlContent
{ {
@ -281,7 +270,7 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
SetProperty(ref _showEvents, value); SetProperty(ref _showEvents, value);
} }
} }
StationWorkModel _stationWorker; StationWorkModel _stationWorker = new StationWorkModel();
public List<StationModel> smList; public List<StationModel> smList;
//public static readonly DependencyProperty XAxesProperty = //public static readonly DependencyProperty XAxesProperty =
@ -455,8 +444,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
} }
private void UpdateChartData() private void UpdateChartData()
{ {
double yRange = YMax - YMin;
double[][] multiChannelData = new double[smList.Count * 3][]; double[][] multiChannelData = new double[smList.Count * 3][];
try try
{ {
@ -480,10 +467,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
public void UpdateWavesFromTxt(string fn) public void UpdateWavesFromTxt(string fn)
{ {
string allStr; string allStr;
string sn = "";//0
int points = 0;//1
int samp = 500;//2
string startTime = "";//3;4,5,6=null
smList = new List<StationModel>(); smList = new List<StationModel>();
using (StreamReader streamReader = new StreamReader(fn)) using (StreamReader streamReader = new StreamReader(fn))
@ -493,9 +476,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
if (allStr.Length > 0) if (allStr.Length > 0)
{ {
string[] strLines = allStr.Trim().Split(new char[] { '\n' }); string[] strLines = allStr.Trim().Split(new char[] { '\n' });
List<string> strList = strLines.ToList();
int cnt = strList.Count;
int num = 0;
string[] snStr = strLines[0].Trim().Split(','); string[] snStr = strLines[0].Trim().Split(',');
string tmpName = snStr[0].Substring(14, 3); string tmpName = snStr[0].Substring(14, 3);
CurPoints = int.Parse(snStr[1].Trim().Split(' ')[0]); CurPoints = int.Parse(snStr[1].Trim().Split(' ')[0]);
@ -913,8 +893,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
} }
private void ThreadLoop() private void ThreadLoop()
{ {
int sm = 0;
while (_stop == false) while (_stop == false)
{ {
@ -941,7 +919,6 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
if (sampleBundleToGenerate > 0) if (sampleBundleToGenerate > 0)
{ {
//YMax = tmps.Max(); //YMax = tmps.Max();
double yRange = YMax - YMin;
double[][] multiChannelData = new double[_channelCount][]; double[][] multiChannelData = new double[_channelCount][];

6
Txgy.EWS.Client.PageModule/Views/EarlyWarningView.xaml.cs
Unescape Escape View File

@ -36,7 +36,7 @@ namespace Txgy.EWS.Client.PageModule.Views
{ {
Dispatcher _dispatcher; Dispatcher _dispatcher;
private readonly IEventAggregator _ea; private readonly IEventAggregator _ea;
private VisualHost host; private readonly VisualHost host = new VisualHost();
public TransformGroup transGroup; public TransformGroup transGroup;
private delegate void HandleDataGeneratedDelegate(List<GridItemEventResult> results, double dw, double dh, int ts, DateTime inTime); private delegate void HandleDataGeneratedDelegate(List<GridItemEventResult> results, double dw, double dh, int ts, DateTime inTime);
/// <summary> /// <summary>
@ -67,7 +67,6 @@ namespace Txgy.EWS.Client.PageModule.Views
double drawUnit = 1; double drawUnit = 1;
Point _downPoint = new Point(0, 0); Point _downPoint = new Point(0, 0);
bool _isMoving = false; bool _isMoving = false;
double left = 0, top = 0;
public bool IsShowGridText = true; public bool IsShowGridText = true;
public bool IsShowGrid = true; public bool IsShowGrid = true;
public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White; public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White;
@ -109,6 +108,7 @@ namespace Txgy.EWS.Client.PageModule.Views
rpi.Draw(null, canvas.Width, canvas.Height); rpi.Draw(null, canvas.Width, canvas.Height);
//host = new VisualHost(); //host = new VisualHost();
canvas.Children.Add(rpi.host); canvas.Children.Add(rpi.host);
canvas.Children.Add(host);
baseX = GlobalConfig.ProjectConfig.WorkArea.EMin; baseX = GlobalConfig.ProjectConfig.WorkArea.EMin;
baseY = GlobalConfig.ProjectConfig.WorkArea.NMin; baseY = GlobalConfig.ProjectConfig.WorkArea.NMin;
@ -1034,8 +1034,6 @@ namespace Txgy.EWS.Client.PageModule.Views
transform.Y += position.Y - this.previousMousePoint.Y; transform.Y += position.Y - this.previousMousePoint.Y;
this.previousMousePoint = position; this.previousMousePoint = position;
} }
private ListBoxItem _lastSelectedItem;
private void myListBox_SelectionChanged(object sender, SelectionChangedEventArgs e) private void myListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
//if (ReceivedEventListBox.SelectedItem == null && _lastSelectedItem != null) //if (ReceivedEventListBox.SelectedItem == null && _lastSelectedItem != null)

4
Txgy.EWS.Client.PageModule/Views/EarlyWarningViewBak.xaml.cs
Unescape Escape View File

@ -35,7 +35,7 @@ namespace Txgy.EWS.Client.PageModule.Views
{ {
Dispatcher _dispatcher; Dispatcher _dispatcher;
private readonly IEventAggregator _ea; private readonly IEventAggregator _ea;
private VisualHost host; private readonly VisualHost host = new VisualHost();
public TransformGroup transGroup; public TransformGroup transGroup;
private delegate void HandleDataGeneratedDelegate(List<GridItemEventResult> results, double dw, double dh,int ts,DateTime inTime); private delegate void HandleDataGeneratedDelegate(List<GridItemEventResult> results, double dw, double dh,int ts,DateTime inTime);
/// <summary> /// <summary>
@ -65,7 +65,6 @@ namespace Txgy.EWS.Client.PageModule.Views
double drawUnit = 1; double drawUnit = 1;
Point _downPoint = new Point(0, 0); Point _downPoint = new Point(0, 0);
bool _isMoving = false; bool _isMoving = false;
double left = 0, top = 0;
public bool IsShowGridText = true; public bool IsShowGridText = true;
public bool IsShowGrid = true; public bool IsShowGrid = true;
public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White; public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White;
@ -105,6 +104,7 @@ namespace Txgy.EWS.Client.PageModule.Views
rpi.Draw(null, canvas.Width, canvas.Height); rpi.Draw(null, canvas.Width, canvas.Height);
//host = new VisualHost(); //host = new VisualHost();
canvas.Children.Add(rpi.host); canvas.Children.Add(rpi.host);
canvas.Children.Add(host);
baseX = GlobalConfig.ProjectConfig.WorkArea.EMin; baseX = GlobalConfig.ProjectConfig.WorkArea.EMin;
baseY = GlobalConfig.ProjectConfig.WorkArea.NMin; baseY = GlobalConfig.ProjectConfig.WorkArea.NMin;

1
Txgy.EWS.Client.PageModule/Views/FocalMechanismView.xaml.cs
Unescape Escape View File

@ -68,7 +68,6 @@ namespace Txgy.EWS.Client.PageModule.Views
double drawUnit = 1; double drawUnit = 1;
Point _downPoint = new Point(0, 0); Point _downPoint = new Point(0, 0);
bool _isMoving = false; bool _isMoving = false;
double left = 0, top = 0;
public bool IsShowGridText = true; public bool IsShowGridText = true;
public bool IsShowGrid = true; public bool IsShowGrid = true;
public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White; public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White;

7
Txgy.EWS.Client.PageModule/Views/PlanView.xaml.cs
Unescape Escape View File

@ -56,7 +56,6 @@ namespace Txgy.EWS.Client.PageModule.Views
{ {
Dispatcher _dispatcher; Dispatcher _dispatcher;
private readonly IEventAggregator _ea; private readonly IEventAggregator _ea;
private readonly ISearchMsEventBLL searchMsEventBLL;
IFreeSql fsqlSqLite = FreeSqlLocalSqLite.freeLocalSqLite; IFreeSql fsqlSqLite = FreeSqlLocalSqLite.freeLocalSqLite;
//private readonly IRemoteDownloadDataBLL remoteDownloadDataBLL; //private readonly IRemoteDownloadDataBLL remoteDownloadDataBLL;
@ -65,7 +64,7 @@ namespace Txgy.EWS.Client.PageModule.Views
/// Delegate for data generation. /// Delegate for data generation.
/// </summary> /// </summary>
private HandleDataGeneratedDelegate _handleDataGenerated; private HandleDataGeneratedDelegate _handleDataGenerated;
private VisualHost host; private readonly VisualHost host = new VisualHost();
public TransformGroup transGroup; public TransformGroup transGroup;
double width = 700; double width = 700;
double height = 700; double height = 700;
@ -83,12 +82,9 @@ namespace Txgy.EWS.Client.PageModule.Views
public double stationFontSize = 10; public double stationFontSize = 10;
double baseX = 39701000; double baseX = 39701000;
double baseY = 4352000; double baseY = 4352000;
double xDrawUnit = 1;
double yDrawUnit = 1;
double drawUnit = 1; double drawUnit = 1;
Point _downPoint = new Point(0, 0); Point _downPoint = new Point(0, 0);
bool _isMoving = false; bool _isMoving = false;
double left = 0, top = 0;
public bool IsShowGridText = true; public bool IsShowGridText = true;
public bool IsShowGrid = true; public bool IsShowGrid = true;
public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White; public System.Windows.Media.Color BackGroundColor = System.Windows.Media.Colors.White;
@ -130,6 +126,7 @@ namespace Txgy.EWS.Client.PageModule.Views
//rpi.DrawPlanClipToDrawVisual(mes, (int)rView.canvasPlan.ActualWidth, (int)rView.canvasPlan.ActualHeight); //rpi.DrawPlanClipToDrawVisual(mes, (int)rView.canvasPlan.ActualWidth, (int)rView.canvasPlan.ActualHeight);
rpi.DrawGier(null, width, height); rpi.DrawGier(null, width, height);
canvas.Children.Add(rpi.host); canvas.Children.Add(rpi.host);
canvas.Children.Add(host);
_handleDataGenerated = new HandleDataGeneratedDelegate(rpi.DrawGier); _handleDataGenerated = new HandleDataGeneratedDelegate(rpi.DrawGier);

3
Txgy.EWS.Client.PageModule/Views/ReportDayListView.xaml.cs
Unescape Escape View File

@ -37,9 +37,6 @@ namespace Txgy.EWS.Client.PageModule.Views
IFreeSql fsqlTencent = FreeSqlTencent.tencentRemoteMySQL; IFreeSql fsqlTencent = FreeSqlTencent.tencentRemoteMySQL;
ReportFreqImage reportImage = new ReportFreqImage(); ReportFreqImage reportImage = new ReportFreqImage();
CultureInfo culture = new CultureInfo("zh-CN"); CultureInfo culture = new CultureInfo("zh-CN");
byte[] dayFreqBytes = null;
byte[] dayMiddleEventPlanBytes = null;
byte[] dayMiddleEventStereoBytes = null;
public string dayFreqImagePath; public string dayFreqImagePath;
public int dayFreqImageWidth = 1485; public int dayFreqImageWidth = 1485;
public int dayFreqImageHeight = 585; public int dayFreqImageHeight = 585;

2
Txgy.EWS.Client.SysModule/ViewModels/AddFileDialogViewModel.cs
Unescape Escape View File

@ -19,7 +19,9 @@ namespace Txgy.EWS.Client.SysModule.ViewModels
{ {
public string Title => "系统更新文件上传"; public string Title => "系统更新文件上传";
#pragma warning disable CS0067
public event Action<IDialogResult> RequestClose; public event Action<IDialogResult> RequestClose;
#pragma warning restore CS0067
public bool CanCloseDialog() => true; public bool CanCloseDialog() => true;

2
Txgy.EWS.Client.Upgrade/DAL/LocalDataAccess.cs
Unescape Escape View File

@ -50,7 +50,7 @@ namespace Txgy.EWS.Client.Upgrade.DAL
return true; return true;
} }
catch (Exception ex) catch (Exception)
{ {
return false; return false;
} }

Write Preview
Loading…
Cancel
Save