Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show better progress in splash screen

Browse Source
This commit is contained in:
skylarmt 2014-12-19 17:55:00 -07:00
parent 09ff148208
commit a4ff46856a
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/apocalypselabs/symat/SplashScreen.form
View File

@ -63,6 +63,8 @@
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[146, 20]"/>
</Property>
<Property name="string" type="java.lang.String" value=""/>
<Property name="stringPainted" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel5">

58
src/net/apocalypselabs/symat/SplashScreen.java
View File

@ -28,6 +28,7 @@
package net.apocalypselabs.symat;
import javax.swing.ImageIcon;
import javax.swing.SwingUtilities;
/**
*
@ -71,6 +72,8 @@ public class SplashScreen extends javax.swing.JFrame {
jProgressBar1.setMaximumSize(new java.awt.Dimension(32767, 20));
jProgressBar1.setMinimumSize(new java.awt.Dimension(10, 20));
jProgressBar1.setPreferredSize(new java.awt.Dimension(146, 20));
jProgressBar1.setString("");
jProgressBar1.setStringPainted(true);
jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/net/apocalypselabs/symat/splash.png"))); // NOI18N
@ -103,18 +106,73 @@ public class SplashScreen extends javax.swing.JFrame {
@Override
public void run() {
setProgress(10, "Starting up");
DotThread dt = new DotThread();
dt.start();
if (!MainGUI.skipPython) {
// Python laggggsss when used for first time, this fixes the wait later.
System.out.println("Warming up Python engine, to skip run with argument 'skippython'");
setProgress(20, "Initializing Python engine");
try {
CodeRunner python = new CodeRunner(true);
} catch (Exception ex) {
// Ignore
}
}
setProgress(70, "Loading main interface");
new MainGUI().setVisible(true);
dt.kill();
setProgress(100, "Done!");
dispose();
}
private void setProgress(int progress, String label) {
final int prog = progress;
final String lbl = label;
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
jProgressBar1.setIndeterminate(false);
jProgressBar1.setValue(prog);
jProgressBar1.setString(lbl);
}
});
}
private class DotThread extends Thread {
private boolean doRun = true;
@Override
public void run() {
while (doRun) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
String val = jProgressBar1.getString();
if (val.endsWith("...")) {
jProgressBar1.setString(val.replace("...", ""));
} else if (val.endsWith("..")) {
jProgressBar1.setString(val.replace("..", "..."));
} else if (val.endsWith(".")) {
jProgressBar1.setString(val.replace(".", ".."));
} else if (!val.endsWith(".")) {
jProgressBar1.setString(val+".");
}
}
});
try {
Thread.sleep(500);
} catch (InterruptedException ex) {
}
}
}
public void kill() {
doRun = false;
}
}
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel jLabel5;