Implement Transition preset components.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@558 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/resources/datafiles/presets/semroc/transitionpresets.csv b/core/resources/datafiles/presets/semroc/transitionpresets.csv
new file mode 100644 (file)
index 0000000..91d5710
--- /dev/null
+++ b/core/resources/datafiles/presets/semroc/transitionpresets.csv
@@ -0,0 +1,157 @@
+Manufacturer,PartNo,Description,Type,ForeShoulderLength,ForeShoulderDiameter,ForeOuterDiameter,Length,OuterDiameter,ShoulderLength,ShoulderDiameter,Filled,Material,Mass,Shape\r
+Semroc,BR-085225,Balsa Reducer 085 to 225,TRANSITION,0.0127,0.021971,0.024003,0.0635,0.059436,0.0127,0.05715,1,Balsa,0.022113,cone\r
+Semroc,BR-085225 [R],Balsa Reducer 085 to 225 \96 Reversed,TRANSITION,0.0127,0.05715,0.059436,0.0635,0.024003,0.0127,0.021971,1,Balsa,0.022113,cone\r
+Semroc,BR-1013,Balsa Reducer 10 to 13,TRANSITION,0.0127,0.0254,0.026416,0.01905,0.034036,0.0127,0.03302,1,Balsa,0.005103,cone\r
+Semroc,BR-1013 [R],Balsa Reducer 10 to 13 \96 Reversed,TRANSITION,0.0127,0.03302,0.034036,0.01905,0.026416,0.0127,0.0254,1,Balsa,0.005103,cone\r
+Semroc,BR-1016,Balsa Reducer 10 to 16,TRANSITION,0.0127,0.0254,0.026416,0.0381,0.041656,0.0127,0.04064,1,Balsa,0.009072,cone\r
+Semroc,BR-1016 [R],Balsa Reducer 10 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0381,0.026416,0.0127,0.0254,1,Balsa,0.009072,cone\r
+Semroc,BR-1016S,Balsa Reducer 10 to 16,TRANSITION,0.0127,0.0254,0.026416,0.03048,0.041656,0.0127,0.04064,1,Balsa,0.0082215,cone\r
+Semroc,BR-1016S [R],Balsa Reducer 10 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.03048,0.026416,0.0127,0.0254,1,Balsa,0.0082215,cone\r
+Semroc,BR-1116,Balsa Reducer 11 to 16,TRANSITION,0.0127,0.028702,0.029718,0.0381,0.041656,0.0127,0.04064,1,Balsa,0.0093555,cone\r
+Semroc,BR-1116 [R],Balsa Reducer 11 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0381,0.029718,0.0127,0.028702,1,Balsa,0.0093555,cone\r
+Semroc,BR-1118,Balsa Reducer 11 to 18,TRANSITION,0.0127,0.028702,0.029718,0.0381,0.046736,0.0127,0.04572,1,Balsa,0.010206,cone\r
+Semroc,BR-1118 [R],Balsa Reducer 11 to 18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.0381,0.029718,0.0127,0.028702,1,Balsa,0.010206,cone\r
+Semroc,BR-11516,Balsa Reducer 115 to 16,TRANSITION,0.0127,0.028956,0.030988,0.085725,0.041656,0.0127,0.04064,1,Balsa,0.0297675,cone\r
+Semroc,BR-11516 [R],Balsa Reducer 115 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.085725,0.030988,0.0127,0.028956,1,Balsa,0.0297675,cone\r
+Semroc,BR-11518,Balsa Reducer 115 to 18,TRANSITION,0.0127,0.028956,0.030988,0.085725,0.046736,0.0127,0.04572,1,Balsa,0.031185,cone\r
+Semroc,BR-11518 [R],Balsa Reducer 115 to 18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.085725,0.030988,0.0127,0.028956,1,Balsa,0.031185,cone\r
+Semroc,BR-125-175,Balsa Reducer 125 to 175,TRANSITION,0.0127,0.03175,0.034036,0.05334,0.046736,0.0127,0.04445,1,Balsa,0.014175,cone\r
+Semroc,BR-125-175 [R],Balsa Reducer 125 to 175 \96 Reversed,TRANSITION,0.0127,0.04445,0.046736,0.05334,0.034036,0.0127,0.03175,1,Balsa,0.014175,cone\r
+Semroc,BR-125-175L,Balsa Reducer 125 to 175,TRANSITION,0.0127,0.03175,0.034036,0.07112,0.046736,0.0127,0.04445,1,Balsa,0.0184275,cone\r
+Semroc,BR-125-175L [R],Balsa Reducer 125 to 175 \96 Reversed,TRANSITION,0.0127,0.04445,0.046736,0.07112,0.034036,0.0127,0.03175,1,Balsa,0.0184275,cone\r
+Semroc,BR-125-225,Balsa Reducer 125 to 225,TRANSITION,0.0127,0.03175,0.034036,0.07112,0.059436,0.0127,0.05715,1,Balsa,0.01701,cone\r
+Semroc,BR-125-225 [R],Balsa Reducer 125 to 225 \96 Reversed,TRANSITION,0.0127,0.05715,0.059436,0.07112,0.034036,0.0127,0.03175,1,Balsa,0.01701,cone\r
+Semroc,BR-1316,Balsa Reducer 13 to 16,TRANSITION,0.0127,0.03302,0.034036,0.01905,0.041656,0.0127,0.04064,1,Balsa,0.006804,cone\r
+Semroc,BR-1316 [R],Balsa Reducer 13 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.01905,0.034036,0.0127,0.03302,1,Balsa,0.006804,cone\r
+Semroc,BR-1316F,Balsa Reducer 13 to 16,TRANSITION,0.0127,0.03302,0.034036,0.04445,0.041656,0.0127,0.04064,1,Balsa,0.010206,cone\r
+Semroc,BR-1316F [R],Balsa Reducer 13 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.04445,0.034036,0.0127,0.03302,1,Balsa,0.010206,cone\r
+Semroc,BR-1316L,Balsa Reducer 13 to 16,TRANSITION,0.0127,0.03302,0.034036,0.0381,0.041656,0.0127,0.04064,1,Balsa,0.008505,cone\r
+Semroc,BR-1316L [R],Balsa Reducer 13 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0381,0.034036,0.0127,0.03302,1,Balsa,0.008505,cone\r
+Semroc,BR-1316M,Balsa Reducer 13 to 16,TRANSITION,0.0127,0.03302,0.034036,0.0254,0.041656,0.0127,0.04064,1,Balsa,0.007938,cone\r
+Semroc,BR-1316M [R],Balsa Reducer 13 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0254,0.034036,0.0127,0.03302,1,Balsa,0.007938,cone\r
+Semroc,BR-1320,Balsa Reducer 13 to 20,TRANSITION,0.0127,0.03302,0.034036,0.01905,0.051816,0.0127,0.0508,1,Balsa,0.007938,cone\r
+Semroc,BR-1320 [R],Balsa Reducer 13 to 20 \96 Reversed,TRANSITION,0.0127,0.0508,0.051816,0.01905,0.034036,0.0127,0.03302,1,Balsa,0.007938,cone\r
+Semroc,BR-1320L,Balsa Reducer 13 to 20,TRANSITION,0.0127,0.03302,0.034036,0.1143,0.051816,0.0127,0.0508,1,Balsa,0.015876,cone\r
+Semroc,BR-1320L [R],Balsa Reducer 13 to 20 \96 Reversed,TRANSITION,0.0127,0.0508,0.051816,0.1143,0.034036,0.0127,0.03302,1,Balsa,0.015876,cone\r
+Semroc,BR-150-225,Balsa Reducer 150 to 225,TRANSITION,0.0127,0.0381,0.040386,0.05715,0.059436,0.0127,0.05715,1,Balsa,0.0297675,cone\r
+Semroc,BR-150-225 [R],Balsa Reducer 150 to 225 \96 Reversed,TRANSITION,0.0127,0.05715,0.059436,0.05715,0.040386,0.0127,0.0381,1,Balsa,0.0297675,cone\r
+Semroc,BR-150-275,Balsa Reducer 150 to 275,TRANSITION,0.0127,0.0381,0.040386,0.07366,0.072136,0.0127,0.06985,1,Balsa,0.0411075,cone\r
+Semroc,BR-150-275 [R],Balsa Reducer 150 to 275 \96 Reversed,TRANSITION,0.0127,0.06985,0.072136,0.07366,0.040386,0.0127,0.0381,1,Balsa,0.0411075,cone\r
+Semroc,BR-1618,Balsa Reducer 16 to 18,TRANSITION,0.0127,0.04064,0.041656,0.0381,0.046736,0.0127,0.04572,1,Balsa,0.007938,cone\r
+Semroc,BR-1618 [R],Balsa Reducer 16 to 18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.0381,0.041656,0.0127,0.04064,1,Balsa,0.007938,cone\r
+Semroc,BR-1618F,Balsa Reducer 16 to 18,TRANSITION,0.0127,0.04064,0.041656,0.04572,0.046736,0.0127,0.04572,1,Balsa,0.008505,cone\r
+Semroc,BR-1618F [R],Balsa Reducer 16 to 18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.04572,0.041656,0.0127,0.04064,1,Balsa,0.008505,cone\r
+Semroc,BR-1620,Balsa Reducer 16 to 20,TRANSITION,0.0127,0.04064,0.041656,0.0381,0.051816,0.0127,0.0508,1,Balsa,0.008505,cone\r
+Semroc,BR-1620 [R],Balsa Reducer 16 to 20 \96 Reversed,TRANSITION,0.0127,0.0508,0.051816,0.0381,0.041656,0.0127,0.04064,1,Balsa,0.008505,cone\r
+Semroc,BR-1620F,Balsa Reducer 16 to 20,TRANSITION,0.0127,0.04064,0.041656,0.03048,0.051816,0.0127,0.0508,1,Balsa,0.0076545,cone\r
+Semroc,BR-1620F [R],Balsa Reducer 16 to 20 \96 Reversed,TRANSITION,0.0127,0.0508,0.051816,0.03048,0.041656,0.0127,0.04064,1,Balsa,0.0076545,cone\r
+Semroc,BR-16225F,Balsa Reducer 16 to 225,TRANSITION,0.0127,0.04064,0.041656,0.03937,0.059436,0.0127,0.05715,1,Balsa,0.0093555,cone\r
+Semroc,BR-16225F [R],Balsa Reducer 16 to 225 \96 Reversed,TRANSITION,0.0127,0.05715,0.059436,0.03937,0.041656,0.0127,0.04064,1,Balsa,0.0093555,cone\r
+Semroc,BR-175-225,Balsa Reducer 175 to 225,TRANSITION,0.0127,0.04445,0.046736,0.05334,0.059436,0.0127,0.05715,1,Balsa,0.02268,cone\r
+Semroc,BR-175-225 [R],Balsa Reducer 175 to 225 \96 Reversed,TRANSITION,0.0127,0.05715,0.059436,0.05334,0.046736,0.0127,0.04445,1,Balsa,0.02268,cone\r
+Semroc,BR-1820,Balsa Reducer 18 to 20,TRANSITION,0.0127,0.04572,0.046736,0.0381,0.051816,0.0127,0.0508,1,Balsa,0.0070875,cone\r
+Semroc,BR-1820 [R],Balsa Reducer 18 to 20 \96 Reversed,TRANSITION,0.0127,0.0508,0.051816,0.0381,0.046736,0.0127,0.04572,1,Balsa,0.0070875,cone\r
+Semroc,BR-18225,Balsa Reducer 18 to 225,TRANSITION,0.0127,0.04572,0.046736,0.0508,0.059436,0.0127,0.05715,1,Balsa,0.0087885,cone\r
+Semroc,BR-18225 [R],Balsa Reducer 18 to 225 \96 Reversed,TRANSITION,0.0127,0.05715,0.059436,0.0508,0.046736,0.0127,0.04572,1,Balsa,0.0087885,cone\r
+Semroc,BR-225-80H,Balsa Reducer 225 to BT-80H,TRANSITION,0.0127,0.05715,0.059436,0.05334,0.067056,0.0127,0.0649732,1,Balsa,0.036855,cone\r
+Semroc,BR-225-80H [R],Balsa Reducer 225 to BT-80H \96 Reversed,TRANSITION,0.0127,0.0649732,0.067056,0.05334,0.059436,0.0127,0.05715,1,Balsa,0.036855,cone\r
+Semroc,BR-510,Balsa Reducer 5 to 10,TRANSITION,0.0127,0.013081,0.0137922,0.01905,0.026416,0.0127,0.0254,1,Balsa,0.0031185,cone\r
+Semroc,BR-510 [R],Balsa Reducer 5 to 10 \96 Reversed,TRANSITION,0.0127,0.0254,0.026416,0.01905,0.0137922,0.0127,0.013081,1,Balsa,0.0031185,cone\r
+Semroc,BR-511,Balsa Reducer 5 to 11,TRANSITION,0.0127,0.013081,0.0137922,0.01905,0.029718,0.0127,0.028702,1,Balsa,0.003402,cone\r
+Semroc,BR-511 [R],Balsa Reducer 5 to 11 \96 Reversed,TRANSITION,0.0127,0.028702,0.029718,0.01905,0.0137922,0.0127,0.013081,1,Balsa,0.003402,cone\r
+Semroc,BR-513,Balsa Reducer 5 to 13,TRANSITION,0.0127,0.013081,0.0137922,0.0381,0.034036,0.0127,0.03302,1,Balsa,0.004536,cone\r
+Semroc,BR-513 [R],Balsa Reducer 5 to 13 \96 Reversed,TRANSITION,0.0127,0.03302,0.034036,0.0381,0.0137922,0.0127,0.013081,1,Balsa,0.004536,cone\r
+Semroc,BR-57,Balsa Reducer 5 to 7,TRANSITION,0.0127,0.013081,0.0137922,0.0127,0.0192786,0.0127,0.018161,1,Balsa,0.0019845,cone\r
+Semroc,BR-57 [R],Balsa Reducer 5 to 7 \96 Reversed,TRANSITION,0.0127,0.018161,0.0192786,0.0127,0.0137922,0.0127,0.013081,1,Balsa,0.0019845,cone\r
+Semroc,BR-58,Balsa Reducer 5 to 8,TRANSITION,0.0127,0.013081,0.0137922,0.0127,0.0230632,0.0127,0.021971,1,Balsa,0.002835,cone\r
+Semroc,BR-58 [R],Balsa Reducer 5 to 8 \96 Reversed,TRANSITION,0.0127,0.021971,0.0230632,0.0127,0.0137922,0.0127,0.013081,1,Balsa,0.002835,cone\r
+Semroc,BR-58F,Balsa Reducer 5 to 8F,TRANSITION,0.0127,0.013081,0.0137922,0.0127,0.0233934,0.0127,0.022479,1,Balsa,0.002835,cone\r
+Semroc,BR-58F [R],Balsa Reducer 5 to 8F \96 Reversed,TRANSITION,0.0127,0.022479,0.0233934,0.0127,0.0137922,0.0127,0.013081,1,Balsa,0.002835,cone\r
+Semroc,BR-59,Balsa Reducer 5 to 9,TRANSITION,0.0127,0.013081,0.0137922,0.0254,0.0253492,0.0127,0.02413,1,Balsa,0.005103,cone\r
+Semroc,BR-59 [R],Balsa Reducer 5 to 9 \96 Reversed,TRANSITION,0.0127,0.02413,0.0253492,0.0254,0.0137922,0.0127,0.013081,1,Balsa,0.005103,cone\r
+Semroc,BR-60-18,Balsa Reducer BT-60 to ST-18,TRANSITION,0.0127,0.040513,0.0415798,0.0254,0.046736,0.0127,0.04572,1,Balsa,0.0082215,cone\r
+Semroc,BR-60-18 [R],Balsa Reducer BT-60 to ST-18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.0254,0.0415798,0.0127,0.040513,1,Balsa,0.0082215,cone\r
+Semroc,BR-710,Balsa Reducer 7 to 10,TRANSITION,0.0127,0.018161,0.0192786,0.01905,0.026416,0.0127,0.0254,1,Balsa,0.003402,cone\r
+Semroc,BR-710 [R],Balsa Reducer 7 to 10 \96 Reversed,TRANSITION,0.0127,0.0254,0.026416,0.01905,0.0192786,0.0127,0.018161,1,Balsa,0.003402,cone\r
+Semroc,BR-711,Balsa Reducer 7 to 11,TRANSITION,0.0127,0.018161,0.0192786,0.01905,0.029718,0.0127,0.028702,1,Balsa,0.0036855,cone\r
+Semroc,BR-711 [R],Balsa Reducer 7 to 11 \96 Reversed,TRANSITION,0.0127,0.028702,0.029718,0.01905,0.0192786,0.0127,0.018161,1,Balsa,0.0036855,cone\r
+Semroc,BR-713,Balsa Reducer 7 to 13,TRANSITION,0.0127,0.018161,0.0192786,0.0381,0.034036,0.0127,0.03302,1,Balsa,0.005103,cone\r
+Semroc,BR-713 [R],Balsa Reducer 7 to 13 \96 Reversed,TRANSITION,0.0127,0.03302,0.034036,0.0381,0.0192786,0.0127,0.018161,1,Balsa,0.005103,cone\r
+Semroc,BR-716,Balsa Reducer 7 to 16,TRANSITION,0.0127,0.018161,0.0192786,0.0508,0.041656,0.0127,0.04064,1,Balsa,0.010206,cone\r
+Semroc,BR-716 [R],Balsa Reducer 7 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0508,0.0192786,0.0127,0.018161,1,Balsa,0.010206,cone\r
+Semroc,BR-718,Balsa Reducer 7 to 18,TRANSITION,0.0127,0.018161,0.0192786,0.0508,0.046736,0.0127,0.04572,1,Balsa,0.011907,cone\r
+Semroc,BR-718 [R],Balsa Reducer 7 to 18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.0508,0.0192786,0.0127,0.018161,1,Balsa,0.011907,cone\r
+Semroc,BR-78,Balsa Reducer 7 to 8,TRANSITION,0.0127,0.018161,0.0192786,0.022225,0.0230632,0.0127,0.021971,1,Balsa,0.0036855,cone\r
+Semroc,BR-78 [R],Balsa Reducer 7 to 8 \96 Reversed,TRANSITION,0.0127,0.021971,0.0230632,0.022225,0.0192786,0.0127,0.018161,1,Balsa,0.0036855,cone\r
+Semroc,BR-78F,Balsa Reducer 7 to 8F,TRANSITION,0.0127,0.018161,0.0192786,0.0254,0.0233934,0.0127,0.022479,1,Balsa,0.0048195,cone\r
+Semroc,BR-78F [R],Balsa Reducer 7 to 8F \96 Reversed,TRANSITION,0.0127,0.022479,0.0233934,0.0254,0.0192786,0.0127,0.018161,1,Balsa,0.0048195,cone\r
+Semroc,BR-78S,Balsa Reducer 7 to 8,TRANSITION,0.0127,0.018161,0.0192786,0.0127,0.0230632,0.0127,0.021971,1,Balsa,0.002835,cone\r
+Semroc,BR-78S [R],Balsa Reducer 7 to 8 \96 Reversed,TRANSITION,0.0127,0.021971,0.0230632,0.0127,0.0192786,0.0127,0.018161,1,Balsa,0.002835,cone\r
+Semroc,BR-79,Balsa Reducer 7 to 9,TRANSITION,0.0127,0.018161,0.0192786,0.0254,0.0253492,0.0127,0.02413,1,Balsa,0.0048195,cone\r
+Semroc,BR-79 [R],Balsa Reducer 7 to 9 \96 Reversed,TRANSITION,0.0127,0.02413,0.0253492,0.0254,0.0192786,0.0127,0.018161,1,Balsa,0.0048195,cone\r
+Semroc,BR-79L,Balsa Reducer 7 to 9,TRANSITION,0.0127,0.018161,0.0192786,0.0508,0.0253492,0.0127,0.02413,1,Balsa,0.0065205,cone\r
+Semroc,BR-79L [R],Balsa Reducer 7 to 9 \96 Reversed,TRANSITION,0.0127,0.02413,0.0253492,0.0508,0.0192786,0.0127,0.018161,1,Balsa,0.0065205,cone\r
+Semroc,BR-810,Balsa Reducer 8 to 10,TRANSITION,0.0127,0.021971,0.0230632,0.0127,0.026416,0.0127,0.0254,1,Balsa,0.003969,cone\r
+Semroc,BR-810 [R],Balsa Reducer 8 to 10 \96 Reversed,TRANSITION,0.0127,0.0254,0.026416,0.0127,0.0230632,0.0127,0.021971,1,Balsa,0.003969,cone\r
+Semroc,BR-813,Balsa Reducer 8 to 13,TRANSITION,0.0127,0.021971,0.0230632,0.04318,0.034036,0.0127,0.03302,1,Balsa,0.007371,cone\r
+Semroc,BR-813 [R],Balsa Reducer 8 to 13 \96 Reversed,TRANSITION,0.0127,0.03302,0.034036,0.04318,0.0230632,0.0127,0.021971,1,Balsa,0.007371,cone\r
+Semroc,BR-813P,Balsa Reducer 8 to 13,TRANSITION,0.0127,0.021971,0.0230632,0.0381,0.034036,0.0127,0.03302,1,Balsa,0.007371,cone\r
+Semroc,BR-813P [R],Balsa Reducer 8 to 13 \96 Reversed,TRANSITION,0.0127,0.03302,0.034036,0.0381,0.0230632,0.0127,0.021971,1,Balsa,0.007371,cone\r
+Semroc,BR-816,Balsa Reducer 8 to 16,TRANSITION,0.0127,0.021971,0.0230632,0.0381,0.041656,0.0127,0.04064,1,Balsa,0.008505,cone\r
+Semroc,BR-816 [R],Balsa Reducer 8 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0381,0.0230632,0.0127,0.021971,1,Balsa,0.008505,cone\r
+Semroc,BR-816NT,Balsa Reducer 8 to 16,TRANSITION,0.0127,0.021971,0.0230632,0.04318,0.041656,0.0127,0.04064,1,Balsa,0.010773,cone\r
+Semroc,BR-816NT [R],Balsa Reducer 8 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.04318,0.0230632,0.0127,0.021971,1,Balsa,0.010773,cone\r
+Semroc,BR-8F11,Balsa Reducer 8F to 11,TRANSITION,0.0127,0.022479,0.0233934,0.0254,0.029718,0.0127,0.028702,1,Balsa,0.005103,cone\r
+Semroc,BR-8F11 [R],Balsa Reducer 8F to 11 \96 Reversed,TRANSITION,0.0127,0.028702,0.029718,0.0254,0.0233934,0.0127,0.022479,1,Balsa,0.005103,cone\r
+Semroc,BR-8F11L,Balsa Reducer 8F to 11,TRANSITION,0.0127,0.022479,0.0233934,0.0381,0.029718,0.0127,0.028702,1,Balsa,0.006237,cone\r
+Semroc,BR-8F11L [R],Balsa Reducer 8F to 11 \96 Reversed,TRANSITION,0.0127,0.028702,0.029718,0.0381,0.0233934,0.0127,0.022479,1,Balsa,0.006237,cone\r
+Semroc,BR-916,Balsa Reducer 9 to 16,TRANSITION,0.0127,0.02413,0.0253492,0.0508,0.041656,0.0127,0.04064,1,Balsa,0.008505,cone\r
+Semroc,BR-916 [R],Balsa Reducer 9 to 16 \96 Reversed,TRANSITION,0.0127,0.04064,0.041656,0.0508,0.0253492,0.0127,0.02413,1,Balsa,0.008505,cone\r
+Semroc,BR-918,Balsa Reducer 9 to 18,TRANSITION,0.0127,0.02413,0.0253492,0.0508,0.046736,0.0127,0.04572,1,Balsa,0.009072,cone\r
+Semroc,BR-918 [R],Balsa Reducer 9 to 18 \96 Reversed,TRANSITION,0.0127,0.04572,0.046736,0.0508,0.0253492,0.0127,0.02413,1,Balsa,0.009072,cone\r
+Semroc,BR-920,Balsa Reducer 9 to 20,TRANSITION,0.0127,0.02413,0.0253492,0.0508,0.051816,0.0127,0.0508,1,Balsa,0.009639,cone\r
+Semroc,BR-920 [R],Balsa Reducer 9 to 20 \96 Reversed,TRANSITION,0.0127,0.0508,0.051816,0.0508,0.0253492,0.0127,0.02413,1,Balsa,0.009639,cone\r
+Semroc,TA-2050,Balsa Reducer BT-20 to BT-50,TRANSITION,0.0127,0.018034,0.0186944,0.0508,0.0247904,0.0127,0.02413,1,Balsa,0.0048195,cone\r
+Semroc,TA-2050 [R],Balsa Reducer BT-20 to BT-50 \96 Reversed,TRANSITION,0.0127,0.02413,0.0247904,0.0508,0.0186944,0.0127,0.018034,1,Balsa,0.0048195,cone\r
+Semroc,TA-2050A,Balsa Reducer BT-20 to BT-50,TRANSITION,0.0127,0.018034,0.0186944,0.0254,0.0247904,0.0127,0.02413,1,Balsa,0.0031185,cone\r
+Semroc,TA-2050A [R],Balsa Reducer BT-20 to BT-50 \96 Reversed,TRANSITION,0.0127,0.02413,0.0247904,0.0254,0.0186944,0.0127,0.018034,1,Balsa,0.0031185,cone\r
+Semroc,TA-2050B,Balsa Reducer BT-20 to BT-50,TRANSITION,0.0127,0.018034,0.0186944,0.0635,0.0247904,0.0127,0.02413,1,Balsa,0.0059535,cone\r
+Semroc,TA-2050B [R],Balsa Reducer BT-20 to BT-50 \96 Reversed,TRANSITION,0.0127,0.02413,0.0247904,0.0635,0.0186944,0.0127,0.018034,1,Balsa,0.0059535,cone\r
+Semroc,TA-2055,Balsa Reducer BT-20 to BT-55,TRANSITION,0.0127,0.018034,0.0186944,0.0381,0.033655,0.0127,0.0325882,1,Balsa,0.006237,cone\r
+Semroc,TA-2055 [R],Balsa Reducer BT-20 to BT-55 \96 Reversed,TRANSITION,0.0127,0.0325882,0.033655,0.0381,0.0186944,0.0127,0.018034,1,Balsa,0.006237,cone\r
+Semroc,TA-2060,Balsa Reducer BT-20 to BT-60,TRANSITION,0.0127,0.018034,0.0186944,0.0508,0.0415798,0.0127,0.040513,1,Balsa,0.00567,cone\r
+Semroc,TA-2060 [R],Balsa Reducer BT-20 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.0508,0.0186944,0.0127,0.018034,1,Balsa,0.00567,cone\r
+Semroc,TA-5055,Balsa Reducer BT-50 to BT-55,TRANSITION,0.0127,0.02413,0.0247904,0.0254,0.033655,0.0127,0.0325882,1,Balsa,0.01701,cone\r
+Semroc,TA-5055 [R],Balsa Reducer BT-50 to BT-55 \96 Reversed,TRANSITION,0.0127,0.0325882,0.033655,0.0254,0.0247904,0.0127,0.02413,1,Balsa,0.01701,cone\r
+Semroc,TA-5055L,Balsa Reducer BT-50 to BT-55,TRANSITION,0.0127,0.02413,0.0247904,0.0381,0.033655,0.0127,0.0325882,1,Balsa,0.0201285,cone\r
+Semroc,TA-5055L [R],Balsa Reducer BT-50 to BT-55 \96 Reversed,TRANSITION,0.0127,0.0325882,0.033655,0.0381,0.0247904,0.0127,0.02413,1,Balsa,0.0201285,cone\r
+Semroc,TA-5060,Balsa Reducer BT-50 to BT-60,TRANSITION,0.0127,0.02413,0.0247904,0.0508,0.0415798,0.0127,0.040513,1,Balsa,0.0065205,cone\r
+Semroc,TA-5060 [R],Balsa Reducer BT-50 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.0508,0.0247904,0.0127,0.02413,1,Balsa,0.0065205,cone\r
+Semroc,TA-5060C,Balsa Reducer BT-50 to BT-60,TRANSITION,0.0127,0.02413,0.0247904,0.0127,0.0415798,0.0127,0.040513,1,Balsa,0.003969,cone\r
+Semroc,TA-5060C [R],Balsa Reducer BT-50 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.0127,0.0247904,0.0127,0.02413,1,Balsa,0.003969,cone\r
+Semroc,TA-5060E,Balsa Reducer BT-50 to BT-60,TRANSITION,0.0127,0.02413,0.0247904,0.0508,0.0415798,0.0127,0.040513,1,Balsa,0.0059535,elliptical\r
+Semroc,TA-5060E [R],Balsa Reducer BT-50 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.0508,0.0247904,0.0127,0.02413,1,Balsa,0.0059535,elliptical\r
+Semroc,TA-5065,Balsa Reducer BT-50 to BT-65,TRANSITION,0.0127,0.02413,0.0247904,0.0508,0.0456184,0.0127,0.04445,1,Balsa,0.007371,cone\r
+Semroc,TA-5065 [R],Balsa Reducer BT-50 to BT-65 \96 Reversed,TRANSITION,0.0127,0.04445,0.0456184,0.0508,0.0247904,0.0127,0.02413,1,Balsa,0.007371,cone\r
+Semroc,TA-520,Balsa Reducer BT-5 to BT-20,TRANSITION,0.0127,0.013081,0.0137414,0.01905,0.0186944,0.0127,0.018034,1,Balsa,0.001134,cone\r
+Semroc,TA-520 [R],Balsa Reducer BT-5 to BT-20 \96 Reversed,TRANSITION,0.0127,0.018034,0.0186944,0.01905,0.0137414,0.0127,0.013081,1,Balsa,0.001134,cone\r
+Semroc,TA-5260A,Balsa Reducer BT-52 to BT-60,TRANSITION,0.0127,0.0250952,0.0257556,0.0254,0.0415798,0.0127,0.040513,1,Balsa,0.0065205,cone\r
+Semroc,TA-5260A [R],Balsa Reducer BT-52 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.0254,0.0257556,0.0127,0.0250952,1,Balsa,0.0065205,cone\r
+Semroc,TA-5260C,Balsa Reducer BT-52 to BT-60,TRANSITION,0.0127,0.0250952,0.0257556,0.09652,0.0415798,0.0127,0.040513,1,Balsa,0.0093555,cone\r
+Semroc,TA-5260C [R],Balsa Reducer BT-52 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.09652,0.0257556,0.0127,0.0250952,1,Balsa,0.0093555,cone\r
+Semroc,TA-550,Balsa Reducer BT-5 to BT-50,TRANSITION,0.0127,0.013081,0.0137414,0.0254,0.0247904,0.0127,0.02413,1,Balsa,0.001701,cone\r
+Semroc,TA-550 [R],Balsa Reducer BT-5 to BT-50 \96 Reversed,TRANSITION,0.0127,0.02413,0.0247904,0.0254,0.0137414,0.0127,0.013081,1,Balsa,0.001701,cone\r
+Semroc,TA-5560,Balsa Reducer BT-55 to BT-60,TRANSITION,0.0127,0.0325882,0.033655,0.0254,0.0415798,0.0127,0.040513,1,Balsa,0.0070875,cone\r
+Semroc,TA-5560 [R],Balsa Reducer BT-55 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.0254,0.033655,0.0127,0.0325882,1,Balsa,0.0070875,cone\r
+Semroc,TA-5560A,Balsa Reducer BT-55 to BT-60,TRANSITION,0.0127,0.0325882,0.033655,0.03175,0.0415798,0.0127,0.040513,1,Balsa,0.0082215,cone\r
+Semroc,TA-5560A [R],Balsa Reducer BT-55 to BT-60 \96 Reversed,TRANSITION,0.0127,0.040513,0.0415798,0.03175,0.033655,0.0127,0.0325882,1,Balsa,0.0082215,cone\r
+Semroc,TA-5565,Balsa Reducer BT-55 to BT-65,TRANSITION,0.0127,0.0325882,0.033655,0.0381,0.0456184,0.0127,0.04445,1,Balsa,0.010773,cone\r
+Semroc,TA-5565 [R],Balsa Reducer BT-55 to BT-65 \96 Reversed,TRANSITION,0.0127,0.04445,0.0456184,0.0381,0.033655,0.0127,0.0325882,1,Balsa,0.010773,cone\r
+Semroc,TA-6065,Balsa Reducer BT-60 to BT-65,TRANSITION,0.0127,0.040513,0.0415798,0.0127,0.0456184,0.0127,0.04445,1,Balsa,0.0065205,cone\r
+Semroc,TA-6065 [R],Balsa Reducer BT-60 to BT-65 \96 Reversed,TRANSITION,0.0127,0.04445,0.0456184,0.0127,0.0415798,0.0127,0.040513,1,Balsa,0.0065205,cone\r
+Semroc,TA-6070,Balsa Reducer BT-60 to BT-70,TRANSITION,0.0127,0.040513,0.0415798,0.0381,0.0563118,0.0127,0.055245,1,Balsa,0.0184275,cone\r
+Semroc,TA-6070 [R],Balsa Reducer BT-60 to BT-70 \96 Reversed,TRANSITION,0.0127,0.055245,0.0563118,0.0381,0.0415798,0.0127,0.040513,1,Balsa,0.0184275,cone\r
+Semroc,TA-6080,Balsa Reducer BT-60 to BT-80,TRANSITION,0.0127,0.040513,0.0415798,0.0381,0.06604,0.0127,0.0649732,1,Balsa,0.0184275,cone\r
+Semroc,TA-6080 [R],Balsa Reducer BT-60 to BT-80 \96 Reversed,TRANSITION,0.0127,0.0649732,0.06604,0.0381,0.0415798,0.0127,0.040513,1,Balsa,0.0184275,cone\r
+Semroc,TA-7080,Balsa Reducer BT-70 to BT-80,TRANSITION,0.0127,0.055245,0.0563118,0.0381,0.06604,0.0127,0.0649732,1,Balsa,0.0184275,cone\r
+Semroc,TA-7080 [R],Balsa Reducer BT-70 to BT-80 \96 Reversed,TRANSITION,0.0127,0.0649732,0.06604,0.0381,0.0563118,0.0127,0.055245,1,Balsa,0.0184275,cone\r

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 3356d151c1d9f6f51ff95a9704d940b1171a1587..501aa5559c3b63809df881a895ec48aac55e9cdb 100644 (file)
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -1591,11 +1591,24 @@ PresetModel.lbl.database = From database...
 ! Component Preset Chooser Dialog
 ComponentPresetChooserDialog.title = Choose component preset
 ComponentPresetChooserDialog.filter.label = Filter:
