click on right table row(if non-static) -> set as activated ellipse

Author: Microos

README.md

@@ -5,7 +5,7 @@
 - [x]  ask for prefix and suffix when load imglist
 - [x]  shift choose on ellipse -> highlight 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]  click on right table row(if non-static) -> set as activated ellipse
 - [x]  load imglist -> disable load img button
 - [x]  one click after load -> disable load annotation button
 - [x]  load annotation -> disable load annotation button

src/hk/microos/frames/MainFrame.java

@@ -234,9 +234,20 @@ public void valueChanged(ListSelectionEvent e) {
 		coordListTH = new TableHelper(coordTable);
 		int s = 50;
 		coordListTH.setColSize(new int[] { 34, s, s, s, s, s });
-
+		ListSelectionModel csm = coordTable.getSelectionModel();
+		csm.addListSelectionListener(new ListSelectionListener() {
+			@Override
+			public void valueChanged(ListSelectionEvent e) {
+				rightTableOnClick(e);
+			}
+		});
+	}
+	void rightTableOnClick(ListSelectionEvent e){
+		if (e.getValueIsAdjusting())
+			return;
+		int rowIdx = coordListTH.getSelectedRowIndex();
+		cm.clickOnRightTable(rowIdx);
 	}
-
 	void leftTableOnClick(ListSelectionEvent e) {
 		if (e.getValueIsAdjusting())
 			return;

src/hk/microos/frames/MyImagePanel.java

@@ -73,17 +73,19 @@ public void setLiveXY(double x, double y) {
 		this.perpendicularConstrainY = y;
 		this.repaint();
 	}
-	private void setOffset(double[] offset){
+
+	private void setOffset(double[] offset) {
 		this.minX = offset[0];
 		this.minY = offset[1];
 		this.maxX = offset[2];
 		this.maxY = offset[3];
 	}
+
 	public void paint(Graphics g) {
 		super.paint(g);
 		if (mImg != null) {
 			setOffset(UniversalTool.getOffset(mImg));
-			g.drawImage(mImg.getImage(), (int)this.minX, (int)this.minY, this);
+			g.drawImage(mImg.getImage(), (int) this.minX, (int) this.minY, this);
 
 			Graphics2D g2d = (Graphics2D) g;
 
@@ -104,10 +106,12 @@ public void paint(Graphics g) {
 			drawStaticEllipses(g2d);
 		}
 	}
-	private int getStaticEllipsesCount(){
+
+	private int getStaticEllipsesCount() {
 		ArrayList<Ellipse> es = mImg.getEllipseStatic();
-		return  es == null? 0 : es.size();
+		return es == null ? 0 : es.size();
 	}
+
 	public void drawStaticEllipses(Graphics2D g2d) {
 		AffineTransform old = g2d.getTransform();
 		// -----------------------------------------//
@@ -117,25 +121,21 @@ public void drawStaticEllipses(Graphics2D g2d) {
 		int i = 0;
 		for (Ellipse e : staticEllipses) {
 			e = e.offset(minX, minY);
-			BasicStroke bs = UniversalTool.getPreferableStroke(Math.max(e.major, e.minor)*2);
+			BasicStroke bs = UniversalTool.getPreferableStroke(Math.max(e.major, e.minor) * 2);
 
-			
 			// do rotation
 			g2d.rotate(e.angle, e.x, e.y);
 			// draw elps
 
-			
 			Ellipse2D.Double ed = e.getErectedEllipse2D();
-			
-			
-			
+
 			g2d.setColor(Color.black);
 			g2d.setStroke(bs);
 			g2d.draw(ed);
-			
+
 			g2d.setColor(Color.yellow);
-			g2d.setStroke(new BasicStroke(bs.getLineWidth()/2));
-			
+			g2d.setStroke(new BasicStroke(bs.getLineWidth() / 2));
+
 			g2d.draw(ed);
 
 			// reset transform
@@ -210,8 +210,7 @@ public void drawElps(Graphics2D g2d, ArrayList<Ellipse> elpses) {
 
 		int i = 0;
 		for (Ellipse e : elpses) {
-			
-			
+
 			ArrayList<Point_> keyPoints = e.getKeyPoints();
 			BasicStroke bs = UniversalTool.getPreferableStroke(Math.max(e.major, e.minor));
 
@@ -225,7 +224,7 @@ public void drawElps(Graphics2D g2d, ArrayList<Ellipse> elpses) {
 			} else {
 				g2d.setColor(Color.GREEN);
 			}
-			
+
 			Ellipse2D.Double ed = e.getErectedEllipse2D();
 			g2d.draw(ed);
 
@@ -239,7 +238,7 @@ public void drawElps(Graphics2D g2d, ArrayList<Ellipse> elpses) {
 				g2d.setColor(Color.red);
 			}
 			for (Point_ p : keyPoints) {
-				
+
 				g2d.fill(UniversalTool.getPointOval(p, 2.2 * bs.getLineWidth()));
 			}
 			i++;
@@ -250,22 +249,22 @@ public void updateStatus() {
 		ll = null;
 		waitLastPoint = false;
 		int unfinishedSize = unfinished.size();
-		if (unfinishedSize== 2) {
+		if (unfinishedSize == 2) {
 			waitLastPoint = true;
 			ll = new LinearLine(unfinished.get(0), unfinished.get(1));
 		}
 		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 ++;
+			Flags.numNewEllipse++;
 			unfinished = new ArrayList<>();
 			this.activedEllipseIdx = mImg.getElpses().size() - 1;
-			
+
 		}
 		mainFrame.marksUpdatedAtSelectedImage(this.mImg);
-		if(unfinishedSize == 3){
-			mainFrame.coordListTH.rightPanelSetSelectedLine(this.activedEllipseIdx+getStaticEllipsesCount());
+		if (unfinishedSize == 3) {
+			mainFrame.coordListTH.rightPanelSetSelectedLine(this.activedEllipseIdx + getStaticEllipsesCount());
 		}
 		repaint();
 	}
@@ -277,13 +276,14 @@ public void addUnfinishedPoint(Point_ p) {
 	}
 
 	public void activateClosest(int x, int y) {
-		//if found that we still have jobs to be done OR no ellipse can be deleted --> abort
+		// if found that we still have jobs to be done OR no ellipse can be
+		// deleted --> abort
 		if (unfinished.size() != 0 || mImg.getElpses().size() == 0) {
 			return;
 		}
 		Point_ p = new Point_(x, y);
 		this.activedEllipseIdx = findTheClosestEllipse(p);
-		mainFrame.coordListTH.rightPanelSetSelectedLine(this.activedEllipseIdx+getStaticEllipsesCount());
+		mainFrame.coordListTH.rightPanelSetSelectedLine(this.activedEllipseIdx + getStaticEllipsesCount());
 		this.repaint();
 	}
 
@@ -293,7 +293,7 @@ public void removeActived() {
 			unfinished.remove(unfinished.size() - 1);
 
 		} else {
-			Flags.numNewEllipse --;
+			Flags.numNewEllipse--;
 			ArrayList<Ellipse> elpses = mImg.getElpses();
 			if (elpses.size() != 0 && this.activedEllipseIdx != -1) {
 				Ellipse e = elpses.remove(this.activedEllipseIdx);
@@ -321,6 +321,16 @@ public int findTheClosestEllipse(Point_ p) {
 		return minIdx;
 	}
 
+	public void setActivatedIndex(int rowIdx) {
+		rowIdx -= getStaticEllipsesCount();
+		if (rowIdx >= 0 && unfinished.size() == 0) {
+			activedEllipseIdx = rowIdx;
+			this.repaint();
+		}else{
+			activedEllipseIdx = -1;
+		}
+	}
+
 	public void reset() {
 		if (!isInited())
 			return;

src/hk/microos/tools/ClickHelper.java

@@ -45,4 +45,7 @@ public void mouseShiftMoveAt(int globalX, int globalY){
 		panel.activateClosest(globalX, globalY);
 
 	}
+	public void clickOnRightTable(int rowIdx){
+		panel.setActivatedIndex(rowIdx);
+	}
 }