Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plugins: Configure slice label name using pattern #2891

Merged
merged 20 commits into from Aug 28, 2017
Merged

Plugins: Configure slice label name using pattern #2891

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1b2056c
Configuration option for slice label
dgault Jul 9, 2017
e01cdd9
Add missing series index
dgault Jul 9, 2017
557e4d6
Use reader to return dimension order
dgault Jul 12, 2017
9872e23
Update getFilename to use optional brackets and indexing
dgault Aug 3, 2017
e618ace
Add option for base index on slice label
dgault Aug 3, 2017
ffd7629
Replace constructSliceLabel with FormatTools
dgault Aug 3, 2017
e73b089
Update config window description
dgault Aug 4, 2017
e259e0a
Prevent exception in getFilename
dgault Aug 7, 2017
f503e5d
Revert "Prevent exception in getFilename"
dgault Aug 10, 2017
a2c53bd
Revert "Update config window description"
dgault Aug 10, 2017
42568a0
Revert "Update getFilename to use optional brackets and indexing"
dgault Aug 10, 2017
1ed9f39
Plugins: Revert to use constructSliceLabel rather than FormatTools
dgault Aug 10, 2017
ab78102
Plugins: Update default slice label
dgault Aug 10, 2017
70d5126
Plugins: Fix slice label channel params
dgault Aug 10, 2017
54d9c6f
Resolve conflict in LociPrefs
dgault Aug 11, 2017
5c90daa
Merge CellSens changes
dgault Aug 11, 2017
4447b86
Merge from openmicroscopy/develop
dgault Aug 11, 2017
b6d77a9
Plugins - configure label with channel name
dgault Aug 21, 2017
915fea6
Plugins - reorder config window
dgault Aug 21, 2017
5802178
Plugins configuration - use retrieve for channel count
dgault Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 55 additions & 9 deletions components/bio-formats-plugins/src/loci/plugins/config/ConfigWindow.java
View file
Open in desktop
Expand Up @@ -70,6 +70,7 @@
import loci.common.Constants;
import loci.common.DateTools;
import loci.formats.FormatTools;
import loci.plugins.util.LociPrefs;
import loci.plugins.util.WindowTools;

