Skip to content
This repository has been archived by the owner on Jun 26, 2018. It is now read-only.

Commit

Permalink
#1381 fixed problem with progress when no splash is active
Browse files Browse the repository at this point in the history 
updated linux tcga launcher
  • Loading branch information
@mstreit
mstreit committed Jul 3, 2013
1 parent da489c8 commit c19acb7
Show file tree
Hide file tree
Showing 13 changed files with 166 additions and 148 deletions.
4 changes: 2 additions & 2 deletions org.caleydo.core/src/org/caleydo/core/io/parser/ascii/GroupingParser.java
View file
Expand Up @@ -47,7 +47,7 @@ public GroupingParser(GroupingParseSpecification groupingSpecifications, IDType
@Override
protected void parseFile(BufferedReader reader) throws IOException {

GeneralManager.get().getSplash().updateProgessLabel("Loading groupings for " + targetIDType);
GeneralManager.get().updateProgressLabel("Loading groupings for " + targetIDType);
float progressBarFactor = 100f / numberOfLinesInFile;

IDSpecification idSpecification = groupingSpecifications.getRowIDSpecification();
Expand Down Expand Up @@ -178,7 +178,7 @@ else if (sourceIDType.getIdTypeParsingRules() != null)
}
lineCounter++;
if (lineCounter % 100 == 0) {
GeneralManager.get().getSplash().updateProgress((int) (progressBarFactor * lineCounter));
GeneralManager.get().updateProgress((int) (progressBarFactor * lineCounter));
}
}

