From 5c1ea1b1fe70d036ca37e9aef83abcdc147eae09 Mon Sep 17 00:00:00 2001 From: "patrick.pdb" Date: Mon, 16 Oct 2023 13:09:12 -0400 Subject: [PATCH 1/2] '#1929 Creates a clearFilter method on IpedChartsPanel with a parameter to indicate if the filterSelection (and consequently app.getAppListener().updateFileListing()) should be called after filters remoaval. This should not be called on interface ClearFilterListener method clearFliter implementation. --- .../main/java/iped/app/timelinegraph/IpedChartPanel.java | 8 +++++++- .../main/java/iped/app/timelinegraph/IpedChartsPanel.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/iped-app/src/main/java/iped/app/timelinegraph/IpedChartPanel.java b/iped-app/src/main/java/iped/app/timelinegraph/IpedChartPanel.java index 3ec85cb0d3..ce441eeee9 100644 --- a/iped-app/src/main/java/iped/app/timelinegraph/IpedChartPanel.java +++ b/iped-app/src/main/java/iped/app/timelinegraph/IpedChartPanel.java @@ -828,13 +828,19 @@ public void removeFilter(Date[] removedDates) { } public void removeAllFilters() { + removeAllFilters(true); + } + + public void removeAllFilters(boolean updateResult) { for (Date[] removedDates : definedFilters) { HighlightWorker sw = new HighlightWorker(ipedChartsPanel.getDomainAxis(), ipedChartsPanel.resultsProvider, removedDates[0], removedDates[1], false, false); } definedFilters.clear(); excludedEvents.clear(); ipedChartsPanel.setApplyFilters(false); - filterSelection(); + if (updateResult) { + filterSelection(); + } IpedCombinedDomainXYPlot rootPlot = ((IpedCombinedDomainXYPlot) getChart().getPlot()); List xyPlots = rootPlot.getSubplots(); diff --git a/iped-app/src/main/java/iped/app/timelinegraph/IpedChartsPanel.java b/iped-app/src/main/java/iped/app/timelinegraph/IpedChartsPanel.java index 01c879aeb2..51d342827d 100644 --- a/iped-app/src/main/java/iped/app/timelinegraph/IpedChartsPanel.java +++ b/iped-app/src/main/java/iped/app/timelinegraph/IpedChartsPanel.java @@ -936,7 +936,7 @@ public void setMetadataToBreakChart(String metadataToBreakChart) { @Override public void clearFilter() { - chartPanel.removeAllFilters(); + chartPanel.removeAllFilters(false); } @Override From ddcf994bd5e5cce7236ffc1dbb8bb47d87b6947c Mon Sep 17 00:00:00 2001 From: Luis Nassif Date: Tue, 17 Oct 2023 14:00:52 -0300 Subject: [PATCH 2/2] closes #1932: embed vcomp140.dll into imagemagick-7.1.1-19-q8-x64 dep --- iped-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iped-app/pom.xml b/iped-app/pom.xml index a15328c33c..a8f9340e6c 100644 --- a/iped-app/pom.xml +++ b/iped-app/pom.xml @@ -301,7 +301,7 @@ org.imagemagick imagemagick-zip - 7.1.1-19-q8-x64 + 7.1.1-19-q8-x64+vcomp.dll zip false ${tools.dir}