Added Geospatial Create Coordinates Panel

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@111826 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-02-09 16:36:13 +00:00
parent f50bda4df0
commit 766198e1fe
19 changed files with 202 additions and 131 deletions

View File

@ -4,6 +4,7 @@
package org.gcube.portlets.user.td.client; package org.gcube.portlets.user.td.client;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import org.gcube.portlets.user.td.chartswidget.client.ChartsWidgetTD; import org.gcube.portlets.user.td.chartswidget.client.ChartsWidgetTD;
import org.gcube.portlets.user.td.client.logs.TDMLogs; import org.gcube.portlets.user.td.client.logs.TDMLogs;
@ -63,9 +64,11 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.CellData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.GridOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.GridOperationId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.RequestProperties; import org.gcube.portlets.user.td.widgetcommonevent.shared.RequestProperties;
import org.gcube.portlets.user.td.widgetcommonevent.shared.RequestPropertiesParameterType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.DataView; import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.DataView;
import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.TabularResourceDataView; import org.gcube.portlets.user.td.widgetcommonevent.shared.dataview.TabularResourceDataView;
import org.gcube.portlets.user.td.widgetcommonevent.shared.geospatial.GeospatialCoordinatesType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.grid.model.RowRaw; import org.gcube.portlets.user.td.widgetcommonevent.shared.grid.model.RowRaw;
import org.gcube.portlets.user.td.wizardwidget.client.WizardListener; import org.gcube.portlets.user.td.wizardwidget.client.WizardListener;
import org.gcube.portlets.user.tdtemplate.client.TdTemplateController; import org.gcube.portlets.user.tdtemplate.client.TdTemplateController;
@ -741,30 +744,30 @@ public class TabularDataController {
break; break;
case PROPERTIES: case PROPERTIES:
break; break;
case IMPORTSDMX: case IMPORT_SDMX:
openSDMXImportWizard(); openSDMXImportWizard();
break; break;
case IMPORTCSV: case IMPORT_CSV:
openCSVImportWizard(); openCSVImportWizard();
break; break;
case IMPORTJSON: case IMPORT_JSON:
break; break;
case EXPORTSDMX: case EXPORT_SDMX:
openSDMXExportWizard(); openSDMXExportWizard();
break; break;
case EXPORTCSV: case EXPORT_CSV:
openCSVExportWizard(); openCSVExportWizard();
break; break;
case EXPORTJSON: case EXPORT_JSON:
openJSONExportWizard(); openJSONExportWizard();
break; break;
case TEMPLATEOPEN: case TEMPLATE_OPEN:
openTemplateOpen(); openTemplateOpen();
break; break;
case TEMPLATENEW: case TEMPLATE_NEW:
openTemplateNew(); openTemplateNew();
break; break;
case TEMPLATEDELETE: case TEMPLATE_DELETE:
openTemplateDelete(); openTemplateDelete();
break; break;
case SHARE: case SHARE:
@ -773,7 +776,7 @@ public class TabularDataController {
case TIMELINE: case TIMELINE:
openTasksManagerWizard(); openTasksManagerWizard();
break; break;
case BACKGROUNDTASKS: case BACKGROUND_TASKS:
openBackgroundMonitor(); openBackgroundMonitor();
break; break;
case HISTORY: case HISTORY:
@ -781,42 +784,42 @@ public class TabularDataController {
case UNDO: case UNDO:
callDiscard(); callDiscard();
break; break;
case DISCARDALL: case DISCARD_ALL:
break; break;
case HELP: case HELP:
break; break;
case LOGS: case LOGS:
openLogsWindow(); openLogsWindow();
break; break;
case RULENEW: case RULE_NEW:
break; break;
case RULEMANAGE: case RULE_MANAGE:
break; break;
case DUPLICATEDETECTION: case DUPLICATE_DETECTION:
openDuplicatesRows(); openDuplicatesRows();
break; break;
case TEMPLATEAPPLY: case TEMPLATE_APPLY:
openTemplateApply(); openTemplateApply();
break; break;
case TABLETYPE: case TABLE_TYPE:
openTableType(); openTableType();
break; break;
case COLUMNLABEL: case COLUMN_LABEL:
openColumnLabel(); openColumnLabel();
break; break;
case COLUMNTYPE: case COLUMN_TYPE:
openChangeColumnType(); openChangeColumnType();
break; break;
case COLUMNADD: case COLUMN_ADD:
openColumnAdd(); openColumnAdd();
break; break;
case COLUMNDELETE: case COLUMN_DELETE:
openColumnDelete(); openColumnDelete();
break; break;
case COLUMNSPLIT: case COLUMN_SPLIT:
openColumnSplit(); openColumnSplit();
break; break;
case COLUMNMERGE: case COLUMN_MERGE:
openColumnMerge(); openColumnMerge();
break; break;
case DENORMALIZE: case DENORMALIZE:
@ -825,70 +828,76 @@ public class TabularDataController {
case NORMALIZE: case NORMALIZE:
openNormalize(); openNormalize();
break; break;
case EXTRACTCODELIST: case EXTRACT_CODELIST:
openExtractCodelistWizard(); openExtractCodelistWizard();
break; break;
case CODELISTMAPPING: case CODELIST_MAPPING:
openCodelistMappingWizard(); openCodelistMappingWizard();
break; break;
case GENERATESUMMARY: case GENERATE_SUMMARY:
break; break;
case TABLEFILTER: case TABLE_FILTER:
break; break;
case TABLEUNION: case TABLE_UNION:
openTableUnionWizard(); openTableUnionWizard();
break; break;
case TABLEGROUPBY: case TABLE_GROUPBY:
openGroupBy(); openGroupBy();
break; break;
case TABLETIMEAGGREGATE: case TABLE_TIME_AGGREGATE:
openTimeAggregate(); openTimeAggregate();
break; break;
case TABLEAGGREAGETE: case TABLE_AGGREAGETE:
break; break;
case TABLEREPLACEBYEXTERNALCOL: case TABLE_REPLACE_BY_EXTERNAL_COL:
openReplaceByExternalColWizard(); openReplaceByExternalColWizard();
break; break;
case ROWADD: case ROW_ADD:
doRowAdd(); doRowAdd();
break; break;
case ROWDELETE: case ROW_DELETE:
doRowsDelete(); doRowsDelete();
break; break;
case DUPLICATEDELETE: case DUPLICATE_DELETE:
openDuplicatesRows(); openDuplicatesRows();
break; break;
case ANNOTATIONADD: case GEOSPATIAL_CSQUARE:
openGeospatialCSquare();
break; break;
case COLUMNFILTER: case GEOSPATIAL_OCEAN_AREA:
openGeospatialOceanArea();
break;
case ANNOTATION_ADD:
break;
case COLUMN_FILTER:
openMultiColumnFilter(); openMultiColumnFilter();
break; break;
case COLUMNBATCHREPLACE: case COLUMN_BATCH_REPLACE:
break; break;
case ANALYSETABLEFILTER: case ANALYSE_TABLE_FILTER:
break; break;
case ANALYSETABLEUNION: case ANALYSE_TABLE_UNION:
break; break;
case ANALYSETABLEGROUPBY: case ANALYSE_TABLE_GROUPBY:
break; break;
case ANALYSETABLEAGGREAGETE: case ANALYSE_TABLE_AGGREAGETE:
break; break;
case ANALYSEROWADD: case ANALYSE_ROW_ADD:
break; break;
case ANALYSEROWDELETE: case ANALYSE_ROW_DELETE:
break; break;
case ANALYSEDUPLICATEDELETE: case ANALYSE_DUPLICATE_DELETE:
break; break;
case ANALYSEANNOTATIONADD: case ANALYSE_ANNOTATION_ADD:
break; break;
case ANALYSECOLUMNFILTER: case ANALYSE_COLUMN_FILTER:
break; break;
case ANALYSECOLUMNEDIT: case ANALYSE_COLUMN_EDIT:
break; break;
case CHARTCREATE: case CHART_CREATE:
openCreateChart(); openCreateChart();
break; break;
case RSTUDIO: case R_STUDIO:
openRStudio(); openRStudio();
break; break;
case STATISTICAL: case STATISTICAL:
@ -896,7 +905,7 @@ public class TabularDataController {
break; break;
case SPREAD: case SPREAD:
break; break;
case CREATEGISMAP: case CREATE_GIS_MAP:
openCreateMapWizard(); openCreateMapWizard();
break; break;
default: default:
@ -1930,7 +1939,47 @@ public class TabularDataController {
UtilsGXT3.alert("Error", "No tabular resource present"); UtilsGXT3.alert("Error", "No tabular resource present");
} }
} }
private void openGeospatialCSquare() {
Log.debug("Request Geospatial Create C-Square Coordiantes Tab");
if (trId != null) {
WidgetRequestEvent e = new WidgetRequestEvent(
WidgetRequestType.GEOSPATIALCREATECOORDINATESPANEL);
e.setTrId(trId);
HashMap<RequestPropertiesParameterType, Object> map=new HashMap<RequestPropertiesParameterType, Object>();
map.put(RequestPropertiesParameterType.Coordinates, GeospatialCoordinatesType.C_SQUARE);
RequestProperties requestProperties= new RequestProperties(map);
e.setRequestProperties(requestProperties);
eventBus.fireEvent(e);
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error", "No tabular resource present");
}
}
private void openGeospatialOceanArea() {
Log.debug("Request Geospatial Create Ocean Area Coordiantes Tab");
if (trId != null) {
WidgetRequestEvent e = new WidgetRequestEvent(
WidgetRequestType.GEOSPATIALCREATECOORDINATESPANEL);
e.setTrId(trId);
HashMap<RequestPropertiesParameterType, Object> map=new HashMap<RequestPropertiesParameterType, Object>();
map.put(RequestPropertiesParameterType.Coordinates, GeospatialCoordinatesType.OCEAN_AREA);
RequestProperties requestProperties= new RequestProperties(map);
e.setRequestProperties(requestProperties);
eventBus.fireEvent(e);
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error", "No tabular resource present");
}
}
private void openBackgroundMonitor() { private void openBackgroundMonitor() {
Log.debug("Request Open Monitor Background Tab"); Log.debug("Request Open Monitor Background Tab");
WidgetRequestEvent e = new WidgetRequestEvent( WidgetRequestEvent e = new WidgetRequestEvent(

View File

@ -415,4 +415,26 @@ public interface TabularDataResources extends ClientBundle {
ImageResource replaceByExternalCol(); ImageResource replaceByExternalCol();
@Source("flag-red_32.png")
ImageResource geospatialCSquare32();
@Source("flag-red.png")
ImageResource geospatialCSquare();
@Source("flag-blue_32.png")
ImageResource geospatialOceanArea32();
@Source("flag-blue.png")
ImageResource geospatialOceanArea();
@Source("flag-green_32.png")
ImageResource geospatialCoordinates32();
@Source("flag-green.png")
ImageResource geospatialCoordinates();
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -288,7 +288,7 @@ public class AnalyseToolBar {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new eventBus.fireEvent(new
RibbonEvent(RibbonType.CHARTCREATE)); RibbonEvent(RibbonType.CHART_CREATE));
} }
}); });
@ -354,7 +354,7 @@ public class AnalyseToolBar {
rstudioButton.addSelectHandler(new SelectHandler() { rstudioButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.RSTUDIO)); eventBus.fireEvent(new RibbonEvent(RibbonType.R_STUDIO));
} }
}); });
@ -419,7 +419,7 @@ public class AnalyseToolBar {
gisButton.addSelectHandler(new SelectHandler() { gisButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.CREATEGISMAP)); eventBus.fireEvent(new RibbonEvent(RibbonType.CREATE_GIS_MAP));
} }
}); });

