Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multi valued item location map #2088

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Multi valued item location map #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4f9a1e
'#2083 Map implementation that supports items with multi valued
patrickdalla Feb 19, 2024
932e580
'#2083 missing item from last commit.
patrickdalla Feb 19, 2024
420ecff
Merge branch 'master' into MultiValuedItemLocMap
lfcnassif May 2, 2024
34d169c
'#2224 and '#2208 Modifications to hide last JSON features if a new
patrickdalla May 20, 2024
7d13379
Revert "'#2224 and '#2208 Modifications to hide last JSON features if…
patrickdalla May 20, 2024
b08708e
Merge branch 'MultiValuedItemLocMap' of https://github.com/sepinf-inc…
patrickdalla May 20, 2024
2c993b5
'#2224 and '#2208 Modifications to hide last JSON features if a new
patrickdalla May 20, 2024
c541b4d
Merge branch 'master' into MultiValuedItemLocMap
lfcnassif Jun 3, 2024
37448a9
'#2088 Removes unnecessary code to run in multi threads what does not
patrickdalla Jun 4, 2024
da52c15
Merge branch 'MultiValuedItemLocMap' of https://github.com/sepinf-inc…
patrickdalla Jun 4, 2024
fe2d94d
'#2088 corrects marker checked sync state for items with multiple valued
patrickdalla Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iped-geo/src/main/java/iped/geo/AbstractMapCanvas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public void drawPolyline(List<StringBuffer> gids) {

}

public abstract void drawJSONFeature(String string);
public abstract void drawJSONFeature(String mid, String jsonFeature);