+table.column.Favorite = Favorite
 table.column.Manufacturer = Manufacturer
 table.column.PartNo = Part Number
-table.column.OuterDiameter = Outer Diameter
-table.column.InnerDiameter = Inner Diameter
+table.column.Description = Description
+table.column.Type = Type
 table.column.Length = Length
-table.column.Favorite = Favorite
+table.column.InnerDiameter = Inner Diameter
+table.column.OuterDiameter = Outer Diameter
+table.column.ShoulderLength = Shoulder Length
+table.column.ShoulderDiameter = Shoulder Diameter
+table.column.ForeShoulderLength = Fore Shoulder Length
+table.column.ForeShoulderDiameter = Fore Shoulder Diameter
+table.column.ForeOuterDiameter = Fore Outer Diameter
 table.column.Shape = Shape
+table.column.Material = Material
+table.column.Finish = Finish
+table.column.Thickness = Thickness
+table.column.Filled = Filled
+table.column.Mass = Mass
+
 

diff --git a/core/src/net/sf/openrocket/preset/ComponentPreset.java b/core/src/net/sf/openrocket/preset/ComponentPreset.java
index c1d562856e726d6cefa85423601fa41bba80cebb..94c1973d227ad69bd3f9f0f257b7d0668245fd93 100644 (file)
--- a/core/src/net/sf/openrocket/preset/ComponentPreset.java
+++ b/core/src/net/sf/openrocket/preset/ComponentPreset.java
@@ -15,6 +15,7 @@ import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
 import net.sf.openrocket.rocketcomponent.NoseCone;
