diff --git a/README.md b/README.md index b1ebbb3..37e5cb3 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,4 @@ C#用GDI做的计时器 # 其它说明 -找不到合适的语音包就用的小爱同学（是的，就是小米的那个），侵删 +音源谷歌翻译 diff --git a/Watch/Form1.cs b/Watch/Form1.cs index 1d11a0a..6188bde 100644 --- a/Watch/Form1.cs +++ b/Watch/Form1.cs @@ -706,7 +706,7 @@ void makePieChart(Chart chart) long lastNoteTime = 0; List xVal = new List(); - List yVal = new List(); + List yVal = new List(); for (int i = 0; i < timers.Count; i++) { @@ -724,7 +724,7 @@ void makePieChart(Chart chart) //timeParagrapgh.Append("[").Append(longToTimeStr(time - lastNoteTime)).Append("] ").Append(timers[i].comment).Append("\r\n"); xVal.Add(timers[i].comment); - yVal.Add((int)((time - lastNoteTime) / 1000 / 60)); + yVal.Add(((time - lastNoteTime) / 1000d / 60d)); lastNoteTime = time; } @@ -744,9 +744,9 @@ void makeFlowChart(Chart chart) long lastNoteTime = 0; List xVal = new List(); - List yVal = new List(); - List yVal2 = new List(); - List yVal3 = new List(); + List yVal = new List(); + List yVal2 = new List(); + List yVal3 = new List(); for (int i = 0; i < timers.Count; i++) { if (i % 2 == 0) @@ -763,9 +763,9 @@ void makeFlowChart(Chart chart) //timeParagrapgh.Append("[").Append(longToTimeStr(time - lastNoteTime)).Append("] ").Append(timers[i].comment).Append("\r\n"); xVal.Add(timers[i].comment); - yVal.Add((int)((lastNoteTime) / 1000 / 60)); - yVal2.Add((int)((time) / 1000 / 60)); - yVal3.Add((int)((time - lastNoteTime) / 60 / 1000)); + yVal.Add(((lastNoteTime) / 1000d / 60d)); + yVal2.Add(((time) / 1000d / 60d)); + yVal3.Add(((time - lastNoteTime) / 60d / 1000d)); lastNoteTime = time; } diff --git a/Watch/FormLongMsg.Designer.cs b/Watch/FormLongMsg.Designer.cs index 3ac4da5..ca39477 100644 --- a/Watch/FormLongMsg.Designer.cs +++ b/Watch/FormLongMsg.Designer.cs @@ -145,7 +145,9 @@ private void InitializeComponent() series1.ChartArea = "ChartArea1"; series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Pie; series1.IsValueShownAsLabel = true; + series1.Label = "#VAL{N2}分钟"; series1.Legend = "Legend1"; + series1.LegendText = "#VALX"; series1.Name = "Series1"; series1.YValuesPerPoint = 2; this.chartPie.Series.Add(series1); @@ -185,7 +187,7 @@ private void InitializeComponent() series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Line; series2.Color = System.Drawing.Color.Red; series2.IsValueShownAsLabel = true; - series2.Label = "#VAL分钟"; + series2.Label = "#VAL{N2}分钟"; series2.LabelAngle = 45; series2.Legend = "Legend1"; series2.Name = "Series1"; @@ -212,7 +214,6 @@ private void InitializeComponent() chartArea3.AxisX.Interval = 1D; chartArea3.AxisX.IsReversed = true; chartArea3.AxisX.MajorGrid.Interval = 1D; - chartArea3.AxisY.Interval = 15D; chartArea3.AxisY.IntervalAutoMode = System.Windows.Forms.DataVisualization.Charting.IntervalAutoMode.VariableCount; chartArea3.AxisY.IsMarginVisible = false; chartArea3.Name = "ChartArea1"; @@ -233,7 +234,7 @@ private void InitializeComponent() series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.RangeBar; series3.Color = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); series3.IsValueShownAsLabel = true; - series3.Label = "#VALY3"; + series3.Label = "#VALY3{N2}"; series3.Legend = "Legend1"; series3.Name = "Series1"; series3.ShadowOffset = 1; diff --git a/Watch/Properties/AssemblyInfo.cs b/Watch/Properties/AssemblyInfo.cs index 112567a..f57a942 100644 --- a/Watch/Properties/AssemblyInfo.cs +++ b/Watch/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.2.1")] -[assembly: AssemblyFileVersion("2.0.2.1")] +[assembly: AssemblyVersion("2.0.2.3")] +[assembly: AssemblyFileVersion("2.0.2.3")] diff --git "a/Watch/\344\270\200.wav" "b/Watch/\344\270\200.wav" index 2668cdf..e9ac09b 100644 Binary files "a/Watch/\344\270\200.wav" and "b/Watch/\344\270\200.wav" differ diff --git "a/Watch/\344\270\203.wav" "b/Watch/\344\270\203.wav" index 4fe163a..32cf990 100644 Binary files "a/Watch/\344\270\203.wav" and "b/Watch/\344\270\203.wav" differ diff --git "a/Watch/\344\270\211.wav" "b/Watch/\344\270\211.wav" index 87e00a4..4e30cab 100644 Binary files "a/Watch/\344\270\211.wav" and "b/Watch/\344\270\211.wav" differ diff --git "a/Watch/\344\271\235.wav" "b/Watch/\344\271\235.wav" index a8b6c74..f4441ad 100644 Binary files "a/Watch/\344\271\235.wav" and "b/Watch/\344\271\235.wav" differ diff --git "a/Watch/\344\272\214.wav" "b/Watch/\344\272\214.wav" index 41c7dc6..0c6b04a 100644 Binary files "a/Watch/\344\272\214.wav" and "b/Watch/\344\272\214.wav" differ diff --git "a/Watch/\344\272\224.wav" "b/Watch/\344\272\224.wav" index 9600aad..b740a1f 100644 Binary files "a/Watch/\344\272\224.wav" and "b/Watch/\344\272\224.wav" differ diff --git "a/Watch/\345\205\253.wav" "b/Watch/\345\205\253.wav" index 8be0aca..79816ae 100644 Binary files "a/Watch/\345\205\253.wav" and "b/Watch/\345\205\253.wav" differ diff --git "a/Watch/\345\205\255.wav" "b/Watch/\345\205\255.wav" index 45aa745..b796f97 100644 Binary files "a/Watch/\345\205\255.wav" and "b/Watch/\345\205\255.wav" differ diff --git "a/Watch/\345\210\206.wav" "b/Watch/\345\210\206.wav" index ad02120..1fd0225 100644 Binary files "a/Watch/\345\210\206.wav" and "b/Watch/\345\210\206.wav" differ diff --git "a/Watch/\345\215\201.wav" "b/Watch/\345\215\201.wav" index 3994168..3685d28 100644 Binary files "a/Watch/\345\215\201.wav" and "b/Watch/\345\215\201.wav" differ diff --git "a/Watch/\345\233\233.wav" "b/Watch/\345\233\233.wav" index 7dd502b..433c5c3 100644 Binary files "a/Watch/\345\233\233.wav" and "b/Watch/\345\233\233.wav" differ diff --git "a/Watch/\345\260\217.wav" "b/Watch/\345\260\217.wav" index ae8c2ec..570f600 100644 Binary files "a/Watch/\345\260\217.wav" and "b/Watch/\345\260\217.wav" differ diff --git "a/Watch/\346\212\245.wav" "b/Watch/\346\212\245.wav" index 3aa00c2..8dcf7eb 100644 Binary files "a/Watch/\346\212\245.wav" and "b/Watch/\346\212\245.wav" differ diff --git "a/Watch/\346\225\264.wav" "b/Watch/\346\225\264.wav" index 0c01a35..03d0934 100644 Binary files "a/Watch/\346\225\264.wav" and "b/Watch/\346\225\264.wav" differ diff --git "a/Watch/\346\227\266.wav" "b/Watch/\346\227\266.wav" index 3994168..ca3d391 100644 Binary files "a/Watch/\346\227\266.wav" and "b/Watch/\346\227\266.wav" differ diff --git "a/Watch/\347\202\271.wav" "b/Watch/\347\202\271.wav" index 744f11a..b8a4550 100644 Binary files "a/Watch/\347\202\271.wav" and "b/Watch/\347\202\271.wav" differ diff --git "a/Watch/\350\256\241.wav" "b/Watch/\350\256\241.wav" index 94e6214..8a01e84 100644 Binary files "a/Watch/\350\256\241.wav" and "b/Watch/\350\256\241.wav" differ diff --git "a/Watch/\351\222\237.wav" "b/Watch/\351\222\237.wav" index ad8a2ab..b01b693 100644 Binary files "a/Watch/\351\222\237.wav" and "b/Watch/\351\222\237.wav" differ diff --git "a/Watch/\351\233\266.wav" "b/Watch/\351\233\266.wav" index 648918d..361385a 100644 Binary files "a/Watch/\351\233\266.wav" and "b/Watch/\351\233\266.wav" differ