Skip to content

Commit 72f31ef

Browse files
committed
Move Laf initialiation to SciView.create()
1 parent d8102d3 commit 72f31ef

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

src/main/java/sc/iview/Main.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,13 @@
2828
*/
2929
package sc.iview;
3030

31-
import com.formdev.flatlaf.FlatLightLaf;
32-
import graphics.scenery.SceneryBase;
33-
34-
import javax.swing.*;
35-
3631
/**
3732
* Entry point for testing SciView functionality.
3833
*
3934
* @author Kyle Harrington
4035
*/
4136
public class Main {
4237
public static void main( String... args ) throws Exception {
43-
SceneryBase.xinitThreads();
44-
FlatLightLaf.install();
45-
46-
try {
47-
UIManager.setLookAndFeel( new FlatLightLaf() );
48-
} catch( Exception ex ) {
49-
System.err.println( "Failed to initialize Flat Light LaF, falling back to Swing default." );
50-
}
51-
5238
SciView.create();
5339
}
5440
}

src/main/java/sc/iview/SciView.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
import bdv.util.volatiles.VolatileViewData;
3939
import bdv.viewer.Source;
4040
import bdv.viewer.SourceAndConverter;
41-
import ch.systemsx.cisd.hdf5.HDF5Factory;
42-
import ch.systemsx.cisd.hdf5.IHDF5Reader;
4341
import cleargl.GLVector;
42+
import com.formdev.flatlaf.FlatLightLaf;
4443
import com.intellij.ui.tabs.JBTabsPosition;
4544
import com.intellij.ui.tabs.TabInfo;
4645
import com.intellij.ui.tabs.impl.JBEditorTabs;
@@ -75,20 +74,16 @@
7574
import net.imagej.lut.LUTService;
7675
import net.imagej.ops.OpService;
7776
import net.imagej.units.UnitService;
78-
import net.imglib2.*;
7977
import net.imglib2.Cursor;
8078
import net.imglib2.RandomAccess;
79+
import net.imglib2.*;
8180
import net.imglib2.display.ColorTable;
8281
import net.imglib2.img.Img;
8382
import net.imglib2.realtransform.AffineTransform3D;
8483
import net.imglib2.type.numeric.ARGBType;
8584
import net.imglib2.type.numeric.RealType;
86-
import net.imglib2.type.numeric.integer.LongType;
8785
import net.imglib2.type.numeric.integer.UnsignedByteType;
8886
import net.imglib2.view.Views;
89-
import org.intellij.lang.annotations.JdkConstants;
90-
import org.janelia.saalfeldlab.n5.hdf5.N5HDF5Reader;
91-
import org.janelia.saalfeldlab.n5.imglib2.N5Utils;
9287
import org.joml.Quaternionf;
9388
import org.joml.Vector2f;
9489
import org.joml.Vector3f;
@@ -129,8 +124,8 @@
129124
import javax.imageio.ImageIO;
130125
import javax.script.ScriptException;
131126
import javax.swing.*;
132-
import java.awt.*;
133127
import java.awt.Image;
128+
import java.awt.*;
134129
import java.awt.event.*;
135130
import java.awt.geom.AffineTransform;
136131
import java.awt.image.BufferedImage;
@@ -2446,6 +2441,13 @@ public String nodeInfoString(Node n) {
24462441
public static SciView create() throws Exception {
24472442
SceneryBase.xinitThreads();
24482443

2444+
FlatLightLaf.install();
2445+
try {
2446+
UIManager.setLookAndFeel( new FlatLightLaf() );
2447+
} catch( Exception ex ) {
2448+
System.err.println( "Failed to initialize Flat Light LaF, falling back to Swing default." );
2449+
}
2450+
24492451
System.setProperty( "scijava.log.level:sc.iview", "debug" );
24502452
Context context = new Context( ImageJService.class, SciJavaService.class, SCIFIOService.class, ThreadService.class);
24512453

0 commit comments

Comments
 (0)