+import net.sf.openrocket.rocketcomponent.Transition;
 import net.sf.openrocket.rocketcomponent.Transition.Shape;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.BugException;
@@ -48,9 +49,20 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                NOSE_CONE( new TypedKey<?>[] {
                                ComponentPreset.MANUFACTURER,
                                ComponentPreset.PARTNO,
+                               ComponentPreset.DESCRIPTION,
                                ComponentPreset.SHAPE,
                                ComponentPreset.OUTER_DIAMETER,
-                               ComponentPreset.LENGTH} ) ;
+                               ComponentPreset.LENGTH} ),
+
+               TRANSITION( new TypedKey<?>[] {
+                               ComponentPreset.MANUFACTURER,
+                               ComponentPreset.PARTNO,
+                               ComponentPreset.DESCRIPTION,
+                               ComponentPreset.SHAPE,
+                               ComponentPreset.FORE_OUTER_DIAMETER,
+                               ComponentPreset.OUTER_DIAMETER,
+                               ComponentPreset.LENGTH
+                               } ) ;
 
                Type[] compatibleTypes;
                TypedKey<?>[] displayedColumns;
@@ -91,6 +103,9 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
        public final static TypedKey<Double> OUTER_DIAMETER = new TypedKey<Double>("OuterDiameter", Double.class, UnitGroup.UNITS_LENGTH);
        public final static TypedKey<Double> SHOULDER_LENGTH = new TypedKey<Double>("ShoulderLength", Double.class, UnitGroup.UNITS_LENGTH);
        public final static TypedKey<Double> SHOULDER_DIAMETER = new TypedKey<Double>("ShoulderDiameter", Double.class, UnitGroup.UNITS_LENGTH);
