#47: simplify

getAnchorBounds to just return the xrange,yrange box. This is simpler and consistent with documentation I see in several places.
das-developers · Dec 7, 2023 · e083750 · e083750
1 parent 4790c43
commit e083750
Showing 1 changed file with 2 additions and 27 deletions.
diff --git a/dasCore/src/org/das2/graph/DasAnnotation.java b/dasCore/src/org/das2/graph/DasAnnotation.java
@@ -839,33 +839,8 @@ private Rectangle getAnchorBounds() {
         Rectangle anchorRect= new Rectangle();
         if ( ( anchorType==AnchorType.DATA ) ) {
             if ( plot!=null && xrange!=null && yrange!=null ) {
-                if ( anchorBorderType==BorderType.NONE && showArrow ) { // this is really confusing, when you can't see the anchor.
-                    try {
-                        anchorRect.x= (int)(plot.getXAxis().transform( pointAtX ) );
-                    } catch ( InconvertibleUnitsException ex ) {
-                        if ( pointAtX.getUnits()==Units.dimensionless && UnitsUtil.isRatioMeasurement(plot.getXAxis().getUnits())  ) {
-                            anchorRect.x= (int)(plot.getXAxis().transform( pointAtX.value(), plot.getXAxis().getUnits() ) );
-                        } else {
-                            logger.info("unable to convert x units for annotation");
-                            anchorRect.x= getColumn().getDMiddle();
-                        }
-                    }
-                    try {
-                        anchorRect.y= (int)(plot.getYAxis().transform( pointAtY ) );
-                    } catch ( InconvertibleUnitsException ex ) {
-                        if ( pointAtY.getUnits()==Units.dimensionless && UnitsUtil.isRatioMeasurement(plot.getYAxis().getUnits()) ) {
-                            anchorRect.y= (int)(plot.getYAxis().transform( pointAtY.value(), plot.getYAxis().getUnits() ) );
-                        } else {
-                            logger.info("unable to convert y units for annotation");
-                            anchorRect.y= getRow().getDMiddle();
-                        }
-                    }
-                    anchorRect.width= 1;
-                    anchorRect.height= 1;
-                } else {
-                    anchorXToData(anchorRect);
-                    anchorYToData(anchorRect);
-                }
+                anchorXToData(anchorRect);
+                anchorYToData(anchorRect);
                 if ( splitAnchorType ) {
                     if ( verticalAnchorType==AnchorType.CANVAS ) {
                         anchorRect.y= getRow().getDMinimum();