Code

Fix LPE:
authorjohanengelen <johanengelen@users.sourceforge.net>
Fri, 17 Aug 2007 20:30:10 +0000 (20:30 +0000)
committerjohanengelen <johanengelen@users.sourceforge.net>
Fri, 17 Aug 2007 20:30:10 +0000 (20:30 +0000)
* add default values for parameters
* remove text for LPE_INVALID
* update example for skel strokes
* clean a bit of the code

16 files changed:
share/examples/live-path-effects-skeletal.svg
src/live_effects/effect.cpp
src/live_effects/effect.h
src/live_effects/lpe-gears.cpp
src/live_effects/lpe-skeletalstrokes.cpp
src/live_effects/lpe-test-doEffect-stack.cpp
src/live_effects/lpeobject-reference.cpp
src/live_effects/lpeobject-reference.h
src/live_effects/lpeobject.cpp
src/live_effects/parameter/enum.h
src/live_effects/parameter/parameter.cpp
src/live_effects/parameter/parameter.h
src/live_effects/parameter/path.cpp
src/live_effects/parameter/path.h
src/live_effects/parameter/point.cpp
src/live_effects/parameter/point.h

index 7f9917ee0563a23eeef8e970b941b5db81ccefef..936b487b5ed3d3bb106474e728fc213161f05997 100644 (file)
        origin="0.1,0.2"
        pattern="M 119.92529,-0.41956101 C 119.92529,1.659909 120.58678,2.431279 121.32538,3.765079 C 120.76714,6.123869 120.41028,8.500889 122.37545,11.088229 C 121.671,13.006199 122.5692,14.924159 123.95054,16.842119 C 123.71907,18.682279 124.92357,20.284009 126.05068,21.898579 C 126.25318,23.990909 127.36543,26.083239 129.20088,28.175559 C 112.57483,22.944749 111.46952,10.168439 108.8996,7.775379 C 107.5348,6.504509 106.05778,6.654809 105.00417,5.064329 C 103.95056,3.473849 103.32038,0.14257899 102.24918,-0.41974101 C 103.32038,-0.98206101 103.95056,-4.313331 105.00417,-5.903821 C 106.05778,-7.494301 107.5348,-7.343991 108.8996,-8.614861 C 111.46952,-11.007921 112.57483,-23.784231 129.20088,-29.015041 C 127.36543,-26.922721 126.25318,-24.830391 126.05068,-22.738061 C 124.92357,-21.123491 123.71907,-19.521771 123.95054,-17.681611 C 122.5692,-15.763641 121.671,-13.845681 122.37545,-11.927711 C 120.41028,-9.340371 120.76714,-6.963351 121.32538,-4.604571 C 120.58678,-3.270761 119.92529,-2.499391 119.92529,-0.41992101 M 102.24917,-9.399491 C 101.73918,-8.349411 101.40752,-7.043061 101.33869,-5.702881 M 97.931762,-12.373781 C 97.196772,-10.747321 96.683652,-9.149741 96.517362,-7.611401 M 40.796126,-31.951641 C 36.393294,-26.573831 34.489541,-20.703561 33.158143,-15.440541 M 92.314832,-9.032131 C 92.607472,-11.125331 93.016652,-13.311561 94.188102,-15.314231 M 69.466596,-14.799961 C 70.526116,-19.749901 72.232996,-25.173971 76.035906,-29.701501 M 76.247336,-13.550161 C 77.232456,-17.658201 78.546166,-22.280971 81.496132,-26.588961 M 81.688812,-12.160461 C 82.459442,-15.577031 83.798922,-19.288461 86.595282,-22.724941 M 87.619382,-10.586331 C 88.269962,-13.778381 89.079762,-17.038011 90.529502,-19.434311 M 39.372996,-16.390721 C 40.663096,-22.091891 42.448976,-28.160771 46.526886,-32.647581 M 44.719896,-16.786451 C 46.020076,-21.938221 48.120906,-27.667231 52.729216,-33.084921 M 51.186366,-16.832791 C 52.460916,-21.977761 54.401586,-27.698631 58.580646,-33.111011 M 57.755366,-16.454151 C 59.035266,-21.645811 60.894386,-27.451691 64.905486,-32.894161 M 70.743036,-31.820641 C 68.781736,-29.846411 65.654026,-23.126311 64.075116,-15.756401 M 32.943271,13.696999 C 31.02686,5.738139 30.600382,-0.45243101 26.863458,-0.37462101 C 30.736989,-0.29396101 30.793459,-6.970991 33.158143,-15.440541 C 32.058705,-10.280411 31.563422,-4.759601 33.107444,-0.37462101 C 31.648043,3.659839 31.768408,8.716679 32.943271,13.696999 z M 101.2948,4.002579 C 101.17471,1.399589 101.32632,-0.45999101 98.464912,-0.37462101 C 101.67522,-0.27884101 100.95543,-2.624431 101.33869,-5.702881 C 101.31622,-3.566861 101.64612,-1.440751 102.07417,-0.37462101 L 102.07417,-0.37461101 C 101.70843,0.53633899 101.30509,2.215759 101.2948,4.002579 z M 96.421272,5.945939 C 95.961022,1.675379 97.120182,-0.47020101 92.570952,-0.37462101 C 97.432252,-0.27249101 95.639582,-2.793851 96.517362,-7.611401 C 96.251492,-4.242461 97.074992,-1.421851 98.464912,-0.37462101 C 97.205982,0.57391899 96.293052,3.033689 96.421272,5.945939 z M 92.199792,7.369879 C 91.682072,3.112599 91.561712,-0.45910101 87.418402,-0.37462101 C 91.855932,-0.28415101 91.596802,-4.354961 92.314832,-9.032131 C 91.936652,-5.782151 91.961722,-2.262891 92.570952,-0.37462101 C 92.017822,1.339789 91.874662,4.370259 92.199792,7.369879 z M 69.316276,13.139069 C 67.797866,5.660429 67.642976,-0.45234101 63.912806,-0.37462101 C 67.774536,-0.29415101 67.758886,-6.940511 69.466596,-14.799961 C 68.459376,-9.690321 68.383356,-4.346991 70.151986,-0.37462101 C 68.463476,3.297119 68.413876,8.256599 69.316276,13.139069 z M 76.078836,11.926069 C 74.460446,4.871139 74.036686,-0.45624101 70.151986,-0.37462101 C 74.171726,-0.29017101 74.285226,-6.166821 76.247336,-13.550161 C 75.280136,-8.280741 74.927876,-2.963871 76.515186,-0.37462101 C 75.005646,1.958549 75.063016,6.925809 76.078836,11.926069 z M 81.510842,10.533629 C 80.232116,4.381079 80.563616,-0.45735101 76.515186,-0.37462101 C 80.723636,-0.28862101 80.257296,-5.632921 81.688812,-12.160461 C 80.480436,-7.730861 80.156206,-3.060491 81.828332,-0.37462101 C 80.253876,2.021669 80.503246,6.293799 81.510842,10.533629 z M 87.231632,9.011219 C 86.277232,3.962159 85.596432,-0.45378101 81.828332,-0.37462101 C 85.721262,-0.29283101 86.645572,-5.247951 87.619382,-10.586331 C 86.643642,-6.535971 86.369042,-2.355891 87.418402,-0.37462101 C 86.435402,1.337139 86.488032,5.129359 87.231632,9.011219 z M 39.188486,14.663929 C 37.426416,6.563309 36.714489,-0.45040101 33.107444,-0.37462101 C 36.841626,-0.29617101 37.280464,-7.861881 39.372996,-16.390721 C 38.458246,-11.472261 38.047626,-5.894711 39.116846,-0.37462101 C 38.108106,4.729069 38.236876,9.909499 39.188486,14.663929 z M 44.509636,15.084679 C 42.430096,6.289929 42.889186,-0.45620101 39.116846,-0.37462101 C 43.005546,-0.29052101 42.225876,-7.554121 44.719896,-16.786451 C 43.333526,-11.095791 42.850856,-4.991741 45.126236,-0.37462101 C 42.961866,3.900459 43.131256,9.595039 44.509636,15.084679 z M 50.990786,15.148389 C 48.912506,6.307419 49.021366,-0.45645101 45.126236,-0.37462101 C 49.135236,-0.29039101 48.729696,-7.576121 51.186366,-16.832791 C 49.925426,-11.117121 49.450086,-4.984491 51.399926,-0.37462101 C 49.545316,3.893529 49.721436,9.637169 50.990786,15.148389 z M 57.565346,14.782989 C 55.531406,6.152689 55.300196,-0.45545101 51.399926,-0.37462101 C 55.418466,-0.29134101 55.350966,-7.413051 57.755366,-16.454151 C 56.576046,-10.870761 56.066836,-4.924771 57.673626,-0.37462101 C 56.143836,3.842269 56.352086,9.409209 57.565346,14.782989 z M 63.897286,14.082869 C 61.995916,5.914449 61.453026,-0.45402101 57.673626,-0.37462101 C 61.576106,-0.29263101 61.875306,-7.194241 64.075116,-15.756401 C 63.069866,-10.454371 62.668056,-4.819531 63.912806,-0.37462101 C 62.730386,3.735449 62.890676,9.007129 63.897286,14.082869 z M 101.2948,4.002579 C 101.2854,5.635799 101.62236,7.359649 102.24917,8.650249 M 96.421272,5.945939 C 96.500192,7.738359 97.047242,9.667199 97.931762,11.624549 M 94.188102,14.564989 C 92.844012,12.267189 92.486012,9.723619 92.199792,7.369879 M 90.529502,18.685079 C 88.532242,15.921769 87.858722,12.328759 87.231632,9.011219 M 86.595282,21.975709 C 83.596552,18.186189 82.259812,14.137229 81.510842,10.533629 M 76.078836,11.926069 C 77.283916,17.857939 79.761566,23.856219 81.496132,25.839729 M 76.035906,28.952269 C 72.027436,24.064879 70.360566,18.282469 69.316276,13.139069 M 63.897286,14.082869 C 65.423906,21.780689 68.711106,29.026089 70.743036,31.071409 M 64.905486,32.144929 C 60.689146,26.315529 58.832476,20.159629 57.565346,14.782989 M 58.580646,32.361779 C 54.188676,26.567379 52.244036,20.479709 50.990786,15.148389 M 52.729216,32.335679 C 47.874606,26.521609 45.773926,20.431609 44.509636,15.084679 M 46.526886,31.898339 C 42.242406,27.064939 40.476646,20.585919 39.188486,14.663929 M 32.943271,13.696999 C 34.257898,19.156649 36.145459,25.406929 40.796126,31.202409 M 120.27531,-19.250851 C 122.72547,-21.866261 126.05068,-22.738061 126.05068,-22.738061 M 116.60008,-13.845671 C 119.57527,-16.461081 123.95054,-17.681611 123.95054,-17.681611 M 113.7999,-7.045611 C 117.82516,-11.578991 122.37545,-11.927711 122.37545,-11.927711 M 111.69977,-2.512241 C 116.7751,-4.604571 121.32538,-4.604571 121.32538,-4.604571 M 120.27531,18.411369 C 122.72547,21.026779 126.05068,21.898579 126.05068,21.898579 M 116.60008,13.006189 C 119.57527,15.621599 123.95054,16.842119 123.95054,16.842119 M 113.7999,6.206129 C 117.82516,10.739509 122.37545,11.088229 122.37545,11.088229 M 111.69977,1.672759 C 116.7751,3.765079 121.32538,3.765079 121.32538,3.765079 M 19.293941,-10.620001 C 19.293941,-10.186891 18.98032,-9.835381 18.593898,-9.835381 C 18.207472,-9.835381 17.893856,-10.186891 17.893856,-10.620001 C 17.893856,-11.053121 18.207472,-11.404621 18.593898,-11.404621 C 18.98032,-11.404621 19.293941,-11.053121 19.293941,-10.620001 z M 25.856859,27.564939 C 30.582156,27.477759 25.856859,6.205779 25.856859,-0.59428101 C 25.856859,-7.394341 27.795183,-22.180491 33.032312,-28.927861 C 38.358126,-35.789491 -1.283572,-12.994371 1.617831,4.810899 C 4.855537,6.641689 9.755844,7.600669 13.693591,9.082729 C 10.01836,9.344269 5.730588,8.210929 2.667892,7.426299 C 4.418006,11.087879 10.543393,21.200789 25.856859,27.564939 z M 21.219074,-11.796931 C 21.219074,-10.473531 20.297813,-9.399471 19.162695,-9.399471 C 18.027572,-9.399471 17.106311,-10.473531 17.106311,-11.796931 C 17.106311,-13.120321 18.027572,-14.194381 19.162695,-14.194381 C 20.297813,-14.194381 21.219074,-13.120321 21.219074,-11.796931 z M 19.293941,-10.620001 C 19.293941,-10.186891 18.98032,-9.835381 18.593898,-9.835381 C 18.207472,-9.835381 17.893856,-10.186891 17.893856,-10.620001 C 17.893856,-11.053121 18.207472,-11.404621 18.593898,-11.404621 C 18.98032,-11.404621 19.293941,-11.053121 19.293941,-10.620001 z"
        copytype="single_stretched" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect2455"