+       public final static TypedKey<Double> FORE_SHOULDER_LENGTH = new TypedKey<Double>("ForeShoulderLength",Double.class, UnitGroup.UNITS_LENGTH);
+       public final static TypedKey<Double> FORE_SHOULDER_DIAMETER = new TypedKey<Double>("ForeShoulderDiameter",Double.class, UnitGroup.UNITS_LENGTH);
+       public final static TypedKey<Double> FORE_OUTER_DIAMETER = new TypedKey<Double>("ForeOuterDiameter", Double.class, UnitGroup.UNITS_LENGTH);
        public final static TypedKey<Shape> SHAPE = new TypedKey<Shape>("Shape", Shape.class);
        public final static TypedKey<Material> MATERIAL = new TypedKey<Material>("Material", Material.class);
        public final static TypedKey<Finish> FINISH = new TypedKey<Finish>("Finish", Finish.class);
@@ -109,6 +124,9 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                keyMap.put(OUTER_DIAMETER.getName(), OUTER_DIAMETER);
                keyMap.put(SHOULDER_LENGTH.getName(), SHOULDER_LENGTH);
                keyMap.put(SHOULDER_DIAMETER.getName(), SHOULDER_DIAMETER);
+               keyMap.put(FORE_SHOULDER_LENGTH.getName(), FORE_SHOULDER_LENGTH);
+               keyMap.put(FORE_SHOULDER_DIAMETER.getName(), FORE_SHOULDER_DIAMETER);
+               keyMap.put(FORE_OUTER_DIAMETER.getName(), FORE_OUTER_DIAMETER);
                keyMap.put(SHAPE.getName(), SHAPE);
                keyMap.put(MATERIAL.getName(), MATERIAL);
                keyMap.put(FINISH.getName(), FINISH);
