1.4.0 merge #26

Merged
Hesham merged 17 commits from release/1.4 into master 2018-09-27 10:31:11 +02:00
2 changed files with 15 additions and 3 deletions
Showing only changes of commit 3500430109 - Show all commits

View File

@ -157,7 +157,7 @@ namespace OWTrack
}
else srLabel.Text = tr.startSR.ToString() + " - " + tr.srDiff();
srTextBox.Text = null;
File.WriteAllText(Directory.GetCurrentDirectory() + "/saves/data.json", JsonConvert.SerializeObject(tr));
saveManeger.SaveJSON(tr);
}
#region Events

View File

@ -32,6 +32,10 @@ namespace OWTrack
{
private static string savesPath = Directory.GetCurrentDirectory() + "/saves/data.json";
/// <summary>
/// Deserialize saved tracker instance.
/// </summary>
/// <returns></returns>
public static Tracker GetSavedTracker()
{
try
@ -44,7 +48,6 @@ namespace OWTrack
}
}
//TODO: use para
public static Tracker GetSavedTracker(string customPath)
{
try
@ -57,11 +60,16 @@ namespace OWTrack
}
}
/// <summary>
///Saves the Tracker Object.
/// </summary>
/// <param name="tracker"></param>
/// <returns></returns>
public static bool SaveJSON(Tracker tracker)
{
try
{
File.WriteAllText(Directory.GetCurrentDirectory() + "/data.json", JsonConvert.SerializeObject(tracker));
File.WriteAllText(savesPath, JsonConvert.SerializeObject(tracker));
return true;
}
catch (Exception)
@ -70,6 +78,10 @@ namespace OWTrack
}
}
/// <summary>
/// Check if a 'data.json' exists in the default location '../saves/data.json'.
/// </summary>
/// <returns>Boolean Value</returns>
public static bool saveExist()
{
try