Task #17225: Change Speedometer to Performeter
Updated pom version at 0.3.0 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@181282 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
98b5608488
commit
dded552f09
|
@ -1,9 +1,14 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset
|
||||||
|
component="org.gcube.portlets-user.performfish-analytics-portlet.0-3-0"
|
||||||
|
date="${buildDate}">
|
||||||
|
<Change>[Task #17225] Change Speedometer to Performeter</Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets-user.performfish-analytics-portlet.0-2-0"
|
component="org.gcube.portlets-user.performfish-analytics-portlet.0-2-0"
|
||||||
date="${buildDate}">
|
date="${buildDate}">
|
||||||
<Change>Task #17165</Change>
|
<Change>[Task #17165]</Change>
|
||||||
<Change>Task #17166 Release Synoptic table functionality</Change>
|
<Change>[]Task #17166] Release Synoptic table functionality</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset
|
<Changeset
|
||||||
component="org.gcube.portlets-user.performfish-analytics-portlet.0-1-0"
|
component="org.gcube.portlets-user.performfish-analytics-portlet.0-1-0"
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -11,7 +11,7 @@
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>performfish-analytics-portlet</artifactId>
|
<artifactId>performfish-analytics-portlet</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>0.2.0-SNAPSHOT</version>
|
<version>0.3.0-SNAPSHOT</version>
|
||||||
<name>Maven Archetype for GWT</name>
|
<name>Maven Archetype for GWT</name>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
|
|
|
@ -345,7 +345,7 @@ public class PerformFishAnnualAnalyticsController {
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
||||||
|
|
||||||
final HTMLPanel panelContainer = submitRequestPanel.getContainerPanel();
|
final HTMLPanel panelContainer = submitRequestPanel.getContainerPanel();
|
||||||
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+algorithm+"...");
|
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+algorithm.getTitle()+"...");
|
||||||
loaderIcon.setVisible(true);
|
loaderIcon.setVisible(true);
|
||||||
panelContainer.setVisible(true);
|
panelContainer.setVisible(true);
|
||||||
panelContainer.add(loaderIcon);
|
panelContainer.add(loaderIcon);
|
||||||
|
@ -552,7 +552,7 @@ public class PerformFishAnnualAnalyticsController {
|
||||||
|
|
||||||
SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1);
|
SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1);
|
||||||
//submitRequestPanel.getElement().addClassName("ext-horizontal-panel");
|
//submitRequestPanel.getElement().addClassName("ext-horizontal-panel");
|
||||||
String tabTitle = algorithm.getName().substring(0,1).toUpperCase()+algorithm.getName().toLowerCase().substring(1, algorithm.getName().length()); //CAMEL CASE
|
String tabTitle = algorithm.getTitle().substring(0,1).toUpperCase()+algorithm.getTitle().toLowerCase().substring(1, algorithm.getTitle().length()); //CAMEL CASE
|
||||||
Tab tab = viewAnnualController.createTab(submitRequestPanel, tabTitle+" #"+(viewAnnualController.currentNumberOfTab()+1));
|
Tab tab = viewAnnualController.createTab(submitRequestPanel, tabTitle+" #"+(viewAnnualController.currentNumberOfTab()+1));
|
||||||
|
|
||||||
switch (algorithm) {
|
switch (algorithm) {
|
||||||
|
@ -660,7 +660,7 @@ public class PerformFishAnnualAnalyticsController {
|
||||||
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
||||||
|
|
||||||
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+dmInputParameters.getChartType()+" Analysis...");
|
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+dmInputParameters.getChartType().getTitle()+" Analysis...");
|
||||||
loaderIcon.setVisible(true);
|
loaderIcon.setVisible(true);
|
||||||
panelContainer.setVisible(true);
|
panelContainer.setVisible(true);
|
||||||
panelContainer.add(loaderIcon);
|
panelContainer.add(loaderIcon);
|
||||||
|
@ -774,7 +774,7 @@ public class PerformFishAnnualAnalyticsController {
|
||||||
case BOXPLOT:
|
case BOXPLOT:
|
||||||
//title = chartType.getName()+" - on all batches<br>";
|
//title = chartType.getName()+" - on all batches<br>";
|
||||||
//title += "Blue dots indicate the selected batch(es): "+focusID;
|
//title += "Blue dots indicate the selected batch(es): "+focusID;
|
||||||
title = chartType.getName()+" - on all farm data<br>";
|
title = chartType.getTitle()+" - on all farm data<br>";
|
||||||
title += "Blue dots indicate the selected farm: "+focusID;
|
title += "Blue dots indicate the selected farm: "+focusID;
|
||||||
break;
|
break;
|
||||||
case CORRELATION:
|
case CORRELATION:
|
||||||
|
@ -784,7 +784,7 @@ public class PerformFishAnnualAnalyticsController {
|
||||||
case SCATTER:
|
case SCATTER:
|
||||||
break;
|
break;
|
||||||
case SPEEDOMETER:
|
case SPEEDOMETER:
|
||||||
title = "Speedometer<br>";
|
title = chartType.getTitle()+"<br>";
|
||||||
title+= "Selected Farm: "+focusID+"<br>";
|
title+= "Selected Farm: "+focusID+"<br>";
|
||||||
title+= "Normalized with respect to all farm data in the VRE";
|
title+= "Normalized with respect to all farm data in the VRE";
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -365,7 +365,7 @@ public class PerformFishAnalyticsController {
|
||||||
final Tab tab = viewController.createTab(submitRequestPanel, tabTitle+" #"+(viewController.currentNumberOfTab()+1));
|
final Tab tab = viewController.createTab(submitRequestPanel, tabTitle+" #"+(viewController.currentNumberOfTab()+1));
|
||||||
final HTMLPanel panelContainer = submitRequestPanel.getContainerPanel();
|
final HTMLPanel panelContainer = submitRequestPanel.getContainerPanel();
|
||||||
|
|
||||||
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+DataMinerAlgorithms.PERFORMFISH_SYNOPTICTABLE_BATCH.getName()+"...");
|
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+DataMinerAlgorithms.PERFORMFISH_SYNOPTICTABLE_BATCH.getTitle()+"...");
|
||||||
loaderIcon.setVisible(true);
|
loaderIcon.setVisible(true);
|
||||||
panelContainer.setVisible(true);
|
panelContainer.setVisible(true);
|
||||||
panelContainer.add(loaderIcon);
|
panelContainer.add(loaderIcon);
|
||||||
|
@ -504,7 +504,7 @@ public class PerformFishAnalyticsController {
|
||||||
|
|
||||||
SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1);
|
SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1);
|
||||||
//submitRequestPanel.getElement().addClassName("ext-horizontal-panel");
|
//submitRequestPanel.getElement().addClassName("ext-horizontal-panel");
|
||||||
String tabTitle = algorithm.getName().substring(0,1).toUpperCase()+algorithm.getName().toLowerCase().substring(1, algorithm.getName().length()); //CAMEL CASE
|
String tabTitle = algorithm.getTitle().substring(0,1).toUpperCase()+algorithm.getTitle().toLowerCase().substring(1, algorithm.getTitle().length()); //CAMEL CASE
|
||||||
Tab tab = viewController.createTab(submitRequestPanel, tabTitle+" #"+(viewController.currentNumberOfTab()+1));
|
Tab tab = viewController.createTab(submitRequestPanel, tabTitle+" #"+(viewController.currentNumberOfTab()+1));
|
||||||
|
|
||||||
switch (algorithm) {
|
switch (algorithm) {
|
||||||
|
@ -609,7 +609,7 @@ public class PerformFishAnalyticsController {
|
||||||
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
||||||
|
|
||||||
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType+" Analysis...");
|
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType.getTitle()+" Analysis...");
|
||||||
loaderIcon.setVisible(true);
|
loaderIcon.setVisible(true);
|
||||||
panelContainer.setVisible(true);
|
panelContainer.setVisible(true);
|
||||||
panelContainer.add(loaderIcon);
|
panelContainer.add(loaderIcon);
|
||||||
|
@ -711,7 +711,7 @@ public class PerformFishAnalyticsController {
|
||||||
case SCATTER:
|
case SCATTER:
|
||||||
break;
|
break;
|
||||||
case SPEEDOMETER:
|
case SPEEDOMETER:
|
||||||
title = "Speedometer<br>";
|
title = chartType.getTitle()+"<br>";
|
||||||
title+= "Selected BATCH ID: "+focusID+"<br>";
|
title+= "Selected BATCH ID: "+focusID+"<br>";
|
||||||
title+= "Normalized with respect to all batches in the VRE";
|
title+= "Normalized with respect to all batches in the VRE";
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -848,7 +848,7 @@ public class AnalyticsAnnualPanelResult extends Composite {
|
||||||
private void displayOutputFilesAsStaticEntities(DataMinerResponse dmResponse, final DataMinerAlgorithms chartType, List<KPI> inputKPIs, List<KPI> outputKPIs, final String focusID, final Panel container, boolean displayError){
|
private void displayOutputFilesAsStaticEntities(DataMinerResponse dmResponse, final DataMinerAlgorithms chartType, List<KPI> inputKPIs, List<KPI> outputKPIs, final String focusID, final Panel container, boolean displayError){
|
||||||
|
|
||||||
String title = displayError?"No results ":"";
|
String title = displayError?"No results ":"";
|
||||||
title+=chartType;
|
title+=chartType.getTitle();
|
||||||
title+=inputKPIs.size()>1?" [Input KPIs: ":" [Input KPI: ";
|
title+=inputKPIs.size()>1?" [Input KPIs: ":" [Input KPI: ";
|
||||||
|
|
||||||
for (KPI kpi : inputKPIs) {
|
for (KPI kpi : inputKPIs) {
|
||||||
|
@ -1009,7 +1009,7 @@ public class AnalyticsAnnualPanelResult extends Composite {
|
||||||
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
||||||
|
|
||||||
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType+" Analysis...");
|
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType.getTitle()+" Analysis...");
|
||||||
loaderIcon.setVisible(true);
|
loaderIcon.setVisible(true);
|
||||||
panel.setVisible(true);
|
panel.setVisible(true);
|
||||||
panel.add(loaderIcon);
|
panel.add(loaderIcon);
|
||||||
|
|
|
@ -310,41 +310,14 @@ public class AnalyticsPanelResult extends Composite {
|
||||||
this.selectedKPIs = selectedKPIs;
|
this.selectedKPIs = selectedKPIs;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// /**
|
|
||||||
// * Gets the KPI for name.
|
|
||||||
// *
|
|
||||||
// * @param name the name
|
|
||||||
// * @return the KPI for name
|
|
||||||
// */
|
|
||||||
// public KPI getKPIForName(String name){
|
|
||||||
//
|
|
||||||
// //GWT.log("Selected KPIs: "+selectedKPIs);
|
|
||||||
// GWT.log("Searching KPI name: "+name);
|
|
||||||
// KPI foundKPI = null;
|
|
||||||
// //String purgedName = name.replaceAll("\\%", "").trim();
|
|
||||||
// String purgedName = name.trim();
|
|
||||||
// for (KPI kpi : selectedKPIs) {
|
|
||||||
// //String purgedKPIName = kpi.getName().replaceAll("\\%", "").trim();
|
|
||||||
// String purgedKPIName = kpi.getName().trim();
|
|
||||||
// if(purgedKPIName.compareToIgnoreCase(purgedName)==0) {
|
|
||||||
// foundKPI = kpi;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
// GWT.log("FOUND KPI: "+foundKPI);
|
|
||||||
// return foundKPI;
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the KPI for name.
|
* Gets the KPI for name.
|
||||||
*
|
*
|
||||||
* @param name the name
|
* @param name the name
|
||||||
* @return the KPI for name
|
* @return the KPI for name
|
||||||
*/
|
*/
|
||||||
public KPI getKPIForName(String name){
|
public KPI getKPIForName(String name){
|
||||||
|
|
||||||
GWT.log("Searching KPI name: "+name);
|
GWT.log("Searching KPI name: "+name);
|
||||||
KPI foundKPI = null;
|
KPI foundKPI = null;
|
||||||
|
@ -359,6 +332,34 @@ public KPI getKPIForName(String name){
|
||||||
GWT.log("FOUND KPI: "+foundKPI);
|
GWT.log("FOUND KPI: "+foundKPI);
|
||||||
return foundKPI;
|
return foundKPI;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the KPI for name.
|
||||||
|
*
|
||||||
|
* @param name the name
|
||||||
|
* @return the KPI for name
|
||||||
|
*/
|
||||||
|
/*public KPI getKPIForName(String name){
|
||||||
|
|
||||||
|
//GWT.log("Selected KPIs: "+selectedKPIs);
|
||||||
|
GWT.log("Searching KPI name: "+name);
|
||||||
|
KPI foundKPI = null;
|
||||||
|
String purgedName = name.replaceAll("\\%", "").trim();
|
||||||
|
GWT.log("Searching pureged KPI name: "+purgedName);
|
||||||
|
//String purgedName = name.trim();
|
||||||
|
for (KPI kpi : selectedKPIs) {
|
||||||
|
String purgedKPIName = kpi.getName().replaceAll("\\%", "").trim();
|
||||||
|
//String purgedKPIName = kpi.getName().trim();
|
||||||
|
GWT.log("The purged KPI name: "+purgedName);
|
||||||
|
if(purgedKPIName.compareToIgnoreCase(purgedName)==0) {
|
||||||
|
foundKPI = kpi;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
GWT.log("FOUND KPI: "+foundKPI);
|
||||||
|
return foundKPI;
|
||||||
|
}*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the parameters.
|
* Adds the parameters.
|
||||||
|
@ -852,7 +853,7 @@ public KPI getKPIForName(String name){
|
||||||
private void displayOutputFilesAsStaticEntities(DataMinerResponse dmResponse, final DataMinerAlgorithms chartType, List<KPI> inputKPIs, List<KPI> outputKPIs, final String focusID, final Panel container, boolean displayError){
|
private void displayOutputFilesAsStaticEntities(DataMinerResponse dmResponse, final DataMinerAlgorithms chartType, List<KPI> inputKPIs, List<KPI> outputKPIs, final String focusID, final Panel container, boolean displayError){
|
||||||
|
|
||||||
String title = displayError?"No results ":"";
|
String title = displayError?"No results ":"";
|
||||||
title+=chartType;
|
title+=chartType.getTitle();
|
||||||
title+=inputKPIs.size()>1?" [Input KPIs: ":" [Input KPI: ";
|
title+=inputKPIs.size()>1?" [Input KPIs: ":" [Input KPI: ";
|
||||||
|
|
||||||
for (KPI kpi : inputKPIs) {
|
for (KPI kpi : inputKPIs) {
|
||||||
|
@ -1013,7 +1014,7 @@ public KPI getKPIForName(String name){
|
||||||
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters));
|
||||||
|
|
||||||
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType+" Analysis...");
|
final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType.getTitle()+" Analysis...");
|
||||||
loaderIcon.setVisible(true);
|
loaderIcon.setVisible(true);
|
||||||
panel.setVisible(true);
|
panel.setVisible(true);
|
||||||
panel.add(loaderIcon);
|
panel.add(loaderIcon);
|
||||||
|
|
|
@ -9,7 +9,6 @@ import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.gcube.portlets.user.performfishanalytics.client.DataMinerAlgorithms;
|
import org.gcube.portlets.user.performfishanalytics.client.DataMinerAlgorithms;
|
||||||
import org.gcube.portlets.user.performfishanalytics.client.controllers.PerformFishAnalyticsController;
|
|
||||||
import org.gcube.portlets.user.performfishanalytics.client.event.LoadSynopticTableEvent;
|
import org.gcube.portlets.user.performfishanalytics.client.event.LoadSynopticTableEvent;
|
||||||
import org.gcube.portlets.user.performfishanalytics.client.event.SubmitRequestEvent;
|
import org.gcube.portlets.user.performfishanalytics.client.event.SubmitRequestEvent;
|
||||||
import org.gcube.portlets.user.performfishanalytics.shared.KPI;
|
import org.gcube.portlets.user.performfishanalytics.shared.KPI;
|
||||||
|
|
Loading…
Reference in New Issue