public void drawJSONFeatures(String[] jsonFeatures) {
// TODO Auto-generated method stub
Expand Down
9 changes: 6 additions & 3 deletions iped-geo/src/main/java/iped/geo/impl/AppMapMarkerEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ public AppMapMarkerEventListener(AppMapPanel mapaPanel) {
@Override
public void onClicked(String mid, MouseEvent e) {
// procura pela posição correspondente na tabela do item clicado no mapa
mid = GetResultsKMLWorker.getBaseGID(mid);
String bmid = GetResultsKMLWorker.getBaseGID(mid);

JTable t = mapaPanel.getResultsProvider().getResultsTable();
int pos = mapaPanel.getItemPositioninResultsTable(mid);
int pos = mapaPanel.getItemPositioninResultsTable(bmid);
if (pos != -1) {
boolean olddesabilitaTemp = mapViewer.desabilitaTemp;
mapViewer.desabilitaTemp = true;
Expand Down Expand Up @@ -53,7 +54,9 @@ public void onClicked(String mid, MouseEvent e) {
}
String jsonFeature = mapaPanel.getSelectedJSONFeature();
if (jsonFeature != null) {
mapaPanel.browserCanvas.drawJSONFeature(jsonFeature);
mapaPanel.browserCanvas.drawJSONFeature(mid, jsonFeature);
} else {
mapaPanel.browserCanvas.drawJSONFeature(mid, "");
}

mapViewer.desabilitaTemp = olddesabilitaTemp;
Expand Down
19 changes: 10 additions & 9 deletions iped-geo/src/main/java/iped/geo/impl/AppMapPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,25 +328,25 @@ private void syncSelectedItems() {
for (int i = 0; i < selected.length; i++) {
int rowModel = resultsTable.convertRowIndexToModel(selected[i]);
IItemId item = results.getItem(rowModel);
addSelection(selecoes, item);
addSelection(selecoes, item, true);
}

mapViewer.updateMapLeadCursor();

browserCanvas.sendSelection(selecoes);
}

public void addSelection(HashMap<String, Boolean> selecoes, IItemId item) {
public void addSelection(HashMap<String, Boolean> selecoes, IItemId item, boolean selected) {
if (kmlResult != null && kmlResult.getGPSItems().containsKey(item)) {
List<Integer> subitems = kmlResult.getGPSItems().get(item);
if (subitems == null) {
String gid = "marker_" + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
selecoes.put(gid, true);
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
selecoes.put(gid, selected);
} else {
for (Integer subitem : subitems) {
String gid = "marker_" + item.getSourceId() + "_" + item.getId() + "_" //$NON-NLS-1$ //$NON-NLS-2$
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId() + "_" //$NON-NLS-1$ //$NON-NLS-2$
+ subitem;
selecoes.put(gid, true);
selecoes.put(gid, selected);
}
}
}
Expand Down Expand Up @@ -393,11 +393,12 @@ public void selectCheckbox(IItemId item, boolean b) {
if (kmlResult != null && kmlResult.getGPSItems().containsKey(item)) {
List<Integer> subitems = kmlResult.getGPSItems().get(item);
if (subitems == null) {
String gid = "marker_" + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
browserCanvas.selectCheckbox(gid, b);
} else {
for (Integer subitem : subitems) {
String gid = "marker_" + item.getSourceId() + "_" + item.getId() + "_" + subitem; //$NON-NLS-1$ //$NON-NLS-2$
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId() + "_" //$NON-NLS-1$ //$NON-NLS-2$
+ subitem;
browserCanvas.selectCheckbox(gid, b);
}
}
Expand Down Expand Up @@ -469,7 +470,7 @@ public int getItemPositioninResultsTable(String mid) {
IMultiSearchResult results = this.getResultsProvider().getResults();
for (int i = 0; i < results.getLength(); i++) {
IItemId item = results.getItem(i);
String gid = "marker_" + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
if (mid.equals(gid)) {
pos = i;
break;
Expand Down
3 changes: 2 additions & 1 deletion iped-geo/src/main/java/iped/geo/impl/AppMapSelectionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import iped.data.IItemId;
import iped.geo.MapSelectionListener;
import iped.geo.js.GetResultsJSWorker;
import iped.geo.kml.GetResultsKMLWorker;
import iped.properties.BasicProps;

Expand All @@ -33,7 +34,7 @@ public void OnSelect(String[] mids) {

for (int i = 0; i < mapaPanel.getResultsProvider().getResults().getLength(); i++) {
IItemId item = mapaPanel.getResultsProvider().getResults().getItem(i);
String gid = "marker_" + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$

if (Arrays.binarySearch(mids, gid) >= 0) {
int row = t.convertRowIndexToView(i);
Expand Down
9 changes: 4 additions & 5 deletions iped-geo/src/main/java/iped/geo/impl/MapViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import bibliothek.gui.dock.common.DefaultSingleCDockable;
import iped.data.IItemId;
import iped.geo.js.GetResultsJSWorker;
import iped.geo.localization.Messages;
import iped.search.IMultiSearchResult;
import iped.viewers.api.GUIProvider;
Expand Down Expand Up @@ -174,8 +175,7 @@ public void applyCheckedItems() {
Entry<IItemId, Boolean> entry = (Entry<IItemId, Boolean>) iterator.next();
IItemId item = entry.getKey();
if (mapaPanel.hasItem(item)) {
String gid = "marker_" + item.getSourceId() + "_" + item.getId(); //$NON-NLS-1$ //$NON-NLS-2$
checked.put(gid, entry.getValue());
mapaPanel.addSelection(checked, item, entry.getValue());
}
}
mapaPanel.browserCanvas.sendCheck(checked);
Expand All @@ -190,7 +190,7 @@ public void updateMapLeadCursor() {
if (resultTableLeadSelIdx != -1) {
int rowModel = resultsTable.convertRowIndexToModel(resultTableLeadSelIdx);
IItemId item = resultsProvider.getResults().getItem(rowModel);
String gid = "marker_" + item.getSourceId() + "_" + item.getId();
String gid = GetResultsJSWorker.MARKER_PREFIX + item.getSourceId() + "_" + item.getId();
mapaPanel.browserCanvas.sendLeadSelection(gid);
}
} catch (Exception ex) {
Expand All @@ -214,12 +214,11 @@ public void run() {
ListSelectionModel lsm = (ListSelectionModel) e.getSource();
for (int i = e.getFirstIndex(); i <= e.getLastIndex(); i++) {
boolean selected = lsm.isSelectedIndex(i);

try {
int rowModel = resultsTable.convertRowIndexToModel(i);

IItemId item = results.getItem(rowModel);
mapaPanel.addSelection(selecoes, item);
mapaPanel.addSelection(selecoes, item, selected);
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
Loading
Loading