nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made sure everything is going through frosted serial.

Browse source 
Better cross platform support.
This commit is contained in:
larsbrubaker 2014-07-28 13:48:28 -07:00
parent 1a09d13a65
commit f625762602
13 changed files with 52 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

63
DataStorage/Datastore.cs
View file

@ -104,27 +104,41 @@ namespace MatterHackers.MatterControl.DataStorage
{
return "StaticData";
}
else if(Directory.Exists(Path.Combine(ApplicationPath, "StaticData")))
{
return Path.Combine(ApplicationPath, "StaticData");
}
else
{
return Path.Combine("..", "..", "StaticData");
}
else if (Directory.Exists(Path.Combine(ApplicationPath, "StaticData")))
{
return Path.Combine(ApplicationPath, "StaticData");
}
else
{
return Path.Combine("..", "..", "StaticData");
}
case OSType.X11:
if (Directory.Exists("StaticData"))
{
return "StaticData";
}
else
{
return Path.Combine("..", "..", "StaticData");
}
if (Directory.Exists("StaticData"))
{
return "StaticData";
}
else
{
return Path.Combine("..", "..", "StaticData");
}
case OSType.Android:
if (Directory.Exists("StaticData"))
{
return "StaticData";
}
else if (Directory.Exists(Path.Combine(ApplicationPath, "StaticData")))
{
return Path.Combine(ApplicationPath, "StaticData");
}
else
{
return Path.Combine("");
}
default:
throw new NotImplementedException();
}
}
}
}
@ -276,20 +290,7 @@ namespace MatterHackers.MatterControl.DataStorage
{
foreach (Type table in dataStoreTables)
{
dbSQLite.CreateTable(table);
//string query = string.Format("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='{0}';", table.Name);
////SQLiteCommand command = dbSQLite.CreateCommand(query);
//int RowCount = 0;
//string result = dbSQLite.ExecuteScalar<string>(query);
//RowCount = Convert.ToInt32(result);
//if (RowCount == 0)
//{
// dbSQLite.CreateTable(table);
//}
}
}