Skip to content

Commit 0c443d1

Browse files
author
DerEffi
committed
paused image display on auto processing
1 parent 7effc5e commit 0c443d1

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

ImageComparisonGUI/ViewModels/SearchPageViewModel.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,28 +136,28 @@ public void AutoProcessAll()
136136
StatusText = "Auto Processing";
137137
while(displayedMatchIndex < Matches.Count && Matches[displayedMatchIndex].Similarity > ConfigService.AutoProcessorThreashold)
138138
{
139-
DisplayedMatch = Matches[displayedMatchIndex];
139+
ImageMatch processingMatch = Matches[displayedMatchIndex];
140140
ImageCountText = $"{displayedMatchIndex + 1} / {Matches.Count}";
141141
PercentComplete = Convert.ToInt32((decimal.Divide(displayedMatchIndex + 1, Matches.Count) * 100));
142-
PreviewAutoProcessor();
142+
PreviewAutoProcessor(processingMatch);
143143

144144
if (AutoProcessProperty != null && AutoProcessProperty != "" && AutoProcessProperty != "None" && AutoProcessSide != 0)
145145
{
146146
try
147147
{
148-
if (AutoProcessSide < 0 && DisplayedMatch.Image1 != null)
149-
DeleteFile(DisplayedMatch.Image1.Image.FullName);
150-
else if (AutoProcessSide > 0 && DisplayedMatch.Image2 != null)
151-
DeleteFile(DisplayedMatch.Image2.Image.FullName);
148+
if (AutoProcessSide < 0 && processingMatch.Image1 != null)
149+
DeleteFile(processingMatch.Image1.Image.FullName);
150+
else if (AutoProcessSide > 0 && processingMatch.Image2 != null)
151+
DeleteFile(processingMatch.Image2.Image.FullName);
152152
}
153153
catch {
154-
LogService.Log($"Error Auto-Processing current match: '{DisplayedMatch.Image1.Image.FullName}' - '{DisplayedMatch.Image2.Image.FullName}'", LogLevel.Error);
154+
LogService.Log($"Error Auto-Processing current match: '{processingMatch.Image1.Image.FullName}' - '{processingMatch.Image2.Image.FullName}'", LogLevel.Error);
155155
}
156156
}
157157
else
158158
{
159159
if (ConfigService.CacheNoMatch)
160-
CacheService.AddNoMatch(DisplayedMatch.Image1.Image.FullName, DisplayedMatch.Image2.Image.FullName);
160+
CacheService.AddNoMatch(processingMatch.Image1.Image.FullName, processingMatch.Image2.Image.FullName);
161161
}
162162

163163
displayedMatchIndex++;
@@ -299,7 +299,7 @@ public void Search(object? sender, RoutedEventArgs e)
299299
DisplayedMatch = Matches.First();
300300
StatusText = "Showing Matches: ";
301301
ImageCountText = $"1 / {Matches.Count}";
302-
PreviewAutoProcessor();
302+
PreviewAutoProcessor(DisplayedMatch);
303303
Displaying = true;
304304
}
305305
else
@@ -349,23 +349,23 @@ private void NextPair(bool forward = true)
349349
ImageCountText = $"{displayedMatchIndex + 1} / {Matches.Count}";
350350
PercentComplete = Convert.ToInt32((decimal.Divide(displayedMatchIndex + 1, Matches.Count) * 100));
351351

352-
PreviewAutoProcessor();
352+
PreviewAutoProcessor(DisplayedMatch);
353353
} else
354354
{
355355
LogService.Log("No more matches to show, stopping displaying matches");
356356
ResetUI();
357357
}
358358
}
359359

360-
public void PreviewAutoProcessor()
360+
public void PreviewAutoProcessor(ImageMatch previewMatch)
361361
{
362362
try
363363
{
364364
List<string> autoProcessors = ConfigService.AutoProcessors;
365365
int currentProcessor = 0;
366366
while (currentProcessor < autoProcessors.Count)
367367
{
368-
int processingResult = AutoProcessorService.Processors.First(p => p.DisplayName == autoProcessors[currentProcessor]).Process(DisplayedMatch.Image1.Image, DisplayedMatch.Image2.Image);
368+
int processingResult = AutoProcessorService.Processors.First(p => p.DisplayName == autoProcessors[currentProcessor]).Process(previewMatch.Image1.Image, previewMatch.Image2.Image);
369369
if (processingResult != 0)
370370
{
371371
AutoProcessSide = processingResult;

0 commit comments

Comments
 (0)