Removed compiler warnings

This commit is contained in:
ebner 2014-02-25 20:20:31 +01:00
parent b381b87ff9
commit c0dd33436e
7 changed files with 3135 additions and 4251 deletions

17
pom.xml
View File

@ -13,4 +13,21 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
<finalName>HDF5_Viewer-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive />
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

View File

@ -1,51 +0,0 @@
package ch.psi.imagej.hdf5;
/* =========================================================================
*
* Copyright 2011 Matthias Schlachter
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
public class HDF5_Batch_
{
public static void run(String arg)
{
parseArgs(arg);
System.out.println("filename");
System.out.println(_filename);
System.out.println("varnames");
for(int i=0; i<_varnames.length; i++)
System.out.println(_varnames[i]);
HDF5_Writer_ w = new HDF5_Writer_();
w.setToBatchMode(_filename,_varnames);
w.run(null);
}
private static void parseArgs(String arg)
{
String[] result = arg.split("]\\s");
_filename = result[0].replaceAll("file=\\[","");
String[] splitVars = result[1].split("\\s");
_varnames = new String[splitVars.length];
for (int x=0; x<splitVars.length; x++)
_varnames[x] = splitVars[x];
}
static private String _filename = null;
static private String[] _varnames = null;
// end of class
}

View File

@ -1,22 +1,4 @@
package ch.psi.imagej.hdf5; package ch.psi.imagej.hdf5;
/* =========================================================================
*
* Copyright 2011 Matthias Schlachter
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
import ij.Prefs; import ij.Prefs;
import ij.gui.GenericDialog; import ij.gui.GenericDialog;
@ -24,210 +6,143 @@ import ij.plugin.PlugIn;
import java.util.regex.*; import java.util.regex.*;
import java.lang.String; import java.lang.String;
public class HDF5_Config implements PlugIn {
public class HDF5_Config implements PlugIn public void run(String arg) {
{ // set default values
public void run(String arg) setDefaultsIfNoValueExists();
{ // read ImageJ Preferences
// set default values boolean groupVarsByName = Boolean.getBoolean(getDefaultValue("HDF5.groupVarsByName"));
setDefaultsIfNoValueExists(); groupVarsByName = Prefs.get("HDF5.groupVarsByName", groupVarsByName);
// read ImageJ Preferences
boolean groupVarsByName =
Boolean.getBoolean(getDefaultValue("HDF5.groupVarsByName"));
groupVarsByName = Prefs.get("HDF5.groupVarsByName", groupVarsByName);
boolean showUnmatchedDataSetNames = boolean showUnmatchedDataSetNames = Boolean.getBoolean(getDefaultValue("HDF5.showUnmatchedDataSetNames"));
Boolean.getBoolean(getDefaultValue("HDF5.showUnmatchedDataSetNames")); showUnmatchedDataSetNames = Prefs.get("HDF5.showUnmatchedDataSetNames", showUnmatchedDataSetNames);
showUnmatchedDataSetNames = Prefs.get("HDF5.showUnmatchedDataSetNames",
showUnmatchedDataSetNames);
String groupVarsByNameFormatGroup = String groupVarsByNameFormatGroup = getDefaultValue("HDF5.groupVarsByNameFormatGroup");
getDefaultValue("HDF5.groupVarsByNameFormatGroup"); groupVarsByNameFormatGroup = Prefs.get("HDF5.groupVarsByNameFormatGroup", groupVarsByNameFormatGroup);
groupVarsByNameFormatGroup
= Prefs.get("HDF5.groupVarsByNameFormatGroup",
groupVarsByNameFormatGroup);
String groupVarsByNameFormat = String groupVarsByNameFormat = getDefaultValue("HDF5.groupVarsByNameFormat");
getDefaultValue("HDF5.groupVarsByNameFormat"); groupVarsByNameFormat = Prefs.get("HDF5.groupVarsByNameFormat", groupVarsByNameFormat);
groupVarsByNameFormat = Prefs.get("HDF5.groupVarsByNameFormat",
groupVarsByNameFormat);
String dollarRegexpForGrouping = String dollarRegexpForGrouping = getDefaultValue("HDF5.dollarRegexpForGrouping");
getDefaultValue("HDF5.dollarRegexpForGrouping"); dollarRegexpForGrouping = Prefs.get("HDF5.dollarRegexpForGrouping", dollarRegexpForGrouping);
dollarRegexpForGrouping = Prefs.get("HDF5.dollarRegexpForGrouping",
dollarRegexpForGrouping);
GenericDialog configDiag = GenericDialog configDiag = new GenericDialog("HDF5 Preferences");
new GenericDialog("HDF5 Preferences"); configDiag.addMessage("Reader:");
configDiag.addMessage("Reader:"); configDiag.addCheckbox("Group data set names instead of showing a list " + "of data set names.", groupVarsByName);
configDiag.addCheckbox("Group data set names instead of showing a list " + configDiag.addCheckbox("Show unmatched data set names in a separate list", showUnmatchedDataSetNames);
"of data set names.", configDiag.addStringField("HDF5 group containing pattern " + "for data set grouping: ", groupVarsByNameFormatGroup, 15);
groupVarsByName); configDiag.addStringField("Pattern for grouping (if no attributes" + " are found): ", groupVarsByNameFormat, 15);
configDiag.addCheckbox("Show unmatched data set names in a separate list", // configDiag.addStringField("$ regexp (ignored because only numbers" +
showUnmatchedDataSetNames); // " work right now): ",
configDiag.addStringField("HDF5 group containing pattern " + // dollarRegexpForGrouping,15);
"for data set grouping: ", configDiag.addMessage("Writer:");
groupVarsByNameFormatGroup,15);
configDiag.addStringField("Pattern for grouping (if no attributes" +
" are found): ",
groupVarsByNameFormat,15);
// configDiag.addStringField("$ regexp (ignored because only numbers" +
// " work right now): ",
// dollarRegexpForGrouping,15);
configDiag.addMessage("Writer:");
String yesLabel = "Save"; String yesLabel = "Save";
String noLabel = "Reset"; String noLabel = "Reset";
configDiag.enableYesNoCancel(yesLabel,noLabel); configDiag.enableYesNoCancel(yesLabel, noLabel);
configDiag.showDialog(); configDiag.showDialog();
if(configDiag.wasCanceled()) if (configDiag.wasCanceled()) {
{ // do nothing
// do nothing return;
return; }
} if (!configDiag.wasOKed()) {
if(!configDiag.wasOKed()) // reset button was pressed
{ System.out.println("reset button was pressed");
// reset button was pressed // reset all and return a new dialog
System.out.println("reset button was pressed"); configDiag.setVisible(false);
// reset all and return a new dialog this.run(arg);
configDiag.setVisible(false); return;
this.run(arg); }
return; // get parameters check if they are correct
}
// get parameters check if they are correct
groupVarsByName = configDiag.getNextBoolean(); groupVarsByName = configDiag.getNextBoolean();
System.out.println("groupVarsByName: " + System.out.println("groupVarsByName: " + Boolean.toString(groupVarsByName));
Boolean.toString(groupVarsByName));
showUnmatchedDataSetNames = configDiag.getNextBoolean(); showUnmatchedDataSetNames = configDiag.getNextBoolean();
System.out.println("showUnmatchedDataSetNames: " + System.out.println("showUnmatchedDataSetNames: " + Boolean.toString(showUnmatchedDataSetNames));
Boolean.toString(showUnmatchedDataSetNames));
groupVarsByNameFormatGroup = configDiag.getNextString(); groupVarsByNameFormatGroup = configDiag.getNextString();
System.out.println("groupVarsByNameFormatGroup: " + System.out.println("groupVarsByNameFormatGroup: " + groupVarsByNameFormatGroup);
groupVarsByNameFormatGroup);
groupVarsByNameFormat = configDiag.getNextString(); groupVarsByNameFormat = configDiag.getNextString();
System.out.println("groupVarsByNameFormat: " + System.out.println("groupVarsByNameFormat: " + groupVarsByNameFormat);
groupVarsByNameFormat);
// dollarRegexpForGrouping = configDiag.getNextString(); // dollarRegexpForGrouping = configDiag.getNextString();
// System.out.println("dollarRegexpForGrouping: " + // System.out.println("dollarRegexpForGrouping: " +
// dollarRegexpForGrouping); // dollarRegexpForGrouping);
try {
String[] formatTokens = HDF5_GroupedVarnames.parseFormatString(groupVarsByNameFormat, dollarRegexpForGrouping);
for (int i = 0; i < formatTokens.length; i++) {
System.out.println("tok " + Integer.toString(i) + " : " + formatTokens[i]);
}
} catch (PatternSyntaxException e) {
// produce an error dialog an start over
String errMsg = e.getMessage();
System.out.println(errMsg);
// reset all and return a new dialog
configDiag.setVisible(false);
this.run(arg);
return;
}
System.out.println("Saving...");
try // all OK and "Save" was pressed, so save it...
{ Prefs.set("HDF5.groupVarsByName", groupVarsByName);
String[] formatTokens Prefs.set("HDF5.showUnmatchedDataSetNames", showUnmatchedDataSetNames);
= HDF5_GroupedVarnames.parseFormatString(groupVarsByNameFormat, Prefs.set("HDF5.groupVarsByNameFormatGroup", groupVarsByNameFormatGroup);
dollarRegexpForGrouping); Prefs.set("HDF5.groupVarsByNameFormat", groupVarsByNameFormat);
for(int i=0; i<formatTokens.length; i++) //
{ // ignore the $ regexp for now, because only numbers work
System.out.println("tok " + Integer.toString(i) + " : " //
+ formatTokens[i]); Prefs.set("HDF5.dollarRegexpForGrouping", dollarRegexpForGrouping);
}
}
catch(PatternSyntaxException e)
{
// produce an error dialog an start over
String errMsg = e.getMessage();
System.out.println(errMsg);
// reset all and return a new dialog
configDiag.setVisible(false);
this.run(arg);
return;
}
System.out.println("Saving...");
// all OK and "Save" was pressed, so save it... }
Prefs.set("HDF5.groupVarsByName",
groupVarsByName);
Prefs.set("HDF5.showUnmatchedDataSetNames",
showUnmatchedDataSetNames);
Prefs.set("HDF5.groupVarsByNameFormatGroup",
groupVarsByNameFormatGroup);
Prefs.set("HDF5.groupVarsByNameFormat",
groupVarsByNameFormat);
//
// ignore the $ regexp for now, because only numbers work
//
Prefs.set("HDF5.dollarRegexpForGrouping",
dollarRegexpForGrouping);
} public static void setDefaultsIfNoValueExists() {
boolean groupVarsByName = Boolean.getBoolean(getDefaultValue("HDF5.groupVarsByName"));
groupVarsByName = Prefs.get("HDF5.groupVarsByName", groupVarsByName);
Prefs.set("HDF5.groupVarsByName", groupVarsByName);
public static void setDefaultsIfNoValueExists() boolean showUnmatchedDataSetNames = Boolean.getBoolean(getDefaultValue("HDF5.showUnmatchedDataSetNames"));
{ showUnmatchedDataSetNames = Prefs.get("HDF5.showUnmatchedDataSetNames", showUnmatchedDataSetNames);
boolean groupVarsByName = Prefs.set("HDF5.showUnmatchedDataSetNames", showUnmatchedDataSetNames);
Boolean.getBoolean(getDefaultValue("HDF5.groupVarsByName"));
groupVarsByName = Prefs.get("HDF5.groupVarsByName", groupVarsByName);
Prefs.set("HDF5.groupVarsByName",
groupVarsByName);
boolean showUnmatchedDataSetNames = String groupVarsByNameFormatGroup = getDefaultValue("HDF5.groupVarsByNameFormatGroup");
Boolean.getBoolean(getDefaultValue("HDF5.showUnmatchedDataSetNames")); groupVarsByNameFormatGroup = Prefs.get("HDF5.groupVarsByNameFormatGroup", groupVarsByNameFormatGroup);
showUnmatchedDataSetNames = Prefs.get("HDF5.showUnmatchedDataSetNames", Prefs.set("HDF5.groupVarsByNameFormatGroup", groupVarsByNameFormatGroup);
showUnmatchedDataSetNames);
Prefs.set("HDF5.showUnmatchedDataSetNames",
showUnmatchedDataSetNames);
String groupVarsByNameFormatGroup = String groupVarsByNameFormat = getDefaultValue("HDF5.groupVarsByNameFormat");
getDefaultValue("HDF5.groupVarsByNameFormatGroup"); groupVarsByNameFormat = Prefs.get("HDF5.groupVarsByNameFormat", groupVarsByNameFormat);
groupVarsByNameFormatGroup Prefs.set("HDF5.groupVarsByNameFormat", groupVarsByNameFormat);
= Prefs.get("HDF5.groupVarsByNameFormatGroup",
groupVarsByNameFormatGroup);
Prefs.set("HDF5.groupVarsByNameFormatGroup",
groupVarsByNameFormatGroup);
String groupVarsByNameFormat = String dollarRegexpForGrouping = getDefaultValue("HDF5.dollarRegexpForGrouping");
getDefaultValue("HDF5.groupVarsByNameFormat"); dollarRegexpForGrouping = Prefs.get("HDF5.dollarRegexpForGrouping", dollarRegexpForGrouping);
groupVarsByNameFormat = Prefs.get("HDF5.groupVarsByNameFormat", Prefs.set("HDF5.dollarRegexpForGrouping", dollarRegexpForGrouping);
groupVarsByNameFormat); }
Prefs.set("HDF5.groupVarsByNameFormat",
groupVarsByNameFormat);
String dollarRegexpForGrouping = public static String getDefaultValue(String key) {
getDefaultValue("HDF5.dollarRegexpForGrouping"); if (key.equals("HDF5.groupVarsByName")) {
dollarRegexpForGrouping = Prefs.get("HDF5.dollarRegexpForGrouping", boolean groupVarsByName = true; // default
dollarRegexpForGrouping); return Boolean.toString(groupVarsByName);
Prefs.set("HDF5.dollarRegexpForGrouping", } else if (key.equals("HDF5.showUnmatchedDataSetNames")) {
dollarRegexpForGrouping); boolean showUnmatchedDataSetNames = true; // default
} return Boolean.toString(showUnmatchedDataSetNames);
} else if (key.equals("HDF5.groupVarsByNameFormatGroup")) {
public static String getDefaultValue(String key) String groupVarsByNameFormatGroup = "/hints"; // default
{ return groupVarsByNameFormatGroup;
if(key.equals("HDF5.groupVarsByName")) } else if (key.equals("HDF5.groupVarsByNameFormat")) {
{ String groupVarsByNameFormat = "/t$T/channel$C"; // default
boolean groupVarsByName = true; // default return groupVarsByNameFormat;
return Boolean.toString(groupVarsByName); } else if (key.equals("HDF5.dollarRegexpForGrouping")) {
} String dollarRegexpForGrouping = "[0-9]+"; // default
else if(key.equals("HDF5.showUnmatchedDataSetNames")) return dollarRegexpForGrouping;
{ } else {
boolean showUnmatchedDataSetNames = true; // default System.out.println("No default value for key: " + key);
return Boolean.toString(showUnmatchedDataSetNames); return null;
} }
else if(key.equals("HDF5.groupVarsByNameFormatGroup")) }
{
String groupVarsByNameFormatGroup = "/hints"; // default
return groupVarsByNameFormatGroup;
}
else if(key.equals("HDF5.groupVarsByNameFormat"))
{
String groupVarsByNameFormat = "/t$T/channel$C"; // default
return groupVarsByNameFormat;
}
else if(key.equals("HDF5.dollarRegexpForGrouping"))
{
String dollarRegexpForGrouping = "[0-9]+"; // default
return dollarRegexpForGrouping;
}
else
{
System.out.println("No default value for key: " + key);
return null;
}
}
} }

View File

@ -1,21 +1,4 @@
package ch.psi.imagej.hdf5; package ch.psi.imagej.hdf5;
/* =========================================================================
*
* Copyright 2011 Matthias Schlachter
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
import java.util.regex.*; import java.util.regex.*;
import java.util.ArrayList; import java.util.ArrayList;
@ -23,339 +6,265 @@ import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
public class HDF5_GroupedVarnames public class HDF5_GroupedVarnames {
{
public static String[] parseFormatString(String groupVarsByNameFormat,
String dollarRegexpForGrouping)
throws PatternSyntaxException
{
String[] formatTokens = null;
formatTokens = groupVarsByNameFormat.split("([$]T|[$]C)");
boolean containsFormatVars
= groupVarsByNameFormat.contains("$T") &&
groupVarsByNameFormat.contains("$C");
boolean rightOrderOfFormatVars
= groupVarsByNameFormat.indexOf("$T")
< groupVarsByNameFormat.indexOf("$C");
for(int i=0; i<formatTokens.length; i++) private final List<String> matchedVarNames = new ArrayList<String>();
{ private final List<String> unMatchedVarNames = new ArrayList<String>();
System.out.println("tok " + Integer.toString(i) + " : " private final List<TimeFrame> frameList = new ArrayList<TimeFrame>();
+ formatTokens[i]); private String[] formatTokens = null;
} private String formatString = null;
if(formatTokens.length < 2 || private int minFrameIndex = -1;
!containsFormatVars || private int maxFrameIndex = -1;
!rightOrderOfFormatVars) private int minChannelIndex = -1;
{ private int maxChannelIndex = -1;
throw new PatternSyntaxException("Your format string has errors. "+ private int nChannels = -1;
"You must provide $T and $C and "+
"also in correct order!",
groupVarsByNameFormat,
-1);
}
String regexp = groupVarsByNameFormat;
regexp = regexp.replace("$T",
dollarRegexpForGrouping);
regexp = regexp.replace("$C",
dollarRegexpForGrouping);
System.out.println(regexp);
// check if we have a regexp;
Pattern p = null;
p = Pattern.compile(regexp);
return formatTokens;
}
public void parseVarNames(String[] varNames, public static String[] parseFormatString(String groupVarsByNameFormat, String dollarRegexpForGrouping) throws PatternSyntaxException {
String groupVarsByNameFormat, String[] formatTokens = null;
String dollarRegexpForGrouping) formatTokens = groupVarsByNameFormat.split("([$]T|[$]C)");
{ boolean containsFormatVars = groupVarsByNameFormat.contains("$T") && groupVarsByNameFormat.contains("$C");
// save format string boolean rightOrderOfFormatVars = groupVarsByNameFormat.indexOf("$T") < groupVarsByNameFormat.indexOf("$C");
formatString = groupVarsByNameFormat;
try
{
formatTokens = parseFormatString(groupVarsByNameFormat,
dollarRegexpForGrouping);
}
catch(PatternSyntaxException e)
{
// produce an error dialog an start over
String errMsg = e.getMessage();
System.out.println(errMsg);
return;
}
String regexp = groupVarsByNameFormat;
regexp = regexp.replace("$T",
dollarRegexpForGrouping);
regexp = regexp.replace("$C",
dollarRegexpForGrouping);
System.out.println(regexp); for (int i = 0; i < formatTokens.length; i++) {
// check if we have a regexp; System.out.println("tok " + Integer.toString(i) + " : " + formatTokens[i]);
Pattern p = null; }
p = Pattern.compile(regexp); if (formatTokens.length < 2 || !containsFormatVars || !rightOrderOfFormatVars) {
/*--------------------------------------------------------------------- throw new PatternSyntaxException("Your format string has errors. " + "You must provide $T and $C and " + "also in correct order!", groupVarsByNameFormat, -1);
* parse var names }
*---------------------------------------------------------------------*/ String regexp = groupVarsByNameFormat;
for (int i = 0; i < varNames.length; i++) regexp = regexp.replace("$T", dollarRegexpForGrouping);
{ regexp = regexp.replace("$C", dollarRegexpForGrouping);
Matcher m=p.matcher(varNames[i]); System.out.println(regexp);
boolean b=m.matches(); // check if we have a regexp;
if(b) Pattern.compile(regexp);
{ return formatTokens;
System.out.println(varNames[i]); }
matchedVarNames.add(varNames[i]);
}
else
{
unMatchedVarNames.add(varNames[i]);
}
}
splitGroupedVarnames();
// ugly hack for sorting ArrayList
Object[] frameListAsArray = frameList.toArray();
Arrays.sort(frameListAsArray);
for(int i=0;i<frameListAsArray.length;i++)
frameList.set(i,(TimeFrame)frameListAsArray[i]);
}
public TimeFrame getFrame(int i) public void parseVarNames(String[] varNames, String groupVarsByNameFormat, String dollarRegexpForGrouping) {
{ // save format string
if(i < frameList.size() && i > -1) formatString = groupVarsByNameFormat;
return frameList.get(i); try {
else formatTokens = parseFormatString(groupVarsByNameFormat, dollarRegexpForGrouping);
return null; } catch (PatternSyntaxException e) {
} // produce an error dialog an start over
String errMsg = e.getMessage();
System.out.println(errMsg);
return;
}
String regexp = groupVarsByNameFormat;
regexp = regexp.replace("$T", dollarRegexpForGrouping);
regexp = regexp.replace("$C", dollarRegexpForGrouping);
private void splitGroupedVarnames() System.out.println(regexp);
{ // check if we have a regexp;
Iterator<String> vars = matchedVarNames.iterator(); Pattern p = null;
while(vars.hasNext()) p = Pattern.compile(regexp);
{ /*---------------------------------------------------------------------
String varName = vars.next(); * parse var names
String[] tokens = null; *---------------------------------------------------------------------*/
if(formatTokens.length == 2) for (int i = 0; i < varNames.length; i++) {
{ Matcher m = p.matcher(varNames[i]);
tokens = varName.split(formatTokens[1]); boolean b = m.matches();
} if (b) {
else if(formatTokens.length == 3) System.out.println(varNames[i]);
{ matchedVarNames.add(varNames[i]);
tokens = varName.split(formatTokens[2]); } else {
varName = tokens[0]; unMatchedVarNames.add(varNames[i]);
tokens = varName.split(formatTokens[1]); }
} }
splitGroupedVarnames();
// ugly hack for sorting ArrayList
Object[] frameListAsArray = frameList.toArray();
Arrays.sort(frameListAsArray);
for (int i = 0; i < frameListAsArray.length; i++)
frameList.set(i, (TimeFrame) frameListAsArray[i]);
}
if(tokens.length < 2 || tokens.length > 3) public TimeFrame getFrame(int i) {
{ if (i < frameList.size() && i > -1)
System.out.println("Error parsing varname!"); return frameList.get(i);
} else
else return null;
{ }
Integer channelIndex = new Integer(tokens[1]);
System.out.println("channelIndex: " + channelIndex.toString());
System.out.println("left token: " + tokens[0]);
tokens = tokens[0].split("/t");
Integer frameIndex = new Integer(tokens[1]);
System.out.println("frameIndex: " + frameIndex.toString());
if(minFrameIndex == -1) private void splitGroupedVarnames() {
minFrameIndex = frameIndex.intValue(); Iterator<String> vars = matchedVarNames.iterator();
minFrameIndex = Math.min(minFrameIndex,frameIndex.intValue()); while (vars.hasNext()) {
String varName = vars.next();
String[] tokens = null;
if (formatTokens.length == 2) {
tokens = varName.split(formatTokens[1]);
} else if (formatTokens.length == 3) {
tokens = varName.split(formatTokens[2]);
varName = tokens[0];
tokens = varName.split(formatTokens[1]);
}
if(maxFrameIndex == -1) if (tokens.length < 2 || tokens.length > 3) {
maxFrameIndex = frameIndex.intValue(); System.out.println("Error parsing varname!");
maxFrameIndex = Math.max(maxFrameIndex,frameIndex.intValue()); } else {
Integer channelIndex = new Integer(tokens[1]);
System.out.println("channelIndex: " + channelIndex.toString());
System.out.println("left token: " + tokens[0]);
tokens = tokens[0].split("/t");
Integer frameIndex = new Integer(tokens[1]);
System.out.println("frameIndex: " + frameIndex.toString());
if(minChannelIndex == -1) if (minFrameIndex == -1)
minChannelIndex = channelIndex.intValue(); minFrameIndex = frameIndex.intValue();
minChannelIndex = Math.min(minChannelIndex,channelIndex.intValue()); minFrameIndex = Math.min(minFrameIndex, frameIndex.intValue());
if(maxChannelIndex == -1) if (maxFrameIndex == -1)
maxChannelIndex = channelIndex.intValue(); maxFrameIndex = frameIndex.intValue();
maxChannelIndex = Math.max(maxChannelIndex,channelIndex.intValue()); maxFrameIndex = Math.max(maxFrameIndex, frameIndex.intValue());
TimeFrame frame = new TimeFrame(frameIndex.intValue()); if (minChannelIndex == -1)
int idx = frameList.indexOf(frame); minChannelIndex = channelIndex.intValue();
if(idx != -1) minChannelIndex = Math.min(minChannelIndex, channelIndex.intValue());
{
frame = (TimeFrame) frameList.get(idx);
frame.addChannel(channelIndex.intValue());
}
else
{
frame.addChannel(channelIndex.intValue());
frameList.add(frame);
}
//System.out.println(frame.toString());
}
}
}
public int getMinFrameIndex() if (maxChannelIndex == -1)
{ maxChannelIndex = channelIndex.intValue();
return minFrameIndex; maxChannelIndex = Math.max(maxChannelIndex, channelIndex.intValue());
}
public int getMaxFrameIndex()
{
return maxFrameIndex;
}
public int getMinChannelIndex()
{
return minChannelIndex;
}
public int getMaxChannelIndex()
{
return maxChannelIndex;
}
public int getNFrames()
{
return frameList.size();
}
public int getNChannels()
{
// TODO: check all frames for min/max of channels not index
if(nChannels == -1)
return maxChannelIndex-minChannelIndex+1;
else
return nChannels;
}
public boolean hasAllFramesInRange()
{
return frameList.size() == (maxFrameIndex-minFrameIndex+1);
}
public String toString()
{
String s = "Data set statistics\n";
s = s + "----------------------------------\n";
s = s + "nFrames: " + Integer.toString(frameList.size()) + "\n";
s = s + "minFrameIndex: " + Integer.toString(minFrameIndex) + "\n";
s = s + "maxFrameIndex: " + Integer.toString(maxFrameIndex) + "\n";
s = s
+ "hasAllFramesInRange: "
+ Boolean.toString(hasAllFramesInRange()) + "\n";
s = s + "minChannelIndex: " + Integer.toString(minChannelIndex) + "\n";
s = s + "maxChannelIndex: " + Integer.toString(maxChannelIndex) + "\n";
// String[] toks = getFormatTokens(); TimeFrame frame = new TimeFrame(frameIndex.intValue());
Iterator<TimeFrame> frames = frameList.iterator(); int idx = frameList.indexOf(frame);
while(frames.hasNext()) if (idx != -1) {
{ frame = (TimeFrame) frameList.get(idx);
TimeFrame f = frames.next(); frame.addChannel(channelIndex.intValue());
s = s + f.toString() + "\n"; } else {
// s = s + "(" + toks[0] + frame.addChannel(channelIndex.intValue());
// Integer.toString(f.getFrameIndex()) frameList.add(frame);
// + toks[1] + "$C"; }
// if(toks.length>2) // System.out.println(frame.toString());
// s = s + toks[2] + "\n"; }
// else }
// s = s + "\n"; }
}
s = s + "----------------------------------";
return s;
}
public List<String> getUnmatchedVarNames() public int getMinFrameIndex() {
{ return minFrameIndex;
return unMatchedVarNames; }
}
public String[] getFormatTokens() public int getMaxFrameIndex() {
{ return maxFrameIndex;
return formatTokens; }
}
public String getFormatString() public int getMinChannelIndex() {
{ return minChannelIndex;
return formatString; }
}
public void setFrameAndChannelRange(int minFrame, public int getMaxChannelIndex() {
int skipFrame, return maxChannelIndex;
int maxFrame, }
int minChannel,
int skipChannel,
int maxChannel)
{
System.out.println("Setting frame range: " +
Integer.toString(minFrame) + ":" +
Integer.toString(skipFrame) + ":" +
Integer.toString(maxFrame));
System.out.println("Setting channel range: " +
Integer.toString(minChannel) + ":" +
Integer.toString(skipChannel) + ":" +
Integer.toString(maxChannel));
if(hasAllFramesInRange())
{
// copy frames
List<TimeFrame> completeFrameList = new ArrayList<TimeFrame>(frameList);
// clear frames
frameList.clear();
// insert wanted frames and channels
for(int f=minFrame;f<maxFrame+1;f+=skipFrame)
{
TimeFrame frameAllChannels = completeFrameList.get(f);
TimeFrame frame = new TimeFrame(frameAllChannels.getFrameIndex());
// TODO remove unwanted channels
for(int c=minChannel;c<maxChannel+1;c+=skipChannel)
{
//System.out.println("Adding channels: " + Integer.toString(c));
frame.addChannel(c);
}
// if(nChannels == -1)
// nChannels = frame.getNChannels();
frameList.add(frame);
}
// TODO update min/max of frames/channels
nChannels = ((maxChannel-minChannel) / skipChannel)+1;
System.out.println("Adding nChannels: " + Integer.toString(nChannels));
}
else
{
System.out.println("-------------------------\n"+
"hasAllFramesInRange==false\n"+
"-------------------------");
// copy frames
List<TimeFrame> completeFrameList = new ArrayList<TimeFrame>(frameList);
// clear frames
frameList.clear();
// insert wanted frames and channels
for(int f=minFrame;f<maxFrame+1;f+=skipFrame)
{
TimeFrame frame = new TimeFrame(f);
int idx = completeFrameList.indexOf(frame);
// System.out.println("index of frame in list: " +
// Integer.toString(idx));
if(idx != -1)
{
// TODO remove unwanted channels
for(int c=minChannel;c<maxChannel+1;c+=skipChannel)
{
//System.out.println("Adding channels: " + Integer.toString(c));
frame.addChannel(c);
}
// if(nChannels == -1)
// nChannels = frame.getNChannels();
frameList.add(frame);
}
else
{
System.out.println("Timestep "+Integer.toString(f)+
" is missing!");
}
}
// TODO update min/max of frames/channels
nChannels = ((maxChannel-minChannel) / skipChannel)+1;
System.out.println("Adding nChannels: " + Integer.toString(nChannels));
}
}
private final List<String> matchedVarNames = new ArrayList<String>(); public int getNFrames() {
private final List<String> unMatchedVarNames = new ArrayList<String>(); return frameList.size();
private final List<TimeFrame> frameList = new ArrayList<TimeFrame>(); }
private String[] formatTokens = null;
private String formatString = null; public int getNChannels() {
private int minFrameIndex = -1; // TODO: check all frames for min/max of channels not index
private int maxFrameIndex = -1; if (nChannels == -1)
private int minChannelIndex = -1; return maxChannelIndex - minChannelIndex + 1;
private int maxChannelIndex = -1; else
private int nChannels = -1; return nChannels;
}
public boolean hasAllFramesInRange() {
return frameList.size() == (maxFrameIndex - minFrameIndex + 1);
}
public String toString() {
String s = "Data set statistics\n";
s = s + "----------------------------------\n";
s = s + "nFrames: " + Integer.toString(frameList.size()) + "\n";
s = s + "minFrameIndex: " + Integer.toString(minFrameIndex) + "\n";
s = s + "maxFrameIndex: " + Integer.toString(maxFrameIndex) + "\n";
s = s + "hasAllFramesInRange: " + Boolean.toString(hasAllFramesInRange()) + "\n";
s = s + "minChannelIndex: " + Integer.toString(minChannelIndex) + "\n";
s = s + "maxChannelIndex: " + Integer.toString(maxChannelIndex) + "\n";
// String[] toks = getFormatTokens();
Iterator<TimeFrame> frames = frameList.iterator();
while (frames.hasNext()) {
TimeFrame f = frames.next();
s = s + f.toString() + "\n";
// s = s + "(" + toks[0] +
// Integer.toString(f.getFrameIndex())
// + toks[1] + "$C";
// if(toks.length>2)
// s = s + toks[2] + "\n";
// else
// s = s + "\n";
}
s = s + "----------------------------------";
return s;
}
public List<String> getUnmatchedVarNames() {
return unMatchedVarNames;
}
public String[] getFormatTokens() {
return formatTokens;
}
public String getFormatString() {
return formatString;
}
public void setFrameAndChannelRange(int minFrame, int skipFrame, int maxFrame, int minChannel, int skipChannel, int maxChannel) {
System.out.println("Setting frame range: " + Integer.toString(minFrame) + ":" + Integer.toString(skipFrame) + ":" + Integer.toString(maxFrame));
System.out.println("Setting channel range: " + Integer.toString(minChannel) + ":" + Integer.toString(skipChannel) + ":" + Integer.toString(maxChannel));
if (hasAllFramesInRange()) {
// copy frames
List<TimeFrame> completeFrameList = new ArrayList<TimeFrame>(frameList);
// clear frames
frameList.clear();
// insert wanted frames and channels
for (int f = minFrame; f < maxFrame + 1; f += skipFrame) {
TimeFrame frameAllChannels = completeFrameList.get(f);
TimeFrame frame = new TimeFrame(frameAllChannels.getFrameIndex());
// TODO remove unwanted channels
for (int c = minChannel; c < maxChannel + 1; c += skipChannel) {
// System.out.println("Adding channels: " +
// Integer.toString(c));
frame.addChannel(c);
}
// if(nChannels == -1)
// nChannels = frame.getNChannels();
frameList.add(frame);
}
// TODO update min/max of frames/channels
nChannels = ((maxChannel - minChannel) / skipChannel) + 1;
System.out.println("Adding nChannels: " + Integer.toString(nChannels));
} else {
System.out.println("-------------------------\n" + "hasAllFramesInRange==false\n" + "-------------------------");
// copy frames
List<TimeFrame> completeFrameList = new ArrayList<TimeFrame>(frameList);
// clear frames
frameList.clear();
// insert wanted frames and channels
for (int f = minFrame; f < maxFrame + 1; f += skipFrame) {
TimeFrame frame = new TimeFrame(f);
int idx = completeFrameList.indexOf(frame);
// System.out.println("index of frame in list: " +
// Integer.toString(idx));
if (idx != -1) {
// TODO remove unwanted channels
for (int c = minChannel; c < maxChannel + 1; c += skipChannel) {
// System.out.println("Adding channels: " +
// Integer.toString(c));
frame.addChannel(c);
}
// if(nChannels == -1)
// nChannels = frame.getNChannels();
frameList.add(frame);
} else {
System.out.println("Timestep " + Integer.toString(f) + " is missing!");
}
}
// TODO update min/max of frames/channels
nChannels = ((maxChannel - minChannel) / skipChannel) + 1;
System.out.println("Adding nChannels: " + Integer.toString(nChannels));
}
}
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,102 +1,74 @@
package ch.psi.imagej.hdf5; package ch.psi.imagej.hdf5;
/* =========================================================================
*
* Copyright 2011 Matthias Schlachter
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*=========================================================================*/
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
public class TimeFrame implements Comparable public class TimeFrame implements Comparable<TimeFrame> {
{
public TimeFrame(int index)
{
frameIndex = index;
}
public TimeFrame(String index) private final int frameIndex;
{ private final List<Integer> channels = new ArrayList<Integer>();
frameIndex = Integer.parseInt(index);
}
public void addChannel(int index) public TimeFrame(int index) {
{ frameIndex = index;
Integer channelIndex = new Integer(index); }
if(!channels.contains(channelIndex))
channels.add(new Integer(index));
else
System.out.println("channel" + channelIndex.toString()
+ " already in list!");
}
public void addChannel(String index) public TimeFrame(String index) {
{ frameIndex = Integer.parseInt(index);
addChannel(Integer.parseInt(index)); }
}
public boolean equals(Object obj) public void addChannel(Integer index) {
{ if (!channels.contains(index)){
TimeFrame f = (TimeFrame) obj; channels.add(new Integer(index));
if(f.frameIndex == frameIndex) }
return true; }
return false;
}
public String toString() public void addChannel(String index) {
{ addChannel(Integer.parseInt(index));
String s = "FrameIdx: " + Integer.toString(frameIndex) + "; "; }
s = s + "nChannels: " + Integer.toString(channels.size()) + "; ";
s = s + "channels: ";
for(int i=0;i<channels.size();i++)
s = s + Integer.toString(channels.get(i)) + ";";
return s; public boolean equals(Object o) {
} return (((TimeFrame)o).frameIndex == frameIndex);
}
public int getNChannels() public String toString() {
{ String s = "FrameIdx: " + Integer.toString(frameIndex) + "; ";
return channels.size(); s = s + "nChannels: " + Integer.toString(channels.size()) + "; ";
} s = s + "channels: ";
for (int i = 0; i < channels.size(); i++){
s = s + Integer.toString(channels.get(i)) + ";";
}
public int getFrameIndex() return s;
{ }
return frameIndex;
}
public int[] getChannelIndices() public int getNChannels() {
{ return channels.size();
Object[] channelsAsArray = channels.toArray(); }
Arrays.sort(channelsAsArray);
int[] channelsIdx = new int[channelsAsArray.length];
for(int i=0;i<channelsAsArray.length;i++)
channelsIdx[i] = ((Integer) channelsAsArray[i]).intValue();
return channelsIdx;
}
public int compareTo(Object obj) public int getFrameIndex() {
{ return frameIndex;
TimeFrame f = (TimeFrame) obj; }
if(frameIndex<f.frameIndex)
return -1;
else if(frameIndex>f.frameIndex)
return 1;
else
return 0;
}
private final int frameIndex; public int[] getChannelIndices() {
private final ArrayList<Integer> channels = new ArrayList<Integer>(); Object[] channelsAsArray = channels.toArray();
Arrays.sort(channelsAsArray);
int[] channelsIdx = new int[channelsAsArray.length];
for (int i = 0; i < channelsAsArray.length; i++){
channelsIdx[i] = ((Integer) channelsAsArray[i]).intValue();
}
return channelsIdx;
}
public int compareTo(TimeFrame f) {
if (frameIndex < f.frameIndex){
return -1;
}
else if (frameIndex > f.frameIndex){
return 1;
}
else{
return 0;
}
}
} }