-       origin="0.1,200"
-       pattern="M 139.18065,483.47597 C 139.18065,485.55544 139.84214,486.32681 140.58074,487.66061 C 140.0225,490.0194 139.66564,492.39642 141.63081,494.98376 C 140.92636,496.90173 141.82456,498.81969 143.2059,500.73765 C 142.97443,502.57781 144.17893,504.17954 145.30604,505.79411 C 145.50854,507.88644 146.62079,509.97877 148.45624,512.07109 C 131.83019,506.84028 130.72488,494.06397 128.15496,491.67091 C 126.79016,490.40004 125.31314,490.55034 124.25953,488.95986 C 123.20592,487.36938 122.57574,484.03811 121.50454,483.47579 C 122.57574,482.91347 123.20592,479.5822 124.25953,477.99171 C 125.31314,476.40123 126.79016,476.55154 128.15496,475.28067 C 130.72488,472.88761 131.83019,460.1113 148.45624,454.88049 C 146.62079,456.97281 145.50854,459.06514 145.30604,461.15747 C 144.17893,462.77204 142.97443,464.37376 143.2059,466.21392 C 141.82456,468.13189 140.92636,470.04985 141.63081,471.96782 C 139.66564,474.55516 140.0225,476.93218 140.58074,479.29096 C 139.84214,480.62477 139.18065,481.39614 139.18065,483.47561 M 121.50453,474.49604 C 120.99454,475.54612 120.66288,476.85247 120.59405,478.19265 M 117.18712,471.52175 C 116.45213,473.14821 115.93901,474.74579 115.77272,476.28413 M 60.051484,451.94389 C 55.648652,457.3217 53.744899,463.19197 52.413501,468.45499 M 111.57019,474.8634 C 111.86283,472.7702 112.27201,470.58397 113.44346,468.5813 M 88.721954,469.09557 C 89.781474,464.14563 91.488354,458.72156 95.291264,454.19403 M 95.502694,470.34537 C 96.487814,466.23733 97.801524,461.61456 100.75149,457.30657 M 100.94417,471.73507 C 101.7148,468.3185 103.05428,464.60707 105.85064,461.17059 M 106.87474,473.3092 C 107.52532,470.11715 108.33512,466.85752 109.78486,464.46122 M 58.628354,467.50481 C 59.918454,461.80364 61.704334,455.73476 65.782244,451.24795 M 63.975254,467.10908 C 65.275434,461.95731 67.376264,456.2283 71.984574,450.81061 M 70.441724,467.06274 C 71.716274,461.91777 73.656944,456.1969 77.836004,450.78452 M 77.010724,467.44138 C 78.290624,462.24972 80.149744,456.44384 84.160844,451.00137 M 89.998394,452.07489 C 88.037094,454.04912 84.909384,460.76922 83.330474,468.13913 M 52.198629,497.59253 C 50.282218,489.63367 49.85574,483.4431 46.118816,483.52091 C 49.992347,483.60157 50.048817,476.92454 52.413501,468.45499 C 51.314063,473.61512 50.81878,479.13593 52.362802,483.52091 C 50.903401,487.55537 51.023766,492.61221 52.198629,497.59253 z M 120.55016,487.89811 C 120.43007,485.29512 120.58168,483.43554 117.72027,483.52091 C 120.93058,483.61669 120.21079,481.2711 120.59405,478.19265 C 120.57158,480.32867 120.90148,482.45478 121.32953,483.52091 L 121.32953,483.52092 C 120.96379,484.43187 120.56045,486.11129 120.55016,487.89811 z M 115.67663,489.84147 C 115.21638,485.57091 116.37554,483.42533 111.82631,483.52091 C 116.68761,483.62304 114.89494,481.10168 115.77272,476.28413 C 115.50685,479.65307 116.33035,482.47368 117.72027,483.52091 C 116.46134,484.46945 115.54841,486.92922 115.67663,489.84147 z M 111.45515,491.26541 C 110.93743,487.00813 110.81707,483.43643 106.67376,483.52091 C 111.11129,483.61138 110.85216,479.54057 111.57019,474.8634 C 111.19201,478.11338 111.21708,481.63264 111.82631,483.52091 C 111.27318,485.23532 111.13002,488.26579 111.45515,491.26541 z M 88.571634,497.0346 C 87.053224,489.55596 86.898334,483.44319 83.168164,483.52091 C 87.029894,483.60138 87.014244,476.95502 88.721954,469.09557 C 87.714734,474.20521 87.638714,479.54854 89.407344,483.52091 C 87.718834,487.19265 87.669234,492.15213 88.571634,497.0346 z M 95.334194,495.8216 C 93.715804,488.76667 93.292044,483.43929 89.407344,483.52091 C 93.427084,483.60536 93.540584,477.72871 95.502694,470.34537 C 94.535494,475.61479 94.183234,480.93166 95.770544,483.52091 C 94.261004,485.85408 94.318374,490.82134 95.334194,495.8216 z M 100.7662,494.42916 C 99.487474,488.27661 99.818974,483.43818 95.770544,483.52091 C 99.978994,483.60691 99.512654,478.26261 100.94417,471.73507 C 99.735794,476.16467 99.411564,480.83504 101.08369,483.52091 C 99.509234,485.9172 99.758604,490.18933 100.7662,494.42916 z M 106.48699,492.90675 C 105.53259,487.85769 104.85179,483.44175 101.08369,483.52091 C 104.97662,483.6027 105.90093,478.64758 106.87474,473.3092 C 105.899,477.35956 105.6244,481.53964 106.67376,483.52091 C 105.69076,485.23267 105.74339,489.02489 106.48699,492.90675 z M 58.443844,498.55946 C 56.681774,490.45884 55.969847,483.44513 52.362802,483.52091 C 56.096984,483.59936 56.535822,476.03365 58.628354,467.50481 C 57.713604,472.42327 57.302984,478.00082 58.372204,483.52091 C 57.363464,488.6246 57.492234,493.80503 58.443844,498.55946 z M 63.764994,498.98021 C 61.685454,490.18546 62.144544,483.43933 58.372204,483.52091 C 62.260904,483.60501 61.481234,476.34141 63.975254,467.10908 C 62.588884,472.79974 62.106214,478.90379 64.381594,483.52091 C 62.217224,487.79599 62.386614,493.49057 63.764994,498.98021 z M 70.246144,499.04392 C 68.167864,490.20295 68.276724,483.43908 64.381594,483.52091 C 68.390594,483.60514 67.985054,476.31941 70.441724,467.06274 C 69.180784,472.77841 68.705444,478.91104 70.655284,483.52091 C 68.800674,487.78906 68.976794,493.5327 70.246144,499.04392 z M 76.820704,498.67852 C 74.786764,490.04822 74.555554,483.44008 70.655284,483.52091 C 74.673824,483.60419 74.606324,476.48248 77.010724,467.44138 C 75.831404,473.02477 75.322194,478.97076 76.928984,483.52091 C 75.399194,487.7378 75.607444,493.30474 76.820704,498.67852 z M 83.152644,497.9784 C 81.251274,489.80998 80.708384,483.44151 76.928984,483.52091 C 80.831464,483.6029 81.130664,476.70129 83.330474,468.13913 C 82.325224,473.44116 81.923414,479.076 83.168164,483.52091 C 81.985744,487.63098 82.146034,492.90266 83.152644,497.9784 z M 120.55016,487.89811 C 120.54076,489.53133 120.87772,491.25518 121.50453,492.54578 M 115.67663,489.84147 C 115.75555,491.63389 116.3026,493.56273 117.18712,495.52008 M 113.44346,498.46052 C 112.09937,496.16272 111.74137,493.61915 111.45515,491.26541 M 109.78486,502.58061 C 107.7876,499.8173 107.11408,496.22429 106.48699,492.90675 M 105.85064,505.87124 C 102.85191,502.08172 101.51517,498.03276 100.7662,494.42916 M 95.334194,495.8216 C 96.539274,501.75347 99.016924,507.75175 100.75149,509.73526 M 95.291264,512.8478 C 91.282794,507.96041 89.615924,502.178 88.571634,497.0346 M 83.152644,497.9784 C 84.679264,505.67622 87.966464,512.92162 89.998394,514.96694 M 84.160844,516.04046 C 79.944504,510.21106 78.087834,504.05516 76.820704,498.67852 M 77.836004,516.25731 C 73.444034,510.46291 71.499394,504.37524 70.246144,499.04392 M 71.984574,516.23121 C 67.129964,510.41714 65.029284,504.32714 63.764994,498.98021 M 65.782244,515.79387 C 61.497764,510.96047 59.732004,504.48145 58.443844,498.55946 M 52.198629,497.59253 C 53.513256,503.05218 55.400817,509.30246 60.051484,515.09794 M 139.53067,464.64468 C 141.98083,462.02927 145.30604,461.15747 145.30604,461.15747 M 135.85544,470.04986 C 138.83063,467.43445 143.2059,466.21392 143.2059,466.21392 M 133.05526,476.84992 C 137.08052,472.31654 141.63081,471.96782 141.63081,471.96782 M 130.95513,481.38329 C 136.03046,479.29096 140.58074,479.29096 140.58074,479.29096 M 139.53067,502.3069 C 141.98083,504.92231 145.30604,505.79411 145.30604,505.79411 M 135.85544,496.90172 C 138.83063,499.51713 143.2059,500.73765 143.2059,500.73765 M 133.05526,490.10166 C 137.08052,494.63504 141.63081,494.98376 141.63081,494.98376 M 130.95513,485.56829 C 136.03046,487.66061 140.58074,487.66061 140.58074,487.66061 M 38.549299,473.27553 C 38.549299,473.70864 38.235678,474.06015 37.849256,474.06015 C 37.46283,474.06015 37.149214,473.70864 37.149214,473.27553 C 37.149214,472.84241 37.46283,472.49091 37.849256,472.49091 C 38.235678,472.49091 38.549299,472.84241 38.549299,473.27553 z M 45.112217,511.46047 C 49.837514,511.37329 45.112217,490.10131 45.112217,483.30125 C 45.112217,476.50119 47.050541,461.71504 52.28767,454.96767 C 57.613484,448.10604 17.971786,470.90116 20.873189,488.70643 C 24.110895,490.53722 29.011202,491.4962 32.948949,492.97826 C 29.273718,493.2398 24.985946,492.10646 21.92325,491.32183 C 23.673364,494.98341 29.798751,505.09632 45.112217,511.46047 z M 40.474432,472.0986 C 40.474432,473.422 39.553171,474.49606 38.418053,474.49606 C 37.28293,474.49606 36.361669,473.422 36.361669,472.0986 C 36.361669,470.77521 37.28293,469.70115 38.418053,469.70115 C 39.553171,469.70115 40.474432,470.77521 40.474432,472.0986 z M 38.549299,473.27553 C 38.549299,473.70864 38.235678,474.06015 37.849256,474.06015 C 37.46283,474.06015 37.149214,473.70864 37.149214,473.27553 C 37.149214,472.84241 37.46283,472.49091 37.849256,472.49091 C 38.235678,472.49091 38.549299,472.84241 38.549299,473.27553 z" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect2403"
-       origin="0.1,350" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect2399"
-       origin="0.1,0.2"
-       pattern="M 377.47385,-87.380536 C 377.47385,-87.380536 376.80416,-86.692757 375.64606,-85.503375 C 375.12878,-84.97213 374.51407,-84.340813 373.81807,-83.626014 C 373.25847,-83.051296 372.64632,-82.42261 371.99001,-81.748579 C 371.41292,-81.155896 370.80168,-80.528154 370.16202,-79.871215 C 369.57515,-79.268489 368.96434,-78.641185 368.33402,-77.993832 C 367.74084,-77.384634 367.13038,-76.75768 366.5063,-76.116744 C 365.90835,-75.502649 365.29791,-74.875718 364.6782,-74.23927 C 364.07666,-73.621479 363.46638,-72.99472 362.85033,-72.362029 C 362.24567,-71.741039 361.63545,-71.114335 361.02246,-70.484786 C 360.41493,-69.860844 359.80467,-69.234108 359.19442,-68.607373 C 358.58415,-67.980622 357.97389,-67.353873 357.36634,-66.729917 C 356.75337,-66.100386 356.14317,-65.473701 355.53853,-64.85273 C 354.92252,-64.220081 354.31228,-63.593363 353.71078,-62.975612 C 353.09118,-62.339275 352.48084,-61.712454 351.883,-61.098466 C 351.25887,-60.457481 350.64836,-59.83048 350.05514,-59.221236 C 349.42485,-58.573925 348.81409,-57.946659 348.22725,-57.343968 C 347.58763,-56.687079 346.97645,-56.059383 346.39939,-55.466743 C 345.74316,-54.792784 345.13107,-54.164157 344.57151,-53.589485 C 343.87555,-52.874728 343.26086,-52.243435 342.74359,-51.712195 C 341.58531,-50.522626 340.9155,-49.83473 340.9155,-49.83473 C 340.32792,-49.104443 339.81526,-48.412938 339.37269,-47.757699 C 338.83536,-46.962174 338.40133,-46.22011 338.06195,-45.527008 C 337.62634,-44.637396 337.34665,-43.828447 337.20456,-43.090652 C 337.01793,-42.121635 337.06867,-41.275362 337.31526,-40.530283 C 337.5843,-39.717379 338.08647,-39.024935 338.76789,-38.424964 C 339.36613,-37.898228 340.10251,-37.442773 340.94058,-37.039659 C 341.67165,-36.688011 342.48009,-36.376193 343.3417,-36.09164 C 344.1298,-35.83136 344.96239,-35.593887 345.82092,-35.369604 C 346.63895,-35.155907 347.48053,-34.954183 348.32965,-34.756113 C 349.16607,-34.561007 350.00979,-34.369447 350.84551,-34.17348 C 351.69483,-33.974321 352.53589,-33.770615 353.35259,-33.554006 C 354.21099,-33.326341 355.04248,-33.084425 355.82841,-32.81857 C 356.68848,-32.527635 357.49398,-32.208027 358.22044,-31.847047 C 358.94005,-31.108817 358.71342,-30.414172 357.96718,-29.74343 C 357.46922,-29.295841 356.73987,-28.858898 355.90592,-28.426749 C 355.21747,-28.069994 354.45772,-27.716506 353.698,-27.362998 C 352.93824,-27.009469 352.1785,-26.655918 351.49014,-26.299054 C 350.65625,-25.866746 349.92708,-25.429576 349.42945,-24.981695 C 348.68422,-24.310967 348.45826,-23.616212 349.17746,-22.877786 C 349.62543,-22.418229 350.3278,-21.963408 351.2132,-21.511987 C 351.87081,-21.176705 352.62938,-20.843301 353.45966,-20.511231 C 354.17991,-20.223169 354.95413,-19.936112 355.76321,-19.649702 C 356.51396,-19.383942 357.29472,-19.118743 358.09026,-18.853819 C 358.85992,-18.597509 359.64341,-18.341454 360.42691,-18.085401 C 361.21039,-17.829354 361.99388,-17.573304 362.76357,-17.317 C 363.55917,-17.052063 364.34003,-16.786852 365.09088,-16.521082 C 365.90009,-16.23465 366.67446,-15.947574 367.39487,-15.659489 C 368.22507,-15.327507 368.98362,-14.994188 369.6413,-14.658991 C 370.5265,-14.20784 371.22895,-13.753287 371.67742,-13.294005 C 372.38115,-12.572067 372.45703,-11.840436 372.18189,-11.103392 C 371.93986,-10.455024 371.42619,-9.8024664 370.82934,-9.1486226 C 370.30243,-8.5714026 369.71069,-7.9931803 369.18377,-7.4159603 C 368.58687,-6.7620727 368.07316,-6.1094716 367.83113,-5.4610629 C 367.55601,-4.7240322 367.63191,-3.9924229 368.33562,-3.2705012 C 368.9359,-2.6546948 369.68437,-2.2644063 370.51328,-1.9863237 C 371.28865,-1.7262015 372.13439,-1.5642605 372.99504,-1.4077518 C 373.82944,-1.2560145 374.67786,-1.1093846 375.48974,-0.88333954 C 376.31941,-0.65234284 377.11092,-0.33841052 377.81032,0.14865531 C 378.46473,0.60438334 379.03849,1.211682 379.48743,2.044444 C 379.84025,2.6989242 380.11598,3.4926628 380.29315,4.461526 C 380.47028,5.4329128 381.01387,6.1300297 381.82143,6.5943802 C 382.51346,6.9922996 383.39934,7.2192869 384.41457,7.3014633 C 385.24149,7.3683968 386.15422,7.3392549 387.11792,7.2281579 C 387.97389,7.1294769 388.87007,6.9661375 389.78205,6.7480266 C 390.64171,6.5424273 391.51539,6.2881608 392.38266,5.9935134 C 393.23718,5.7031923 394.08547,5.3736621 394.90796,5.0128542 C 395.75171,4.6427138 396.5683,4.239657 397.33661,3.8122324 C 398.16333,3.3523147 398.93415,2.8641837 399.62275,2.358502 C 400.44747,1.5117371 400.43842,0.90434284 400.02642,0.41268314 C 399.64124,-0.046966894 398.90389,-0.40546694 398.16639,-0.76384408 C 397.429,-1.1221666 396.69147,-1.4803717 396.30567,-1.9394345 C 395.89256,-2.4309931 395.88274,-3.0381935 396.70821,-3.8850212 C 397.31651,-4.5093353 397.92159,-5.0553541 398.5216,-5.5350811 C 399.20107,-6.0783359 399.87404,-6.5365849 400.53781,-6.9272584 C 401.28264,-7.3656406 402.01589,-7.7189405 402.73374,-8.0117934 C 403.52769,-8.3356891 404.30282,-8.5856458 405.05395,-8.7949896 C 405.87792,-9.0246343 406.67303,-9.2054097 407.43246,-9.3813181 C 408.26836,-9.5749384 409.06105,-9.7626619 409.80144,-10.003158 C 410.60314,-10.263572 411.34353,-10.585865 412.01107,-11.044526 C 412.64733,-11.481693 413.21742,-12.04275 413.71135,-12.792194 C 414.11005,-13.397141 414.45913,-14.124834 414.75335,-15.009199 C 415.01489,-15.79561 414.73037,-16.511749 414.12644,-17.179391 C 413.6614,-17.693488 413.00697,-18.178827 412.26665,-18.645355 C 411.62276,-19.051104 410.9139,-19.442622 410.20815,-19.826446 C 409.48978,-20.217127 408.77463,-20.59984 408.13448,-20.981476 C 407.34439,-21.452507 406.66857,-21.921904 406.24198,-22.402631 C 405.65033,-23.069374 405.53814,-23.757918 406.26552,-24.50285 C 406.93191,-24.893431 407.71705,-25.274119 408.59447,-25.650069 C 409.339,-25.969081 410.14996,-26.284682 411.01117,-26.600018 C 411.79091,-26.885522 412.61184,-27.170812 413.46194,-27.458221 C 414.2609,-27.72834 415.08563,-28.000332 415.92615,-28.276137 C 416.73681,-28.542142 417.56216,-28.811692 418.39326,-29.086533 C 419.21082,-29.3569 420.03395,-29.632382 420.85412,-29.914638 C 421.67542,-30.197285 422.49376,-30.486721 423.30057,-30.784613 C 424.12267,-31.088153 424.93281,-31.400468 425.72194,-31.723326 C 426.54097,-32.058414 427.33737,-32.404856 428.10102,-32.764618 C 428.91097,-33.146197 429.68408,-33.542759 430.40829,-33.956656 C 431.19687,-34.407345 431.92747,-34.878589 432.58448,-35.373414 C 433.32089,-35.928033 433.96486,-36.512281 434.49445,-37.130419 C 435.09095,-37.826654 435.54235,-38.565889 435.81729,-39.354222 C 436.09732,-40.157163 436.19429,-41.011039 436.07508,-41.922296 C 435.97322,-42.700833 435.71356,-43.521255 435.27544,-44.387581 C 434.92324,-45.084004 434.45572,-45.810088 433.86213,-46.567925 C 433.37295,-47.192455 432.79817,-47.838545 432.13176,-48.507367 C 432.13176,-48.507367 431.43759,-49.219462 430.23717,-50.450891 C 429.70099,-51.00092 429.06381,-51.654553 428.34237,-52.394624 C 427.76231,-52.989659 427.12779,-53.640573 426.4475,-54.338432 C 425.84931,-54.952067 425.21574,-55.602003 424.5527,-56.282167 C 423.94437,-56.9062 423.31124,-57.555682 422.65788,-58.225921 C 422.04302,-58.856657 421.41024,-59.505775 420.76335,-60.16937 C 420.14356,-60.805174 419.5108,-61.454271 418.86844,-62.113219 C 418.24492,-62.75285 417.61233,-63.401767 416.97377,-64.056826 C 416.34701,-64.699769 415.71448,-65.348629 415.07909,-66.000435 C 414.44935,-66.646435 413.81679,-67.29533 413.18424,-67.944221 C 412.55174,-68.593055 411.91924,-69.241889 411.28956,-69.88783 C 410.65418,-70.539623 410.02167,-71.18847 409.39492,-71.8314 C 408.75639,-72.486423 408.12384,-73.135304 407.50035,-73.774901 C 406.8581,-74.43374 406.22545,-75.082729 405.60575,-75.718432 C 404.9588,-76.382086 404.32597,-77.031261 403.71106,-77.662049 C 403.05773,-78.332255 402.42463,-78.981705 401.81633,-79.605711 C 401.15333,-80.285831 400.5198,-80.935726 399.92165,-81.549327 C 399.24142,-82.247124 398.60695,-82.897982 398.02693,-83.492978 C 397.30552,-84.233017 396.66836,-84.886638 396.13217,-85.436668 C 394.93154,-86.66831 394.23724,-87.380536 394.23724,-87.380536 C 393.59189,-88.002366 392.88643,-88.538559 392.13826,-88.988716 C 391.37657,-89.447007 390.5706,-89.816126 389.73869,-90.09565 C 388.89909,-90.377762 388.03307,-90.568614 387.1595,-90.667773 C 386.28026,-90.767577 385.39336,-90.774493 384.51804,-90.688081 C 383.63826,-90.601229 382.77017,-90.420093 381.9333,-90.144226 C 381.09673,-89.868458 380.29136,-89.498026 379.5367,-89.032485 C 378.79373,-88.574161 378.09991,-88.023654 377.47385,-87.380536 C 377.47385,-87.380536 377.47385,-87.380536 377.47385,-87.380536 M 419.46669,-15.009199 C 419.46669,-14.550636 420.29548,-14.130971 421.54498,-13.811415 C 422.25697,-13.629323 423.10557,-13.479738 424.01527,-13.37398 C 424.81931,-13.28051 425.67107,-13.221276 426.51845,-13.204102 C 427.37673,-13.186705 428.2305,-13.212457 429.0256,-13.28948 C 429.95272,-13.379295 430.80007,-13.538825 431.48175,-13.780951 C 432.49433,-14.140614 433.14138,-14.682531 433.14138,-15.448922 C 432.86041,-16.264931 432.40976,-16.955326 431.83935,-17.522225 C 431.26182,-18.096198 430.56153,-18.543574 429.79029,-18.866557 C 429.04638,-19.1781 428.23646,-19.373905 427.40705,-19.455947 C 426.59298,-19.536474 425.76013,-19.507409 424.95248,-19.370619 C 424.13147,-19.231568 423.3365,-18.981197 422.61376,-18.62147 C 421.86467,-18.248626 421.19318,-17.758307 420.65073,-17.152694 C 420.11197,-16.55121 419.70049,-15.835996 419.46669,-15.009199 C 419.46669,-15.009199 419.46669,-15.009199 419.46669,-15.009199 M 357.86667,-5.11133 C 358.55134,-4.5171383 359.31485,-4.2054565 360.10741,-4.1204506 C 360.90652,-4.0347429 361.73517,-4.1794691 362.54235,-4.4974081 C 363.28373,-4.7894253 364.007,-5.2275617 364.67263,-5.767479 C 365.31082,-6.2851315 365.89603,-6.896344 366.39343,-7.5620358 C 366.90188,-8.242517 367.31857,-8.9799246 367.60631,-9.7325204 C 367.07793,-10.437124 366.30547,-10.90016 365.41067,-11.161662 C 364.60115,-11.398241 363.6915,-11.469864 362.77187,-11.406172 C 361.88696,-11.344887 360.9928,-11.158305 360.16973,-10.872837 C 359.27131,-10.561235 358.45758,-10.131811 357.83303,-9.6189079 C 357.04999,-8.9758496 356.5643,-8.2015681 356.58187,-7.3637588 C 356.59693,-6.6454314 356.98194,-5.8804004 357.86667,-5.11133 C 357.86667,-5.11133 357.86667,-5.11133 357.86667,-5.11133 M 417.75225,-11.182788 C 417.07502,-10.573102 416.62984,-9.9619767 416.37681,-9.3762927 C 416.02487,-8.561655 416.0447,-7.7962389 416.3289,-7.1523776 C 416.62465,-6.4823787 417.20668,-5.9440073 417.95401,-5.6187651 C 418.60149,-5.336979 419.37304,-5.215173 420.18999,-5.3063541 C 420.8882,-5.3842807 421.61957,-5.6177791 422.33497,-6.039938 C 422.77975,-6.4929485 422.78734,-7.4965033 422.15722,-8.5165874 C 421.77046,-9.1427096 421.14344,-9.7750588 420.22979,-10.29015 C 419.56275,-10.666217 418.74292,-10.979783 417.75225,-11.182788 C 417.75225,-11.182788 417.75225,-11.182788 417.75225,-11.182788 M 368.72477,-29.815034 C 368.93929,-29.681301 369.81913,-29.431691 371.10001,-29.117177 C 371.79941,-28.945445 372.61837,-28.754362 373.51388,-28.552225 C 374.27437,-28.380564 375.09007,-28.200933 375.93461,-28.018412 C 376.72492,-27.847614 377.5405,-27.674287 378.35975,-27.502593 C 379.17232,-27.332299 379.98851,-27.163612 380.78723,-27.000601 C 381.62463,-26.829693 382.44284,-26.665024 383.21757,-26.511273 C 384.09643,-26.336856 384.91935,-26.176491 385.65087,-26.037014 C 386.67569,-25.841613 387.52114,-25.68721 388.08976,-25.592599 C 388.88299,-25.424723 388.81735,-24.843403 388.22382,-24.217644 C 387.8807,-23.855883 387.36113,-23.47927 386.72909,-23.1591 C 386.14872,-23.004314 385.23507,-23.043745 384.11626,-23.2229 C 383.34341,-23.346654 382.47268,-23.537084 381.54628,-23.776222 C 380.73687,-23.985165 379.88497,-24.231292 379.01873,-24.502629 C 378.19223,-24.761516 377.35269,-25.043357 376.52456,-25.337737 C 375.68354,-25.636705 374.8543,-25.948608 374.06246,-26.262551 C 373.19865,-26.605027 372.37936,-26.949929 371.63784,-27.283111 C 370.70868,-27.700602 369.90165,-28.09969 369.28218,-28.452537 C 367.87745,-29.252674 367.43725,-29.815034 368.72477,-29.815034 C 368.72477,-29.815034 368.72477,-29.815034 368.72477,-29.815034 M 392.02752,-84.74766 C 392.02752,-84.74766 392.7344,-84.027144 393.83561,-82.904681 C 394.36005,-82.370118 394.97392,-81.744392 395.64348,-81.061913 C 396.2128,-80.481607 396.82237,-79.860268 397.45145,-79.21905 C 398.04259,-78.616501 398.65095,-77.996398 399.25931,-77.376294 C 399.86769,-76.756182 400.47606,-76.136069 401.06721,-75.533508 C 401.69634,-74.892231 402.30597,-74.270835 402.87534,-73.690478 C 403.54497,-73.007923 404.15892,-72.382133 404.6834,-71.847527 C 405.78456,-70.725117 406.49139,-70.004642 406.49139,-70.004642 C 407.10333,-69.377078 407.43845,-68.486913 407.55379,-67.623781 C 407.69697,-66.552367 407.5015,-65.522606 407.07648,-65.088482 C 407.07648,-65.088482 406.31158,-65.702557 405.28105,-66.529897 C 404.73277,-66.970071 404.10929,-67.470613 403.48581,-67.97116 C 402.86227,-68.471752 402.23873,-68.972349 401.69039,-69.412571 C 400.65982,-70.23994 399.89489,-70.854045 399.89489,-70.854045 C 399.89489,-70.854045 399.74446,-69.944712 399.54179,-68.719577 C 399.43396,-68.067759 399.31134,-67.32655 399.18873,-66.585333 C 399.0661,-65.844049 398.94347,-65.102758 398.83563,-64.45087 C 398.63295,-63.225692 398.48252,-62.316314 398.48252,-62.316314 C 398.48252,-62.316314 397.584,-62.792357 396.48234,-63.37602 C 395.83873,-63.717007 395.12579,-64.094729 394.48218,-64.435717 C 393.38051,-65.019385 392.48198,-65.495431 392.48198,-65.495431 C 392.48198,-65.495431 391.68973,-64.993043 390.56019,-64.276775 C 389.98665,-63.913077 389.32614,-63.494237 388.63825,-63.058026 C 388.00531,-62.656665 387.34919,-62.2406 386.71626,-61.83925 C 386.02838,-61.403044 385.3679,-60.98422 384.79439,-60.620545 C 383.66505,-59.904405 382.87297,-59.402124 382.87297,-59.402124 C 382.87297,-59.402124 382.61068,-60.461171 382.23672,-61.971077 C 382.04684,-62.73776 381.82817,-63.620686 381.60043,-64.540232 C 381.39091,-65.386196 381.17372,-66.263155 380.96421,-67.109111 C 380.7365,-68.028522 380.51786,-68.911313 380.328,-69.677897 C 379.95404,-71.187859 379.69173,-72.246957 379.69173,-72.246957 C 379.69173,-72.246957 379.1419,-71.292245 378.40112,-70.00597 C 378.007,-69.321624 377.55882,-68.543425 377.11064,-67.76522 C 376.66242,-66.986942 376.2142,-66.208656 375.82004,-65.524239 C 375.07923,-64.237918 374.52937,-63.283159 374.52937,-63.283159 C 374.52937,-63.283159 373.34764,-63.283159 371.89875,-63.283159 C 371.05228,-63.283159 370.11462,-63.283159 369.26815,-63.283159 C 367.81925,-63.283159 366.63751,-63.283159 366.63751,-63.283159 C 365.73009,-63.283159 365.04856,-63.609193 364.60329,-64.143167 C 364.1505,-64.68616 363.94204,-65.444172 363.98881,-66.293026 C 364.02685,-66.983511 364.23379,-67.734106 364.61549,-68.477967 C 364.93883,-69.10811 365.38759,-69.733421 365.96534,-70.313268 C 366.533,-70.928228 367.10997,-71.544506 367.69155,-72.158695 C 368.27081,-72.770441 368.85465,-73.380116 369.4384,-73.984353 C 370.02775,-74.594398 370.61702,-75.198901 371.2014,-75.7944 C 371.8,-76.404377 372.39347,-77.004907 372.97666,-77.592267 C 373.58434,-78.204291 374.18087,-78.802016 374.76041,-79.381232 C 375.37838,-79.998849 375.97704,-80.59542 376.54931,-81.165842 C 377.18047,-81.794948 377.77954,-82.392246 378.33704,-82.95089 C 378.99162,-83.606793 379.58889,-84.20941 380.11354,-84.74766 C 380.74309,-85.39346 381.46457,-85.908627 382.24134,-86.295283 C 383.03374,-86.689717 383.88367,-86.950416 384.75223,-87.079631 C 385.6235,-87.209248 386.51352,-87.206561 387.38301,-87.073843 C 388.25343,-86.940983 389.10329,-86.677815 389.8932,-86.286619 C 390.67638,-85.898751 391.40062,-85.385024 392.02752,-84.74766 C 392.02752,-84.74766 392.02752,-84.74766 392.02752,-84.74766" />
     <marker
        inkscape:stockid="Arrow1Mend"
        orient="auto"
      d="M 413.47727,254.19401 L 510.07072,254.19401"
      transform="translate(-31.967048,-168.123)" />
   <path
