From 3bc2eb4bb2ce37867fd8b16d3e5bf6ed8b3a0d28 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 27 Mar 2020 12:38:43 -0400 Subject: [PATCH] 6163 time filtering ui changes --- .../autopsy/geolocation/Bundle.properties | 6 +++-- .../autopsy/geolocation/GeoFilterPanel.form | 25 +++++++++++++++---- .../autopsy/geolocation/GeoFilterPanel.java | 23 +++++++++++------ nbproject/genfiles.properties | 4 +-- 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties index df9448a6cb..18aafd2987 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/geolocation/Bundle.properties @@ -7,8 +7,8 @@ RefreshPanel.closeButton.text= WaypointDetailPanel.closeButton.text= WaypointDetailPanel.imageLabel.text= GeoFilterPanel.waypointSettings.border.title= -GeoFilterPanel.allButton.text=Show All -GeoFilterPanel.mostRecentButton.text=Show only last +GeoFilterPanel.allButton.text=All +GeoFilterPanel.mostRecentButton.text=Only last GeoFilterPanel.applyButton.text=Apply GeoFilterPanel.showWaypointsWOTSCheckBox.text=Include waypoints with no time stamps GeoFilterPanel.daysLabel.text=days of activity @@ -37,3 +37,5 @@ GeolocationTopComponent.reportButton.text=KML Report GeolocationTopComponent.coordLabel.text= MapPanel.zoomInBtn.text= MapPanel.zoomOutBtn.text= +GeoFilterPanel.showLabel.text=Show... +GeoFilterPanel.showLabel.toolTipText=Show... diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.form b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.form index 843676578e..f422df262f 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.form +++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.form @@ -61,7 +61,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -120,7 +120,22 @@ - + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java index 9430f440d1..0adc23d51b 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/GeoFilterPanel.java @@ -210,6 +210,7 @@ class GeoFilterPanel extends javax.swing.JPanel { showWaypointsWOTSCheckBox = new javax.swing.JCheckBox(); daysSpinner = new javax.swing.JSpinner(numberModel); daysLabel = new javax.swing.JLabel(); + showLabel = new javax.swing.JLabel(); javax.swing.JPanel buttonPanel = new javax.swing.JPanel(); applyButton = new javax.swing.JButton(); javax.swing.JLabel optionsLabel = new javax.swing.JLabel(); @@ -229,7 +230,7 @@ class GeoFilterPanel extends javax.swing.JPanel { }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; + gridBagConstraints.gridy = 1; gridBagConstraints.gridwidth = 4; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.weightx = 1.0; @@ -244,7 +245,7 @@ class GeoFilterPanel extends javax.swing.JPanel { }); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; + gridBagConstraints.gridy = 2; gridBagConstraints.gridwidth = 2; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0); @@ -254,17 +255,16 @@ class GeoFilterPanel extends javax.swing.JPanel { showWaypointsWOTSCheckBox.setEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 2; + gridBagConstraints.gridy = 3; gridBagConstraints.gridwidth = 3; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(0, 30, 0, 0); waypointSettings.add(showWaypointsWOTSCheckBox, gridBagConstraints); daysSpinner.setEnabled(false); daysSpinner.setPreferredSize(new java.awt.Dimension(75, 26)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 1; + gridBagConstraints.gridy = 2; gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; gridBagConstraints.insets = new java.awt.Insets(9, 0, 0, 0); waypointSettings.add(daysSpinner, gridBagConstraints); @@ -272,12 +272,20 @@ class GeoFilterPanel extends javax.swing.JPanel { org.openide.awt.Mnemonics.setLocalizedText(daysLabel, org.openide.util.NbBundle.getMessage(GeoFilterPanel.class, "GeoFilterPanel.daysLabel.text")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 3; - gridBagConstraints.gridy = 1; + gridBagConstraints.gridy = 2; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 1.0; gridBagConstraints.insets = new java.awt.Insets(9, 5, 0, 0); waypointSettings.add(daysLabel, gridBagConstraints); + org.openide.awt.Mnemonics.setLocalizedText(showLabel, org.openide.util.NbBundle.getMessage(GeoFilterPanel.class, "GeoFilterPanel.showLabel.text")); // NOI18N + showLabel.setToolTipText(org.openide.util.NbBundle.getMessage(GeoFilterPanel.class, "GeoFilterPanel.showLabel.toolTipText")); // NOI18N + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.insets = new java.awt.Insets(0, 5, 0, 0); + waypointSettings.add(showLabel, gridBagConstraints); + gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -330,6 +338,7 @@ class GeoFilterPanel extends javax.swing.JPanel { private javax.swing.JLabel daysLabel; private javax.swing.JSpinner daysSpinner; private javax.swing.JRadioButton mostRecentButton; + private javax.swing.JLabel showLabel; private javax.swing.JCheckBox showWaypointsWOTSCheckBox; // End of variables declaration//GEN-END:variables @@ -458,7 +467,7 @@ class GeoFilterPanel extends javax.swing.JPanel { HashMap atCountsTotal = new HashMap<>(); for (DataSource dataSource : sleuthkitCase.getDataSources()) { - HashMap atCounts = getGPSDataSources(sleuthkitCase, dataSource); + Map atCounts = getGPSDataSources(sleuthkitCase, dataSource); if (!atCounts.isEmpty()) { for (Map.Entry entry : atCounts.entrySet()) { atCountsTotal.putIfAbsent(entry.getKey(), 0L); diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 2b63032682..24292e702c 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -5,7 +5,7 @@ build.xml.stylesheet.CRC32=eaf9f76a@1.42.2 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=2e7964b0 nbproject/build-impl.xml.script.CRC32=b72261eb -nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.47.1 +nbproject/build-impl.xml.stylesheet.CRC32=473dc988@2.76.1 nbproject/platform.xml.data.CRC32=2e7964b0 nbproject/platform.xml.script.CRC32=6dcbd131 -nbproject/platform.xml.stylesheet.CRC32=45ddf0e0@2.72.1 +nbproject/platform.xml.stylesheet.CRC32=ae64f0b6@2.76.1