diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java index 528e38d..c842f38 100644 --- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java +++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java @@ -10,6 +10,7 @@ import org.gcube.portlets.user.td.monitorwidget.client.background.MonitorBackgro import org.gcube.portlets.user.td.resourceswidget.client.ResourcesPanel; import org.gcube.portlets.user.td.tablewidget.client.ChangeTableTypePanel; import org.gcube.portlets.user.td.tablewidget.client.geometry.GeometryCreatePointPanel; +import org.gcube.portlets.user.td.tablewidget.client.geospatial.DownscaleCSquarePanel; import org.gcube.portlets.user.td.tablewidget.client.geospatial.GeospatialCreateCoordinatesPanel; import org.gcube.portlets.user.td.tablewidget.client.history.HistoryPanel; import org.gcube.portlets.user.td.tablewidget.client.normalize.DenormalizePanel; @@ -69,7 +70,7 @@ public class ToolBox extends TabPanel { private ResourcesPanel resourcesPanel; private GeospatialCreateCoordinatesPanel geospatialCreateCoordinatesPanel; private GeometryCreatePointPanel geometryCreatePointPanel; - + private DownscaleCSquarePanel downscaleCSquarePanel; private FramedPanel taskPanel; private PositionColumnPanel positionColumnPanel; @@ -206,10 +207,10 @@ public class ToolBox extends TabPanel { } - public void openPositionColumnTab(TRId trId, String columnName) { + public void openPositionColumnTab(TRId trId, String columnLocalId) { Log.debug("Open Position Column Tab"); if (positionColumnPanel == null) { - addPositionColumnPanel(trId, columnName); + addPositionColumnPanel(trId, columnLocalId); } else { positionColumnPanel.update(trId); } @@ -325,6 +326,19 @@ public class ToolBox extends TabPanel { } + + public void openDownscaleCSquareTab(TRId trId, String columnLocalId) { + Log.debug("Open DownscaleCSquare Tab"); + if (downscaleCSquarePanel == null) { + addDownscaleCSquarePanel(trId,columnLocalId); + } else { + downscaleCSquarePanel.update(trId,columnLocalId); + } + setActiveWidget(downscaleCSquarePanel); + + + } + // Close @@ -840,7 +854,7 @@ public class ToolBox extends TabPanel { }); }; - protected void addPositionColumnPanel(TRId trId, String columnName) { + protected void addPositionColumnPanel(TRId trId, String columnLocalId) { TabItemConfig labelColumnItemConf = new TabItemConfig("Position Column", true); @@ -1013,6 +1027,30 @@ public class ToolBox extends TabPanel { } + private void addDownscaleCSquarePanel(TRId trId, String columnLocalId) { + TabItemConfig downscaleCSquareItemConf = new TabItemConfig( + "Downscale C-Square", true); + + downscaleCSquarePanel = new DownscaleCSquarePanel( + trId, columnLocalId, eventBus); + add(downscaleCSquarePanel, + downscaleCSquareItemConf); + + addBeforeCloseHandler(new BeforeCloseHandler() { + + public void onBeforeClose(BeforeCloseEvent event) { + if (downscaleCSquarePanel == event.getItem()) { + remove(downscaleCSquarePanel); + downscaleCSquarePanel = null; + + } + + } + + }); + + } + protected void addDuplicatesRowsPanel(TRId trId) { TabItemConfig duplicatesRowsDeleteItemConf = new TabItemConfig( diff --git a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java index 5602001..d591d7a 100644 --- a/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java @@ -179,7 +179,9 @@ public class ToolBoxPanel extends ContentPanel { case GEOMETRYCREATEPOINTPANEL: doGeometryCreatePointTab(event); break; - + case DOWNSCALECSQUAREPANEL: + doDownscaleCSquareTab(event); + break; default: break; @@ -361,14 +363,14 @@ public class ToolBoxPanel extends ContentPanel { || uiStateType == UIStateType.TABLEUPDATE) { if (state == ToolBoxPanelState.OPENED) { toolBox.openPositionColumnTab(event.getTrId(), - event.getColumnName()); + event.getColumnLocalId()); Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); } else { enable(); expand(); state = ToolBoxPanelState.OPENED; toolBox.openPositionColumnTab(event.getTrId(), - event.getColumnName()); + event.getColumnLocalId()); } } else { Log.debug("ToolBoxPanel No table open"); @@ -541,7 +543,27 @@ public class ToolBoxPanel extends ContentPanel { } - + protected void doDownscaleCSquareTab(WidgetRequestEvent event) { + Log.debug("WidgetRequestEvent.DOWNSCALECSQUAREPANEL : [" + event.getTrId() + + " ,columnName: " + event.getColumnName() + "]"); + if (uiStateType == UIStateType.TR_OPEN + || uiStateType == UIStateType.TABLECURATION + || uiStateType == UIStateType.TABLEUPDATE) { + if (state == ToolBoxPanelState.OPENED) { + toolBox.openDownscaleCSquareTab(event.getTrId(), + event.getColumnLocalId()); + Log.debug("ToolBoxPanelSTate.OPENED Add Tabs"); + } else { + enable(); + expand(); + state = ToolBoxPanelState.OPENED; + toolBox.openDownscaleCSquareTab(event.getTrId(), + event.getColumnLocalId()); + } + } else { + Log.debug("ToolBoxPanel No table open"); + } + } protected void doNormalizeTab(WidgetRequestEvent event) {