shift choose on ellipse -> highlight right table row

Author: Microos

README.md

@@ -3,7 +3,7 @@
 ### TODO:
 - [x]  basic functions
 - [x]  ask for prefix and suffix when load imglist
-- [ ]  shift choose on ellipse -> hightlight right table row
+- [x]  shift choose on ellipse -> hightlight right table row
 - [ ]  click on right table row(if static) -> enlarge stroke
 - [ ]  click on right table row(if non-static) -> set as activated ellipse
 - [x]  load imglist -> disable load img button

src/hk/microos/frames/MainFrame.java

@@ -69,6 +69,7 @@ public class MainFrame extends JFrame {
 	private JButton btnReadImageList;
 
 	private int leftTableSelectedRow = -1;
+	
 	private HashMap<String, MyImage> pathImgPair = null;
 	private HashMap<String, ArrayList<Ellipse>> pathStaticElpsesPair = null;
 	private JButton btnReadAnnotations;
@@ -283,7 +284,7 @@ void setRightPanelCoords(MyImage mim) {
 		// 2 load drawn ellipse into the table
 		coordListTH.fillRightTable(mim.getStaticElpsesStrings(), mim.getElpsesStrings());
 	}
-
+	
 	void updateImagePanelSize(MyImage mim) {
 		if (defaultScrollW == -1)
 			defaultScrollW = scrollPanel.getWidth();
@@ -341,7 +342,6 @@ void fillImageNameTable() {
 	void testTable() {
 		System.out.println(imgListTH.getTable().hashCode() == imgNameTable.hashCode());
 	}
-
 	void loadAnnotList() {
 		if (pathImgPair == null) {
 			// no images loaded, abort
@@ -458,7 +458,7 @@ public void marksLoadAnnotationUpdate() {
 		setRightPanelCoords(null);
 	}
 
-	public void marksUpdatedAtSelected(MyImage mim) {
+	public void marksUpdatedAtSelectedImage(MyImage mim) {
 
 		if (leftTableSelectedRow == -1) {
 			System.err.println("marking on non-loaded image?");

src/hk/microos/frames/MyImagePanel.java

@@ -104,7 +104,10 @@ public void paint(Graphics g) {
 			drawStaticEllipses(g2d);
 		}
 	}
-
+	private int getStaticEllipsesCount(){
+		ArrayList<Ellipse> es = mImg.getEllipseStatic();
+		return  es == null? 0 : es.size();
+	}
 	public void drawStaticEllipses(Graphics2D g2d) {
 		AffineTransform old = g2d.getTransform();
 		// -----------------------------------------//
@@ -126,8 +129,6 @@ public void drawStaticEllipses(Graphics2D g2d) {
 
 
 
-			
-			
 			g2d.setColor(Color.black);
 			g2d.setStroke(bs);
 			g2d.draw(ed);
@@ -248,19 +249,24 @@ public void drawElps(Graphics2D g2d, ArrayList<Ellipse> elpses) {
 	public void updateStatus() {
 		ll = null;
 		waitLastPoint = false;
-		if (unfinished.size() == 2) {
+		int unfinishedSize = unfinished.size();
+		if (unfinishedSize== 2) {
 			waitLastPoint = true;
 			ll = new LinearLine(unfinished.get(0), unfinished.get(1));
 		}
-		if (unfinished.size() == 3) {
+		if (unfinishedSize == 3) {
 			Ellipse e = new Ellipse(unfinished.get(0), unfinished.get(1), this.projPoint);
 			e.setOffsetForTableDisplay(this.minX, this.minY);
 			mImg.addElps(e);
 			Flags.numNewEllipse ++;
 			unfinished = new ArrayList<>();
 			this.activedEllipseIdx = mImg.getElpses().size() - 1;
+			
+		}
+		mainFrame.marksUpdatedAtSelectedImage(this.mImg);
+		if(unfinishedSize == 3){
+			mainFrame.coordListTH.rightPanelSetSelectedLine(this.activedEllipseIdx+getStaticEllipsesCount());
 		}
-		mainFrame.marksUpdatedAtSelected(this.mImg);
 		repaint();
 	}
 
@@ -277,6 +283,7 @@ public void activateClosest(int x, int y) {
 		}
 		Point_ p = new Point_(x, y);
 		this.activedEllipseIdx = findTheClosestEllipse(p);
+		mainFrame.coordListTH.rightPanelSetSelectedLine(this.activedEllipseIdx+getStaticEllipsesCount());
 		this.repaint();
 	}
 

src/hk/microos/tools/TableHelper.java

@@ -146,7 +146,10 @@ public void setSelectedRow(int row) {
 			return;
 		this.table.getSelectionModel().setSelectionInterval(row, row);
 	}
-
+	public void rightPanelSetSelectedLine(int finalIndex){
+		this.setSelectedRow(finalIndex);
+		
+	}
 	public int getRowIndexOfValue(String v) {
 		if (rowStringList == null)
 			return -1;