'#1830 Modify worker to permit items uncheck functionality.

sepinf-inc · Sep 5, 2023 · da482df · da482df
1 parent 4b606ea
commit da482df
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/iped-app/src/main/java/iped/app/timelinegraph/popups/LegendItemPopupMenu.java b/iped-app/src/main/java/iped/app/timelinegraph/popups/LegendItemPopupMenu.java
@@ -118,7 +118,7 @@ public void showSelection(List<LegendItemBlockContainer> selLegends) {
         }
     }
 
-    public void checkEventItems(List<LegendItemBlockContainer> selLegends) {
+    public void checkEventItems(List<LegendItemBlockContainer> selLegends, boolean check) {
         List<LegendItemBlockContainer> selLegendsList = ipedChartPanel.getIpedChartsPanel().getLegendList().getSelectedValuesList();
         if (selLegends != null && selLegends.size() > 0) {
             LegendItemBlockContainer libc = selLegendsList.get(0);
@@ -133,8 +133,14 @@ public void checkEventItems(List<LegendItemBlockContainer> selLegends) {
                 ds.bitSetItems(libc.getSeriesKey().toString(), bs);// set bits of items in serie
             }
 
-            EventPeriodCheckWorker bsCheck = new EventPeriodCheckWorker(
-                    ipedChartPanel.getIpedChartsPanel().getDomainAxis(), msrp, bs, true);
+            EventPeriodCheckWorker bsCheck;
+            if(check) {
+                bsCheck = new EventPeriodCheckWorker(
+                        ipedChartPanel.getIpedChartsPanel().getDomainAxis(), msrp, bs, true);
+            }else{
+                bsCheck = new EventPeriodCheckWorker(
+                        ipedChartPanel.getIpedChartsPanel().getDomainAxis(), msrp, false, bs);
+            }
             bsCheck.execute();
         }
     }
@@ -212,10 +218,10 @@ public void actionPerformed(ActionEvent e) {
 
         //IMPORTANT
         if (e.getSource() == checkItems) {
-            checkEventItems(selLegends);
+            checkEventItems(selLegends, true);
         }
         if (e.getSource() == uncheckItems) {
-            unselectEvents(selLegends);
+            checkEventItems(selLegends, false);
         }
 
         if (e.getSource() == selectAll) {

diff --git a/iped-app/src/main/java/iped/app/timelinegraph/swingworkers/EventPeriodCheckWorker.java b/iped-app/src/main/java/iped/app/timelinegraph/swingworkers/EventPeriodCheckWorker.java
@@ -19,9 +19,14 @@ public EventPeriodCheckWorker(IpedDateAxis domainAxis, IMultiSearchResultProvide
         super(domainAxis, resultsProvider, bs, clearPreviousSelection);
     }
 
+    public EventPeriodCheckWorker(IpedDateAxis domainAxis, IMultiSearchResultProvider resultsProvider,
+            boolean highlight, RoaringBitmap bs) {
+        super(domainAxis, resultsProvider, bs, false);
+        this.highlight = highlight;
+    }
+
     @Override
     public void processResultsItem(JTable t, int i) {
-        Boolean checked = (Boolean) t.getModel().getValueAt(i, 1);
         t.getModel().setValueAt(highlight, i, 1);
     }