Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2025-12-21 18:59:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resuming WIP: InterpSettings now get deserialized and loaded

Browse Source
This commit is contained in:
N00MKRAD
2021-02-01 22:48:22 +01:00
parent dd79c5a2a8
commit d8eadba6a4
3 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Code/Data/InterpSettings.cs
View File

@@ -2,6 +2,7 @@
using Flowframes.Data; using Flowframes.Data;
using Flowframes.IO; using Flowframes.IO;
using Flowframes.Main; using Flowframes.Main;
using Flowframes.MiscUtils;
using Flowframes.UI; using Flowframes.UI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -70,9 +71,21 @@ namespace Flowframes
scaledResolution = new Size(0, 0); scaledResolution = new Size(0, 0);
} }
/*
public InterpSettings (string serializedData) public InterpSettings (string serializedData)
{ {
inPath = "";
outPath = "";
ai = Networks.networks[0];
inFps = 0;
interpFactor = 0;
outFps = 0;
outMode = Interpolate.OutMode.VidMp4;
model = "";
alpha = false;
stepByStep = false;
inputResolution = new Size(0, 0);
scaledResolution = new Size(0, 0);
Dictionary<string, string> entries = new Dictionary<string, string>(); Dictionary<string, string> entries = new Dictionary<string, string>();
foreach(string line in serializedData.SplitIntoLines()) foreach(string line in serializedData.SplitIntoLines())
@@ -94,10 +107,31 @@ namespace Flowframes
case "INTERPFACTOR": interpFactor = float.Parse(entry.Value); break; case "INTERPFACTOR": interpFactor = float.Parse(entry.Value); break;
case "OUTMODE": outMode = (Interpolate.OutMode)Enum.Parse(typeof(Interpolate.OutMode), entry.Value); break; case "OUTMODE": outMode = (Interpolate.OutMode)Enum.Parse(typeof(Interpolate.OutMode), entry.Value); break;
case "MODEL": model = entry.Value; break; case "MODEL": model = entry.Value; break;
case "INPUTRES": inputResolution = FormatUtils.ParseSize(entry.Value); break;
case "OUTPUTRES": scaledResolution = FormatUtils.ParseSize(entry.Value); break;
case "ALPHA": alpha = bool.Parse(entry.Value); break;
case "STEPBYSTEP": stepByStep = bool.Parse(entry.Value); break;
} }
} }
try
{
tempFolder = InterpolateUtils.GetTempFolderLoc(inPath, outPath);
framesFolder = Path.Combine(tempFolder, Paths.framesDir);
interpFolder = Path.Combine(tempFolder, Paths.interpDir);
inputIsFrames = IOUtils.IsPathDirectory(inPath);
outFilename = Path.Combine(outPath, Path.GetFileNameWithoutExtension(inPath) + IOUtils.GetExportSuffix(interpFactor, ai, model) + FFmpegUtils.GetExt(outMode));
}
catch
{
Logger.Log("Tried to create InterpSettings struct without an inpath. Can't set tempFolder, framesFolder and interpFolder.", true);
tempFolder = "";
framesFolder = "";
interpFolder = "";
inputIsFrames = false;
outFilename = "";
}
} }
*/
public void UpdatePaths (string inPathArg, string outPathArg) public void UpdatePaths (string inPathArg, string outPathArg)
{ {
@@ -169,9 +203,10 @@ namespace Flowframes
s += $"INTERPFACTOR|{interpFactor}\n"; s += $"INTERPFACTOR|{interpFactor}\n";
s += $"OUTMODE|{outMode}\n"; s += $"OUTMODE|{outMode}\n";
s += $"MODEL|{model}\n"; s += $"MODEL|{model}\n";
s += $"INPUTRES|{inputResolution}\n"; s += $"INPUTRES|{inputResolution.Width}x{inputResolution.Height}\n";
s += $"OUTPUTRES|{scaledResolution}\n"; s += $"OUTPUTRES|{scaledResolution.Width}x{scaledResolution.Height}\n";
s += $"ALPHA|{alpha}\n"; s += $"ALPHA|{alpha}\n";
s += $"STEPBYSTEP|{stepByStep}\n";
return s; return s;
} }

3
Code/Main/ResumeUtils.cs
View File

@@ -71,6 +71,9 @@ namespace Flowframes.Main
public static void LoadTempFolder (string tempFolderPath) public static void LoadTempFolder (string tempFolderPath)
{ {
string resumeFolderPath = Path.Combine(tempFolderPath, Paths.resumeDir); string resumeFolderPath = Path.Combine(tempFolderPath, Paths.resumeDir);
string interpSettingsPath = Path.Combine(resumeFolderPath, interpSettingsFilename);
InterpSettings interpSettings = new InterpSettings(File.ReadAllText(interpSettingsPath));
Program.mainForm.LoadBatchEntry(interpSettings);
} }
static void LoadFilenameMap() static void LoadFilenameMap()

13
Code/MiscUtils/FormatUtils.cs
View File

@@ -102,5 +102,18 @@ namespace Flowframes.MiscUtils
return outStr; return outStr;
} }
public static System.Drawing.Size ParseSize (string str)
{
try
{
string[] values = str.Split('x');
return new System.Drawing.Size(values[0].GetInt(), values[1].GetInt());
}
catch
{
return new System.Drawing.Size();
}
}
} }
} }