Hesham/OWtrack
1
0
Fork 0
Code Issues 2 Pull Requests Releases 10 Wiki Activity

Fixed bug and organize

Browse Source
This commit is contained in:
HeshamTB 2018-12-21 23:23:59 +03:00
parent a28e09de89
commit 003668dea4
6 changed files with 26 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OWTrack/MainForm.cs
View File

@ -34,15 +34,14 @@ namespace OWTrack
private string Version = Program.Version.ToString(); private string Version = Program.Version.ToString();
public MainForm() public MainForm()
{ {
InitializeComponent(); InitializeComponent();
tr = new Tracker(); tr = new Tracker();
loadSave(); loadSave();
tr.StartNewSeission();
checkStatus(); checkStatus();
update(); update();
label4.Text = Version; label4.Text = Version;
Text = "OWTrack " + Version; Text = "OWTrack " + Version;
} }
private void checkStatus() private void checkStatus()
@ -72,8 +71,7 @@ namespace OWTrack
} }
} }
//Move to saveManeger.cs ? //Move to saveManeger.cs ?
//Refactor!!
private void loadSave() private void loadSave()
{ {
try try
@ -109,6 +107,7 @@ namespace OWTrack
} }
ExeTrackCheckBx.Checked = tr.settings.TrackOW; ExeTrackCheckBx.Checked = tr.settings.TrackOW;
SRCheckBx.Checked = tr.settings.TrackSR; SRCheckBx.Checked = tr.settings.TrackSR;
tr.StartNewSeission();
} }
private string askForGamePath() private string askForGamePath()
@ -152,10 +151,10 @@ namespace OWTrack
{ {
Match match = new Match Match match = new Match
{ {
oldSR = tr.startSR, StartSR = tr.startSR,
newSR = tr.newSR, newSR = tr.newSR,
ChangeInSR = tr.srDiff(), ChangeInSR = tr.srDiff(),
dateTime = DateTime.Now dateTime = DateTime.Now.Date
}; };
tr.GetCurrentSession().AddMatch(match); tr.GetCurrentSession().AddMatch(match);
} }

9
OWTrack/OWTrack.csproj
View File

@ -113,12 +113,6 @@
<DependentUpon>MainForm.cs</DependentUpon> <DependentUpon>MainForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="saveManeger.cs" /> <Compile Include="saveManeger.cs" />
<Compile Include="Splash.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Splash.Designer.cs">
<DependentUpon>Splash.cs</DependentUpon>
</Compile>
<Compile Include="Tracker.cs" /> <Compile Include="Tracker.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
@ -134,9 +128,6 @@
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<EmbeddedResource Include="Splash.resx">
<DependentUpon>Splash.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.manifest" /> <None Include="app.manifest" />
<None Include="OWTrack_TemporaryKey.pfx" /> <None Include="OWTrack_TemporaryKey.pfx" />
<None Include="packages.config" /> <None Include="packages.config" />

98
OWTrack/Splash.Designer.cs generated
View File

@ -1,98 +0,0 @@
namespace OWTrack
{
partial class Splash
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.splashLabel = new System.Windows.Forms.Label();
this.versionLabel = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// progressBar1
//
this.progressBar1.Location = new System.Drawing.Point(95, 57);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(196, 12);
this.progressBar1.TabIndex = 0;
//
// splashLabel
//
this.splashLabel.AutoSize = true;
this.splashLabel.Location = new System.Drawing.Point(171, 31);
this.splashLabel.Name = "splashLabel";
this.splashLabel.Size = new System.Drawing.Size(0, 13);
this.splashLabel.TabIndex = 1;
this.splashLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// versionLabel
//
this.versionLabel.AutoSize = true;
this.versionLabel.Location = new System.Drawing.Point(13, 91);
this.versionLabel.Name = "versionLabel";
this.versionLabel.Size = new System.Drawing.Size(0, 13);
this.versionLabel.TabIndex = 2;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.Gray;
this.label1.Location = new System.Drawing.Point(13, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(89, 24);
this.label1.TabIndex = 3;
this.label1.Text = "OWtrack";
//
// Splash
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(402, 116);
this.Controls.Add(this.label1);
this.Controls.Add(this.versionLabel);
this.Controls.Add(this.splashLabel);
this.Controls.Add(this.progressBar1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "Splash";
this.Text = "Splash";
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
private System.Windows.Forms.ProgressBar progressBar1;
private System.Windows.Forms.Label splashLabel;
private System.Windows.Forms.Label versionLabel;
private System.Windows.Forms.Label label1;
}
}

20
OWTrack/Splash.cs
View File

@ -1,20 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace OWTrack
{
public partial class Splash : Form
{
public Splash()
{
InitializeComponent();
}
}
}

123
OWTrack/Splash.resx
View File

@ -1,123 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

28
OWTrack/Tracker.cs
View File

@ -30,13 +30,17 @@ namespace OWTrack
class Tracker class Tracker
{ {
public int wins, losses, startSR, newSR, totalMatches = 0; public int wins, losses, startSR, newSR, totalMatches = 0;
public void reset() { wins = 0; losses = 0; startSR = 0; newSR = 0; settings.Reset(); }
public void addWin() => wins++; public void addWin() => wins++;
public void addLoss() => losses++; public void addLoss() => losses++;
public void reduceWin() => wins--; public void reduceWin() => wins--;
public void rediceLoss() => losses--; public void rediceLoss() => losses--;
public int GetWins() { return wins; } public int GetWins() { return wins; }
public int GetLosses() { return losses; } public int GetLosses() { return losses; }
public void setNewSR(int SR) { newSR = SR; }
public int srDiff() { return newSR - startSR; }
public Settings settings = new Settings();
public List<Session> sessions = new List<Session>();
public int GetTotalMatches() public int GetTotalMatches()
{ {
int number = 0; int number = 0;
@ -52,12 +56,17 @@ namespace OWTrack
return sessions.Last().TotalMatches; return sessions.Last().TotalMatches;
} }
public void setNewSR(int SR) { newSR = SR; } public void reset()
public int srDiff() { return newSR - startSR; } {
public Settings settings = new Settings(); wins = 0;
//public List<Match> matches = new List<Match>(); losses = 0;
public List<Session> sessions = new List<Session>(); startSR = 0;
newSR = 0;
settings.Reset();
sessions.Clear();
StartNewSeission();
}
public void StartNewSeission() public void StartNewSeission()
{ {
Session ses = new Session(startSR); Session ses = new Session(startSR);
@ -69,6 +78,7 @@ namespace OWTrack
{ {
return sessions.Last(); return sessions.Last();
} }
public bool owRunning() public bool owRunning()
{ {
if (settings.TrackOW) if (settings.TrackOW)
@ -170,8 +180,8 @@ namespace OWTrack
public int TotalMatches; public int TotalMatches;
public int SkillChange; public int SkillChange;
public int StartSR; public int StartSR;
public List<Match> Matches = new List<Match>();
public DateTime date; public DateTime date;
public List<Match> Matches = new List<Match>();
/// <summary> /// <summary>
/// Start a new session with a starting Skill Rating /// Start a new session with a starting Skill Rating
@ -205,7 +215,7 @@ namespace OWTrack
{ {
public Match() { } public Match() { }
public DateTime dateTime { get; set; } public DateTime dateTime { get; set; }
public int oldSR; public int StartSR;
public int newSR; public int newSR;
public int ChangeInSR; public int ChangeInSR;
} }