@@ -192,6 +210,7 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                        break;
                }
                case NOSE_CONE: {
+                       
                        if ( !props.containsKey(LENGTH) ) {
                                throw new InvalidComponentPresetException( "No Length specified for nose cone preset " + props.toString());
                        }
@@ -220,6 +239,36 @@ public class ComponentPreset implements Comparable<ComponentPreset> {
                        }
                        break;
                }
+               case TRANSITION: {
+                       
+                       if ( !props.containsKey(LENGTH) ) {
+                               throw new InvalidComponentPresetException( "No Length specified for transition preset " + props.toString());
+                       }
+                       if ( !props.containsKey(OUTER_DIAMETER) ) {
+                               throw new InvalidComponentPresetException( "No Outer Diameter specified for transition preset " + props.toString());
+                       }
+                       if ( !props.containsKey(FORE_OUTER_DIAMETER) ) {
+                               throw new InvalidComponentPresetException( "No Fore Outer Diameter specified for transition preset " + props.toString());
+                       }
+                       
+                       if ( props.containsKey(MASS) ) {
+                               // compute a density for this component
+                               double mass = props.get(MASS);
+                               Transition tr = new Transition();
+                               tr.loadPreset(preset);
+                               double density = mass / tr.getComponentVolume();
+
+                               String materialName = "TransitionCustom";
+                               if ( props.containsKey(MATERIAL) ) {
+                                       materialName = props.get(MATERIAL).getName();
+                               }
+                               
+                               Material m = Material.newMaterial(Material.Type.BULK, materialName,density, false);
+                               preset.properties.put(MATERIAL, m);
+
+                       }
+                       break;
+               }
                }
 
                preset.computeDigest();