-     style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53125000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 420.181,520.089 C 418.46,521.253 418.561,522.774 418.203,524.694 C 416.92,524.87 415.695,525.156 414.766,525.95 C 413.838,526.744 413.217,528.041 413.021,530.21 C 411.876,530.169 411.112,530.755 410.569,531.708 C 410.027,532.66 409.703,533.983 409.432,535.455 C 407.642,536.021 407.22,538.525 406.57,540.819 C 404.848,542.046 403.77,544.501 402.84,547.716 C 402.316,544.749 401.794,542.032 401.343,539.519 C 400.892,537.005 400.512,534.695 400.224,532.556 C 399.65,528.279 399.466,524.684 399.551,521.627 C 399.636,518.571 399.982,516.061 400.23,514.002 C 400.478,511.943 400.62,510.334 400.166,509.075 C 399.683,507.739 398.885,506.628 398.144,505.551 C 397.404,504.474 396.722,503.428 396.445,502.174 C 396.169,500.919 396.295,499.448 396.311,498.065 C 396.327,496.681 396.23,495.385 395.525,494.517 C 396.563,494.931 397.835,494.675 399.202,494.34 C 400.568,494.005 402.028,493.591 403.399,493.685 C 404.769,493.779 406.043,494.38 407.34,495.095 C 408.638,495.81 409.958,496.637 411.472,497.202 C 412.897,497.734 414.628,497.685 416.92,497.722 C 419.212,497.758 422.071,497.872 425.701,498.893 C 429.331,499.914 433.761,501.835 438.886,505.793 C 441.449,507.772 444.179,510.266 446.983,513.451 C 449.788,516.637 452.67,520.514 455.443,525.273 C 451.6,521.664 448.425,520.144 446.333,520.642 C 444.978,519.76 443.595,518.877 442.383,518.399 C 441.172,517.92 440.138,517.843 439.472,518.533 C 437.833,517.577 436.327,516.926 435.138,516.812 C 433.949,516.698 433.082,517.117 432.674,518.292 C 430.423,517.07 428.895,517.021 427.776,517.522 C 426.657,518.022 425.936,519.081 425.257,520.209 C 423.3,519.613 421.902,518.926 420.181,520.089 M 400.842,487.277 C 399.319,487.462 397.98,488.118 397.086,489.128 M 394.546,479.47 C 392.293,479.997 390.523,480.82 389.443,481.972 M 265.387,452.433 C 261.528,456.729 259.293,460.722 257.965,464.314 M 257.965,464.314 C 256.429,468.475 256.109,472.098 256.109,475.348 M 382.1,476.473 C 383.581,474.867 385.349,473.275 388.645,472.745 M 335.07,458.156 C 336.437,455.771 338.232,453.303 340.947,451.039 C 343.662,448.774 347.305,446.701 352.373,445.311 M 349.978,461.305 C 351.43,459.481 353.128,457.58 355.467,455.825 C 357.807,454.07 360.793,452.453 364.846,451.334 M 361.449,465.369 C 362.726,463.95 364.354,462.557 366.595,461.381 C 368.837,460.205 371.694,459.242 375.428,458.789 M 373.34,470.971 C 375.82,468.512 378.745,466.151 382.825,465.351 M 268.335,468.085 C 268.534,464.883 269.038,461.461 270.544,457.875 C 272.05,454.29 274.563,450.524 278.864,446.857 M 279.578,463.287 C 280.158,460.371 281.2,457.157 283.366,453.663 C 285.532,450.169 288.825,446.375 294.042,442.569 M 293.775,459.241 C 294.628,456.411 295.893,453.353 298.169,450.143 C 300.446,446.933 303.735,443.557 308.74,440.318 M 308.585,457.097 C 309.73,454.349 311.258,451.414 313.749,448.437 C 316.241,445.46 319.7,442.427 324.791,439.7 M 339.505,441.432 C 337.342,442.074 334.609,443.57 331.961,445.683 M 331.961,445.683 C 330.155,447.117 328.388,448.836 326.833,450.735 C 325.278,452.635 323.935,454.715 322.936,456.855 M 270.311,500.763 C 266.844,498.177 264.041,495.75 261.347,494.466 C 260,493.824 258.676,493.473 257.302,493.562 C 255.929,493.65 254.504,494.178 252.994,495.302 C 254.583,494.17 255.562,493.012 256.137,491.727 C 256.713,490.442 256.882,489.033 256.853,487.443 C 256.823,485.853 256.592,484.082 256.386,482.083 C 256.181,480.083 255.999,477.855 256.109,475.348 C 256.312,478.208 256.938,480.946 258.135,483.225 C 259.332,485.505 261.091,487.323 263.534,488.442 C 263.268,490.923 263.896,493.203 265.119,495.255 C 266.343,497.306 268.16,499.134 270.311,500.763 L 270.311,500.763 M 391.408,497.003 C 392.059,495.881 392.714,494.984 392.623,493.971 C 392.531,492.959 391.693,491.805 389.29,490.326 M 389.29,490.326 C 389.254,490.304 389.217,490.281 389.18,490.259 C 389.217,490.282 389.252,490.306 389.288,490.329 M 389.288,490.329 C 391.951,492.042 393.257,492.301 394.247,491.822 C 395.237,491.344 395.873,490.143 397.086,489.128 C 395.813,490.845 395.143,492.974 395.213,494.345 L 395.213,494.345 C 394.079,494.646 392.455,495.555 391.408,497.003 L 391.408,497.003 M 382.49,493.603 C 383.178,491.536 384.271,490.313 384.211,489.063 C 384.181,488.438 383.859,487.802 383.031,487.062 C 382.202,486.321 380.867,485.472 378.797,484.485 C 380.987,485.585 382.466,486.23 383.549,486.483 C 384.631,486.736 385.312,486.601 385.853,486.207 C 386.935,485.42 387.42,483.583 389.443,481.972 C 388.352,483.285 387.843,484.775 387.823,486.221 C 387.803,487.667 388.271,489.07 389.18,490.259 C 387.852,489.985 386.478,490.155 385.292,490.729 C 384.107,491.304 383.112,492.282 382.49,493.603 L 382.49,493.603 M 374.769,491.131 C 375.252,489.003 375.818,487.101 375.307,485.312 C 375.052,484.417 374.524,483.549 373.57,482.713 C 372.615,481.877 371.233,481.071 369.275,480.343 C 371.356,481.165 372.958,481.586 374.27,481.674 C 375.582,481.762 376.601,481.519 377.476,481.047 C 379.226,480.104 380.382,478.238 382.1,476.473 C 379.948,479.039 378.523,482.251 378.797,484.485 C 377.043,485.534 375.517,488.165 374.769,491.131 L 374.769,491.131 M 332.789,486.012 C 331.906,482.948 331.324,480.137 330.488,477.85 M 330.488,477.85 C 329.862,476.136 329.086,474.716 327.895,473.728 C 326.704,472.74 325.093,472.18 322.837,472.243 C 325.117,472.227 326.724,471.7 327.985,470.739 C 329.246,469.777 330.155,468.385 330.999,466.693 M 330.999,466.693 C 332.195,464.296 333.247,461.295 335.07,458.156 C 333.756,460.625 333.027,463.204 333.039,465.68 C 333.05,468.157 333.797,470.528 335.41,472.656 C 333.56,474.345 332.584,476.455 332.232,478.747 C 331.88,481.039 332.149,483.519 332.789,486.012 L 332.789,486.012 M 345.08,486.329 C 344.259,482.594 343.78,479.376 342.556,476.969 C 341.331,474.563 339.32,472.94 335.41,472.656 C 339.448,473.034 341.673,471.906 343.613,469.779 C 345.554,467.653 347.158,464.544 349.978,461.305 C 348.441,463.704 347.305,466.2 346.897,468.477 C 346.488,470.754 346.797,472.804 348.133,474.373 C 346.42,475.24 345.411,476.929 344.962,479.044 C 344.513,481.159 344.615,483.703 345.08,486.329 L 345.08,486.329 M 355.074,487.16 C 354.753,483.882 354.994,481.105 354.356,478.918 C 354.036,477.824 353.49,476.877 352.517,476.104 C 351.545,475.331 350.145,474.73 348.133,474.373 C 350.216,474.787 351.776,474.805 353.038,474.487 C 354.301,474.168 355.262,473.515 356.113,472.624 C 357.817,470.841 359.051,468.092 361.449,465.369 C 359.569,467.146 358.21,469.149 357.647,471.129 C 357.084,473.109 357.31,475.058 358.573,476.806 C 356.721,477.533 355.673,478.993 355.18,480.827 C 354.687,482.66 354.741,484.871 355.074,487.16 L 355.074,487.16 M 365.593,488.978 C 365.66,486.305 365.741,483.809 364.893,481.688 C 364.045,479.566 362.245,477.791 358.573,476.806 C 362.344,477.903 365.002,477.54 367.269,476.331 C 369.537,475.122 371.382,473.073 373.34,470.971 C 371.613,472.472 370.278,474.173 369.536,475.816 C 368.795,477.458 368.642,479.039 369.275,480.343 C 368.044,480.787 367.135,481.921 366.535,483.454 C 365.934,484.988 365.636,486.92 365.593,488.978 L 365.593,488.978 M 280.572,496.616 C 276.669,492.712 273.419,489.024 269.913,487.751 M 269.913,487.751 C 267.911,487.023 265.809,487.097 263.534,488.442 C 265.887,487.116 267.061,485.428 267.643,483.299 M 267.643,483.299 C 268.163,481.399 268.201,479.159 268.17,476.61 C 268.139,474.061 268.036,471.204 268.335,468.085 C 268.371,470.755 268.8,473.445 269.762,475.973 C 270.725,478.5 272.218,480.861 274.328,482.941 C 274.55,488.428 277.107,492.957 280.572,496.616 L 280.572,496.616 M 289.453,493.578 C 286.295,490.013 284.209,486.65 282.101,484.485 C 281.047,483.402 279.977,482.625 278.73,482.312 C 277.483,481.998 276.056,482.147 274.328,482.941 C 276.126,482.161 277.221,481.238 277.885,480.093 C 278.549,478.948 278.78,477.586 278.843,475.979 C 278.906,474.372 278.798,472.522 278.815,470.412 C 278.831,468.302 278.969,465.93 279.578,463.287 C 278.99,466.489 279.036,469.611 279.971,472.265 C 280.906,474.918 282.717,477.094 285.62,478.563 C 284.222,481.278 284.176,483.959 284.975,486.481 C 285.774,489.002 287.415,491.376 289.453,493.578 L 289.453,493.578 M 300.465,490.516 C 297.691,486.615 295.811,483.07 293.74,480.741 C 292.705,479.576 291.612,478.719 290.306,478.307 C 289,477.895 287.478,477.926 285.62,478.563 C 287.545,477.947 288.815,477.11 289.691,476.006 C 290.567,474.902 291.046,473.536 291.378,471.911 C 291.709,470.287 291.891,468.405 292.193,466.286 C 292.495,464.166 292.916,461.807 293.775,459.241 C 292.999,462.346 292.784,465.451 293.385,468.211 C 293.986,470.971 295.393,473.378 297.812,475.202 C 296.447,477.691 296.266,480.323 296.845,482.918 C 297.424,485.513 298.758,488.079 300.465,490.516 L 300.465,490.516 M 311.869,488.171 C 309.564,484.099 307.946,480.482 305.982,478.039 C 304.999,476.817 303.922,475.892 302.605,475.377 C 301.288,474.862 299.727,474.757 297.812,475.202 C 299.794,474.784 301.19,474.08 302.242,473.078 C 303.293,472.076 303.999,470.778 304.583,469.217 C 305.168,467.656 305.63,465.832 306.21,463.793 C 306.79,461.755 307.488,459.501 308.585,457.097 C 307.576,460.026 307.046,463.008 307.256,465.758 C 307.466,468.509 308.408,471.021 310.284,473.091 C 308.998,475.366 308.705,477.883 309.077,480.447 C 309.448,483.012 310.48,485.63 311.869,488.171 L 311.869,488.171 M 323.061,486.701 C 321.292,482.648 319.979,479.06 318.185,476.553 C 316.391,474.047 314.065,472.605 310.284,473.091 C 312.241,472.881 313.704,472.332 314.883,471.465 C 316.062,470.599 316.954,469.417 317.75,467.977 C 319.341,465.098 320.509,461.173 322.936,456.855 C 321.837,459.523 321.153,462.281 321.08,464.912 C 321.007,467.542 321.543,470.042 322.837,472.243 C 321.68,474.319 321.266,476.684 321.377,479.148 C 321.487,481.612 322.118,484.18 323.061,486.701 L 323.061,486.701 M 391.408,497.003 C 390.45,498.327 389.986,500.104 390.154,501.83 M 382.49,493.603 C 381.725,495.23 381.657,497.41 381.986,499.913 M 374.764,499.174 C 373.748,496.046 374.234,493.483 374.769,491.131 M 367.313,500.135 C 366.337,498.19 365.873,496.286 365.675,494.422 C 365.478,492.557 365.549,490.735 365.593,488.978 M 360.015,500.729 C 358.361,498.108 357.201,495.689 356.427,493.431 C 355.652,491.173 355.262,489.08 355.074,487.16 M 345.08,486.329 C 345.632,489.445 346.641,492.68 347.718,495.47 C 348.794,498.26 349.943,500.605 351.008,501.921 M 341.989,503.086 C 339.378,500.134 337.434,497.207 335.976,494.334 C 334.519,491.461 333.548,488.645 332.789,486.012 M 323.061,486.701 C 323.907,488.964 324.974,491.193 326.097,493.28 C 327.219,495.367 328.398,497.311 329.52,498.991 M 329.52,498.991 C 331.072,501.316 332.52,503.137 333.692,504.088 M 324.887,504.748 C 321.733,501.84 319.168,498.995 317.061,496.21 C 314.954,493.426 313.305,490.707 311.869,488.171 M 315.465,505.461 C 311.906,502.915 308.969,500.389 306.527,497.876 C 304.085,495.363 302.138,492.868 300.465,490.516 M 306.828,506.732 C 302.71,504.583 299.307,502.423 296.473,500.212 C 293.638,498.001 291.373,495.745 289.453,493.578 M 297.758,508.553 C 293.999,507.174 290.826,505.346 288.027,503.266 C 285.229,501.186 282.813,498.857 280.572,496.616 M 270.311,500.763 C 272.978,502.754 275.972,504.857 279.607,506.768 M 279.607,506.768 C 282.46,508.243 285.709,509.586 289.49,510.774 M 436.229,510.25 C 438.94,511.97 441.523,514.535 443.366,516.71 C 445.209,518.886 446.333,520.642 446.333,520.642 M 426.836,506.428 C 429.948,508.309 433.196,511.265 435.57,513.833 C 437.944,516.401 439.472,518.533 439.472,518.533 M 417.654,505.948 C 422.198,507.727 426.069,510.807 428.678,513.46 C 431.286,516.113 432.674,518.292 432.674,518.292 M 411.33,505.712 C 415.677,508.799 419.234,512.44 421.617,515.3 C 423.999,518.16 425.257,520.209 425.257,520.209 M 404.92,531.101 C 404.949,533.496 405.398,535.909 405.797,537.74 C 406.196,539.57 406.57,540.819 406.57,540.819 M 405.647,522.889 C 406.219,525.75 407.239,528.865 408.032,531.293 C 408.825,533.72 409.432,535.455 409.432,535.455 M 407.653,514.636 C 408.438,518.992 409.803,522.816 410.939,525.624 C 412.075,528.432 413.021,530.21 413.021,530.21 M 408.285,508.583 C 410.97,512.955 413.459,516.943 415.258,519.884 C 417.057,522.825 418.203,524.694 418.203,524.694 M 234.247,497.567 C 234.544,497.883 234.288,498.604 233.683,499.184 C 233.078,499.764 232.347,499.99 232.044,499.681 C 231.74,499.372 231.984,498.639 232.596,498.052 C 233.208,497.465 233.951,497.252 234.247,497.567 L 234.247,497.567 M 268.178,518.784 C 269.626,517.66 269.594,516.051 268.67,514.12 C 267.746,512.19 265.914,509.962 263.71,507.742 C 261.505,505.523 258.924,503.322 256.61,501.366 C 254.297,499.409 252.256,497.691 251.233,496.335 C 249.187,493.625 246.682,488.736 245.649,482.861 C 245.133,479.924 244.993,476.74 245.487,473.495 C 245.981,470.25 247.113,466.942 249.109,463.83 C 250.124,462.248 249.859,461.948 248.615,462.672 C 247.37,463.397 245.162,465.156 242.495,467.761 C 239.829,470.365 236.716,473.821 233.669,477.879 C 230.623,481.937 227.648,486.596 225.128,491.499 C 222.608,496.401 220.543,501.542 219.123,506.493 C 217.704,511.444 216.927,516.199 216.811,520.344 C 216.695,524.489 217.232,528.019 218.358,530.614 C 219.484,533.208 221.189,534.866 223.461,535.402 C 225.852,533.18 228.549,530.283 231.448,527.404 C 234.348,524.525 237.451,521.668 240.448,519.414 C 238.265,522.065 235.754,524.803 233.337,527.482 C 230.921,530.162 228.601,532.781 226.741,535.041 C 227.956,534.818 229.782,534.38 232.163,533.631 C 234.543,532.882 237.476,531.821 240.934,530.43 C 244.391,529.04 248.372,527.318 252.897,525.335 C 257.421,523.351 262.487,521.099 268.178,518.784 L 268.178,518.784 M 236.577,493.86 C 237.452,494.852 236.662,496.969 234.876,498.651 C 233.09,500.333 230.929,500.995 229.99,500.062 C 229.051,499.13 229.737,496.906 231.587,495.164 C 233.438,493.422 235.703,492.868 236.577,493.86 L 236.577,493.86 M 234.247,497.567 C 234.544,497.883 234.288,498.604 233.683,499.184 C 233.078,499.764 232.347,499.99 232.044,499.681 C 231.74,499.372 231.984,498.639 232.596,498.052 C 233.208,497.465 233.951,497.252 234.247,497.567 L 234.247,497.567"
+     style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.53125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 703.788,96.4602 C 702.086,97.655 702.215,99.1793 701.903,101.117 C 700.62,101.318 699.396,101.625 698.484,102.44 C 697.571,103.255 696.979,104.574 696.855,106.78 C 695.701,106.756 694.95,107.361 694.437,108.339 C 693.925,109.318 693.648,110.673 693.441,112.187 C 691.659,112.795 691.347,115.374 690.825,117.765 C 689.155,119.067 688.208,121.638 687.537,125.057 C 685.968,118.807 684.739,113.665 684.009,109.26 C 683.28,104.855 683.032,101.193 683.079,98.0952 C 683.125,94.9971 683.461,92.4698 683.704,90.3993 C 683.947,88.3288 684.092,86.7148 683.639,85.4472 C 683.158,84.1008 682.363,82.9786 681.628,81.8897 C 680.892,80.8007 680.217,79.7439 679.952,78.4839 C 679.687,77.2239 679.83,75.7547 679.863,74.3718 C 679.896,72.989 679.818,71.6919 679.126,70.8139 C 680.158,71.2442 681.433,71.0074 682.802,70.6916 C 684.171,70.3758 685.633,69.9804 686.999,70.0891 C 688.365,70.1978 689.627,70.8093 690.912,71.5318 C 692.198,72.2542 693.506,73.0867 695.01,73.6545 C 696.426,74.189 698.152,74.1437 700.434,74.1761 C 702.717,74.2086 705.561,74.3111 709.168,75.2844 C 712.774,76.2578 717.169,78.0963 722.282,81.8489 C 724.839,83.7252 727.569,86.0847 730.396,89.0831 C 733.224,92.0815 736.151,95.7196 739.024,100.16 C 735.123,96.8979 731.944,95.5577 729.877,96.144 C 728.513,95.346 727.121,94.5408 725.907,94.1211 C 724.693,93.7015 723.663,93.6652 723.014,94.3701 C 721.365,93.4914 719.854,92.9004 718.668,92.8261 C 717.482,92.7519 716.624,93.1913 716.239,94.3674 C 713.972,93.227 712.447,93.2138 711.338,93.7388 C 710.229,94.2638 709.526,95.3353 708.868,96.4757 C 706.901,95.9282 705.49,95.2653 703.788,96.46 M 684.549,63.6646 C 683.029,63.8277 681.682,64.4615 680.772,65.4556 M 678.428,55.7566 C 677.863,55.8759 677.326,56.0144 676.823,56.1728 M 676.823,56.1728 C 676.823,56.1728 676.823,56.1728 676.823,56.1728 C 675.312,56.6513 674.101,57.3064 673.274,58.1543 M 548.902,28.1389 C 544.885,32.7169 542.672,36.934 541.42,40.6914 M 541.42,40.6914 C 540.11,44.6516 539.866,48.1057 539.91,51.2147 M 666.026,52.5041 C 667.541,50.9269 669.342,49.37 672.652,48.9061 M 619.088,33.4258 C 620.482,31.0536 622.312,28.6039 625.072,26.3717 C 627.833,24.1395 631.533,22.1131 636.664,20.8005 M 634.059,36.7515 C 635.541,34.95 637.273,33.0749 639.651,31.3578 C 642.028,29.6408 645.056,28.0745 649.151,27.0272 M 645.521,40.9995 C 646.825,39.6036 648.482,38.2389 650.751,37.1043 C 653.021,35.9698 655.907,35.0607 659.662,34.6801 M 657.351,46.8243 C 659.882,44.4128 662.859,42.1084 666.963,41.3902 M 552.051,43.7596 C 552.21,40.5524 552.673,37.119 554.145,33.5079 C 555.616,29.8969 558.101,26.0897 562.398,22.3656 M 563.277,38.7965 C 563.829,35.871 564.843,32.6412 566.991,29.1192 C 569.139,25.5972 572.423,21.7629 577.666,17.9096 M 577.507,34.5861 C 578.344,31.7478 579.596,28.6765 581.873,25.4486 C 584.149,22.2207 587.453,18.8197 592.509,15.5602 M 592.397,32.3343 C 593.541,29.582 595.074,26.6413 597.587,23.6587 C 600.101,20.6761 603.599,17.6364 608.773,14.9191 M 623.691,16.7511 C 620.915,17.5318 617.213,19.6797 613.912,22.7059 M 613.912,22.7059 C 611.041,25.3366 608.488,28.6187 606.857,32.0665 M 554.466,76.4218 C 550.958,73.8869 548.121,71.5015 545.408,70.2564 C 544.052,69.6338 542.721,69.302 541.348,69.4095 C 539.975,69.5171 538.556,70.0644 537.059,71.2086 C 538.635,70.0548 539.601,68.8832 540.16,67.5905 C 540.719,66.2978 540.871,64.8869 540.82,63.2972 C 540.769,61.7076 540.515,59.9406 540.282,57.9445 C 540.049,55.9483 539.836,53.7228 539.91,51.2147 C 540.154,54.0715 540.818,56.7997 542.046,59.0619 C 543.274,61.3242 545.058,63.1168 547.518,64.1997 C 547.285,66.6848 547.944,68.9561 549.195,70.9898 C 550.446,73.0235 552.289,74.8245 554.466,76.4218 L 554.466,76.4218 M 674.969,73.2281 C 675.643,72.1097 676.317,71.2188 676.23,70.1954 C 676.143,69.1721 675.296,67.9907 672.854,66.4413 C 675.541,68.2597 676.863,68.5628 677.872,68.1086 C 678.88,67.6544 679.536,66.4564 680.772,65.4556 C 679.472,67.1492 678.767,69.2654 678.816,70.6366 L 678.816,70.6366 C 677.679,70.919 676.04,71.7988 674.969,73.2281 L 674.969,73.2281 M 666.093,69.6527 C 666.82,67.5978 667.937,66.3968 667.901,65.1446 C 667.883,64.5185 667.573,63.8758 666.757,63.1179 C 665.941,62.36 664.62,61.4828 662.566,60.4539 C 664.738,61.5988 666.207,62.274 667.286,62.549 C 668.365,62.824 669.05,62.7031 669.599,62.32 C 670.697,61.5538 671.218,59.7254 673.274,58.1543 C 671.678,60.0004 671.257,62.2204 671.778,64.2011 M 671.778,64.2011 C 671.986,64.994 672.347,65.7509 672.854,66.4413 C 672.042,66.2568 671.208,66.238 670.409,66.3793 M 670.409,66.3793 C 668.603,66.6984 666.991,67.8367 666.093,69.6527 L 666.093,69.6527 M 658.404,67.0212 C 658.929,64.9024 659.532,63.0109 659.055,61.2098 C 658.816,60.3093 658.304,59.4304 657.364,58.5749 C 656.424,57.7193 655.055,56.885 653.107,56.1185 C 655.176,56.9814 656.772,57.435 658.085,57.5495 C 659.397,57.664 660.423,57.4411 661.308,56.9869 C 663.079,56.0786 664.272,54.2346 666.026,52.5041 C 663.822,55.0279 662.334,58.2126 662.566,60.4539 C 660.789,61.4673 659.211,64.0691 658.404,67.0212 L 658.404,67.0212 M 616.6,61.2576 C 615.964,58.9729 615.487,56.8301 614.949,54.9374 C 614.411,53.0446 613.809,51.4015 612.886,50.1333 M 612.886,50.1333 C 611.635,48.4141 609.773,47.3699 606.73,47.4495 C 609.795,47.4326 611.657,46.4911 613.084,44.8322 M 613.084,44.8322 C 614.187,43.5507 615.018,41.8496 615.904,39.8898 C 616.79,37.93 617.726,35.711 619.088,33.4258 C 617.746,35.8823 616.997,38.4554 616.993,40.9319 C 616.988,43.4085 617.723,45.7839 619.322,47.9248 C 617.455,49.5978 616.465,51.7013 616.098,53.991 C 615.731,56.2808 615.982,58.7612 616.6,61.2576 L 616.6,61.2576 M 628.827,61.692 C 628.061,57.9489 627.623,54.7272 626.427,52.3079 C 625.232,49.8886 623.234,48.2417 619.322,47.9248 C 621.342,48.1308 622.904,47.9681 624.215,47.4815 C 625.526,46.9948 626.584,46.1859 627.569,45.1353 C 629.538,43.0341 631.184,39.9478 634.059,36.7515 C 632.484,39.1268 631.314,41.6064 630.877,43.8767 C 630.439,46.1469 630.724,48.1995 632.039,49.7863 C 630.313,50.628 629.282,52.3033 628.807,54.4112 C 628.331,56.519 628.401,59.0617 628.827,61.692 L 628.827,61.692 M 638.781,62.6732 C 638.517,59.3916 638.803,56.6194 638.199,54.4226 C 637.897,53.3242 637.365,52.3687 636.403,51.5811 C 635.442,50.7935 634.048,50.1711 632.039,49.7863 C 634.119,50.2284 635.68,50.271 636.949,49.9727 C 638.217,49.6743 639.19,49.0372 640.057,48.1605 C 641.791,46.407 643.072,43.6791 645.521,40.9995 C 643.607,42.7433 642.213,44.7224 641.617,46.6921 C 641.022,48.6618 641.218,50.614 642.454,52.3833 C 640.587,53.0775 639.516,54.5199 638.993,56.3443 C 638.47,58.1687 638.488,60.3793 638.781,62.6732 L 638.781,62.6732 M 649.261,64.6844 C 649.378,62.0121 649.505,59.517 648.695,57.3794 C 647.885,55.2418 646.113,53.4321 642.454,52.3833 C 646.211,53.5452 648.878,53.2337 651.171,52.0674 C 653.465,50.9011 655.351,48.8883 657.351,46.8243 C 655.593,48.2917 654.224,49.9667 653.452,51.5955 C 652.679,53.2243 652.497,54.8025 653.107,56.1185 C 651.866,56.5384 650.936,57.6554 650.306,59.1774 C 649.676,60.6995 649.343,62.6265 649.261,64.6844 L 649.261,64.6844 M 564.684,72.1251 C 562.62,70.116 560.728,68.1737 558.895,66.592 C 557.063,65.0104 555.285,63.7903 553.434,63.2676 M 553.434,63.2676 C 551.562,62.7382 549.605,62.9256 547.518,64.1997 C 549.674,62.9445 550.821,61.3966 551.42,59.4836 M 551.42,59.4836 C 552.026,57.551 552.065,55.2562 552.004,52.6236 C 551.943,49.991 551.778,47.0218 552.051,43.7596 C 552.121,46.4319 552.585,49.1174 553.583,51.6315 C 554.58,54.1456 556.108,56.4853 558.248,58.5352 C 558.544,64.022 561.168,68.5132 564.684,72.1251 L 564.684,72.1251 M 573.518,68.9754 C 570.319,65.4476 568.19,62.1104 566.052,59.9721 C 564.983,58.903 563.902,58.1402 562.649,57.8436 C 561.397,57.547 559.969,57.7158 558.248,58.5352 C 560.039,57.7287 561.124,56.79 561.775,55.6354 C 562.426,54.4809 562.64,53.1147 562.684,51.506 C 562.727,49.8974 562.598,48.0479 562.59,45.9362 C 562.582,43.8245 562.693,41.4492 563.277,38.7965 C 562.721,42.009 562.803,45.1324 563.771,47.7748 C 564.739,50.4171 566.58,52.5699 569.505,54.0032 C 568.135,56.7362 568.122,59.4196 568.953,61.9316 C 569.784,64.4437 571.454,66.7971 573.518,68.9754 L 573.518,68.9754 M 584.471,65.8004 C 581.668,61.9235 579.754,58.3977 577.658,56.089 C 576.61,54.9347 575.508,54.0897 574.196,53.6919 C 572.884,53.2941 571.359,53.3428 569.505,54.0032 C 571.426,53.3633 572.689,52.511 573.555,51.3972 C 574.422,50.2833 574.889,48.9114 575.206,47.283 C 575.523,45.6545 575.689,43.7708 575.974,41.6477 C 576.259,39.5245 576.662,37.1609 577.507,34.5861 C 576.75,37.6988 576.56,40.8069 577.187,43.5611 C 577.813,46.3152 579.246,48.7081 581.683,50.5112 C 580.337,53.0116 580.181,55.6464 580.785,58.2358 C 581.388,60.8251 582.746,63.3784 584.471,65.8004 L 584.471,65.8004 M 595.808,63.3834 C 593.496,59.3226 591.86,55.7157 589.88,53.2848 C 588.891,52.0693 587.807,51.1514 586.484,50.6465 C 585.162,50.1416 583.598,50.0488 581.683,50.5112 C 583.666,50.0753 585.058,49.3604 586.105,48.3506 C 587.152,47.3407 587.851,46.0387 588.429,44.474 C 589.007,42.9093 589.461,41.0828 590.035,39.0415 C 590.608,37.0001 591.301,34.7429 592.397,32.3343 C 591.391,35.2673 590.871,38.252 591.094,41.0004 C 591.316,43.7489 592.274,46.2547 594.161,48.3159 C 592.882,50.5959 592.602,53.1138 592.987,55.6755 C 593.371,58.2373 594.415,60.8491 595.808,63.3834 L 595.808,63.3834 M 606.931,61.9035 C 605.18,57.8473 603.869,54.2609 602.074,51.7565 C 600.279,49.252 597.945,47.8137 594.161,48.3159 C 596.119,48.0973 597.582,47.5441 598.762,46.6752 C 599.941,45.8064 600.835,44.6239 601.632,43.184 C 603.227,40.304 604.401,36.3798 606.857,32.0665 C 605.744,34.7321 605.052,37.4888 604.977,40.1187 C 604.901,42.7486 605.437,45.2476 606.73,47.4495 C 605.568,49.5229 605.153,51.8867 605.262,54.3503 C 605.37,56.8139 605.998,59.3806 606.931,61.9035 L 606.931,61.9035 M 674.969,73.2281 C 673.99,74.5345 673.499,76.3041 673.647,78.035 M 666.093,69.6527 C 665.461,70.9291 665.262,72.5631 665.348,74.4334 C 665.348,74.4334 665.348,74.4334 665.348,74.4334 M 665.348,74.4334 C 665.37,74.9243 665.412,75.4317 665.472,75.9534 M 658.247,75.0706 C 657.288,71.9192 657.824,69.3641 658.404,67.0212 M 650.767,75.8796 C 649.828,73.9134 649.401,72.0002 649.24,70.131 C 649.078,68.2619 649.183,66.4402 649.261,64.6844 M 643.462,76.3294 C 641.862,73.6766 640.751,71.2364 640.02,68.9653 C 639.289,66.6943 638.936,64.5953 638.781,62.6732 M 628.827,61.692 C 629.334,64.8123 630.289,68.0584 631.313,70.8618 C 632.337,73.6652 633.435,76.0263 634.469,77.3598 M 625.515,78.3962 C 622.981,75.4165 621.097,72.4774 619.685,69.5954 C 618.273,66.7134 617.334,63.894 616.6,61.2576 M 606.931,61.9035 C 608.301,65.6068 610.225,69.2282 612.058,72.2764 M 612.058,72.2764 C 614.015,75.5255 615.888,78.1194 617.33,79.328 M 608.697,79.9504 C 605.617,77.0301 603.082,74.1862 600.991,71.4057 C 598.899,68.6253 597.249,65.9132 595.808,63.3834 M 599.453,80.6551 C 595.939,78.1179 593.011,75.6095 590.567,73.1135 C 588.122,70.6175 586.161,68.1383 584.471,65.8004 M 590.947,81.9639 C 586.857,79.8437 583.449,77.7151 580.6,75.5329 C 577.751,73.3507 575.463,71.1201 573.518,68.9754 M 581.985,83.8599 C 578.234,82.5173 575.046,80.726 572.224,78.68 C 569.403,76.6341 566.956,74.3366 564.684,72.1251 M 554.466,76.4218 C 557.059,78.2963 559.957,80.2718 563.44,82.0701 M 563.44,82.0701 C 566.416,83.5908 569.817,84.9665 573.792,86.168 M 719.672,86.3149 C 722.385,87.9339 724.985,90.3657 726.854,92.424 C 728.722,94.4824 729.877,96.144 729.877,96.144 M 710.296,82.7402 C 713.403,84.5571 716.659,87.4066 719.055,89.8697 C 721.452,92.3327 723.014,94.3701 723.014,94.3701 M 701.139,82.3627 C 705.675,84.1088 709.551,87.108 712.183,89.6824 C 714.814,92.2567 716.239,94.3674 716.239,94.3674 M 694.824,82.1438 C 699.163,85.2307 702.738,88.8307 705.154,91.6486 C 707.569,94.4665 708.868,96.4757 708.868,96.4757 M 688.714,107.766 C 688.822,110.219 689.378,112.701 689.874,114.588 C 690.37,116.475 690.825,117.765 690.825,117.765 M 689.243,99.4045 C 689.869,102.303 690.979,105.471 691.863,107.944 C 692.748,110.416 693.441,112.187 693.441,112.187 M 691.162,91.08 C 691.979,95.4605 693.417,99.3205 694.628,102.154 C 695.838,104.988 696.855,106.78 696.855,106.78 M 691.776,85.0097 C 694.464,89.395 696.999,93.3863 698.851,96.3228 C 700.703,99.2593 701.903,101.117 701.903,101.117 M 518.337,73.6736 C 518.636,73.9866 518.386,74.7089 517.787,75.2931 C 517.188,75.8772 516.459,76.1083 516.153,75.8017 C 515.847,75.4952 516.085,74.7613 516.691,74.1707 C 517.297,73.5801 518.037,73.3606 518.337,73.6736 L 518.337,73.6736 M 552.518,94.4998 C 553.963,93.3487 553.916,91.7357 552.97,89.8167 C 552.024,87.8978 550.163,85.6946 547.929,83.506 C 545.696,81.3174 543.086,79.1517 540.747,77.2256 C 538.409,75.2995 536.348,73.6069 535.309,72.2646 C 533.231,69.5798 530.669,64.7219 529.561,58.8646 C 529.007,55.936 528.825,52.7564 529.273,49.5079 C 529.721,46.2595 530.803,42.9395 532.75,39.7996 C 533.74,38.203 533.471,37.9068 532.239,38.6489 C 531.008,39.391 528.829,41.1808 526.204,43.8167 C 523.58,46.4526 520.523,49.9402 517.535,54.02 C 514.547,58.0998 511.636,62.7715 509.17,67.6762 C 506.703,72.5809 504.684,77.7142 503.293,82.6546 C 501.902,87.595 501.136,92.3372 501.018,96.4751 C 500.899,100.613 501.42,104.143 502.529,106.746 C 503.638,109.348 505.328,111.022 507.597,111.573 C 510.013,109.357 512.736,106.455 515.653,103.559 C 518.57,100.664 521.68,97.7797 524.68,95.4938 C 522.498,98.1714 519.978,100.936 517.547,103.634 C 515.115,106.332 512.772,108.962 510.886,111.225 C 512.106,111.005 513.941,110.571 516.335,109.817 C 518.729,109.062 521.681,107.988 525.16,106.566 C 528.639,105.144 532.644,103.373 537.189,101.318 C 541.734,99.2631 546.817,96.918 552.518,94.4998 L 552.518,94.4998 M 520.628,69.9505 C 521.512,70.9335 520.745,73.0561 518.975,74.7515 C 517.205,76.4468 515.051,77.1215 514.104,76.1961 C 513.158,75.2707 513.824,73.046 515.656,71.293 C 517.487,69.54 519.743,68.9675 520.628,69.9505 L 520.628,69.9505 M 518.337,73.6736 C 518.636,73.9866 518.386,74.7089 517.787,75.2931 C 517.188,75.8772 516.459,76.1083 516.153,75.8017 C 515.847,75.4952 516.085,74.7613 516.691,74.1707 C 517.297,73.5801 518.037,73.3606 518.337,73.6736 L 518.337,73.6736"
      id="path2459"
      inkscape:path-effect="#path-effect2461"
