now can basically load image annotation file.

Author: Microos

src/hk/microos/data/Ellipse.java

@@ -74,7 +74,7 @@ public String toString() {
 		return sb.toString();
 	}
 	public String toRowFormatString(){
-		String fmt = "%.3f";
+		String fmt = "%.2f";
 		String[] strs = new String[5];
 
 		strs[0] = String.format(fmt, this.major);

src/hk/microos/data/MyImage.java

@@ -7,26 +7,39 @@
 import hk.microos.tools.ImageTool;
 
 public class MyImage {
-	private int id;
 	private String path;
 	private BufferedImage bi;
-	public int w, h;
+	private int w = -1, h = -1;
 	private ArrayList<Ellipse> elpses = new ArrayList<>();
-	private ArrayList<Ellipse> elpsesStatic = new ArrayList<>();
-	public MyImage(File f, int id) {
-		this.id = id;
+	private ArrayList<Ellipse> elpsesStatic = null;
+
+	public MyImage(File f) {
 		this.path = f.getAbsolutePath();
-		this.bi = ImageTool.openImage(f);
-		this.w = bi.getWidth();
-		this.h = bi.getHeight();
+		// this.bi = ImageTool.openImage(f);
+		// this.w = bi.getWidth();
+		// this.h = bi.getHeight();
+	}
+
+	public int w() {
+		if (w == -1)
+			w = getImage().getWidth();
+		return w;
+	}
+
+	public int h() {
+		if (h == -1)
+			h = getImage().getHeight();
+
+		return h;
 	}
 
 	public void setElpsFromString(String s) {
 		// load annotation from string with a specific format
 	}
 
 	public BufferedImage getImage() {
-		return bi;
+
+		return bi == null ? ImageTool.openImage(new File(path)) : bi;
 	}
 
 	public void addElps(Ellipse e) {
@@ -36,44 +49,61 @@ public void addElps(Ellipse e) {
 	public ArrayList<Ellipse> getElpses() {
 		return elpses;
 	}
-	public ArrayList<Ellipse> getEllipseStatic(){
+
+	public ArrayList<Ellipse> getEllipseStatic() {
 		return elpsesStatic;
 	}
-	public ArrayList<String> getElpsesStrings(){
+
+	public ArrayList<String> getElpsesStrings() {
 		ArrayList<String> strs = new ArrayList<>();
-		for(Ellipse e : elpses){
+		for (Ellipse e : elpses) {
 			strs.add(e.toRowFormatString());
 		}
 		return strs;
 	}
-	public ArrayList<String> getStaticElpsesStrings(){
+
+	public ArrayList<String> getStaticElpsesStrings() {
+		if (elpsesStatic == null) {
+			return null;
+		}
 		ArrayList<String> strs = new ArrayList<>();
-		for(Ellipse e : elpsesStatic){
+		for (Ellipse e : elpsesStatic) {
 			strs.add(e.toRowFormatString());
 		}
 		return strs;
 	}
-	public ArrayList<String> getAllElpsesStrings(){
+
+	public ArrayList<String> getAllElpsesStrings() {
 		ArrayList<String> strs = new ArrayList<>();
-		for(Ellipse e : elpses){
+		for (Ellipse e : elpses) {
 			strs.add(e.toRowFormatString());
 		}
-		for(Ellipse e : elpsesStatic){
-			strs.add(e.toRowFormatString());
+		if (elpsesStatic != null) {
+			for (Ellipse e : elpsesStatic) {
+				strs.add(e.toRowFormatString());
+			}
 		}
+
 		return strs;
 	}
-	
+
+	public String getPath() {
+		return this.path;
+	}
+
 	@Override
 	public boolean equals(Object obj) {
-		MyImage img = (MyImage)obj;
-		return img.path.equals(this.path) && img.id == this.id;
+		MyImage img = (MyImage) obj;
+		return img.path.equals(this.path);
 	}
-	public String getMarkNumString(){
-		return String.format("%d+%d", elpsesStatic.size(), elpses.size());
+
+	public String getMarkNumString() {
+		int elpsesStaticSize = (elpsesStatic == null) ? 0 : elpsesStatic.size();
+		return String.format("%d+%d", elpsesStaticSize, elpses.size());
 	}
-	public void setElpsesStatic(ArrayList<Ellipse> elps){
+
+	public void setElpsesStatic(ArrayList<Ellipse> elps) {
 		this.elpsesStatic = elps;
 	}
-	
+
 }