Expand Down
4 changes: 2 additions & 2 deletions org.caleydo.core/src/org/caleydo/core/io/parser/ascii/IDMappingParser.java
View file
Expand Up @@ -117,7 +117,7 @@ public final void setTokenSeperator(final String tokenSeparator) {
@Override
protected void parseFile(BufferedReader reader) throws IOException {

GeneralManager.get().getSplash().updateProgessLabel("Loading ID mapping for " + mappingType);
GeneralManager.get().updateProgressLabel("Loading ID mapping for " + mappingType);
String line;

int lineCounter = 0;
Expand Down Expand Up @@ -167,7 +167,7 @@ protected void parseFile(BufferedReader reader) throws IOException {

// Update progress bar only on each 100th line
if (lineCounter % 100 == 0) {
GeneralManager.get().getSplash().updateProgress((int) (progressBarFactor * lineCounter));
GeneralManager.get().updateProgress((int) (progressBarFactor * lineCounter));
}
lineCounter++;
}
Expand Down
4 changes: 2 additions & 2 deletions org.caleydo.core/src/org/caleydo/core/io/parser/ascii/TabularDataParser.java
View file
Expand Up @@ -244,7 +244,7 @@ protected void parseFile(BufferedReader reader) throws IOException {
initializTables();

// Init progress bar
GeneralManager.get().getSplash().updateProgessLabel("Loading data for: " + dataSetDescription.getDataSetName());
GeneralManager.get().updateProgressLabel("Loading data for: " + dataSetDescription.getDataSetName());
float progressBarFactor = 100f / numberOfLinesInFile;

for (int countHeaderLines = 0; countHeaderLines < dataSetDescription.getNumberOfHeaderLines(); countHeaderLines++) {
Expand Down Expand Up @@ -361,7 +361,7 @@ else if (toIDType.getIdTypeParsingRules() != null)

}
if (lineCounter % 100 == 0) {
GeneralManager.get().getSplash().updateProgress((int) (progressBarFactor * lineCounter));
GeneralManager.get().updateProgress((int) (progressBarFactor * lineCounter));
}
lineCounter++;
}
Expand Down
19 changes: 17 additions & 2 deletions org.caleydo.core/src/org/caleydo/core/manager/GeneralManager.java
View file
Expand Up @@ -19,6 +19,7 @@
import org.caleydo.core.serialize.ProjectMetaData;
import org.caleydo.core.serialize.SerializationManager;
import org.caleydo.core.startup.InteractiveSplashHandler;
import org.caleydo.core.util.logging.Logger;
import org.caleydo.core.util.statistics.IStatisticsPerformer;
import org.caleydo.core.view.ViewManager;
import org.caleydo.data.loader.ResourceLoader;
Expand Down Expand Up @@ -88,6 +89,8 @@ public class GeneralManager {

private ProjectMetaData metaData = ProjectMetaData.createDefault();

private Logger logger = Logger.create(GeneralManager.class);

public void init() {
eventPublisher = EventPublisher.INSTANCE;
viewManager = ViewManager.get();
Expand Down Expand Up @@ -212,7 +215,19 @@ public void setSplash(InteractiveSplashHandler splash) {
this.splash = splash;
}

public InteractiveSplashHandler getSplash() {
return splash;
public void updateProgress(int percentage) {
if (splash == null) {
logger.info("Progress update:" + percentage);
} else {
splash.updateProgress(percentage);
}
}

public void updateProgressLabel(String message) {
if (splash == null) {
logger.info("Progress update:" + message);
} else {
splash.updateProgressLabel(message);
}
}
}
6 changes: 3 additions & 3 deletions org.caleydo.core/src/org/caleydo/core/serialize/ProjectManager.java
View file
Expand Up @@ -219,7 +219,7 @@ private static SerializationData loadData(String dirName) throws IOException, JA

HashMap<String, Perspective> recordPerspectives = new HashMap<String, Perspective>();

GeneralManager.get().getSplash().updateProgessLabel("Loading groupings for: " + dataDomain.getLabel());
GeneralManager.get().updateProgressLabel("Loading groupings for: " + dataDomain.getLabel());

Set<String> recordPerspectiveIDs = ((ATableBasedDataDomain) dataDomain).getRecordPerspectiveIDs();
Set<String> dimensionPerspectiveIDs = ((ATableBasedDataDomain) dataDomain).getDimensionPerspectiveIDs();
Expand All @@ -240,7 +240,7 @@ private static SerializationData loadData(String dirName) throws IOException, JA
if (tree != null)
recordPerspective.setTree(tree);

GeneralManager.get().getSplash().updateProgress((int) (progressBarFactor * perspectiveCount));
GeneralManager.get().updateProgress((int) (progressBarFactor * perspectiveCount));
perspectiveCount++;
}

Expand All @@ -259,7 +259,7 @@ private static SerializationData loadData(String dirName) throws IOException, JA
ClusterTree tree = loadTree(extendedDirName + dimensionPerspectiveID + "_tree.xml",
((ATableBasedDataDomain) dataDomain).getDimensionIDType());
dimensionPerspective.setTree(tree);
GeneralManager.get().getSplash().updateProgress((int) (progressBarFactor * perspectiveCount));
GeneralManager.get().updateProgress((int) (progressBarFactor * perspectiveCount));
perspectiveCount++;

}
Expand Down
7 changes: 5 additions & 2 deletions org.caleydo.core/src/org/caleydo/core/startup/InteractiveSplashHandler.java
View file
Expand Up @@ -34,6 +34,9 @@ public void init(Shell splash) {
super.init(splash);

createUI();

// Force the splash screen to layout
splash.layout(true);
}

private void createUI() {
Expand All @@ -52,7 +55,7 @@ private void createUI() {
gc.setFont(new Font(display, "Arial", 10, SWT.NONE));
gc.setForeground(display.getSystemColor(SWT.COLOR_WHITE));

updateProgessLabel("Loading...");
updateProgressLabel("Loading...");

gc.drawString(" Version " + GeneralManager.VERSION, 336, 185, true);

Expand All @@ -69,7 +72,7 @@ public void updateProgress(int percentage) {
progressBar.setSelection(percentage);
}

public void updateProgessLabel(String message) {
public void updateProgressLabel(String message) {
gc.drawString(message, progressLabelX, progressLabelY, true);
}
}
2 changes: 1 addition & 1 deletion org.caleydo.data.importer/launch/Caleydo Data Importer Linux.launch
View file
Expand Up @@ -24,7 +24,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.caleydo.data.importer.product"/>
<stringAttribute key="selected_target_plugins" value="com.google.gson@default:default,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rcp@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.caleydo.core@default:default,org.caleydo.data.importer@default:default,org.caleydo.data@default:default,org.caleydo.datadomain.generic@default:default,org.caleydo.datadomain.genetic@default:default,org.caleydo.datadomain.pathway@default:default,org.caleydo.lib.args4j@default:default,org.caleydo.lib.jgrapht@default:default,org.caleydo.lib.jogl@default:default,org.caleydo.lib.nattable@default:default,org.caleydo.lib.weka@default:default,org.caleydo.util.gleem@default:default,org.caleydo.view.table@default:default,org.caleydo.vis.rank.demos@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.caleydo.core@default:default,org.caleydo.data.importer@default:default,org.caleydo.data.tcga@default:default,org.caleydo.data@default:default,org.caleydo.datadomain.generic@default:default,org.caleydo.datadomain.genetic@default:default,org.caleydo.datadomain.pathway@default:default,org.caleydo.lib.args4j@default:default,org.caleydo.lib.jgrapht@default:default,org.caleydo.lib.jogl@default:default,org.caleydo.lib.nattable@default:default,org.caleydo.lib.weka@default:default,org.caleydo.util.gleem@default:default,org.caleydo.view.table@default:default,org.caleydo.vis.rank.demos@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Expand Down

0 comments on commit c19acb7

Please sign in to comment.