-     inkscape:original-d="M 219.34365,533.3047 C 270.88924,446.31397 395.04189,458.14884 428.57132,536.7376"
-     sodipodi:nodetypes="cc"
-     transform="translate(293.62325,-417.93955)" />
+     inkscape:original-d="M 503.49518,109.44533 C 555.807,22.673092 673.35319,31.460958 712.72285,112.87823"
+     sodipodi:nodetypes="cc" />
   <text
      xml:space="preserve"
      style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
index a0a8f3db9569c39f266efc03face9e64c5e035f7..404db61fb3361e628b4ae5d13d4d9643026499b6 100644 (file)
@@ -35,35 +35,42 @@ namespace Inkscape {
 \r
 namespace LivePathEffect {\r
 \r
-const Util::EnumData<EffectType> LPETypeData[ENDTYPE_LPE] = {\r
-    {INVALID_LPE,           _("Invalid effect"),        "invalid"},\r
+const Util::EnumData<EffectType> LPETypeData[INVALID_LPE] = {\r
     {SKELETAL_STROKES,      _("Skeletal Strokes"),      "skeletal"},\r
     {SLANT,                 _("Slant"),                 "slant"},\r
     {DOEFFECTSTACK_TEST,    _("doEffect stack test"),   "doeffectstacktest"},\r
     {GEARS,                 _("Gears"),                 "gears"}\r
 };\r
-const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, ENDTYPE_LPE);\r
+const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, INVALID_LPE);\r
 \r
 Effect*\r
 Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)\r
 {\r
+    Effect* neweffect = NULL;\r
     switch (lpenr) {\r
-        case INVALID_LPE:\r
-            g_warning("LivePathEffect::Effect::New   called with invalid patheffect type");\r
-            return NULL;\r
         case SKELETAL_STROKES:\r
-            return (Effect*) new LPESkeletalStrokes(lpeobj);\r
+            neweffect = (Effect*) new LPESkeletalStrokes(lpeobj);\r
+            break;\r
         case SLANT:\r
-            return (Effect*) new LPESlant(lpeobj);\r
+            neweffect = (Effect*) new LPESlant(lpeobj);\r
+            break;\r
         case DOEFFECTSTACK_TEST:\r
-            return (Effect*) new LPEdoEffectStackTest(lpeobj);\r
+            neweffect = (Effect*) new LPEdoEffectStackTest(lpeobj);\r
+            break;\r
         case GEARS:\r
-            return (Effect*) new LPEGears(lpeobj);\r
-        case ENDTYPE_LPE:\r
-            return NULL;\r
+            neweffect = (Effect*) new LPEGears(lpeobj);\r
+            break;\r
+        default:\r
+            g_warning("LivePathEffect::Effect::New   called with invalid patheffect type (%d)", lpenr);\r
+            neweffect = NULL;\r
+            break;\r
     }\r
 \r
-    return NULL;\r
+    if (neweffect) {\r
+        neweffect->readallParameters(SP_OBJECT_REPR(lpeobj));\r
+    }\r
+\r
+    return neweffect;\r
 }\r
 \r
 Effect::Effect(LivePathEffectObject *lpeobject)\r
