hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed shock-cord display

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-08-14 18:04:09 -04:00
parent 1d879c2281
commit 719db29a31
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swing/src/net/sf/openrocket/gui/rocketfigure/MassComponentShapes.java
View File

@ -28,17 +28,10 @@ public class MassComponentShapes extends RocketComponentShape {
double radius = tube.getRadius(); double radius = tube.getRadius();
double arc = Math.min(length, 2*radius) * 0.7; double arc = Math.min(length, 2*radius) * 0.7;
Coordinate oldStart = transformation.transform( componentAbsoluteLocation );
Coordinate start = transformation.transform( componentAbsoluteLocation); Coordinate start = transformation.transform( componentAbsoluteLocation);
// Shape s = new RoundRectangle2D.Double(start.x*S,(start.y-radius)*S,
// length*S,2*radius*S,arc*S,arc*S);
Shape[] s = new Shape[1]; Shape[] s = new Shape[1];
for (int i=0; i < 1; i++) { s[0] = new RoundRectangle2D.Double(start.x*S,(start.y-radius)*S,
s[i] = new RoundRectangle2D.Double((start.x)*S,(start.y-radius)*S,
length*S,2*radius*S,arc*S,arc*S); length*S,2*radius*S,arc*S,arc*S);
}
switch (type) { switch (type) {
case ALTIMETER: case ALTIMETER:

12
swing/src/net/sf/openrocket/gui/rocketfigure/ShockCordShapes.java
View File

@ -22,18 +22,12 @@ public class ShockCordShapes extends RocketComponentShape {
double radius = massObj.getRadius(); double radius = massObj.getRadius();
double arc = Math.min(length, 2*radius) * 0.7; double arc = Math.min(length, 2*radius) * 0.7;
Coordinate start = transformation.transform( componentAbsoluteLocation);
Shape[] s = new Shape[1]; Shape[] s = new Shape[1];
Coordinate start = componentAbsoluteLocation; s[0] = new RoundRectangle2D.Double(start.x*S,(start.y-radius)*S,
s[0] = new RoundRectangle2D.Double((start.x-radius)*S,(start.y-radius)*S,
length*S,2*radius*S,arc*S,arc*S); length*S,2*radius*S,arc*S,arc*S);
// Coordinate[] start = transformation.transform(tube.toAbsolute(instanceOffset));
//
// Shape[] s = new Shape[start.length];
// for (int i=0; i < start.length; i++) {
// s[i] = new RoundRectangle2D.Double(start[i].x*S,(start[i].y-radius)*S,
// length*S,2*radius*S,arc*S,arc*S);
// }
return RocketComponentShape.toArray( addSymbol(s), component); return RocketComponentShape.toArray( addSymbol(s), component);
} }