Changeset 1144 for trunk/src/org/expeditee/io
- Timestamp:
- 09/18/18 12:02:44 (6 years ago)
- Location:
- trunk/src/org/expeditee/io
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/io/Conversion.java
r1102 r1144 475 475 476 476 if (orig == null) { 477 p. x = Integer.parseInt(xPos.trim());478 p. y = Integer.parseInt(yPos.trim());477 p.setX(Integer.parseInt(xPos.trim())); 478 p.setY(Integer.parseInt(yPos.trim())); 479 479 } else { 480 480 assert (orig instanceof Point); 481 481 Point originalPoint = (Point) orig; 482 p. x = (Integer) Convert(int.class, xPos, originalPoint.x);483 p. y = (Integer) Convert(int.class, yPos, originalPoint.y);482 p.setX((Integer) Convert(int.class, xPos, originalPoint.getX())); 483 p.setY((Integer) Convert(int.class, yPos, originalPoint.getY())); 484 484 } 485 485 return p; … … 693 693 // covert points 694 694 if (output instanceof Point) 695 return ((Point) output). x + " " + ((Point) output).y;695 return ((Point) output).getX() + " " + ((Point) output).getY(); 696 696 697 697 if (output instanceof Boolean) -
trunk/src/org/expeditee/io/ExpClipReader.java
r1102 r1144 55 55 public ExpClipReader(Point p) 56 56 { 57 this(p. x, p.y);57 this(p.getX(), p.getY()); 58 58 } 59 59 … … 186 186 ++index; 187 187 Point startend = separateValues(lines[index].substring(2)); 188 int start = startend. x;189 int end = startend. y;188 int start = startend.getX(); 189 int end = startend.getY(); 190 190 191 191 if (_linePoints.get(start) != null 192 192 && _linePoints.get(end) != null) { 193 193 _items.add(new Line(_linePoints.get(start), 194 _linePoints.get(end), idtype. x));194 _linePoints.get(end), idtype.getX())); 195 195 } else { 196 196 System.out … … 210 210 Point startend = separateValues(lines[index].substring(2)); 211 211 212 Item a = _linePoints.get(startend. x);213 Item b = _linePoints.get(startend. y);212 Item a = _linePoints.get(startend.getX()); 213 Item b = _linePoints.get(startend.getY()); 214 214 215 215 // System.out.println("adding constraint" + a + " " + b + " " + idtype.x + " " + idtype.y); 216 216 217 new Constraint(a, b, idtype. x, idtype.y);217 new Constraint(a, b, idtype.getX(), idtype.getY()); 218 218 } 219 219 } -
trunk/src/org/expeditee/io/ExpClipWriter.java
r1102 r1144 44 44 public ExpClipWriter(Point p) 45 45 { 46 this(p. x, p.y);46 this(p.getX(), p.getY()); 47 47 } 48 48 -
trunk/src/org/expeditee/io/ExpReader.java
r1102 r1144 137 137 next = _reader.readLine(); 138 138 Point startend = separateValues(next.substring(2)); 139 int start = startend. x;140 int end = startend. y;139 int start = startend.getX(); 140 int end = startend.getY(); 141 141 142 142 if (_linePoints.get(start) != null 143 143 && _linePoints.get(end) != null) { 144 144 newFrame.addItem(new Line(_linePoints.get(start), 145 _linePoints.get(end), idtype. x));145 _linePoints.get(end), idtype.getX())); 146 146 } else { 147 147 System.out … … 161 161 Point startend = separateValues(next.substring(2)); 162 162 163 Item a = _linePoints.get(startend. x);164 Item b = _linePoints.get(startend. y);165 166 new Constraint(a, b, idtype. x, idtype.y);163 Item a = _linePoints.get(startend.getX()); 164 Item b = _linePoints.get(startend.getY()); 165 166 new Constraint(a, b, idtype.getX(), idtype.getY()); 167 167 } 168 168 } -
trunk/src/org/expeditee/io/HTMLWriter.java
r1102 r1144 77 77 0.0, 78 78 pic.getStart(), 79 new Dimension(pic.getEnd(). x - pic.getStart().x, pic.getEnd().y - pic.getStart().y));79 new Dimension(pic.getEnd().getX() - pic.getStart().getX(), pic.getEnd().getY() - pic.getStart().getY())); 80 80 g.popDrawingSurface(); 81 81 image = bufferedImage; -
trunk/src/org/expeditee/io/KMSReader.java
r1102 r1144 275 275 Point startend = separateValues(s); 276 276 277 int start = startend. x;278 int end = startend. y;277 int start = startend.getX(); 278 int end = startend.getY(); 279 279 280 280 if (_linePoints.get(start) != null && _linePoints.get(end) != null) { 281 281 Line line = new Line(_linePoints.get(start), _linePoints.get(end), 282 idtype. x);282 idtype.getX()); 283 283 return line; 284 284 } … … 302 302 Point startend = separateValues(_data.get("s")); 303 303 304 Item a = _linePoints.get(startend. x);305 Item b = _linePoints.get(startend. y);306 307 new Constraint(a, b, idtype. x, idtype.y);304 Item a = _linePoints.get(startend.getX()); 305 Item b = _linePoints.get(startend.getY()); 306 307 new Constraint(a, b, idtype.getX(), idtype.getY()); 308 308 } 309 309 -
trunk/src/org/expeditee/io/PDF2Writer.java
r1102 r1144 243 243 private void drawPolygon(PdfContentByte cb, PolygonBounds poly, Colour fill, Colour line, float lineThickness) { 244 244 if(poly != null) { 245 cb.moveTo(poly.toArray()[0]. x, _height - poly.toArray()[0].y);245 cb.moveTo(poly.toArray()[0].getX(), _height - poly.toArray()[0].getY()); 246 246 for(int i = 1; i < poly.toArray().length; i++) { 247 cb.lineTo(poly.toArray()[i]. x, _height - poly.toArray()[i].y);247 cb.lineTo(poly.toArray()[i].getX(), _height - poly.toArray()[i].getY()); 248 248 } 249 249 cb.closePath();
Note:
See TracChangeset
for help on using the changeset viewer.