@@ -83,7 +90,10 @@ Effect::~Effect()
 Glib::ustring \r
 Effect::getName()\r
 {\r
-    return Glib::ustring( LPETypeConverter.get_label(lpeobj->effecttype) );\r
+    if (lpeobj->effecttype_set && lpeobj->effecttype < INVALID_LPE)\r
+        return Glib::ustring( LPETypeConverter.get_label(lpeobj->effecttype) );\r
+    else\r
+        return Glib::ustring( _("No effect") );\r
 }\r
 \r
 /*\r
@@ -211,14 +221,14 @@ Effect::getRepr()
 SPDocument * \r
 Effect::getSPDoc()\r
 {\r
-    if (SP_OBJECT_DOCUMENT(lpeobj) == NULL) g_message("oh crap");\r
+    if (SP_OBJECT_DOCUMENT(lpeobj) == NULL) g_message("Effect::getSPDoc() returns NULL");\r
     return SP_OBJECT_DOCUMENT(lpeobj);\r
 }\r
 \r
 \r
-}; /* namespace LivePathEffect */\r
+} /* namespace LivePathEffect */\r
 \r
-}; /* namespace Inkscape */\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index 0ebd5d5a586da4372f3998550f13eb446c005541..714bcdcab0e7b3224f7bb5792df2303ab0cf4df1 100644 (file)
@@ -39,15 +39,14 @@ namespace XML {
 namespace LivePathEffect {\r
 \r
 enum EffectType {\r
-    INVALID_LPE = 0,\r
-    SKELETAL_STROKES,\r
+    SKELETAL_STROKES = 0,\r
     SLANT,\r
     DOEFFECTSTACK_TEST,\r
     GEARS,\r
-    ENDTYPE_LPE // This must be last\r
+    INVALID_LPE // This must be last\r
 };\r
 \r
-extern const Util::EnumData<EffectType> LPETypeData[ENDTYPE_LPE];\r
+extern const Util::EnumData<EffectType> LPETypeData[INVALID_LPE];\r
 extern const Util::EnumDataConverter<EffectType> LPETypeConverter;\r
 \r
 class Parameter;\r
@@ -102,7 +101,7 @@ private:
 };\r
 \r
 \r
-}; //namespace LivePathEffect\r
-}; //namespace Inkscape\r
+} //namespace LivePathEffect\r
+} //namespace Inkscape\r
 \r
 #endif\r
