Individual filterer disable/reenable in filters panel.

iped-app/resources/localization/iped-desktop-messages.properties

@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters into node tree to combine them.
 FilterValue.Duplicates=Duplicate Filter Result
 FilterValue.SimilarDocument=Similar Documents
 FilterValue.SimilarFace=Similar Faces:

iped-app/resources/localization/iped-desktop-messages_de_DE.properties

@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter (TBT)
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter (TBT)
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters into node tree to combine them.(TBT)
 FilterValue.Duplicates=Duplicate Filter Result (TBT)
 FilterValue.SimilarDocument=Similar Documents (TBT)
 FilterValue.SimilarFace=Similar Faces: (TBT)

iped-app/resources/localization/iped-desktop-messages_es_AR.properties

@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter (TBT)
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter (TBT)
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters into node tree to combine them.(TBT)
 FilterValue.Duplicates=Duplicate Filter Result (TBT)
 FilterValue.SimilarDocument=Similar Documents (TBT)
 FilterValue.SimilarFace=Similar Faces: (TBT)

iped-app/resources/localization/iped-desktop-messages_it_IT.properties

@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Timeline Filter (TBT)
 iped.app.ui.TreeListener.filtererName=Evidence Tree Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Combined Filter (TBT)
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Apply Combined Filter (TBT)
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Drag and drop filters into node tree to combine them.(TBT)
 FilterValue.Duplicates=Duplicate Filter Result (TBT)
 FilterValue.SimilarDocument=Similar Documents (TBT)
 FilterValue.SimilarFace=Similar Faces: (TBT)

iped-app/resources/localization/iped-desktop-messages_pt_BR.properties

@@ -414,6 +414,7 @@ iped.app.ui.TimelineListener.filtererName=Filtro de Visão em Timeline
 iped.app.ui.TreeListener.filtererName=Filtro da Árvore de Evidências
 iped.app.ui.filterdecisiontree.CombinedFilterer.filtererName=Filtro Combinado
 iped.app.ui.filterdecisiontree.CombinedFilterer.tooltip=Aplicar Filtro Combinado
+iped.app.ui.filterdecisiontree.CombinedFilterer.dragAndDropTooltip=Arreste e solte filtros na árvore de nós para combiná-los.
 FilterValue.Duplicates=Resultado do Filtro de Duplicados
 FilterValue.SimilarDocument=Documentos Similares
 FilterValue.SimilarFace=Faces Similares:

iped-app/src/main/java/iped/app/graph/FilterSelectedEdges.java