View File

@ -127,7 +127,7 @@ public class CurationToolBar {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent( eventBus.fireEvent(new RibbonEvent(
RibbonType.DUPLICATEDETECTION)); RibbonType.DUPLICATE_DETECTION));
} }
}); });
@ -144,7 +144,7 @@ public class CurationToolBar {
applyTemplateButton.addSelectHandler(new SelectHandler() { applyTemplateButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.TEMPLATEAPPLY)); eventBus.fireEvent(new RibbonEvent(RibbonType.TEMPLATE_APPLY));
} }
}); });
@ -174,7 +174,7 @@ public class CurationToolBar {
tableTypeButton.addSelectHandler(new SelectHandler() { tableTypeButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.TABLETYPE)); eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_TYPE));
} }
}); });
@ -191,7 +191,7 @@ public class CurationToolBar {
changeColumnLabelButton.addSelectHandler(new SelectHandler() { changeColumnLabelButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNLABEL)); eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_LABEL));
} }
}); });
@ -208,7 +208,7 @@ public class CurationToolBar {
columnTypeButton.addSelectHandler(new SelectHandler() { columnTypeButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNTYPE)); eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_TYPE));
} }
}); });
@ -225,7 +225,7 @@ public class CurationToolBar {
addColumnButton.addSelectHandler(new SelectHandler() { addColumnButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNADD)); eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_ADD));
} }
}); });
@ -242,7 +242,7 @@ public class CurationToolBar {
deleteColumnButton.addSelectHandler(new SelectHandler() { deleteColumnButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNDELETE)); eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_DELETE));
} }
}); });
@ -260,7 +260,7 @@ public class CurationToolBar {
splitColumnButton.addSelectHandler(new SelectHandler() { splitColumnButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNSPLIT)); eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_SPLIT));
} }
}); });
@ -277,7 +277,7 @@ public class CurationToolBar {
mergeColumnButton.addSelectHandler(new SelectHandler() { mergeColumnButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNMERGE)); eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMN_MERGE));
} }
}); });
@ -342,7 +342,7 @@ public class CurationToolBar {
extractCodelistButton.addSelectHandler(new SelectHandler() { extractCodelistButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXTRACTCODELIST)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXTRACT_CODELIST));
} }
}); });
@ -359,7 +359,7 @@ public class CurationToolBar {
codelistMappingButton.addSelectHandler(new SelectHandler() { codelistMappingButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.CODELISTMAPPING)); eventBus.fireEvent(new RibbonEvent(RibbonType.CODELIST_MAPPING));
} }
}); });