diff --git a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
index 8b621c2f9c5d48e25cc7d52578de008f3d2583d7..6ef65ed24b363f63a93787207dff33ed8f82df1e 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
@@ -120,27 +120,9 @@ public class NoseCone extends Transition {
 
        @Override
        protected void loadFromPreset(ComponentPreset preset) {
-               if ( preset.has(ComponentPreset.SHAPE) ) {
-                       Shape s = preset.get(ComponentPreset.SHAPE);
-                       this.setType(s);
-               }
-               if ( preset.has(ComponentPreset.OUTER_DIAMETER) )  {
-                       double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER);
-                       this.setAftRadiusAutomatic(false);
-                       this.setAftRadius(outerDiameter/2.0);
-               }
-               if ( preset.has(ComponentPreset.SHOULDER_LENGTH) ) {
-                       double length = preset.get(ComponentPreset.SHOULDER_LENGTH);
-                       this.setAftShoulderLength(length);
-               }
-               if ( preset.has(ComponentPreset.SHOULDER_DIAMETER) ) {
-                       double d = preset.get(ComponentPreset.SHOULDER_DIAMETER);
-                       this.setAftShoulderRadius(d/2.0);
-               }
-
+               
+               //Many parameters are handled by the super class Transition.loadFromPreset
                super.loadFromPreset(preset);
-
-               fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
        }
 
        /**

diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
index f3a6f9b6a8764925dcb53939fc0244922774da28..1a7ba10e010659e1af6ade057d2ae6c096ecc411 100644 (file)
--- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
@@ -6,6 +6,8 @@ import static net.sf.openrocket.util.MathUtil.*;
 import java.util.Collection;
 
 import net.sf.openrocket.l10n.Translator;
+import net.sf.openrocket.preset.ComponentPreset;
+import net.sf.openrocket.preset.ComponentPreset.Type;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.MathUtil;
@@ -514,7 +516,51 @@ public class Transition extends SymmetricComponent {
                return false;
        }
        
-       
+       @Override
+       public Type getPresetType() {
+               return ComponentPreset.Type.TRANSITION;
+       }
+
+
+       @Override
+       protected void loadFromPreset(ComponentPreset preset) {
+
+               if ( preset.has(ComponentPreset.SHAPE) ) {
+                       Shape s = preset.get(ComponentPreset.SHAPE);
+                       this.setType(s);
+               }
+               if ( preset.has(ComponentPreset.OUTER_DIAMETER) )  {
+                       double outerDiameter = preset.get(ComponentPreset.OUTER_DIAMETER);
+                       this.setAftRadiusAutomatic(false);
+                       this.setAftRadius(outerDiameter/2.0);
+               }
+               if ( preset.has(ComponentPreset.SHOULDER_LENGTH) ) {
+                       double d = preset.get(ComponentPreset.SHOULDER_LENGTH);
+                       this.setAftShoulderLength(d);
+               }
+               if ( preset.has(ComponentPreset.SHOULDER_DIAMETER) ) {
+                       double d = preset.get(ComponentPreset.SHOULDER_DIAMETER);
+                       this.setAftShoulderRadius(d/2.0);
+               }
+               if ( preset.has(ComponentPreset.FORE_OUTER_DIAMETER) )  {
+                       double outerDiameter = preset.get(ComponentPreset.FORE_OUTER_DIAMETER);
+                       this.setForeRadiusAutomatic(false);
+                       this.setForeRadius(outerDiameter/2.0);
+               }
+               if ( preset.has(ComponentPreset.FORE_SHOULDER_LENGTH) ) {
+                       double d = preset.get(ComponentPreset.FORE_SHOULDER_LENGTH);
+                       this.setForeShoulderLength(d);
+               }
+               if ( preset.has(ComponentPreset.FORE_SHOULDER_DIAMETER) ) {
+                       double d = preset.get(ComponentPreset.FORE_SHOULDER_DIAMETER);
+                       this.setForeShoulderRadius(d/2.0);
+               }
+
+               super.loadFromPreset(preset);
+
+               fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
+
+       }
 
        /**
         * An enumeration listing the possible shapes of transitions.