index 8da819ef6fe0e59667f4225478d45bb64453bc2b..03e19f31cac47b48d428ac832f74f9f960b9f21e 100644 (file)
@@ -251,8 +251,8 @@ LPEGears::doEffect (std::vector<Geom::Path> & path_in)
 }\r
 \r
 \r
-}; // namespace LivePathEffect\r
-}; /* namespace Inkscape */\r
+} // namespace LivePathEffect\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index 47c73a56bed3170816676d013394f0bdc93d7ace..e8cff95182651263bdcd90948394e5255540c7fe 100644 (file)
@@ -58,9 +58,9 @@ static const Util::EnumDataConverter<SkelCopyType> SkelCopyTypeConverter(SkelCop
 \r
 LPESkeletalStrokes::LPESkeletalStrokes(LivePathEffectObject *lpeobject) :\r
     Effect(lpeobject),\r
-    pattern(_("Pattern"), _("Pattern to put along path"), "pattern", &wr, this),\r
-    origin(_("Origin"), _("Origin of ?"), "origin", &wr, this),\r
-    copytype(_("Copytype"), _("tooltip"), "copytype", SkelCopyTypeConverter, &wr, this)\r
+    pattern(_("Pattern"), _("Pattern to put along path"), "pattern", &wr, this, "M0,0 L1,1"),\r
+    origin(_("Origin"), _("Origin of ?"), "origin", &wr, this, Geom::Point(0,0)),\r
+    copytype(_("Copytype"), _("tooltip"), "copytype", SkelCopyTypeConverter, &wr, this, SSCT_SINGLE_STRETCHED)\r
 {\r
     registerParameter( dynamic_cast<Parameter *>(&origin) );\r
     registerParameter( dynamic_cast<Parameter *>(&pattern) );\r
@@ -83,10 +83,7 @@ LPESkeletalStrokes::doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_in
 /* LOTS OF CODE COPIED FROM 2geom/src/toys/path-along-path.cpp\r
  * All credits should go to jfb and mgsloan of lib2geom development! */\r
 \r
-    const Util::EnumData<SkelCopyType> * data = copytype.get_selected_data();\r
-    if (!data)\r
-        return pwd2_in;\r
-    SkelCopyType type = data->id;\r
+    SkelCopyType type = copytype.get_value();\r
 \r
     Piecewise<D2<SBasis> > uskeleton = arc_length_parametrization(Piecewise<D2<SBasis> >(pwd2_in),2,.1);\r
     uskeleton = remove_short_cuts(uskeleton,.01);\r
@@ -146,8 +143,8 @@ LPESkeletalStrokes::on_pattern_pasted()
 \r
 \r
 \r
-}; // namespace LivePathEffect\r
-}; /* namespace Inkscape */\r
+} // namespace LivePathEffect\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index 2e3d127251178d0f082e666249aa77afa473ccf1..346d79c9dcf9e04a35af571ca82837edb92f5752 100644 (file)
@@ -81,8 +81,8 @@ LPEdoEffectStackTest::doEffect (Geom::Piecewise<Geom::D2<Geom::SBasis> > & pwd2_
 }\r
 \r
 \r