View File

@ -206,7 +206,7 @@ public class FileToolBar {
importSDMXButton.addSelectHandler(new SelectHandler() { importSDMXButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTSDMX)); eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_SDMX));
} }
}); });
@ -219,7 +219,7 @@ public class FileToolBar {
importCSVButton.addSelectHandler(new SelectHandler() { importCSVButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTCSV)); eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_CSV));
} }
}); });
importLayout.setWidget(0, 2, importCSVButton); importLayout.setWidget(0, 2, importCSVButton);
@ -231,7 +231,7 @@ public class FileToolBar {
importJSONButton.addSelectHandler(new SelectHandler() { importJSONButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORTJSON)); eventBus.fireEvent(new RibbonEvent(RibbonType.IMPORT_JSON));
} }
}); });
importLayout.setWidget(1, 2, importJSONButton); importLayout.setWidget(1, 2, importJSONButton);
@ -259,7 +259,7 @@ public class FileToolBar {
exportSDMXButton.addSelectHandler(new SelectHandler() { exportSDMXButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTSDMX)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_SDMX));
} }
}); });
@ -273,7 +273,7 @@ public class FileToolBar {
exportCSVButton.addSelectHandler(new SelectHandler() { exportCSVButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTCSV)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_CSV));
} }
}); });
exportLayout.setWidget(0, 2, exportCSVButton); exportLayout.setWidget(0, 2, exportCSVButton);
@ -285,7 +285,7 @@ public class FileToolBar {
exportJSONButton.addSelectHandler(new SelectHandler() { exportJSONButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORTJSON)); eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_JSON));
} }
}); });
exportLayout.setWidget(1, 2, exportJSONButton); exportLayout.setWidget(1, 2, exportJSONButton);
@ -313,7 +313,7 @@ public class FileToolBar {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent( eventBus.fireEvent(new RibbonEvent(
RibbonType.TEMPLATENEW)); RibbonType.TEMPLATE_NEW));
} }
}); });
@ -331,7 +331,7 @@ public class FileToolBar {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent( eventBus.fireEvent(new RibbonEvent(
RibbonType.TEMPLATEOPEN)); RibbonType.TEMPLATE_OPEN));
} }
}); });
@ -350,7 +350,7 @@ public class FileToolBar {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent( eventBus.fireEvent(new RibbonEvent(
RibbonType.TEMPLATEDELETE)); RibbonType.TEMPLATE_DELETE));
} }
}); });
@ -426,7 +426,7 @@ public class FileToolBar {
backgroundButton.addSelectHandler(new SelectHandler() { backgroundButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.BACKGROUNDTASKS)); eventBus.fireEvent(new RibbonEvent(RibbonType.BACKGROUND_TASKS));
} }
}); });