/**
Expand All @@ -91,13 +92,16 @@ public class ConfigWindow extends JFrame
private DefaultListModel formatsListModel;
private JList formatsList;
private JPanel formatInfo;
private JTextField extensions;
private JTextField extensions, sliceLabel;
private JCheckBox enabledBox, windowlessBox, upgradeBox;

private DefaultListModel libsListModel;
private JList libsList;
private JTextField type, status, version, path, url, license;
private JTextArea notes;
private JButton installButton;
private JButton setSliceLabelButton;
private JButton resetSliceLabelButton;

private PrintWriter log;

Expand All @@ -118,7 +122,7 @@ public ConfigWindow() {
JPanel installPanel = new JPanel();
//tabs.addTab("Install", installPanel);

JButton installButton = new JButton(
installButton = new JButton(
"<html><center><br><font size=\"+1\">Check my system,<br>" +
"install missing libraries,<br>" +
"and upgrade old files</font><br>" +
Expand Down Expand Up @@ -192,11 +196,10 @@ public ConfigWindow() {

// TODO: "How to install" for each library?

JPanel upgradePanel = new JPanel();
tabs.addTab("Upgrade", upgradePanel);

upgradePanel.setLayout(new SpringLayout());
JPanel bfOptionsPanel = new JPanel(new SpringLayout());
tabs.addTab("Bio-Formats Options", bfOptionsPanel);

JPanel upgradePanel = new JPanel(new SpringLayout());
JLabel upgradeLabel =
new JLabel("Automatically check for new versions of the Bio-Formats plugins");
upgradePanel.add(upgradeLabel);
Expand All @@ -206,7 +209,38 @@ public ConfigWindow() {
upgradeBox.addItemListener(this);
upgradePanel.add(upgradeBox);

SpringUtilities.makeCompactGrid(upgradePanel, 1, 2, PAD, PAD, PAD, PAD);
SpringUtilities.makeCompactGrid(upgradePanel,1, 2, PAD, PAD, PAD, PAD);

JPanel sliceNamePanel = new JPanel(new SpringLayout());
JLabel sliceNameLabel = new JLabel("Slice Label Pattern");
sliceNamePanel.add(sliceNameLabel);

final String sliceLabelPattern = LociPrefs.getSliceLabelPattern();
sliceLabel = new JTextField(sliceLabelPattern);
int prefHeight = sliceLabel.getPreferredSize().height;
sliceLabel.setMaximumSize(new Dimension(Integer.MAX_VALUE, prefHeight));
sliceNamePanel.add(sliceLabel);

setSliceLabelButton = new JButton("Set");
resetSliceLabelButton = new JButton("Reset");
setSliceLabelButton.addActionListener(this);
resetSliceLabelButton.addActionListener(this);
sliceNamePanel.add(setSliceLabelButton);
sliceNamePanel.add(resetSliceLabelButton);
SpringUtilities.makeCompactGrid(sliceNamePanel,1, 4, PAD, PAD, PAD, PAD);

bfOptionsPanel.add(upgradePanel);
bfOptionsPanel.add(sliceNamePanel);
JLabel sliceDescription = new JLabel("<html>Customize the slice label by specifying a pattern string:"
+ "<br>%s - series index"
+ "<br>%n - series name"
+ "<br>%c - channel index"
+ "<br>%w - channel name"
+ "<br>%z - Z index"
+ "<br>%t - T index"
+ "<br>%A - acquisition timestamp</html>");
bfOptionsPanel.add(sliceDescription);
SpringUtilities.makeCompactGrid(bfOptionsPanel,3, 1, PAD, PAD, PAD, PAD);

JPanel logPanel = new JPanel();
tabs.addTab("Log", logPanel);
Expand All @@ -232,8 +266,20 @@ public ConfigWindow() {

@Override
public void actionPerformed(ActionEvent e) {
new LociInstaller().run(null);
dispose();
Object src = e.getSource();
if (src == installButton) {
new LociInstaller().run(null);
dispose();
}
else if (src == setSliceLabelButton) {
Prefs.set(LociPrefs.PREF_SLICE_LABEL_PATTERN, sliceLabel.getText());
return;
}
else if (src == resetSliceLabelButton) {
Prefs.set(LociPrefs.PREF_SLICE_LABEL_PATTERN, null);
sliceLabel.setText(LociPrefs.getSliceLabelPattern());
return;
}
}

// -- ItemListener API methods --
Expand Down
75 changes: 11 additions & 64 deletions components/bio-formats-plugins/src/loci/plugins/in/ImagePlusReader.java
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@
import java.util.List;
import java.util.Vector;

import loci.common.DateTools;
import loci.common.Location;
import loci.common.Region;
import loci.common.StatusEvent;
Expand All @@ -50,12 +51,20 @@
import loci.formats.FormatTools;
import loci.formats.IFormatReader;
import loci.formats.Modulo;
import loci.formats.meta.DummyMetadata;
import loci.formats.meta.IMetadata;
import loci.formats.meta.MetadataRetrieve;
import loci.formats.meta.MetadataStore;
import loci.plugins.Slicer;
import loci.plugins.util.BFVirtualStack;
import loci.plugins.util.ImageProcessorReader;
import loci.plugins.util.LociPrefs;
import loci.plugins.util.LuraWave;
import loci.plugins.util.VirtualImagePlus;
import ome.units.UNITS;
import ome.units.quantity.Time;
import ome.xml.model.enums.DimensionOrder;
import ome.xml.model.primitives.Timestamp;

/**
* A high-level reader for {@link ij.ImagePlus} objects.
Expand Down Expand Up @@ -327,8 +336,7 @@ private ImageStack createVirtualStack(ImportProcess process, int s,
final BFVirtualStack virtualStack = new BFVirtualStack(options.getId(),
reader, false, false, false);
for (int i=0; i<imageCount; i++) {
final String label = constructSliceLabel(i,
reader, meta, s, zCount, cCount, tCount);
String label = FormatTools.getFilename(s, i, reader, LociPrefs.getSliceLabelPattern(), false);
virtualStack.addSlice(label);
}

Expand Down Expand Up @@ -378,8 +386,7 @@ private ImageStack readPlanes(ImportProcess process, int s, List<LUT> luts,
throw new FormatException("Cannot read plane #" + i);
}
// generate a label for ith plane
final String label = constructSliceLabel(i,
reader, meta, s, zCount, cCount, tCount);
String label = FormatTools.getFilename(s, i, reader, LociPrefs.getSliceLabelPattern(), false);

for (ImageProcessor ip : p) {
procs.add(ip);
Expand Down Expand Up @@ -565,66 +572,6 @@ private String constructImageTitle(IFormatReader r,
return title;
}

private String constructSliceLabel(int ndx, IFormatReader r,
IMetadata meta, int series, int zCount, int cCount, int tCount)
{
r.setSeries(series);

final int[] zct = r.getZCTCoords(ndx);
final StringBuffer sb = new StringBuffer();

int[] subC;
String[] subCTypes;
Modulo moduloC = r.getModuloC();
if (moduloC.length() > 1) {
subC = new int[] {r.getSizeC() / moduloC.length(), moduloC.length()};
subCTypes = new String[] {moduloC.parentType, moduloC.type};
} else {
subC = new int[] {r.getSizeC()};
subCTypes = new String[] {FormatTools.CHANNEL};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to keep a way to include the modulo information in the slice labels?

}

boolean first = true;
if (cCount > 1) {
if (first) first = false;
else sb.append("; ");
int[] subCPos = FormatTools.rasterToPosition(subC, zct[1]);
for (int i=0; i<subC.length; i++) {
boolean ch =
subCTypes[i] == null || FormatTools.CHANNEL.equals(subCTypes[i]);
sb.append(ch ? "c" : subCTypes[i]);
sb.append(":");
sb.append(subCPos[i] + 1);
sb.append("/");
sb.append(subC[i]);
if (i < subC.length - 1) sb.append(", ");
}
}
if (zCount > 1) {
if (first) first = false;
else sb.append("; ");
sb.append("z:");
sb.append(zct[0] + 1);
sb.append("/");
sb.append(r.getSizeZ());
}
if (tCount > 1) {
if (first) first = false;
else sb.append("; ");
sb.append("t:");
sb.append(zct[2] + 1);
sb.append("/");
sb.append(r.getSizeT());
}
// put image name at the end, in case it is long
String imageName = meta.getImageName(series);
if (imageName != null && !imageName.trim().equals("")) {
sb.append(" - ");
sb.append(imageName);
}
return sb.toString();
}

private static void saveLUTs(ImagePlus imp, List<LUT> luts) {
// NB: Save individual planar LUTs as properties, for later access.
// This step is necessary because ImageStack.addSlice only extracts the
Expand Down
13 changes: 13 additions & 0 deletions components/bio-formats-plugins/src/loci/plugins/util/LociPrefs.java
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
import ij.Prefs;

import loci.formats.ClassList;
import loci.formats.FormatTools;
import loci.formats.IFormatReader;
import loci.formats.ImageReader;
import loci.formats.in.DynamicMetadataOptions;
Expand Down Expand Up @@ -67,6 +68,8 @@ public final class LociPrefs {
"bioformats.nativend2.chunkmap";
public static final String PREF_LEICA_LIF_PHYSICAL_SIZE =
"bioformats.leicalif.physicalsize.compatibility";
public static final String PREF_SLICE_LABEL_PATTERN = "bioformats.sliceLabelPattern";
public static final String PREF_SLICE_LABEL_BASE_INDEX = "bioformats.sliceLabelBaseIndex";

// -- Constructor --

Expand Down Expand Up @@ -103,6 +106,8 @@ public static ImageReader makeImageReader() {
NativeND2Reader.USE_CHUNKMAP_KEY, useND2Chunkmap());
((DynamicMetadataOptions) options).setBoolean(
LIFReader.OLD_PHYSICAL_SIZE_KEY, isLeicaLIFPhysicalSizeBackwardsCompatible());
((DynamicMetadataOptions) options).setInteger(
FormatTools.BASE_INDEX, getSliceLabelBaseIndex());
reader.setMetadataOptions(options);
}

Expand Down Expand Up @@ -190,6 +195,14 @@ public static boolean isLeicaLIFPhysicalSizeBackwardsCompatible() {
LIFReader.OLD_PHYSICAL_SIZE_DEFAULT);
}

public static String getSliceLabelPattern() {
return Prefs.get(PREF_SLICE_LABEL_PATTERN, "[c:%c/%C ][z:%z/%Z ][t:%t/%T ]- %n");
}

public static int getSliceLabelBaseIndex() {
return Prefs.getInt(PREF_SLICE_LABEL_BASE_INDEX, 1);
}

// -- Helper methods --

private static boolean getPref(String pref,
Expand Down