-}; // namespace LivePathEffect\r
-}; /* namespace Inkscape */\r
+} // namespace LivePathEffect\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index a5392ef904730ebb03955717f02928c006af5324..e4def4301198d110e0f11ce0ae4e556e186ac23a 100644 (file)
@@ -145,9 +145,9 @@ lpeobjectreference_source_modified(SPObject *iSource, guint flags, LPEObjectRefe
     lpeobjref->owner->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);\r
 }\r
 \r
-}; //namespace LivePathEffect\r
+} //namespace LivePathEffect\r
 \r
-}; // namespace inkscape\r
+} // namespace inkscape\r
 \r
 /*\r
   Local Variables:\r
index 7aaa5f69166cbe43bfda15b1c161efe0981d5ee7..ff7556d50c58dda5d01daf72f380f8badcdfbc44 100644 (file)
@@ -53,9 +53,9 @@ protected:
 \r
 };\r
 \r
-}; //namespace LivePathEffect\r
+} //namespace LivePathEffect\r
 \r
-}; // namespace inkscape\r
+} // namespace inkscape\r
 \r
 #endif /* !SEEN_LPEOBJECT_REFERENCE_H */\r
 \r
index 0ce2ce2830d2ef7ea398cb62c782674b66fa7a7b..de2baa4708063977224bcfdbb2c194bef86a9c60 100644 (file)
@@ -179,7 +179,6 @@ livepatheffect_set(SPObject *object, unsigned key, gchar const *value)
                 lpeobj->effecttype = Inkscape::LivePathEffect::LPETypeConverter.get_id_from_key(value);\r
                 if (lpeobj->effecttype != Inkscape::LivePathEffect::INVALID_LPE) {\r
                     lpeobj->lpe = Inkscape::LivePathEffect::Effect::New(lpeobj->effecttype, lpeobj);\r
-                    lpeobj->lpe->readallParameters(SP_OBJECT_REPR(object));\r
                 }\r
                 lpeobj->effecttype_set = true;\r
             } else {\r
index d70360a24fa4eb15371a81e783192246892d04c6..bfc9fd35206fbac4b5bed31d2ed56390a5336707 100644 (file)
@@ -28,11 +28,14 @@ public:
                 const Glib::ustring& tip,\r
                 const Glib::ustring& key,\r
                 const Util::EnumDataConverter<E>& c,\r
-                Inkscape::UI::Widget::Registry* wr, Effect* effect)\r
+                Inkscape::UI::Widget::Registry* wr,\r
+                Effect* effect,\r
+                E defvalue)\r
         : Parameter(label, tip, key, wr, effect)\r
     {\r
         regenum = NULL;\r
         enumdataconv = &c;\r
+        value = defvalue;\r
     };\r
     ~EnumParam() {\r
         if (regenum)\r
@@ -44,37 +47,36 @@ public:
             regenum = new Inkscape::UI::Widget::RegisteredEnum<E>();\r
             regenum->init(param_label, param_tooltip, param_key, *enumdataconv, *param_wr, param_effect->getRepr(), param_effect->getSPDoc());\r
             regenum->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change enum parameter"));\r
+            regenum->combobox()->set_active_by_id(value);\r
         }\r
         return dynamic_cast<Gtk::Widget *> (regenum->labelled);\r
     };\r
 \r
     bool param_readSVGValue(const gchar * strvalue) {\r
+        if (!strvalue) return false;\r
+\r
+        value = enumdataconv->get_id_from_key(Glib::ustring(strvalue));\r
+\r
         if (regenum)\r
-            regenum->combobox()->set_active_by_key(Glib::ustring(strvalue));\r
+            regenum->combobox()->set_active_by_id(value);\r
+\r
         return true;\r
     };\r
     gchar * param_writeSVGValue() const {\r
-        if (regenum) {\r
-            gchar * str = g_strdup(regenum->combobox()->get_active_data()->key.c_str());\r
-            return str;\r
-        } else {\r
-            return NULL;\r
-        }\r
+        gchar * str = g_strdup( enumdataconv->get_key(value).c_str() );\r
+        return str;\r
     };\r
 \r
