Skip to content

Commit afc3c51

Browse files
committed
Merge branch 'release/release_1.2.0'
* release/release_1.2.0: (26 commits) Version change. Updated combined graph. Updated tooltips. Cleanup. Cleanup. Work in progress. Work in progress. Warning cleanup. Updated x-axis offsets. Updated OxyPlot Updates. Work in progress. Changed default URL. Removed old feed-reader. Added last date to graph text annotation. Updated OxyPlot. Text annotation changes. Graph related changes. Complete new approach: download all values from new site to a file (.csv) and read values from the file. Added change to text annotation. Change GUI font when renderer is changed. Change GUI font when renderer is changed. Added menu shortcuts. ...
2 parents ca642e0 + cfb5c2b commit afc3c51

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3164
-39831
lines changed

EuriborSharp/CustonEventArgs/CustomEventArg.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using EuriborSharp.Enums;
23

34
namespace EuriborSharp.CustonEventArgs
45
{
@@ -21,4 +22,24 @@ public BooleanEventArg(bool b)
2122
value = b;
2223
}
2324
}
25+
26+
public class GraphStyleEventArgs : EventArgs
27+
{
28+
public readonly GraphStyle style;
29+
30+
public GraphStyleEventArgs(GraphStyle g)
31+
{
32+
style = g;
33+
}
34+
}
35+
36+
public class RendererEventArgs : EventArgs
37+
{
38+
public readonly Renderer value;
39+
40+
public RendererEventArgs(Renderer r)
41+
{
42+
value = r;
43+
}
44+
}
2445
}

EuriborSharp/Enums/Enums.cs

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
namespace EuriborSharp.Enums
1+
using System;
2+
3+
namespace EuriborSharp.Enums
24
{
5+
/// <summary>
6+
/// Available time periods.
7+
/// </summary>
38
public enum TimePeriods
49
{
510
Default = 0,
@@ -10,4 +15,24 @@ public enum TimePeriods
1015
SixMonths,
1116
TwelveMonths
1217
}
18+
19+
/// <summary>
20+
/// Available serie styles.
21+
/// </summary>
22+
[Serializable]
23+
public enum GraphStyle
24+
{
25+
Line,
26+
Bar
27+
}
28+
29+
/// <summary>
30+
/// Available renderer for the graph.
31+
/// </summary>
32+
[Serializable]
33+
public enum Renderer
34+
{
35+
Normal,
36+
Xkcd
37+
}
1338
}

EuriborSharp/EuriborSharp.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@
3737
<ApplicationIcon>euro-1.ico</ApplicationIcon>
3838
</PropertyGroup>
3939
<ItemGroup>
40+
<Reference Include="MoreLinq">
41+
<HintPath>..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll</HintPath>
42+
</Reference>
4043
<Reference Include="OxyPlot">
41-
<HintPath>..\packages\OxyPlot.WindowsForms.2014.1.318.1\lib\NET40\OxyPlot.dll</HintPath>
44+
<HintPath>..\packages\OxyPlot.Core.2014.1.444\lib\portable-net4+sl4+wp71+win8\OxyPlot.dll</HintPath>
4245
</Reference>
4346
<Reference Include="OxyPlot.WindowsForms">
44-
<HintPath>..\packages\OxyPlot.WindowsForms.2014.1.318.1\lib\NET40\OxyPlot.WindowsForms.dll</HintPath>
47+
<HintPath>..\packages\OxyPlot.WindowsForms.2014.1.444\lib\net40\OxyPlot.WindowsForms.dll</HintPath>
4548
</Reference>
4649
<Reference Include="System" />
4750
<Reference Include="System.Core" />
@@ -138,6 +141,9 @@
138141
<Content Include="euro-1.ico" />
139142
<None Include="euro-1.png" />
140143
</ItemGroup>
144+
<ItemGroup>
145+
<Folder Include="Resources\" />
146+
</ItemGroup>
141147
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
142148
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
143149
Other similar extension points exist, see Microsoft.Common.targets.

EuriborSharp/EuriborSharpSettings.Designer.cs

Lines changed: 58 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

EuriborSharp/EuriborSharpSettings.settings

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,26 @@
88
<Setting Name="SmoothLine" Type="System.Boolean" Scope="User">
99
<Value Profile="(Default)">True</Value>
1010
</Setting>
11-
<Setting Name="Xkcd" Type="System.Boolean" Scope="User">
12-
<Value Profile="(Default)">True</Value>
13-
</Setting>
1411
<Setting Name="DotLineSelected" Type="System.Boolean" Scope="User">
1512
<Value Profile="(Default)">False</Value>
1613
</Setting>
1714
<Setting Name="NormalLineSelected" Type="System.Boolean" Scope="User">
1815
<Value Profile="(Default)">True</Value>
1916
</Setting>
17+
<Setting Name="SelectedGraphStyle" Type="EuriborSharp.Enums.GraphStyle" Scope="User">
18+
<Value Profile="(Default)">Line</Value>
19+
</Setting>
20+
<Setting Name="Autoload" Type="System.Boolean" Scope="User">
21+
<Value Profile="(Default)">False</Value>
22+
</Setting>
23+
<Setting Name="SelectedRenderer" Type="EuriborSharp.Enums.Renderer" Scope="User">
24+
<Value Profile="(Default)">Xkcd</Value>
25+
</Setting>
26+
<Setting Name="XkcdSelected" Type="System.Boolean" Scope="User">
27+
<Value Profile="(Default)">True</Value>
28+
</Setting>
29+
<Setting Name="EuriborDefaultUrl" Type="System.String" Scope="User">
30+
<Value Profile="(Default)">http://www.emmi-benchmarks.eu/assets/modules/rateisblue/processed_files/hist_EURIBOR_2014.csv</Value>
31+
</Setting>
2032
</Settings>
2133
</SettingsFile>