@@ -188,7 +188,7 @@ public boolean hasFilters() {
 
     @Override
     public boolean hasFiltersApplied() {
-        return false;
+        return selectedEdges.size() > 0;
     }
 
     @Override
@@ -199,6 +199,19 @@ public void clearFilter() {
     public void setGraph(Graph graph) {
         this.graph = graph;
     }
+
+    @Override
+    public void restoreDefinedFilters(List<IFilter> filtersToRestore) {
+        for (Iterator iterator = filtersToRestore.iterator(); iterator.hasNext();) {
+            IFilter iFilter = (IFilter) iterator.next();
+            if (iFilter instanceof EdgeFilter) {
+                EdgeFilter efilter = (EdgeFilter) iFilter;
+                this.graph = efilter.graph;
+                this.selectedEdges = efilter.selectedEdges;
+            }
+        }
+        updateResults();
+    }
 }
 
 class EdgeFilter implements IResultSetFilter {

iped-app/src/main/java/iped/app/metadata/ValueCountQueryFilter.java

@@ -14,18 +14,40 @@
 public class ValueCountQueryFilter implements IQueryFilter {
     StringBuffer queryStr = null;
     StringBuffer name = null;
+    StringBuffer textualDetail = null;
     Set<ValueCount> values = null;
     String filterField;
+    MetadataSearch metadataSearch;
     private Query query;
 
-    public ValueCountQueryFilter(String filterField, Set<ValueCount> selectedValues) {
+    public ValueCountQueryFilter(MetadataSearch metadataSearch, String filterField, Set<ValueCount> selectedValues) {
         this.filterField = filterField;
+        this.metadataSearch = metadataSearch;
         values = new HashSet<ValueCount>();
         if (selectedValues != null) {
             values.addAll(selectedValues);
         }
     }
 
+    @Override
+    public String getTextualDetails() {
+        if (textualDetail == null) {
+            textualDetail = new StringBuffer();
+            textualDetail.append(filterField);
+            textualDetail.append(":[");
+            boolean first = true;
+            for (ValueCount value : values) {
+                if (!first) {
+                    textualDetail.append(",");
+                }
+                textualDetail.append(value.getVal());
+                first = false;
+            }
+            textualDetail.append("]");
+        }
+        return textualDetail.toString();
+    }
+
     public String toString() {
         if (name == null) {
             name = new StringBuffer();
@@ -82,4 +104,16 @@ public Query getQuery() {
         return query;
     }
 
+    public String getFilterField() {
+        return filterField;
+    }
+
+    public Set<ValueCount> getValues() {
+        return values;
+    }
+
+    public MetadataSearch getMetadataSearch() {
+        return metadataSearch;
+    }
+
 }

iped-app/src/main/java/iped/app/timelinegraph/IpedChartPanel.java

@@ -69,6 +69,7 @@
 import iped.jfextensions.chart.ChartPanel;
 import iped.jfextensions.model.Minute;
 import iped.utils.IconUtil;
+import iped.viewers.api.IFilterer;
 
 public class IpedChartPanel extends ChartPanel implements KeyListener {
     private Rectangle2D filterIntervalRectangle; // represents the filter selection rectangle while drawing/defining a interval
@@ -83,7 +84,7 @@ public class IpedChartPanel extends ChartPanel implements KeyListener {
 
     HashMap<Class<? extends TimePeriod>, ChartTimePeriodConstraint> timePeriodConstraints = new HashMap<Class<? extends TimePeriod>, ChartTimePeriodConstraint>();
 
-    JButton apllyFilters;
+    JButton applyFilters;
 
     private int filterMask = InputEvent.SHIFT_DOWN_MASK;
     private int panMask = InputEvent.CTRL_DOWN_MASK;
@@ -157,18 +158,32 @@ public IpedChartPanel(IpedChart chart, IpedChartsPanel ipedChartsPanel) {
 
         IpedChartPanel self = this;
 
+        ipedChartsPanel.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                App.get().setDockablesColors();
+                if (e.getID() == IFilterer.ENABLE_FILTER_EVENT) {
+                    ipedChartsPanel.setApplyFilters(true);
+                } else {
+                    ipedChartsPanel.setApplyFilters(false);
+                }
+                App.get().filtersPanel.updateUI();
+            }
+        });
+
         this.setLayout(new FlowLayout(FlowLayout.LEFT));
         ImageIcon icon = new ImageIcon(IconUtil.class.getResource(resPath + "down.png"));
         Image img = icon.getImage();
-        apllyFilters = new JButton(new ImageIcon(img.getScaledInstance(12, 12, java.awt.Image.SCALE_SMOOTH)));
-        apllyFilters.setMaximumSize(new Dimension(16, 16));
-        apllyFilters.addActionListener(new ActionListener() {
+        applyFilters = new JButton(new ImageIcon(img.getScaledInstance(12, 12, java.awt.Image.SCALE_SMOOTH)));
+        applyFilters.setMaximumSize(new Dimension(16, 16));
+        applyFilters.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                chartPanelPopupMenu.show(apllyFilters, apllyFilters.getX() - 2, apllyFilters.getY() + apllyFilters.getHeight() - 8);
+                chartPanelPopupMenu.show(applyFilters, applyFilters.getX() - 2,
+                        applyFilters.getY() + applyFilters.getHeight() - 8);
             }
         });
-        this.add(apllyFilters);
+        this.add(applyFilters);
 
         this.addChartMouseListener(new ChartMouseListener() {
             @Override
@@ -855,7 +870,7 @@ public void removeAllFilters(boolean updateResult) {
         }
 
         App app = (App) ipedChartsPanel.getGUIProvider();
-        app.setDockablesColors();
+
         this.repaint();
     }
 
@@ -918,7 +933,6 @@ public void filterSelection() {
         if (!isClearing) {
             app.getAppListener().updateFileListing();
         }
-        app.setDockablesColors();
     }
 
     public HashSet<String> getExcludedEvents() {
@@ -1030,4 +1044,10 @@ public void updateUI() {
             }
         }
     }
+
+    public void applyFilters(boolean selected) {
+        App app = (App) this.getIpedChartsPanel().getGUIProvider();
+        app.getFilterManager().setFilterEnabled(this.getIpedChartsPanel(), selected);
+        this.filterSelection();
+    }
 }

iped-app/src/main/java/iped/app/timelinegraph/IpedChartsPanel.java

@@ -1084,48 +1084,64 @@ public void resetZoom() {
         refreshChart(true);
     }
 
+    public class TimeRangeFilter implements IQueryFilter {
+        private Query query;
+        Date[] dates;
+
+        public TimeRangeFilter(Date[] dates) {
+            this.dates = dates;
+        }
+
+        public String toString() {
+            String timeFilter = domainAxis.ISO8601DateFormatUTC(dates[0]);
+            timeFilter += " TO ";
+            timeFilter += domainAxis.ISO8601DateFormatUTC(dates[1]);
+            return timeFilter;
+        }
+
+        @Override
+        public Query getQuery() {
+            if (query == null) {
+                String timeFilter = "timeStamp:[";
+                timeFilter += domainAxis.ISO8601DateFormatUTC(dates[0]);
+                timeFilter += " TO ";
+                timeFilter += domainAxis.ISO8601DateFormatUTC(dates[1]);
+                timeFilter += "]";
+
+                try {
+                    query = new QueryBuilder(App.get().appCase).getQuery(timeFilter);
+                } catch (ParseException | QueryNodeException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+            return query;
+        }
+    }
+
+    public class EventTypeFilter implements IFilter {
+        String event;
+
+        public EventTypeFilter(String event) {
+            this.event = event;
+        }
+
+        public String toString() {
+            return "-eventType:" + event;
+        }
+    }
+
     @Override
     public List getDefinedFilters() {
         ArrayList<IFilter> result = new ArrayList<IFilter>();
         if (chartPanel.definedFilters.size() > 0) {
             for (Date[] dates : chartPanel.definedFilters) {
-                result.add(new IQueryFilter() {
-                    private Query query;
-
-                    public String toString() {
-                        String timeFilter = domainAxis.ISO8601DateFormatUTC(dates[0]);
-                        timeFilter += " TO ";
-                        timeFilter += domainAxis.ISO8601DateFormatUTC(dates[1]);
-                        return timeFilter;
-                    }
-
-                    @Override
-                    public Query getQuery() {
-                        if (query == null) {
-                            String timeFilter = "timeStamp:[";
-                            timeFilter += domainAxis.ISO8601DateFormatUTC(dates[0]);
-                            timeFilter += " TO ";
-                            timeFilter += domainAxis.ISO8601DateFormatUTC(dates[1]);
-                            timeFilter += "]";
-
-                            try {
-                                query = new QueryBuilder(App.get().appCase).getQuery(timeFilter);
-                            } catch (ParseException | QueryNodeException e) {
-                                // TODO Auto-generated catch block
-                                e.printStackTrace();
-                            }
-                        }
-                        return query;
-                    }
-                });
+                result.add(new TimeRangeFilter(dates));
             }
         }
+
         for (String event : chartPanel.excludedEvents) {
-            result.add(new IFilter() {
-                public String toString() {
-                    return "-eventType:" + event;
-                }
-            });
+            result.add(new EventTypeFilter(event));
         }
 
         return result;
@@ -1144,4 +1160,22 @@ public static String[] getOrdToEventName() {
         return ordToEventName;
     }
 
+    public void restoreDefinedFilters(List<IFilter> filtersToRestore) {
+        boolean hasFilters = false;
+        for (IFilter filter : filtersToRestore) {
+            hasFilters = true;
+            if (filter instanceof TimeRangeFilter) {
+                chartPanel.definedFilters.add(((TimeRangeFilter) filter).dates);
+            }
+            if (filter instanceof EventTypeFilter) {
+                chartPanel.excludedEvents.add(((EventTypeFilter) filter).event);
+            }
+        }
+        if (hasFilters) {
+            applyFilters = true;
+            App.get().getFilterManager().setFilterEnabled(this, true);
+        }
+
+    }
+
 }

iped-app/src/main/java/iped/app/timelinegraph/popups/ChartPanelPopupMenu.java

@@ -10,7 +10,6 @@
 
 import iped.app.timelinegraph.IpedChartPanel;
 import iped.app.timelinegraph.dialog.IntervalDefinitionDialog;
-import iped.app.ui.App;
 import iped.app.ui.Messages;
 
 public class ChartPanelPopupMenu extends JPopupMenu implements ActionListener {
@@ -63,10 +62,7 @@ public void actionPerformed(ActionEvent e) {
 
         if (e.getSource() == applyFiltersMenu) {
             if (!ipedChartPanel.hasNoFilter()) {
-                ipedChartPanel.getIpedChartsPanel().setApplyFilters(applyFiltersMenu.isSelected());
-                App app = (App) ipedChartPanel.getIpedChartsPanel().getGUIProvider();
-                ipedChartPanel.filterSelection();
-                app.setDockablesColors();
+                ipedChartPanel.applyFilters(applyFiltersMenu.isSelected());
             }
         }
         if (e.getSource() == clearAllFiltersMenu) {

iped-app/src/main/java/iped/app/timelinegraph/popups/TimelineFilterSelectionPopupMenu.java

@@ -62,8 +62,7 @@ public void actionPerformed(ActionEvent e) {
         }
 
         if (e.getSource() == filterSelection) {
-            ipedChartPanel.getIpedChartsPanel().setApplyFilters(true);
-            ipedChartPanel.filterSelection();
+            ipedChartPanel.applyFilters(true);
         }
 
         if (e.getSource() == selectItems) {