Add image diff, change the read_xy_alt, update the figures
This commit is contained in:
parent
7998d89668
commit
b0f56f54e3
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 41 KiB |
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.0 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 27 KiB |
400005
figures/rmax-n.svg
400005
figures/rmax-n.svg
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 20 MiB After Width: | Height: | Size: 20 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 32 KiB |
@ -6,7 +6,7 @@
|
||||
<rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<cc:Work>
|
||||
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
|
||||
<dc:date>2023-03-17T15:19:19.078346</dc:date>
|
||||
<dc:date>2023-03-17T21:13:46.394313</dc:date>
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
@ -41,12 +41,12 @@ z
|
||||
<g id="xtick_1">
|
||||
<g id="line2d_1">
|
||||
<defs>
|
||||
<path id="m2eeb5fd5ed" d="M 0 0
|
||||
<path id="me761353d38" d="M 0 0
|
||||
L 0 3.5
|
||||
" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use xlink:href="#m2eeb5fd5ed" x="70.553388" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me761353d38" x="70.553388" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_1">
|
||||
@ -91,7 +91,7 @@ z
|
||||
<g id="xtick_2">
|
||||
<g id="line2d_2">
|
||||
<g>
|
||||
<use xlink:href="#m2eeb5fd5ed" x="136.140165" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me761353d38" x="136.140165" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_2">
|
||||
@ -132,7 +132,7 @@ z
|
||||
<g id="xtick_3">
|
||||
<g id="line2d_3">
|
||||
<g>
|
||||
<use xlink:href="#m2eeb5fd5ed" x="201.726942" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me761353d38" x="201.726942" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_3">
|
||||
@ -168,7 +168,7 @@ z
|
||||
<g id="xtick_4">
|
||||
<g id="line2d_4">
|
||||
<g>
|
||||
<use xlink:href="#m2eeb5fd5ed" x="267.313719" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me761353d38" x="267.313719" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_4">
|
||||
@ -215,7 +215,7 @@ z
|
||||
<g id="xtick_5">
|
||||
<g id="line2d_5">
|
||||
<g>
|
||||
<use xlink:href="#m2eeb5fd5ed" x="332.900496" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me761353d38" x="332.900496" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_5">
|
||||
@ -271,7 +271,7 @@ z
|
||||
<g id="xtick_6">
|
||||
<g id="line2d_6">
|
||||
<g>
|
||||
<use xlink:href="#m2eeb5fd5ed" x="398.487273" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me761353d38" x="398.487273" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_6">
|
||||
@ -457,17 +457,17 @@ z
|
||||
<g id="ytick_1">
|
||||
<g id="line2d_7">
|
||||
<defs>
|
||||
<path id="m9e839b01d6" d="M 0 0
|
||||
<path id="mbc9cae7394" d="M 0 0
|
||||
L -3.5 0
|
||||
" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="283.166711" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="307.128527" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_8">
|
||||
<!-- 1.75 -->
|
||||
<g transform="translate(28.334375 286.96593) scale(0.1 -0.1)">
|
||||
<!-- 1.70 -->
|
||||
<g transform="translate(28.334375 310.927745) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
<path id="DejaVuSans-37" d="M 525 4666
|
||||
L 3525 4666
|
||||
@ -479,6 +479,24 @@ L 525 4134
|
||||
L 525 4666
|
||||
z
|
||||
" transform="scale(0.015625)"/>
|
||||
</defs>
|
||||
<use xlink:href="#DejaVuSans-31"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-37" x="95.410156"/>
|
||||
<use xlink:href="#DejaVuSans-30" x="159.033203"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_2">
|
||||
<g id="line2d_8">
|
||||
<g>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="272.183001" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_9">
|
||||
<!-- 1.75 -->
|
||||
<g transform="translate(28.334375 275.98222) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
<path id="DejaVuSans-35" d="M 691 4666
|
||||
L 3169 4666
|
||||
L 3169 4134
|
||||
@ -512,15 +530,15 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_2">
|
||||
<g id="line2d_8">
|
||||
<g id="ytick_3">
|
||||
<g id="line2d_9">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="250.103814" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="237.237476" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_9">
|
||||
<g id="text_10">
|
||||
<!-- 1.80 -->
|
||||
<g transform="translate(28.334375 253.903033) scale(0.1 -0.1)">
|
||||
<g transform="translate(28.334375 241.036695) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-31"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-38" x="95.410156"/>
|
||||
@ -528,15 +546,15 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_3">
|
||||
<g id="line2d_9">
|
||||
<g id="ytick_4">
|
||||
<g id="line2d_10">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="217.040917" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="202.291951" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_10">
|
||||
<g id="text_11">
|
||||
<!-- 1.85 -->
|
||||
<g transform="translate(28.334375 220.840136) scale(0.1 -0.1)">
|
||||
<g transform="translate(28.334375 206.091169) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-31"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-38" x="95.410156"/>
|
||||
@ -544,15 +562,15 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_4">
|
||||
<g id="line2d_10">
|
||||
<g id="ytick_5">
|
||||
<g id="line2d_11">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="183.97802" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="167.346425" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_11">
|
||||
<g id="text_12">
|
||||
<!-- 1.90 -->
|
||||
<g transform="translate(28.334375 187.777239) scale(0.1 -0.1)">
|
||||
<g transform="translate(28.334375 171.145644) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
<path id="DejaVuSans-39" d="M 703 97
|
||||
L 703 672
|
||||
@ -592,15 +610,15 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_5">
|
||||
<g id="line2d_11">
|
||||
<g id="ytick_6">
|
||||
<g id="line2d_12">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="150.915123" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="132.4009" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_12">
|
||||
<g id="text_13">
|
||||
<!-- 1.95 -->
|
||||
<g transform="translate(28.334375 154.714342) scale(0.1 -0.1)">
|
||||
<g transform="translate(28.334375 136.200119) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-31"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-39" x="95.410156"/>
|
||||
@ -608,15 +626,15 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_6">
|
||||
<g id="line2d_12">
|
||||
<g id="ytick_7">
|
||||
<g id="line2d_13">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="117.852227" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="97.455375" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_13">
|
||||
<g id="text_14">
|
||||
<!-- 2.00 -->
|
||||
<g transform="translate(28.334375 121.651445) scale(0.1 -0.1)">
|
||||
<g transform="translate(28.334375 101.254593) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-32"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-30" x="95.410156"/>
|
||||
@ -624,35 +642,19 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_7">
|
||||
<g id="line2d_13">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="84.78933" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_14">
|
||||
<!-- 2.05 -->
|
||||
<g transform="translate(28.334375 88.588549) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-32"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-30" x="95.410156"/>
|
||||
<use xlink:href="#DejaVuSans-35" x="159.033203"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_8">
|
||||
<g id="line2d_14">
|
||||
<g>
|
||||
<use xlink:href="#m9e839b01d6" x="57.6" y="51.726433" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mbc9cae7394" x="57.6" y="62.509849" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_15">
|
||||
<!-- 2.10 -->
|
||||
<g transform="translate(28.334375 55.525652) scale(0.1 -0.1)">
|
||||
<!-- 2.05 -->
|
||||
<g transform="translate(28.334375 66.309068) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-32"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-31" x="95.410156"/>
|
||||
<use xlink:href="#DejaVuSans-30" x="159.033203"/>
|
||||
<use xlink:href="#DejaVuSans-30" x="95.410156"/>
|
||||
<use xlink:href="#DejaVuSans-35" x="159.033203"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
@ -721,209 +723,209 @@ z
|
||||
</g>
|
||||
<g id="line2d_15">
|
||||
<path d="M 73.832727 53.568
|
||||
L 77.112066 74.632832
|
||||
L 80.391405 97.004493
|
||||
L 83.670744 105.452382
|
||||
L 86.950083 115.16586
|
||||
L 90.229421 124.786392
|
||||
L 93.50876 132.385918
|
||||
L 96.788099 141.756265
|
||||
L 100.067438 150.891533
|
||||
L 103.346777 158.443343
|
||||
L 106.626116 163.213623
|
||||
L 109.905455 172.765608
|
||||
L 113.184793 179.50849
|
||||
L 116.464132 176.944845
|
||||
L 119.743471 187.775194
|
||||
L 123.02281 187.651576
|
||||
L 126.302149 189.105427
|
||||
L 129.581488 195.765528
|
||||
L 132.860826 200.231534
|
||||
L 136.140165 201.786351
|
||||
L 139.419504 206.294897
|
||||
L 142.698843 210.712101
|
||||
L 145.978182 214.837584
|
||||
L 149.257521 218.652522
|
||||
L 152.53686 217.337977
|
||||
L 155.816198 219.670768
|
||||
L 159.095537 221.703785
|
||||
L 162.374876 229.09955
|
||||
L 165.654215 224.756719
|
||||
L 168.933554 230.766226
|
||||
L 172.212893 227.264664
|
||||
L 175.492231 231.457854
|
||||
L 178.77157 230.133395
|
||||
L 182.050909 228.295621
|
||||
L 185.330248 232.91756
|
||||
L 188.609587 234.237536
|
||||
L 191.888926 238.605444
|
||||
L 195.168264 243.111321
|
||||
L 198.447603 241.707489
|
||||
L 201.726942 245.941651
|
||||
L 205.006281 246.983962
|
||||
L 208.28562 244.740504
|
||||
L 211.564959 249.74397
|
||||
L 214.844298 249.532255
|
||||
L 218.123636 250.676201
|
||||
L 221.402975 248.112964
|
||||
L 224.682314 253.45355
|
||||
L 227.961653 253.449472
|
||||
L 231.240992 258.94032
|
||||
L 234.520331 258.270164
|
||||
L 237.799669 261.95061
|
||||
L 241.079008 256.389704
|
||||
L 244.358347 256.246507
|
||||
L 247.637686 255.397604
|
||||
L 250.917025 261.618718
|
||||
L 254.196364 259.809744
|
||||
L 257.475702 259.595368
|
||||
L 260.755041 264.279561
|
||||
L 264.03438 264.761185
|
||||
L 267.313719 263.547844
|
||||
L 270.593058 265.88345
|
||||
L 273.872397 264.33436
|
||||
L 277.151736 267.391207
|
||||
L 280.431074 268.812625
|
||||
L 283.710413 268.449508
|
||||
L 286.989752 274.727698
|
||||
L 290.269091 272.55752
|
||||
L 293.54843 274.151487
|
||||
L 296.827769 272.238186
|
||||
L 300.107107 273.546583
|
||||
L 303.386446 273.506514
|
||||
L 306.665785 275.153876
|
||||
L 309.945124 277.9183
|
||||
L 313.224463 278.060936
|
||||
L 316.503802 279.273747
|
||||
L 319.78314 273.986384
|
||||
L 323.062479 277.113327
|
||||
L 326.341818 277.575303
|
||||
L 329.621157 276.538459
|
||||
L 332.900496 281.651697
|
||||
L 336.179835 284.106053
|
||||
L 339.459174 280.107973
|
||||
L 342.738512 286.168913
|
||||
L 346.017851 284.848187
|
||||
L 349.29719 282.350649
|
||||
L 352.576529 279.975317
|
||||
L 355.855868 282.01396
|
||||
L 359.135207 284.188298
|
||||
L 362.414545 282.896583
|
||||
L 365.693884 285.533784
|
||||
L 368.973223 288.851511
|
||||
L 372.252562 287.379331
|
||||
L 375.531901 291.103196
|
||||
L 378.81124 286.004072
|
||||
L 382.090579 288.2515
|
||||
L 385.369917 287.616994
|
||||
L 388.649256 290.260738
|
||||
L 391.928595 292.276308
|
||||
L 77.112066 73.907956
|
||||
L 80.391405 96.219519
|
||||
L 83.670744 104.576337
|
||||
L 86.950083 114.314249
|
||||
L 90.229421 124.320698
|
||||
L 93.50876 131.669392
|
||||
L 96.788099 141.081681
|
||||
L 100.067438 150.141127
|
||||
L 103.346777 157.756319
|
||||
L 106.626116 162.664737
|
||||
L 109.905455 172.033195
|
||||
L 113.184793 179.12914
|
||||
L 116.464132 176.454492
|
||||
L 119.743471 187.458361
|
||||
L 123.02281 187.40524
|
||||
L 126.302149 188.432332
|
||||
L 129.581488 195.306633
|
||||
L 132.860826 199.633641
|
||||
L 136.140165 201.121374
|
||||
L 139.419504 205.652928
|
||||
L 142.698843 210.429907
|
||||
L 145.978182 214.35287
|
||||
L 149.257521 218.08234
|
||||
L 152.53686 216.685948
|
||||
L 155.816198 219.121086
|
||||
L 159.095537 221.133096
|
||||
L 162.374876 228.785815
|
||||
L 165.654215 224.315221
|
||||
L 168.933554 230.417634
|
||||
L 172.212893 226.828309
|
||||
L 175.492231 231.056435
|
||||
L 178.77157 229.742059
|
||||
L 182.050909 227.861551
|
||||
L 185.330248 232.616686
|
||||
L 188.609587 233.969867
|
||||
L 191.888926 238.475525
|
||||
L 195.168264 242.70608
|
||||
L 198.447603 241.379203
|
||||
L 201.726942 245.695654
|
||||
L 205.006281 246.615777
|
||||
L 208.28562 244.374891
|
||||
L 211.564959 249.510651
|
||||
L 214.844298 249.295136
|
||||
L 218.123636 250.551363
|
||||
L 221.402975 247.888987
|
||||
L 224.682314 253.336302
|
||||
L 227.961653 253.31556
|
||||
L 231.240992 258.905545
|
||||
L 234.520331 258.353088
|
||||
L 237.799669 261.981152
|
||||
L 241.079008 256.378284
|
||||
L 244.358347 256.38987
|
||||
L 247.637686 255.382997
|
||||
L 250.917025 261.610336
|
||||
L 254.196364 259.628875
|
||||
L 257.475702 259.435805
|
||||
L 260.755041 264.130324
|
||||
L 264.03438 264.620777
|
||||
L 267.313719 263.474837
|
||||
L 270.593058 265.82565
|
||||
L 273.872397 264.270534
|
||||
L 277.151736 267.231027
|
||||
L 280.431074 268.592976
|
||||
L 283.710413 268.346072
|
||||
L 286.989752 274.647086
|
||||
L 290.269091 272.394106
|
||||
L 293.54843 274.212571
|
||||
L 296.827769 272.214966
|
||||
L 300.107107 273.540712
|
||||
L 303.386446 273.638168
|
||||
L 306.665785 275.146514
|
||||
L 309.945124 277.97054
|
||||
L 313.224463 278.184532
|
||||
L 316.503802 279.497872
|
||||
L 319.78314 273.973915
|
||||
L 323.062479 277.06878
|
||||
L 326.341818 277.685226
|
||||
L 329.621157 276.48117
|
||||
L 332.900496 281.586124
|
||||
L 336.179835 284.165879
|
||||
L 339.459174 280.143244
|
||||
L 342.738512 286.170683
|
||||
L 346.017851 284.850199
|
||||
L 349.29719 282.181252
|
||||
L 352.576529 279.796411
|
||||
L 355.855868 281.744841
|
||||
L 359.135207 284.112297
|
||||
L 362.414545 282.79101
|
||||
L 365.693884 285.458392
|
||||
L 368.973223 288.72065
|
||||
L 372.252562 287.148585
|
||||
L 375.531901 290.937049
|
||||
L 378.81124 285.777585
|
||||
L 382.090579 288.140311
|
||||
L 385.369917 287.384538
|
||||
L 388.649256 290.246443
|
||||
L 391.928595 292.151486
|
||||
L 395.207934 295.488
|
||||
L 398.487273 293.88031
|
||||
" clip-path="url(#p78140d9f8d)" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
L 398.487273 293.708953
|
||||
" clip-path="url(#p3666199b34)" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
</g>
|
||||
<g id="line2d_16">
|
||||
<path d="M 73.832727 55.044004
|
||||
L 77.112066 71.316991
|
||||
L 80.391405 92.232896
|
||||
L 83.670744 102.572486
|
||||
L 86.950083 116.394551
|
||||
L 90.229421 128.701998
|
||||
L 93.50876 134.949383
|
||||
L 96.788099 145.661993
|
||||
L 100.067438 150.9475
|
||||
L 103.346777 155.247094
|
||||
L 106.626116 165.30939
|
||||
L 109.905455 171.850092
|
||||
L 113.184793 177.589865
|
||||
L 116.464132 182.401881
|
||||
L 119.743471 184.806134
|
||||
L 123.02281 190.21085
|
||||
L 126.302149 195.437979
|
||||
L 129.581488 196.584883
|
||||
L 132.860826 199.005479
|
||||
L 136.140165 203.314613
|
||||
L 139.419504 202.702001
|
||||
L 142.698843 209.154995
|
||||
L 145.978182 207.034673
|
||||
L 149.257521 216.539983
|
||||
L 152.53686 219.843551
|
||||
L 155.816198 218.482902
|
||||
L 159.095537 219.867446
|
||||
L 162.374876 221.000527
|
||||
L 165.654215 226.821642
|
||||
L 168.933554 224.348242
|
||||
L 172.212893 231.917835
|
||||
L 175.492231 226.959572
|
||||
L 178.77157 232.064755
|
||||
L 182.050909 235.639473
|
||||
L 185.330248 236.053711
|
||||
L 188.609587 240.631122
|
||||
L 191.888926 239.199149
|
||||
L 195.168264 243.744334
|
||||
L 198.447603 244.283347
|
||||
L 201.726942 247.270287
|
||||
L 205.006281 249.72863
|
||||
L 208.28562 247.163411
|
||||
L 211.564959 245.11978
|
||||
L 214.844298 247.837848
|
||||
L 218.123636 252.441702
|
||||
L 221.402975 253.121624
|
||||
L 224.682314 255.038864
|
||||
L 227.961653 252.43824
|
||||
L 231.240992 255.526152
|
||||
L 234.520331 264.829535
|
||||
L 237.799669 256.866402
|
||||
L 241.079008 260.831769
|
||||
L 244.358347 254.605633
|
||||
L 247.637686 259.264374
|
||||
L 250.917025 262.161779
|
||||
L 254.196364 264.027839
|
||||
L 257.475702 263.511462
|
||||
L 260.755041 263.688742
|
||||
L 264.03438 269.565947
|
||||
L 267.313719 267.194634
|
||||
L 270.593058 265.310783
|
||||
L 273.872397 271.116429
|
||||
L 277.151736 272.676245
|
||||
L 280.431074 265.756754
|
||||
L 283.710413 272.734708
|
||||
L 286.989752 272.632687
|
||||
L 290.269091 270.636738
|
||||
L 293.54843 273.679382
|
||||
L 296.827769 277.323299
|
||||
L 300.107107 279.63649
|
||||
L 303.386446 274.66347
|
||||
L 306.665785 275.725493
|
||||
L 309.945124 280.8126
|
||||
L 313.224463 277.205127
|
||||
L 316.503802 274.080043
|
||||
L 319.78314 278.354384
|
||||
L 323.062479 275.410492
|
||||
L 326.341818 278.942557
|
||||
L 329.621157 280.741045
|
||||
L 332.900496 277.95808
|
||||
L 336.179835 280.041818
|
||||
L 339.459174 280.279351
|
||||
L 342.738512 279.999285
|
||||
L 346.017851 279.308407
|
||||
L 349.29719 282.452027
|
||||
L 352.576529 286.68285
|
||||
L 355.855868 284.684239
|
||||
L 359.135207 287.03954
|
||||
L 362.414545 288.619296
|
||||
L 365.693884 287.091053
|
||||
L 368.973223 285.207315
|
||||
L 372.252562 288.498115
|
||||
L 375.531901 293.273443
|
||||
L 378.81124 292.717334
|
||||
L 382.090579 290.452192
|
||||
L 385.369917 292.349738
|
||||
L 388.649256 295.115098
|
||||
L 391.928595 293.354212
|
||||
L 395.207934 289.563207
|
||||
L 398.487273 289.373599
|
||||
" clip-path="url(#p78140d9f8d)" style="fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
<path d="M 73.832727 54.647546
|
||||
L 77.112066 70.777784
|
||||
L 80.391405 91.567979
|
||||
L 83.670744 101.873281
|
||||
L 86.950083 115.878156
|
||||
L 90.229421 128.051891
|
||||
L 93.50876 134.501843
|
||||
L 96.788099 144.877128
|
||||
L 100.067438 150.189687
|
||||
L 103.346777 154.64767
|
||||
L 106.626116 164.800839
|
||||
L 109.905455 171.181188
|
||||
L 113.184793 176.702392
|
||||
L 116.464132 181.625038
|
||||
L 119.743471 184.239505
|
||||
L 123.02281 189.728111
|
||||
L 126.302149 194.741249
|
||||
L 129.581488 196.00389
|
||||
L 132.860826 198.381028
|
||||
L 136.140165 202.753602
|
||||
L 139.419504 201.928046
|
||||
L 142.698843 208.426105
|
||||
L 145.978182 206.364832
|
||||
L 149.257521 216.016414
|
||||
L 152.53686 219.402845
|
||||
L 155.816198 217.942414
|
||||
L 159.095537 219.460194
|
||||
L 162.374876 220.503939
|
||||
L 165.654215 226.135626
|
||||
L 168.933554 223.748616
|
||||
L 172.212893 231.465417
|
||||
L 175.492231 226.422204
|
||||
L 178.77157 231.560266
|
||||
L 182.050909 235.215139
|
||||
L 185.330248 235.587331
|
||||
L 188.609587 240.278703
|
||||
L 191.888926 238.736995
|
||||
L 195.168264 243.442127
|
||||
L 198.447603 244.058403
|
||||
L 201.726942 246.952831
|
||||
L 205.006281 249.285517
|
||||
L 208.28562 246.874842
|
||||
L 211.564959 244.726192
|
||||
L 214.844298 247.661596
|
||||
L 218.123636 252.438779
|
||||
L 221.402975 252.930796
|
||||
L 224.682314 254.75928
|
||||
L 227.961653 252.072546
|
||||
L 231.240992 255.234813
|
||||
L 234.520331 264.572625
|
||||
L 237.799669 256.461733
|
||||
L 241.079008 260.574286
|
||||
L 244.358347 254.275044
|
||||
L 247.637686 258.973617
|
||||
L 250.917025 261.880871
|
||||
L 254.196364 263.717719
|
||||
L 257.475702 263.225026
|
||||
L 260.755041 263.317175
|
||||
L 264.03438 269.181928
|
||||
L 267.313719 266.749879
|
||||
L 270.593058 264.81417
|
||||
L 273.872397 270.846272
|
||||
L 277.151736 272.589731
|
||||
L 280.431074 265.489674
|
||||
L 283.710413 272.575376
|
||||
L 286.989752 272.430946
|
||||
L 290.269091 270.479427
|
||||
L 293.54843 273.53734
|
||||
L 296.827769 277.07611
|
||||
L 300.107107 279.448347
|
||||
L 303.386446 274.352238
|
||||
L 306.665785 275.454036
|
||||
L 309.945124 280.727555
|
||||
L 313.224463 277.077005
|
||||
L 316.503802 273.824331
|
||||
L 319.78314 278.087304
|
||||
L 323.062479 275.076464
|
||||
L 326.341818 278.816043
|
||||
L 329.621157 280.662168
|
||||
L 332.900496 277.754125
|
||||
L 336.179835 279.978253
|
||||
L 339.459174 280.102379
|
||||
L 342.738512 279.740794
|
||||
L 346.017851 279.11831
|
||||
L 349.29719 282.316544
|
||||
L 352.576529 286.60753
|
||||
L 355.855868 284.414226
|
||||
L 359.135207 286.801582
|
||||
L 362.414545 288.523157
|
||||
L 365.693884 286.943698
|
||||
L 368.973223 285.086942
|
||||
L 372.252562 288.479713
|
||||
L 375.531901 293.196286
|
||||
L 378.81124 292.575788
|
||||
L 382.090579 290.299576
|
||||
L 385.369917 292.202069
|
||||
L 388.649256 295.042039
|
||||
L 391.928595 293.274822
|
||||
L 395.207934 289.398872
|
||||
L 398.487273 289.140531
|
||||
" clip-path="url(#p3666199b34)" style="fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
</g>
|
||||
<g id="patch_3">
|
||||
<path d="M 57.6 307.584
|
||||
@ -1372,7 +1374,7 @@ z
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="p78140d9f8d">
|
||||
<clipPath id="p3666199b34">
|
||||
<rect x="57.6" y="41.472" width="357.12" height="266.112"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
@ -6,7 +6,7 @@
|
||||
<rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
|
||||
<cc:Work>
|
||||
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
|
||||
<dc:date>2023-03-17T15:15:17.288767</dc:date>
|
||||
<dc:date>2023-03-17T21:12:53.560959</dc:date>
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
@ -39,220 +39,220 @@ z
|
||||
</g>
|
||||
<g id="PolyCollection_1">
|
||||
<path d="M 73.832727 53.568
|
||||
L 73.832727 131.131986
|
||||
L 77.112066 144.60005
|
||||
L 80.391405 160.258111
|
||||
L 83.670744 165.64779
|
||||
L 86.950083 172.91854
|
||||
L 90.229421 179.922013
|
||||
L 93.50876 185.369536
|
||||
L 96.788099 191.86985
|
||||
L 100.067438 196.997817
|
||||
L 103.346777 201.392608
|
||||
L 106.626116 207.490146
|
||||
L 109.905455 214.151527
|
||||
L 113.184793 221.091603
|
||||
L 116.464132 216.498885
|
||||
L 119.743471 225.646359
|
||||
L 123.02281 224.86351
|
||||
L 126.302149 223.822061
|
||||
L 129.581488 227.37428
|
||||
L 132.860826 231.993521
|
||||
L 136.140165 231.269924
|
||||
L 139.419504 234.207749
|
||||
L 142.698843 238.68065
|
||||
L 145.978182 240.182277
|
||||
L 149.257521 242.997481
|
||||
L 152.53686 242.242142
|
||||
L 155.816198 244.899974
|
||||
L 159.095537 245.432419
|
||||
L 162.374876 252.59396
|
||||
L 165.654215 246.166978
|
||||
L 168.933554 251.135166
|
||||
L 172.212893 248.417562
|
||||
L 175.492231 252.982214
|
||||
L 178.77157 252.139552
|
||||
L 182.050909 249.808476
|
||||
L 185.330248 253.860184
|
||||
L 188.609587 254.401901
|
||||
L 191.888926 257.77306
|
||||
L 195.168264 258.741083
|
||||
L 198.447603 259.149928
|
||||
L 201.726942 261.418394
|
||||
L 205.006281 263.729356
|
||||
L 208.28562 261.289351
|
||||
L 211.564959 264.49787
|
||||
L 214.844298 266.09199
|
||||
L 218.123636 266.42795
|
||||
L 221.402975 265.604932
|
||||
L 224.682314 268.419029
|
||||
L 227.961653 267.560436
|
||||
L 231.240992 271.8194
|
||||
L 234.520331 272.486041
|
||||
L 237.799669 273.463569
|
||||
L 241.079008 269.784361
|
||||
L 244.358347 269.770416
|
||||
L 247.637686 268.0947
|
||||
L 250.917025 272.754131
|
||||
L 254.196364 271.280641
|
||||
L 257.475702 269.871594
|
||||
L 260.755041 274.083824
|
||||
L 264.03438 273.359217
|
||||
L 267.313719 273.623348
|
||||
L 270.593058 275.236744
|
||||
L 273.872397 274.102657
|
||||
L 277.151736 276.311646
|
||||
L 280.431074 277.314744
|
||||
L 283.710413 277.735523
|
||||
L 286.989752 282.346272
|
||||
L 290.269091 279.965693
|
||||
L 293.54843 282.782426
|
||||
L 296.827769 279.393449
|
||||
L 300.107107 280.528355
|
||||
L 303.386446 280.722704
|
||||
L 306.665785 282.353294
|
||||
L 309.945124 282.647632
|
||||
L 313.224463 283.24181
|
||||
L 316.503802 284.837251
|
||||
L 319.78314 279.716239
|
||||
L 323.062479 283.184059
|
||||
L 326.341818 282.443064
|
||||
L 329.621157 283.531567
|
||||
L 332.900496 287.938659
|
||||
L 336.179835 289.616438
|
||||
L 339.459174 286.823709
|
||||
L 342.738512 289.635226
|
||||
L 346.017851 288.200724
|
||||
L 349.29719 285.540563
|
||||
L 352.576529 284.435203
|
||||
L 355.855868 284.333099
|
||||
L 359.135207 286.34715
|
||||
L 362.414545 286.548784
|
||||
L 365.693884 287.765258
|
||||
L 368.973223 289.989326
|
||||
L 372.252562 289.414802
|
||||
L 375.531901 293.144174
|
||||
L 378.81124 289.460582
|
||||
L 382.090579 290.882384
|
||||
L 385.369917 289.062397
|
||||
L 388.649256 291.428877
|
||||
L 391.928595 292.424984
|
||||
L 73.832727 111.282701
|
||||
L 77.112066 127.350202
|
||||
L 80.391405 145.36649
|
||||
L 83.670744 151.396756
|
||||
L 86.950083 160.802863
|
||||
L 90.229421 166.831386
|
||||
L 93.50876 174.019387
|
||||
L 96.788099 180.90315
|
||||
L 100.067438 187.094066
|
||||
L 103.346777 191.165515
|
||||
L 106.626116 198.406361
|
||||
L 109.905455 203.939906
|
||||
L 113.184793 211.740685
|
||||
L 116.464132 206.158391
|
||||
L 119.743471 216.724276
|
||||
L 123.02281 216.089566
|
||||
L 126.302149 214.910405
|
||||
L 129.581488 219.564324
|
||||
L 132.860826 226.193677
|
||||
L 136.140165 225.983242
|
||||
L 139.419504 228.5928
|
||||
L 142.698843 233.965103
|
||||
L 145.978182 235.45701
|
||||
L 149.257521 238.517094
|
||||
L 152.53686 236.168231
|
||||
L 155.816198 239.555214
|
||||
L 159.095537 239.97909
|
||||
L 162.374876 248.760584
|
||||
L 165.654215 240.761025
|
||||
L 168.933554 247.169364
|
||||
L 172.212893 242.655693
|
||||
L 175.492231 248.367
|
||||
L 178.77157 247.48975
|
||||
L 182.050909 244.683685
|
||||
L 185.330248 249.065709
|
||||
L 188.609587 249.440654
|
||||
L 191.888926 254.087699
|
||||
L 195.168264 254.24051
|
||||
L 198.447603 255.038611
|
||||
L 201.726942 257.522594
|
||||
L 205.006281 260.077855
|
||||
L 208.28562 256.753457
|
||||
L 211.564959 260.589639
|
||||
L 214.844298 262.553997
|
||||
L 218.123636 262.197107
|
||||
L 221.402975 261.386702
|
||||
L 224.682314 264.34602
|
||||
L 227.961653 263.204379
|
||||
L 231.240992 268.56476
|
||||
L 234.520331 270.26204
|
||||
L 237.799669 271.371776
|
||||
L 241.079008 267.304909
|
||||
L 244.358347 267.174449
|
||||
L 247.637686 265.062936
|
||||
L 250.917025 270.439088
|
||||
L 254.196364 268.730051
|
||||
L 257.475702 266.89928
|
||||
L 260.755041 271.760926
|
||||
L 264.03438 270.874292
|
||||
L 267.313719 270.795298
|
||||
L 270.593058 273.128652
|
||||
L 273.872397 271.691849
|
||||
L 277.151736 273.884729
|
||||
L 280.431074 275.606655
|
||||
L 283.710413 275.816323
|
||||
L 286.989752 280.852459
|
||||
L 290.269091 278.240591
|
||||
L 293.54843 281.643711
|
||||
L 296.827769 276.905284
|
||||
L 300.107107 277.685263
|
||||
L 303.386446 278.063361
|
||||
L 306.665785 280.242272
|
||||
L 309.945124 280.890666
|
||||
L 313.224463 281.689671
|
||||
L 316.503802 283.448563
|
||||
L 319.78314 276.709738
|
||||
L 323.062479 281.355722
|
||||
L 326.341818 280.10217
|
||||
L 329.621157 282.084805
|
||||
L 332.900496 286.177634
|
||||
L 336.179835 288.266486
|
||||
L 339.459174 285.25687
|
||||
L 342.738512 288.333303
|
||||
L 346.017851 286.481951
|
||||
L 349.29719 284.282347
|
||||
L 352.576529 283.587316
|
||||
L 355.855868 282.82657
|
||||
L 359.135207 285.167598
|
||||
L 362.414545 285.959359
|
||||
L 365.693884 287.141926
|
||||
L 368.973223 289.588304
|
||||
L 372.252562 289.058956
|
||||
L 375.531901 292.934061
|
||||
L 378.81124 288.840188
|
||||
L 382.090579 290.505652
|
||||
L 385.369917 288.223715
|
||||
L 388.649256 290.570047
|
||||
L 391.928595 291.654464
|
||||
L 395.207934 295.488
|
||||
L 398.487273 294.266948
|
||||
L 398.487273 228.590556
|
||||
L 398.487273 228.590556
|
||||
L 395.207934 229.631778
|
||||
L 391.928595 228.175434
|
||||
L 388.649256 226.335314
|
||||
L 385.369917 224.981628
|
||||
L 382.090579 224.054492
|
||||
L 378.81124 222.313806
|
||||
L 375.531901 225.805489
|
||||
L 372.252562 224.294793
|
||||
L 368.973223 225.791861
|
||||
L 365.693884 223.347361
|
||||
L 362.414545 220.852874
|
||||
L 359.135207 222.872157
|
||||
L 355.855868 221.82657
|
||||
L 352.576529 218.855771
|
||||
L 349.29719 221.09288
|
||||
L 346.017851 221.947151
|
||||
L 342.738512 222.37112
|
||||
L 339.459174 216.653933
|
||||
L 336.179835 219.487137
|
||||
L 332.900496 217.711248
|
||||
L 329.621157 214.923202
|
||||
L 326.341818 217.47071
|
||||
L 323.062479 216.079641
|
||||
L 319.78314 215.147357
|
||||
L 316.503802 217.466503
|
||||
L 313.224463 217.355325
|
||||
L 309.945124 217.748793
|
||||
L 306.665785 214.153148
|
||||
L 303.386446 213.465639
|
||||
L 300.107107 213.716371
|
||||
L 296.827769 213.010155
|
||||
L 293.54843 212.313495
|
||||
L 290.269091 212.887265
|
||||
L 286.989752 213.56047
|
||||
L 283.710413 209.33681
|
||||
L 280.431074 210.268552
|
||||
L 277.151736 209.271491
|
||||
L 273.872397 207.179011
|
||||
L 270.593058 208.22474
|
||||
L 267.313719 206.551568
|
||||
L 264.03438 208.523062
|
||||
L 260.755041 207.120733
|
||||
L 257.475702 204.74156
|
||||
L 254.196364 203.634175
|
||||
L 250.917025 204.706198
|
||||
L 247.637686 200.611536
|
||||
L 244.358347 200.130361
|
||||
L 241.079008 200.317917
|
||||
L 237.799669 204.463785
|
||||
L 234.520331 200.262342
|
||||
L 231.240992 201.871998
|
||||
L 227.961653 198.40447
|
||||
L 224.682314 197.551615
|
||||
L 221.402975 192.850659
|
||||
L 218.123636 195.634523
|
||||
L 214.844298 194.360769
|
||||
L 211.564959 196.252807
|
||||
L 208.28562 192.420655
|
||||
L 205.006281 193.137551
|
||||
L 201.726942 193.981817
|
||||
L 198.447603 190.292145
|
||||
L 195.168264 192.676404
|
||||
L 191.888926 187.303944
|
||||
L 188.609587 184.528764
|
||||
L 185.330248 183.213065
|
||||
L 182.050909 180.760973
|
||||
L 178.77157 181.015936
|
||||
L 175.492231 182.036999
|
||||
L 172.212893 180.701166
|
||||
L 168.933554 182.910816
|
||||
L 165.654215 179.422674
|
||||
L 162.374876 179.106744
|
||||
L 159.095537 175.861271
|
||||
L 155.816198 173.532939
|
||||
L 152.53686 172.908165
|
||||
L 149.257521 174.002598
|
||||
L 145.978182 171.449581
|
||||
L 142.698843 167.145999
|
||||
L 139.419504 165.403194
|
||||
L 136.140165 161.996779
|
||||
L 132.860826 159.085308
|
||||
L 129.581488 157.420171
|
||||
L 126.302149 151.600572
|
||||
L 123.02281 148.513324
|
||||
L 119.743471 147.904425
|
||||
L 116.464132 141.811881
|
||||
L 113.184793 140.826619
|
||||
L 109.905455 138.27839
|
||||
L 106.626116 131.498614
|
||||
L 103.346777 130.883611
|
||||
L 100.067438 124.651809
|
||||
L 96.788099 116.925006
|
||||
L 93.50876 110.239755
|
||||
L 90.229421 104.993542
|
||||
L 86.950083 98.4594
|
||||
L 83.670744 92.061747
|
||||
L 80.391405 85.563907
|
||||
L 77.112066 69.741494
|
||||
L 398.487273 294.328166
|
||||
L 398.487273 240.946054
|
||||
L 398.487273 240.946054
|
||||
L 395.207934 242.530445
|
||||
L 391.928595 241.217323
|
||||
L 388.649256 239.363163
|
||||
L 385.369917 237.294935
|
||||
L 382.090579 236.178796
|
||||
L 378.81124 234.199694
|
||||
L 375.531901 238.064427
|
||||
L 372.252562 236.095729
|
||||
L 368.973223 237.991332
|
||||
L 365.693884 235.405594
|
||||
L 362.414545 232.473657
|
||||
L 359.135207 235.303537
|
||||
L 355.855868 233.992703
|
||||
L 352.576529 230.226454
|
||||
L 349.29719 233.210101
|
||||
L 346.017851 235.127416
|
||||
L 342.738512 235.312944
|
||||
L 339.459174 229.091899
|
||||
L 336.179835 232.287301
|
||||
L 332.900496 230.396814
|
||||
L 329.621157 226.615123
|
||||
L 326.341818 230.455045
|
||||
L 323.062479 228.250609
|
||||
L 319.78314 228.122684
|
||||
L 316.503802 229.904704
|
||||
L 313.224463 229.637734
|
||||
L 309.945124 230.106652
|
||||
L 306.665785 226.398914
|
||||
L 303.386446 226.251163
|
||||
L 300.107107 226.478933
|
||||
L 296.827769 225.213915
|
||||
L 293.54843 223.556845
|
||||
L 290.269091 224.154935
|
||||
L 286.989752 225.018347
|
||||
L 283.710413 220.335009
|
||||
L 280.431074 220.925533
|
||||
L 277.151736 220.546618
|
||||
L 273.872397 218.172861
|
||||
L 270.593058 219.134865
|
||||
L 267.313719 217.842029
|
||||
L 264.03438 219.530678
|
||||
L 260.755041 217.887507
|
||||
L 257.475702 215.507739
|
||||
L 254.196364 213.974783
|
||||
L 250.917025 215.3222
|
||||
L 247.637686 211.092523
|
||||
L 244.358347 210.534137
|
||||
L 241.079008 210.385806
|
||||
L 237.799669 214.961505
|
||||
L 234.520331 210.47486
|
||||
L 231.240992 213.024319
|
||||
L 227.961653 209.762005
|
||||
L 224.682314 208.65236
|
||||
L 221.402975 203.209057
|
||||
L 218.123636 206.505433
|
||||
L 214.844298 204.210782
|
||||
L 211.564959 206.507578
|
||||
L 208.28562 202.421718
|
||||
L 205.006281 202.553945
|
||||
L 201.726942 203.689893
|
||||
L 198.447603 199.515641
|
||||
L 195.168264 202.360483
|
||||
L 191.888926 195.987555
|
||||
L 188.609587 193.684508
|
||||
L 185.330248 191.972137
|
||||
L 182.050909 189.019245
|
||||
L 178.77157 189.113911
|
||||
L 175.492231 190.26412
|
||||
L 172.212893 189.453434
|
||||
L 168.933554 190.476389
|
||||
L 165.654215 187.471601
|
||||
L 162.374876 186.368047
|
||||
L 159.095537 183.345027
|
||||
L 155.816198 180.665327
|
||||
L 152.53686 180.296048
|
||||
L 149.257521 180.101154
|
||||
L 145.978182 177.408437
|
||||
L 142.698843 172.849073
|
||||
L 139.419504 170.852764
|
||||
L 136.140165 166.472286
|
||||
L 132.860826 163.966985
|
||||
L 129.581488 163.921819
|
||||
L 126.302149 157.971953
|
||||
L 123.02281 155.208476
|
||||
L 119.743471 154.655708
|
||||
L 116.464132 148.247845
|
||||
L 113.184793 146.791263
|
||||
L 109.905455 143.646366
|
||||
L 106.626116 134.728828
|
||||
L 103.346777 134.398314
|
||||
L 100.067438 126.723135
|
||||
L 96.788099 118.939626
|
||||
L 93.50876 111.304694
|
||||
L 90.229421 107.157148
|
||||
L 86.950083 97.750471
|
||||
L 83.670744 92.1356
|
||||
L 80.391405 85.275263
|
||||
L 77.112066 68.875397
|
||||
L 73.832727 53.568
|
||||
z
|
||||
" clip-path="url(#p1e54213d91)" style="fill: #1f77b4; fill-opacity: 0.2"/>
|
||||
" clip-path="url(#pfe185082f7)" style="fill: #1f77b4; fill-opacity: 0.2"/>
|
||||
</g>
|
||||
<g id="matplotlib.axis_1">
|
||||
<g id="xtick_1">
|
||||
<g id="line2d_1">
|
||||
<defs>
|
||||
<path id="ma277a096a4" d="M 0 0
|
||||
<path id="mdd114e1862" d="M 0 0
|
||||
L 0 3.5
|
||||
" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use xlink:href="#ma277a096a4" x="70.553388" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mdd114e1862" x="70.553388" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_1">
|
||||
@ -297,7 +297,7 @@ z
|
||||
<g id="xtick_2">
|
||||
<g id="line2d_2">
|
||||
<g>
|
||||
<use xlink:href="#ma277a096a4" x="136.140165" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mdd114e1862" x="136.140165" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_2">
|
||||
@ -338,7 +338,7 @@ z
|
||||
<g id="xtick_3">
|
||||
<g id="line2d_3">
|
||||
<g>
|
||||
<use xlink:href="#ma277a096a4" x="201.726942" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mdd114e1862" x="201.726942" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_3">
|
||||
@ -374,7 +374,7 @@ z
|
||||
<g id="xtick_4">
|
||||
<g id="line2d_4">
|
||||
<g>
|
||||
<use xlink:href="#ma277a096a4" x="267.313719" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mdd114e1862" x="267.313719" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_4">
|
||||
@ -421,7 +421,7 @@ z
|
||||
<g id="xtick_5">
|
||||
<g id="line2d_5">
|
||||
<g>
|
||||
<use xlink:href="#ma277a096a4" x="332.900496" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mdd114e1862" x="332.900496" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_5">
|
||||
@ -477,7 +477,7 @@ z
|
||||
<g id="xtick_6">
|
||||
<g id="line2d_6">
|
||||
<g>
|
||||
<use xlink:href="#ma277a096a4" x="398.487273" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#mdd114e1862" x="398.487273" y="307.584" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_6">
|
||||
@ -663,17 +663,17 @@ z
|
||||
<g id="ytick_1">
|
||||
<g id="line2d_7">
|
||||
<defs>
|
||||
<path id="m40ef1fa380" d="M 0 0
|
||||
<path id="me3e3fbf5f8" d="M 0 0
|
||||
L -3.5 0
|
||||
" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</defs>
|
||||
<g>
|
||||
<use xlink:href="#m40ef1fa380" x="57.6" y="277.153254" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me3e3fbf5f8" x="57.6" y="277.987127" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_8">
|
||||
<!-- 1.7 -->
|
||||
<g transform="translate(34.696875 280.952473) scale(0.1 -0.1)">
|
||||
<g transform="translate(34.696875 281.786345) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
<path id="DejaVuSans-37" d="M 525 4666
|
||||
L 3525 4666
|
||||
@ -695,12 +695,12 @@ z
|
||||
<g id="ytick_2">
|
||||
<g id="line2d_8">
|
||||
<g>
|
||||
<use xlink:href="#m40ef1fa380" x="57.6" y="230.628517" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me3e3fbf5f8" x="57.6" y="224.082766" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_9">
|
||||
<!-- 1.8 -->
|
||||
<g transform="translate(34.696875 234.427736) scale(0.1 -0.1)">
|
||||
<g transform="translate(34.696875 227.881985) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-31"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-38" x="95.410156"/>
|
||||
@ -710,12 +710,12 @@ z
|
||||
<g id="ytick_3">
|
||||
<g id="line2d_9">
|
||||
<g>
|
||||
<use xlink:href="#m40ef1fa380" x="57.6" y="184.103779" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me3e3fbf5f8" x="57.6" y="170.178406" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_10">
|
||||
<!-- 1.9 -->
|
||||
<g transform="translate(34.696875 187.902998) scale(0.1 -0.1)">
|
||||
<g transform="translate(34.696875 173.977624) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
<path id="DejaVuSans-39" d="M 703 97
|
||||
L 703 672
|
||||
@ -757,12 +757,12 @@ z
|
||||
<g id="ytick_4">
|
||||
<g id="line2d_10">
|
||||
<g>
|
||||
<use xlink:href="#m40ef1fa380" x="57.6" y="137.579042" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me3e3fbf5f8" x="57.6" y="116.274045" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_11">
|
||||
<!-- 2.0 -->
|
||||
<g transform="translate(34.696875 141.378261) scale(0.1 -0.1)">
|
||||
<g transform="translate(34.696875 120.073264) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-32"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-30" x="95.410156"/>
|
||||
@ -772,34 +772,19 @@ z
|
||||
<g id="ytick_5">
|
||||
<g id="line2d_11">
|
||||
<g>
|
||||
<use xlink:href="#m40ef1fa380" x="57.6" y="91.054305" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
<use xlink:href="#me3e3fbf5f8" x="57.6" y="62.369685" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_12">
|
||||
<!-- 2.1 -->
|
||||
<g transform="translate(34.696875 94.853523) scale(0.1 -0.1)">
|
||||
<g transform="translate(34.696875 66.168904) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-32"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-31" x="95.410156"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="ytick_6">
|
||||
<g id="line2d_12">
|
||||
<g>
|
||||
<use xlink:href="#m40ef1fa380" x="57.6" y="44.529567" style="stroke: #000000; stroke-width: 0.8"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_13">
|
||||
<!-- 2.2 -->
|
||||
<g transform="translate(34.696875 48.328786) scale(0.1 -0.1)">
|
||||
<use xlink:href="#DejaVuSans-32"/>
|
||||
<use xlink:href="#DejaVuSans-2e" x="63.623047"/>
|
||||
<use xlink:href="#DejaVuSans-32" x="95.410156"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="text_14">
|
||||
<g id="text_13">
|
||||
<!-- $fd$ -->
|
||||
<g transform="translate(28.617188 179.478) rotate(-90) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
@ -862,108 +847,108 @@ z
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_13">
|
||||
<path d="M 73.832727 92.349993
|
||||
L 77.112066 107.170772
|
||||
L 80.391405 122.911009
|
||||
L 83.670744 128.854768
|
||||
L 86.950083 135.68897
|
||||
L 90.229421 142.457777
|
||||
L 93.50876 147.804646
|
||||
L 96.788099 154.397428
|
||||
L 100.067438 160.824813
|
||||
L 103.346777 166.13811
|
||||
L 106.626116 169.49438
|
||||
L 109.905455 176.214958
|
||||
L 113.184793 180.959111
|
||||
L 116.464132 179.155383
|
||||
L 119.743471 186.775392
|
||||
L 123.02281 186.688417
|
||||
L 126.302149 187.711317
|
||||
L 129.581488 192.397225
|
||||
L 132.860826 195.539414
|
||||
L 136.140165 196.633351
|
||||
L 139.419504 199.805471
|
||||
L 142.698843 202.913325
|
||||
L 145.978182 205.815929
|
||||
L 149.257521 208.50004
|
||||
L 152.53686 207.575154
|
||||
L 155.816198 209.216457
|
||||
L 159.095537 210.646845
|
||||
L 162.374876 215.850352
|
||||
L 165.654215 212.794826
|
||||
L 168.933554 217.022991
|
||||
L 172.212893 214.559364
|
||||
L 175.492231 217.509606
|
||||
L 178.77157 216.577744
|
||||
L 182.050909 215.284724
|
||||
L 185.330248 218.536625
|
||||
L 188.609587 219.465333
|
||||
L 191.888926 222.538502
|
||||
L 195.168264 225.708744
|
||||
L 198.447603 224.721037
|
||||
L 201.726942 227.700105
|
||||
L 205.006281 228.433453
|
||||
L 208.28562 226.855003
|
||||
L 211.564959 230.375338
|
||||
L 214.844298 230.226379
|
||||
L 218.123636 231.031237
|
||||
L 221.402975 229.227796
|
||||
L 224.682314 232.985322
|
||||
L 227.961653 232.982453
|
||||
L 231.240992 236.845699
|
||||
L 234.520331 236.374191
|
||||
L 237.799669 238.963677
|
||||
L 241.079008 235.051139
|
||||
L 244.358347 234.950388
|
||||
L 247.637686 234.353118
|
||||
L 250.917025 238.730165
|
||||
L 254.196364 237.457408
|
||||
L 257.475702 237.306577
|
||||
L 260.755041 240.602278
|
||||
L 264.03438 240.941139
|
||||
L 267.313719 240.087458
|
||||
L 270.593058 241.730742
|
||||
L 273.872397 240.640834
|
||||
L 277.151736 242.791568
|
||||
L 280.431074 243.791648
|
||||
L 283.710413 243.536167
|
||||
L 286.989752 247.953371
|
||||
L 290.269091 246.426479
|
||||
L 293.54843 247.547961
|
||||
L 296.827769 246.201802
|
||||
L 300.107107 247.122363
|
||||
L 303.386446 247.094171
|
||||
L 306.665785 248.253221
|
||||
L 309.945124 250.198213
|
||||
L 313.224463 250.298568
|
||||
L 316.503802 251.151877
|
||||
L 319.78314 247.431798
|
||||
L 323.062479 249.63185
|
||||
L 326.341818 249.956887
|
||||
L 329.621157 249.227385
|
||||
L 332.900496 252.824953
|
||||
L 336.179835 254.551788
|
||||
L 339.459174 251.738821
|
||||
L 342.738512 256.003173
|
||||
L 346.017851 255.073938
|
||||
L 349.29719 253.316722
|
||||
L 352.576529 251.645487
|
||||
L 355.855868 253.079834
|
||||
L 359.135207 254.609653
|
||||
L 362.414545 253.700829
|
||||
L 365.693884 255.556309
|
||||
L 368.973223 257.890593
|
||||
L 372.252562 256.854797
|
||||
L 375.531901 259.474832
|
||||
L 378.81124 255.887194
|
||||
L 382.090579 257.468438
|
||||
L 385.369917 257.022012
|
||||
L 388.649256 258.882096
|
||||
L 391.928595 260.300209
|
||||
L 395.207934 262.559889
|
||||
L 398.487273 261.428752
|
||||
" clip-path="url(#p1e54213d91)" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
<g id="line2d_12">
|
||||
<path d="M 73.832727 82.42535
|
||||
L 77.112066 98.1128
|
||||
L 80.391405 115.320876
|
||||
L 83.670744 121.766178
|
||||
L 86.950083 129.276667
|
||||
L 90.229421 136.994267
|
||||
L 93.50876 142.662041
|
||||
L 96.788099 149.921388
|
||||
L 100.067438 156.908601
|
||||
L 103.346777 162.781914
|
||||
L 106.626116 166.567594
|
||||
L 109.905455 173.793136
|
||||
L 113.184793 179.265974
|
||||
L 116.464132 177.203118
|
||||
L 119.743471 185.689992
|
||||
L 123.02281 185.649021
|
||||
L 126.302149 186.441179
|
||||
L 129.581488 191.743071
|
||||
L 132.860826 195.080331
|
||||
L 136.140165 196.227764
|
||||
L 139.419504 199.722782
|
||||
L 142.698843 203.407088
|
||||
L 145.978182 206.432723
|
||||
L 149.257521 209.309124
|
||||
L 152.53686 208.232139
|
||||
L 155.816198 210.11027
|
||||
L 159.095537 211.662058
|
||||
L 162.374876 217.564316
|
||||
L 165.654215 214.116313
|
||||
L 168.933554 218.822877
|
||||
L 172.212893 216.054564
|
||||
L 175.492231 219.31556
|
||||
L 178.77157 218.301831
|
||||
L 182.050909 216.851465
|
||||
L 185.330248 220.518923
|
||||
L 188.609587 221.562581
|
||||
L 191.888926 225.037627
|
||||
L 195.168264 228.300497
|
||||
L 198.447603 227.277126
|
||||
L 201.726942 230.606244
|
||||
L 205.006281 231.3159
|
||||
L 208.28562 229.587588
|
||||
L 211.564959 233.548608
|
||||
L 214.844298 233.38239
|
||||
L 218.123636 234.35127
|
||||
L 221.402975 232.297879
|
||||
L 224.682314 236.49919
|
||||
L 227.961653 236.483192
|
||||
L 231.240992 240.79454
|
||||
L 234.520331 240.36845
|
||||
L 237.799669 243.16664
|
||||
L 241.079008 238.845357
|
||||
L 244.358347 238.854293
|
||||
L 247.637686 238.077729
|
||||
L 250.917025 242.880644
|
||||
L 254.196364 241.352417
|
||||
L 257.475702 241.203509
|
||||
L 260.755041 244.824217
|
||||
L 264.03438 245.202485
|
||||
L 267.313719 244.318664
|
||||
L 270.593058 246.131758
|
||||
L 273.872397 244.932355
|
||||
L 277.151736 247.215673
|
||||
L 280.431074 248.266094
|
||||
L 283.710413 248.075666
|
||||
L 286.989752 252.935403
|
||||
L 290.269091 251.197763
|
||||
L 293.54843 252.600278
|
||||
L 296.827769 251.0596
|
||||
L 300.107107 252.082098
|
||||
L 303.386446 252.157262
|
||||
L 306.665785 253.320593
|
||||
L 309.945124 255.498659
|
||||
L 313.224463 255.663703
|
||||
L 316.503802 256.676634
|
||||
L 319.78314 252.416211
|
||||
L 323.062479 254.803165
|
||||
L 326.341818 255.278607
|
||||
L 329.621157 254.349964
|
||||
L 332.900496 258.287224
|
||||
L 336.179835 260.276893
|
||||
L 339.459174 257.174384
|
||||
L 342.738512 261.823124
|
||||
L 346.017851 260.804684
|
||||
L 349.29719 258.746224
|
||||
L 352.576529 256.906885
|
||||
L 355.855868 258.409636
|
||||
L 359.135207 260.235567
|
||||
L 362.414545 259.216508
|
||||
L 365.693884 261.27376
|
||||
L 368.973223 263.789818
|
||||
L 372.252562 262.577343
|
||||
L 375.531901 265.499244
|
||||
L 378.81124 261.519941
|
||||
L 382.090579 263.342224
|
||||
L 385.369917 262.759325
|
||||
L 388.649256 264.966605
|
||||
L 391.928595 266.435894
|
||||
L 395.207934 269.009223
|
||||
L 398.487273 267.63711
|
||||
" clip-path="url(#pfe185082f7)" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
</g>
|
||||
<g id="patch_3">
|
||||
<path d="M 57.6 307.584
|
||||
@ -1007,7 +992,7 @@ L 267.060625 51.070437
|
||||
z
|
||||
" style="fill: #1f77b4; fill-opacity: 0.2"/>
|
||||
</g>
|
||||
<g id="text_15">
|
||||
<g id="text_14">
|
||||
<!-- Standard error band -->
|
||||
<g transform="translate(295.060625 58.070437) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
@ -1253,13 +1238,13 @@ z
|
||||
<use xlink:href="#DejaVuSans-64" x="948.693359"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="line2d_14">
|
||||
<g id="line2d_13">
|
||||
<path d="M 267.060625 69.248562
|
||||
L 277.060625 69.248562
|
||||
L 287.060625 69.248562
|
||||
" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/>
|
||||
</g>
|
||||
<g id="text_16">
|
||||
<g id="text_15">
|
||||
<!-- fd mean, seeds = 100 -->
|
||||
<g transform="translate(295.060625 72.748562) scale(0.1 -0.1)">
|
||||
<defs>
|
||||
@ -1394,7 +1379,7 @@ z
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="p1e54213d91">
|
||||
<clipPath id="pfe185082f7">
|
||||
<rect x="57.6" y="41.472" width="357.12" height="266.112"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
|
||||
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
@ -17,6 +17,23 @@ def read_xy(path: str):
|
||||
return df.replace([np.inf, -np.inf], np.nan).dropna()
|
||||
|
||||
|
||||
def read_xy_alt(path: str):
|
||||
df = pd.read_csv(path)
|
||||
df['N'] = df.index + 1
|
||||
|
||||
# Find the outermost corner of this object
|
||||
df['r'] = (
|
||||
(df.x.abs() + np.sqrt(0.5)) ** 2 +
|
||||
(df.y.abs() + np.sqrt(0.5)) ** 2
|
||||
) ** 0.5
|
||||
|
||||
df['cr'] = df.r.cummax()
|
||||
df['fd'] = np.log(df.N) / np.log(df.cr)
|
||||
df['run'] = os.path.splitext(Path(path).name)[0]
|
||||
|
||||
return df
|
||||
|
||||
|
||||
def read_xyz(path: str):
|
||||
df = pd.read_csv(path)
|
||||
df['N'] = df.index + 1
|
||||
@ -46,7 +63,7 @@ def read_xyz_alt(path: str):
|
||||
return df
|
||||
|
||||
|
||||
def read_load(load_dir: str, reader=read_xy):
|
||||
def read_load(load_dir: str, reader=read_xy_alt):
|
||||
paths = glob(f'{load_dir}/*.csv')
|
||||
return pd.concat([reader(path) for path in paths])
|
||||
|
||||
|
||||
268
tools/diff-image
Executable file
268
tools/diff-image
Executable file
@ -0,0 +1,268 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
usage()
|
||||
{
|
||||
echo "Usage: $0 [<options>] <file1> <file2>"
|
||||
echo
|
||||
echo "Options:"
|
||||
echo " -h Print this help."
|
||||
echo " -b <color> Use this as the background color; defaults to white."
|
||||
echo " -c <color> Highlight differences with this color; defaults to red."
|
||||
echo " -e Show Exif differences only; don't compare the image data."
|
||||
echo " -f <fuzz> Use the specified percentage of fuzz. Defaults to "
|
||||
echo " 5% for JPEGs, zero otherwise."
|
||||
echo " -n <name> The name to give the first file."
|
||||
echo " -N <name> The name to give the second file."
|
||||
echo " -o <path> Output pathname to save diff instead of showing it"
|
||||
echo
|
||||
}
|
||||
|
||||
|
||||
backgroundcolor=
|
||||
color=
|
||||
exif_only=false
|
||||
fuzz=
|
||||
name1=
|
||||
name2=
|
||||
outputPath=
|
||||
|
||||
while getopts "hb:c:ef:n:N:o:" opt
|
||||
do
|
||||
case "$opt" in
|
||||
h)
|
||||
usage
|
||||
exit 0
|
||||
;;
|
||||
b)
|
||||
backgroundcolor="$OPTARG"
|
||||
;;
|
||||
c)
|
||||
color="$OPTARG"
|
||||
;;
|
||||
e)
|
||||
exif_only=true
|
||||
;;
|
||||
f)
|
||||
fuzz="$OPTARG"
|
||||
;;
|
||||
n)
|
||||
name1="$OPTARG"
|
||||
;;
|
||||
N)
|
||||
name2="$OPTARG"
|
||||
;;
|
||||
o)
|
||||
outputPath="$OPTARG"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
shift $(( OPTIND - 1 ))
|
||||
|
||||
|
||||
if [ -z "${1-}" ] || [ -z "${2-}" ]
|
||||
then
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
f1="$1"
|
||||
f2="$2"
|
||||
|
||||
if [[ "$f1" != '/dev/null' ]] && [[ ! -f "$f1" ]]
|
||||
then
|
||||
echo "$f1: No such file." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -d "$f2" ]]
|
||||
then
|
||||
f=$(basename "$f1")
|
||||
f2="$f2/$f"
|
||||
fi
|
||||
|
||||
if [[ "$f2" != '/dev/null' ]] && [[ ! -f "$f2" ]]
|
||||
then
|
||||
echo "$f2: No such file." >&2
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z "$name1" ]]
|
||||
then
|
||||
name1="$f1"
|
||||
fi
|
||||
if [[ -z "$name2" ]]
|
||||
then
|
||||
name2="$f2"
|
||||
fi
|
||||
|
||||
ext="${name1##*.}"
|
||||
|
||||
|
||||
if diff "$f1" "$f2" >/dev/null
|
||||
then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
exif()
|
||||
{
|
||||
if [[ "$1" = /dev/null ]]
|
||||
then
|
||||
echo /dev/null
|
||||
return
|
||||
fi
|
||||
|
||||
local b="$(basename "$1")"
|
||||
local d="$(mktemp -t "$b.XXXXXX")"
|
||||
|
||||
exiftool "$1" | grep -v 'File Name' | \
|
||||
grep -v 'Directory' | \
|
||||
grep -v 'ExifTool Version Number' | \
|
||||
grep -v 'File Inode Change' | \
|
||||
grep -v 'File Access Date/Time' | \
|
||||
grep -v 'File Modification Date/Time' | \
|
||||
grep -v 'File Permissions' | \
|
||||
grep -v 'File Type Extension' | \
|
||||
sort \
|
||||
>"$d"
|
||||
echo "$d"
|
||||
}
|
||||
|
||||
|
||||
diff_clean_names()
|
||||
{
|
||||
diff -u "$1" --label "$name1" "$2" --label "$name2" || true
|
||||
}
|
||||
|
||||
|
||||
exifdiff=
|
||||
if which exiftool > /dev/null
|
||||
then
|
||||
d1="$(exif "$f1")"
|
||||
d2="$(exif "$f2")"
|
||||
diff_clean_names "$d1" "$d2"
|
||||
set +e
|
||||
diff -q "$d1" "$d2" >/dev/null
|
||||
exifdiff=$?
|
||||
set -e
|
||||
else
|
||||
diff_clean_names "$f1" "$f2"
|
||||
fi
|
||||
|
||||
if $exif_only
|
||||
then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if \
|
||||
! which compare > /dev/null || \
|
||||
! which montage > /dev/null
|
||||
then
|
||||
echo 'ImageMagick is not installed.' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ $exifdiff = 0 ]] && compare "$f1" "$f2" /dev/null
|
||||
then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
bn="$(basename "$f1")"
|
||||
destfile="$(mktemp -t "$bn.XXXXXX").png"
|
||||
|
||||
if [ -z "$fuzz" ] && ( [ "$ext" = "jpeg" ] || [ "$ext" = "jpg" ] )
|
||||
then
|
||||
fuzz='5'
|
||||
fi
|
||||
|
||||
backgroundcolor_flag=
|
||||
if [ -n "$backgroundcolor" ]
|
||||
then
|
||||
backgroundcolor_flag="-background $backgroundcolor"
|
||||
fi
|
||||
|
||||
color_flag=
|
||||
if [ -n "$color" ]
|
||||
then
|
||||
color_flag="-highlight-color $color"
|
||||
fi
|
||||
|
||||
fuzz_flag=
|
||||
if [ -n "$fuzz" ]
|
||||
then
|
||||
fuzz_flag="-fuzz $fuzz%"
|
||||
fi
|
||||
|
||||
density_flag=
|
||||
do_compare()
|
||||
{
|
||||
compare $density_flag $color_flag $fuzz_flag $backgroundcolor_flag "$f1" "$f2" png:- | \
|
||||
montage $density_flag -geometry +4+4 $backgroundcolor_flag "$f1" - "$f2" png:- >"$destfile" 2>/dev/null || true
|
||||
}
|
||||
|
||||
if which xdg-open > /dev/null
|
||||
then
|
||||
# Get width and height of each input image.
|
||||
f1_width="$(exiftool -S -ImageWidth "$f1" | cut -d' ' -f2)"
|
||||
f2_width="$(exiftool -S -ImageWidth "$f2" | cut -d' ' -f2)"
|
||||
f1_height="$(exiftool -S -ImageHeight "$f1" | cut -d' ' -f2)"
|
||||
f2_height="$(exiftool -S -ImageHeight "$f2" | cut -d' ' -f2)"
|
||||
# find the max of each.
|
||||
if (( $(echo "$f1_width > $f2_width" |bc -l) )); then
|
||||
max_file_width=$f1_width
|
||||
else
|
||||
max_file_width=$f2_width
|
||||
fi
|
||||
if (( $(echo "$f1_height > $f2_height" |bc -l) )); then
|
||||
max_file_height=$f1_height
|
||||
else
|
||||
max_file_height=$f2_height
|
||||
fi
|
||||
screen_width="$(xdpyinfo | grep dimensions | sed -e 's/.* \([^ ]*\)x\([^ ]*\) pixels.*/\1/')"
|
||||
screen_height="$(xdpyinfo | grep dimensions | sed -e 's/.* \([^ ]*\)x\([^ ]*\) pixels.*/\2/')"
|
||||
resolution_width="$(xdpyinfo | grep resolution | sed -e 's/.* \([^ ]*\)x\([^ ]*\) dots per inch.*/\1/')"
|
||||
resolution_height="$(xdpyinfo | grep resolution | sed -e 's/.* \([^ ]*\)x\([^ ]*\) dots per inch.*/\2/')"
|
||||
# Assume that the combined size will be the same as the maximum of
|
||||
# each. Add 100 pixels on each side for the window borders.
|
||||
montage_width=$( echo "$f1_width + $max_file_width + $f2_width + 100" |bc -l )
|
||||
montage_height=$( echo "$f1_height + $max_file_height + $f2_height + 100" |bc -l )
|
||||
# Select the most limiting (lowest) density.
|
||||
if (( $(echo "($resolution_width / $montage_width * $screen_width) < ($resolution_height / $montage_height * $screen_height)" |bc -l) )); then
|
||||
density=$( echo "$resolution_width / $montage_width * $screen_width" |bc -l )
|
||||
else
|
||||
density=$( echo "$resolution_height / $montage_height * $screen_height" |bc -l )
|
||||
fi
|
||||
|
||||
# If the density needed is less than either of the inputs, use it.
|
||||
if (( $(echo "$density < $resolution_width || $density < $resolution_height" |bc -l) )); then
|
||||
density_flag="-density $density"
|
||||
fi
|
||||
|
||||
do_compare
|
||||
if [ -n "$outputPath" ]
|
||||
then
|
||||
echo "Copy diff image to $outputPath"
|
||||
cp "$destfile" "$outputPath"
|
||||
else
|
||||
xdg-open "$destfile"
|
||||
fi
|
||||
else
|
||||
w=$(exiftool -p '$ImageWidth' "$f1" || true)
|
||||
if [[ $w -ge 10000 ]]
|
||||
then
|
||||
cp "$f1" "$destfile"
|
||||
exec open "$destfile" "$f2"
|
||||
else
|
||||
do_compare
|
||||
if [ -n "$outputPath" ]
|
||||
then
|
||||
echo "Copy diff image to $outputPath"
|
||||
cp "$destfile" "$outputPath"
|
||||
else
|
||||
exec open "$destfile"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
Loading…
Reference in New Issue
Block a user