View File

@ -48,8 +48,8 @@ public class ModifyToolBar {
//protected TextButton annotationButton; //protected TextButton annotationButton;
// Column // Column
protected TextButton filterColumnButton; protected TextButton csquareButton;
protected TextButton replaceValueBatchButton; protected TextButton oceanAreaButton;
public ModifyToolBar(EventBus eventBus) { public ModifyToolBar(EventBus eventBus) {
@ -104,7 +104,7 @@ public class ModifyToolBar {
unionButton.addSelectHandler(new SelectHandler() { unionButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEUNION)); eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_UNION));
} }
}); });
@ -122,7 +122,7 @@ public class ModifyToolBar {
groupbyButton.addSelectHandler(new SelectHandler() { groupbyButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEGROUPBY)); eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_GROUPBY));
} }
}); });
@ -158,7 +158,7 @@ public class ModifyToolBar {
timeAggregationButton.addSelectHandler(new SelectHandler() { timeAggregationButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.TABLETIMEAGGREGATE)); eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_TIME_AGGREGATE));
} }
}); });
@ -176,7 +176,7 @@ public class ModifyToolBar {
replaceByExternalCol.addSelectHandler(new SelectHandler() { replaceByExternalCol.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEREPLACEBYEXTERNALCOL)); eventBus.fireEvent(new RibbonEvent(RibbonType.TABLE_REPLACE_BY_EXTERNAL_COL));
} }
}); });
@ -196,7 +196,7 @@ public class ModifyToolBar {
addRowButton.addSelectHandler(new SelectHandler() { addRowButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.ROWADD)); eventBus.fireEvent(new RibbonEvent(RibbonType.ROW_ADD));
} }
}); });
@ -213,7 +213,7 @@ public class ModifyToolBar {
deleteRowButton.addSelectHandler(new SelectHandler() { deleteRowButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.ROWDELETE)); eventBus.fireEvent(new RibbonEvent(RibbonType.ROW_DELETE));
} }
}); });
@ -230,7 +230,7 @@ public class ModifyToolBar {
deleteDuplicateButton.addSelectHandler(new SelectHandler() { deleteDuplicateButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATEDELETE)); eventBus.fireEvent(new RibbonEvent(RibbonType.DUPLICATE_DELETE));
} }
}); });
@ -257,61 +257,61 @@ public class ModifyToolBar {
*/ */
cleanCells(tableLayout.getElement()); cleanCells(tableLayout.getElement());
// Column Group // Geospatial Group
ButtonGroup columnGroup = new ButtonGroup(); ButtonGroup geospatialGroup = new ButtonGroup();
columnGroup.setId("Column"); geospatialGroup.setId("Geospatial");
columnGroup.setStyleName("ribbon"); geospatialGroup.setStyleName("ribbon");
columnGroup.setHeadingText("Column"); geospatialGroup.setHeadingText("Geospatial");
columnGroup.disable(); geospatialGroup.enable();
columnGroup.setVisible(false); geospatialGroup.setVisible(true);
toolBar.add(columnGroup); toolBar.add(geospatialGroup);
FlexTable columnLayout = new FlexTable(); FlexTable geospatialLayout = new FlexTable();
columnGroup.add(columnLayout); geospatialGroup.add(geospatialLayout);
filterColumnButton = new TextButton("Filter", csquareButton = new TextButton("C-Square",
TabularDataResources.INSTANCE.columnFilter32()); TabularDataResources.INSTANCE.geospatialCSquare32());
filterColumnButton.disable(); csquareButton.disable();
filterColumnButton.setScale(ButtonScale.LARGE); csquareButton.setScale(ButtonScale.LARGE);
filterColumnButton.setIconAlign(IconAlign.TOP); csquareButton.setIconAlign(IconAlign.TOP);
filterColumnButton csquareButton
.setToolTip("Filter column values according to an condition"); .setToolTip("Create C-Square Coordinates");
filterColumnButton csquareButton
.setArrowAlign(ButtonArrowAlign.BOTTOM); .setArrowAlign(ButtonArrowAlign.BOTTOM);
filterColumnButton csquareButton
.addSelectHandler(new SelectHandler() { .addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNFILTER)); eventBus.fireEvent(new RibbonEvent(RibbonType.GEOSPATIAL_CSQUARE));
} }
}); });
columnLayout.setWidget(0, 0, filterColumnButton); geospatialLayout.setWidget(0, 0, csquareButton);
columnLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); geospatialLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
replaceValueBatchButton = new TextButton("Replace Batch", oceanAreaButton = new TextButton("Ocean Area",
TabularDataResources.INSTANCE.columnReplaceBatch32()); TabularDataResources.INSTANCE.geospatialOceanArea32());
replaceValueBatchButton.disable(); oceanAreaButton.disable();
replaceValueBatchButton.setScale(ButtonScale.LARGE); oceanAreaButton.setScale(ButtonScale.LARGE);
replaceValueBatchButton.setIconAlign(IconAlign.TOP); oceanAreaButton.setIconAlign(IconAlign.TOP);
replaceValueBatchButton oceanAreaButton
.setToolTip("Replace column values in batch"); .setToolTip("Create Ocean Area Coordinates");
replaceValueBatchButton oceanAreaButton
.setArrowAlign(ButtonArrowAlign.BOTTOM); .setArrowAlign(ButtonArrowAlign.BOTTOM);
replaceValueBatchButton oceanAreaButton
.addSelectHandler(new SelectHandler() { .addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNBATCHREPLACE)); eventBus.fireEvent(new RibbonEvent(RibbonType.GEOSPATIAL_OCEAN_AREA));
} }
}); });
columnLayout.setWidget(0, 1, replaceValueBatchButton); geospatialLayout.setWidget(0, 1, oceanAreaButton);
columnLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); geospatialLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
cleanCells(columnLayout.getElement()); cleanCells(geospatialLayout.getElement());
eventBus.addHandler(UIStateEvent.TYPE, eventBus.addHandler(UIStateEvent.TYPE,
new UIStateEvent.UIStateHandler() { new UIStateEvent.UIStateHandler() {
@ -352,9 +352,9 @@ public class ModifyToolBar {
deleteRowButton.disable(); deleteRowButton.disable();
deleteDuplicateButton.disable(); deleteDuplicateButton.disable();
//annotationButton.disable(); //annotationButton.disable();
// Column // geospatial
filterColumnButton.disable(); csquareButton.disable();
replaceValueBatchButton.disable(); oceanAreaButton.disable();
break; break;
case TR_CLOSE: case TR_CLOSE:
case TR_READONLY: case TR_READONLY:
@ -369,9 +369,9 @@ public class ModifyToolBar {
deleteRowButton.disable(); deleteRowButton.disable();
deleteDuplicateButton.disable(); deleteDuplicateButton.disable();
//annotationButton.disable(); //annotationButton.disable();
// Column // geospatial
filterColumnButton.disable(); csquareButton.disable();
replaceValueBatchButton.disable(); oceanAreaButton.disable();
break; break;
case TR_OPEN: case TR_OPEN:
case TABLEUPDATE: case TABLEUPDATE:
@ -387,9 +387,9 @@ public class ModifyToolBar {
deleteRowButton.enable(); deleteRowButton.enable();
deleteDuplicateButton.enable(); deleteDuplicateButton.enable();
//annotationButton.disable(); //annotationButton.disable();
// Column // geospatial
filterColumnButton.disable(); csquareButton.enable();
replaceValueBatchButton.disable(); oceanAreaButton.enable();
break; break;
case WIZARD_OPEN: case WIZARD_OPEN:
// Table // Table
@ -404,8 +404,8 @@ public class ModifyToolBar {
deleteDuplicateButton.disable(); deleteDuplicateButton.disable();
//annotationButton.disable(); //annotationButton.disable();
// Column // Column
filterColumnButton.disable(); csquareButton.disable();
replaceValueBatchButton.disable(); oceanAreaButton.disable();
break; break;
default: default:
break; break;

Binary file not shown.

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -76,7 +76,7 @@
<!-- Specify the app entry point class. --> <!-- Specify the app entry point class. -->
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' /> <entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
<!-- <!--
<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property name="log_ConsoleLogger" value="ENABLED" />
<set-property name="log_DivLogger" value="ENABLED" /> <set-property name="log_DivLogger" value="ENABLED" />
<set-property name="log_GWTLogger" value="ENABLED" /> <set-property name="log_GWTLogger" value="ENABLED" />
@ -87,7 +87,7 @@
<set-property name="log_ConsoleLogger" value="DISABLED" /> <set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" /> <set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" /> <set-property name="log_GWTLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" /> <set-property name="log_SystemLogger" value="DISABLED" />
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED" /> --> <!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED" /> -->
<!-- Specify the paths for translatable code --> <!-- Specify the paths for translatable code -->