-    const Util::EnumData<E>* get_selected_data() {\r
-        if (regenum) {\r
-            return regenum->combobox()->get_active_data();\r
-        } else {\r
-            return NULL;\r
-        }\r
-    };\r
+    E get_value() const {\r
+        return value;\r
+    }\r
 \r
 private:\r
     EnumParam(const EnumParam&);\r
     EnumParam& operator=(const EnumParam&);\r
 \r
     UI::Widget::RegisteredEnum<E> * regenum;\r
+    E value;\r
 \r
     const Util::EnumDataConverter<E> * enumdataconv;\r
 };\r
index 6806a1d49b12c38c674f5a585be9e4c0677674d1..beaafcc22a156a2cba179faa4d132e7a625caafc 100644 (file)
@@ -62,6 +62,8 @@ RealParam::param_readSVGValue(const gchar * strvalue)
     unsigned int success = sp_svg_number_read_d(strvalue, &newval);\r
     if (success == 1) {\r
         value = newval;\r
+        if (rsu)\r
+            rsu->setValue(value);\r
         return true;\r
     }\r
     return false;\r
@@ -71,7 +73,7 @@ gchar *
 RealParam::param_writeSVGValue() const\r
 {\r
     Inkscape::SVGOStringStream os;\r
-    os << rsu->getS()->getValue();\r
+    os << value;\r
     gchar * str = g_strdup(os.str().c_str());\r
     return str;\r
 }\r
@@ -89,9 +91,9 @@ RealParam::param_getWidget()
 }\r
 \r
 \r
-}; /* namespace LivePathEffect */\r
+} /* namespace LivePathEffect */\r
 \r
-}; /* namespace Inkscape */\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index 327d3d15360b4e38584ff23acf77b5a044219c3f..93cdc94ee03a312983f4a47b08bdafbc0865397e 100644 (file)
@@ -28,7 +28,11 @@ class Effect;
 \r
 class Parameter {\r
 public:\r
-    Parameter(const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect);\r
+    Parameter(  const Glib::ustring& label,\r
+                const Glib::ustring& tip,\r
+                const Glib::ustring& key,\r
+                Inkscape::UI::Widget::Registry* wr,\r
+                Effect* effect);\r
     virtual ~Parameter() {};\r
 \r
     virtual bool param_readSVGValue(const gchar * strvalue) = 0;   // returns true if new value is valid / accepted.\r
@@ -56,8 +60,12 @@ private:
 \r
 class RealParam : public Parameter {\r
 public:\r
-    RealParam( const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, \r
-               Inkscape::UI::Widget::Registry* wr, Effect* effect, gdouble initial_value = 1.0);\r
+    RealParam(  const Glib::ustring& label,\r
+                const Glib::ustring& tip,\r
+                const Glib::ustring& key, \r
+                Inkscape::UI::Widget::Registry* wr,\r
+                Effect* effect,\r
+                gdouble initial_value = 1.0);\r
     ~RealParam();\r
 \r
     bool param_readSVGValue(const gchar * strvalue);\r
@@ -77,8 +85,8 @@ private:
 };\r
 \r
 \r
-}; //namespace LivePathEffect\r
+} //namespace LivePathEffect\r
 \r
-}; //namespace Inkscape\r
+} //namespace Inkscape\r
 \r
 #endif\r
index 90974f686637d54ff43e8abdcdbdf30ca8d9d1bd..d2615901f170eb4ff22abd15c104388fe951d4c0 100644 (file)
@@ -33,11 +33,12 @@ namespace LivePathEffect {
 \r
 PathParam::PathParam( const Glib::ustring& label, const Glib::ustring& tip,\r
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,\r
-                      Effect* effect )\r
+                      Effect* effect, const gchar * defvalue)\r
     : Parameter(label, tip, key, wr, effect)\r
 {\r
     _widget = NULL;\r
     _tooltips = NULL;\r
+    param_readSVGValue(defvalue);\r
 }\r
 \r
 PathParam::~PathParam()\r
@@ -150,9 +151,9 @@ PathParam::param_write_to_repr(const char * svgd)
 }\r
 \r
 \r
-}; /* namespace LivePathEffect */\r
+} /* namespace LivePathEffect */\r
 \r
-}; /* namespace Inkscape */\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index 39ea9e2d8d44d957a769535fb9b3847e1bec0248..18ffe5321d7e6480281910d3c55fbcbc2dd0d143 100644 (file)
@@ -25,7 +25,12 @@ namespace LivePathEffect {
 \r
 class PathParam : public Geom::Piecewise<Geom::D2<Geom::SBasis> >, public Parameter {\r
 public:\r
-    PathParam(const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect);;\r
+    PathParam ( const Glib::ustring& label,\r
+                const Glib::ustring& tip,\r
+                const Glib::ustring& key,\r
+                Inkscape::UI::Widget::Registry* wr,\r
+                Effect* effect,\r
+                const gchar * defvalue = "M0,0 L1,1");\r
     ~PathParam();\r
 \r
     Gtk::Widget * param_getWidget();\r
@@ -49,8 +54,8 @@ private:
 };\r
 \r
 \r
-}; //namespace LivePathEffect\r
+} //namespace LivePathEffect\r
 \r
-}; //namespace Inkscape\r
+} //namespace Inkscape\r
 \r
 #endif\r
index 8079f54eb6aaa6dc2be2c64206108579c6cea35e..39208ad620f223ab7001c80ee50b87f2ecf6ebc2 100644 (file)
@@ -29,8 +29,8 @@ namespace LivePathEffect {
 \r
 PointParam::PointParam( const Glib::ustring& label, const Glib::ustring& tip,\r
                         const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,\r
-                        Effect* effect )\r
-    : Geom::Point(0,0), Parameter(label, tip, key, wr, effect)\r
+                        Effect* effect, Geom::Point defvalue )\r
+    : Geom::Point(defvalue), Parameter(label, tip, key, wr, effect)\r
 {\r
     _widget = NULL;\r
     pointwdg = NULL;\r
@@ -58,7 +58,7 @@ PointParam::param_readSVGValue(const gchar * strvalue)
     success += sp_svg_number_read_d(strarray[1], &newy);\r
     g_strfreev (strarray);\r
     if (success == 2) {\r
-        *dynamic_cast<Geom::Point *>( this ) = Geom::Point(newx, newy);\r
+        param_setValue( Geom::Point(newx, newy) );\r
         return true;\r
     }\r
     return false;\r
@@ -68,7 +68,7 @@ gchar *
 PointParam::param_writeSVGValue() const\r
 {\r
     Inkscape::SVGOStringStream os;\r
-    os << pointwdg->getPoint()->getXValue() << "," << pointwdg->getPoint()->getYValue();\r
+    os << (*this)[0] << "," << (*this)[1];\r
     gchar * str = g_strdup(os.str().c_str());\r
     return str;\r
 }\r
@@ -79,7 +79,7 @@ PointParam::param_getWidget()
     if (!_widget) {\r
         pointwdg = new Inkscape::UI::Widget::RegisteredPoint();\r
         pointwdg->init(param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc());\r
-        pointwdg->setValue(0.1, 0.2);\r
+        pointwdg->setValue( (*this)[0], (*this)[1] );\r
         pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change point parameter"));\r
 \r
         Gtk::Widget*  pIcon = Gtk::manage( sp_icon_get_icon( "draw_node", Inkscape::ICON_SIZE_BUTTON) );\r
@@ -108,7 +108,8 @@ void
 PointParam::param_setValue(Geom::Point newpoint)\r
 {\r
     *dynamic_cast<Geom::Point *>( this ) = newpoint;\r
-    pointwdg->setValue(newpoint[0], newpoint[1]);\r
+    if (pointwdg)\r
+        pointwdg->setValue(newpoint[0], newpoint[1]);\r
 }\r
 \r
 \r
@@ -150,9 +151,9 @@ PointParam::on_button_click()
     }\r
 }\r
 \r
-}; /* namespace LivePathEffect */\r
+} /* namespace LivePathEffect */\r
 \r
-}; /* namespace Inkscape */\r
+} /* namespace Inkscape */\r
 \r
 /*\r
   Local Variables:\r
index 1240ea3d13b943cc944a7b5928282dfefd378e09..368ab63ed4abcafd5039e5be54b31a4206d6bc8e 100644 (file)
@@ -27,7 +27,12 @@ namespace LivePathEffect {
 \r
 class PointParam : public Geom::Point, public Parameter {\r
 public:\r
-    PointParam(const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr, Effect* effect);;\r
+    PointParam( const Glib::ustring& label,\r
+                const Glib::ustring& tip,\r
+                const Glib::ustring& key,\r
+                Inkscape::UI::Widget::Registry* wr,\r
+                Effect* effect,\r
+                Geom::Point defvalue = Geom::Point(0,0));\r
     ~PointParam();\r
 \r
     Gtk::Widget * param_getWidget();\r
@@ -50,8 +55,8 @@ private:
 };\r
 \r
 \r
-}; //namespace LivePathEffect\r
+} //namespace LivePathEffect\r
 \r
-}; //namespace Inkscape\r
+} //namespace Inkscape\r
 \r
 #endif\r