Skip to content
Permalink
Browse files

Merge pull request #429 from hcmlab/develop

Develop
  • Loading branch information...
tobiasbaur committed Oct 30, 2019
2 parents 526c350 + c63c03e commit 0928ffe5d458f0f28b1293d4dad3cf94b622eb1a
@@ -124,6 +124,11 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
{
file.Delete();
}

foreach (var file in dir.EnumerateFiles(Path.GetFileName(Properties.Settings.Default.CMLTempTrainerPath) + Properties.Settings.Default.CMLTempTrainerName + "*"))
{
file.Delete();
}
}
catch { }

@@ -16,7 +16,7 @@ public partial class MainHandler
{

//Config
public static string BuildVersion = "1.0.6.2";
public static string BuildVersion = "1.0.6.3";
public static MEDIABACKEND MediaBackend = MEDIABACKEND.MEDIAKIT;
public static bool ENABLE_PYTHON = Properties.Settings.Default.EnablePython;
public static int xaiProcessId;
@@ -1220,8 +1220,15 @@ private void CompleteSession()
foreach (var file in dir.EnumerateFiles(Path.GetFileName(tempTrainerPath) + "*.trainer*"))
{
string[] split = file.Name.Split('.');
split[0] = "latestcmlmodel";
string filename = string.Join(".", split);
string filename = file.Name;
if (split.Length == 2 && split[1] == "trainer")
{
Properties.Settings.Default.CMLTempTrainerName = split[0];
Properties.Settings.Default.Save();
split[0] = "latestcmlmodel";
filename = string.Join(".", split);
}


if (File.Exists(Properties.Settings.Default.CMLTempTrainerPath + filename))
{
@@ -708,17 +708,27 @@ private void Apply_Click(object sender, RoutedEventArgs e)


Properties.Settings.Default.CMLTempTrainerPath = Properties.Settings.Default.CMLDirectory + "\\" + Defaults.CML.ModelsFolderName + "\\" + Defaults.CML.ModelsTrainerFolderName + "\\" + AnnoTier.Selected.AnnoList.Scheme.Type.ToString().ToLower() + "\\" + AnnoTier.Selected.AnnoList.Scheme.Name + "\\" + stream.Type + "{" + streamName + "}\\" + trainer.Name + "\\";



Properties.Settings.Default.Save();



if (!Directory.Exists(Properties.Settings.Default.CMLDirectory)) Directory.CreateDirectory(Properties.Settings.Default.CMLTempTrainerPath);

foreach (var file in dir.EnumerateFiles(Path.GetFileName(tempTrainerPath) + "*"))
{
string filename = file.Name;
string[] split = file.Name.Split('.');
split[0] = "latestcmlmodel";
string filename = string.Join(".", split);
if (split.Length == 2 && split[1] == "trainer")
{
Properties.Settings.Default.CMLTempTrainerName = split[0];
Properties.Settings.Default.Save();

split[0] = "latestcmlmodel";
filename = string.Join(".", split);
}

if (File.Exists(Properties.Settings.Default.CMLTempTrainerPath + filename))
{

Some generated files are not rendered by default. Learn more.

@@ -158,5 +158,8 @@
<Setting Name="EnablePythonDebug" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="CMLTempTrainerName" Type="System.String" Scope="User">
<Value Profile="(Default)">""</Value>
</Setting>
</Settings>
</SettingsFile>
@@ -179,6 +179,9 @@
<setting name="EnablePythonDebug" serializeAs="String">
<value>False</value>
</setting>
<setting name="CMLTempTrainerName" serializeAs="String">
<value>""</value>
</setting>
</ssi.Properties.Settings>
</userSettings>
</configuration>
BIN +512 Bytes (100%) bin/nova.exe
Binary file not shown.

0 comments on commit 0928ffe

Please sign in to comment.
You can’t perform that action at this time.