EuriborSharp/Interfaces/IAboutFormPresenter.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
interface IAboutFormPresenter
44
{
55
void ShowAboutForm();
6+
void UpdateFonts(bool xkcdSelected);
67
}
78
}
Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
1-
namespace EuriborSharp.Interfaces
1+
using EuriborSharp.Enums;
2+
3+
namespace EuriborSharp.Interfaces
24
{
35
interface IGraphControl
46
{
5-
void Init(Enums.TimePeriods period, bool smoothSelected, bool xkcd);
7+
/// <summary>
8+
/// Initializies plot model and data series based on given parameters.
9+
/// </summary>
10+
/// <param name="period">Selected time period.</param>
11+
/// <param name="smoothSelected">Flag for smooth line.</param>
12+
/// <param name="style">Selected plot data serie type.</param>
13+
/// <param name="renderer">Selected plot renderer.</param>
14+
/// <param name="dotLine">Flag for dotted line.</param>
15+
void Init(TimePeriods period, bool smoothSelected, GraphStyle style, Renderer renderer, bool dotLine);
16+
17+
/// <summary>
18+
/// Updated selected plot data series.
19+
/// </summary>
20+
void UpdateGraph(TimePeriods period);
21+
22+
/// <summary>
23+
/// Updated all plot data series.
24+
/// </summary>
625
void UpdateGraph();
7-
void UpdateSmoothing(bool b);
8-
void SetLineStyleToNormal();
9-
void SetLineStyleToDot();
1026
}
1127
}

EuriborSharp/Interfaces/ILogControl.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ namespace EuriborSharp.Interfaces
55
{
66
public interface ILogControl
77
{
8+
event EventHandler<BooleanEventArg> AutoloadChanged;
89
event EventHandler<StringEventArg> AddressChanged;
910
event EventHandler UpdateClicked;
1011
event EventHandler ClearClicked;
1112

1213
void AddText(string s, bool append);
1314
void UpdateAddress(string s);
1415
void Init();
16+
void SetupAutoload(bool enabled);
1517
}
1618
}
Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,50 @@
11
using System;
22
using System.Windows.Forms;
33
using EuriborSharp.CustonEventArgs;
4+
using EuriborSharp.Enums;
45

56
namespace EuriborSharp.Interfaces
67
{
78
interface IMainForm
89
{
9-
event EventHandler<BooleanEventArg> XkcdChanged;
10+
/// <summary>
11+
/// Occurs when smooth line enabled or disabled.
12+
/// </summary>
1013
event EventHandler<BooleanEventArg> LineSmoothChanged;
11-
event EventHandler LineStyleNormalSelected;
12-
event EventHandler LineStyleNoneSelected;
14+
15+
/// <summary>
16+
/// Occurs when graph serie style is changed.
17+
/// </summary>
18+
event EventHandler<GraphStyleEventArgs> GraphStyleChanged;
19+
20+
/// <summary>
21+
/// Occurs when renderer is changed.
22+
/// </summary>
23+
event EventHandler<RendererEventArgs> RendererChanged;
24+
25+
/// <summary>
26+
/// Occurs when line style is changed.
27+
/// </summary>
28+
event EventHandler<BooleanEventArg> DotLineSelected;
29+
30+
/// <summary>
31+
/// Occurs when about menu is selected from the menu.
32+
/// </summary>
1333
event EventHandler HelpSelected;
34+
35+
/// <summary>
36+
/// Occurs when exit is selected from the menu.
37+
/// </summary>
1438
event EventHandler ExitSelected;
1539

1640
void Close();
1741
void Dispose();
1842
void AddControl(UserControl control, string tabName);
1943
void UpdateTitle(string s);
44+
void UpdateLineStyle(bool dotlineSelected);
2045
void UpdateSmoothSelection(bool selected);
21-
void UpdateLineStyleSelection(bool normalSelected);
22-
void UpdateRendererSelection(bool xkcdSelected);
46+
void UpdateSeriesStyle(GraphStyle g);
47+
void UpdateRenderer(Renderer r);
48+
void UpdateGui(bool xkcdSelected);
2349
}
2450
}

0 commit comments

Comments
 (0)