Fix incorrect seam allowance.

This commit is contained in:
Roman Telezhynskyi 2022-07-15 17:21:56 +03:00
parent 62f84c06a5
commit be430f8c7e
30 changed files with 2148 additions and 1848 deletions

View File

@ -1063,7 +1063,7 @@ QVector<QPointF> VAbstractPiece::Equidistant(QVector<VSAPoint> points, qreal wid
if (width < 0)
{
qDebug()<<"Width < 0.";
return QVector<QPointF>();
return {};
}
width = qMax(width, VSAPoint::minSAWidth);
@ -1078,7 +1078,7 @@ QVector<QPointF> VAbstractPiece::Equidistant(QVector<VSAPoint> points, qreal wid
const QString errorMsg = tr("Piece '%1'. Not enough points to build seam allowance.").arg(name);
VAbstractApplication::VApp()->IsPedantic() ? throw VException(errorMsg) :
qWarning() << VAbstractValApplication::warningMessageSignature + errorMsg;
return QVector<QPointF>();
return {};
}
if (ConstLast(points).toPoint() != ConstFirst(points).toPoint())

View File

@ -247,11 +247,14 @@ QVector<T> VAbstractPiece::RemoveDublicates(const QVector<T> &points, bool remov
p.append(ConstFirst(points));
// Default accuracy is not enough
constexpr qreal accuracy = (0.5/*mm*/ / 25.4) * PrintDPI;
for (int i = 0; i < points.size(); ++i)
{
for (int j = i+1; j < points.size(); ++j)
{
if (not VFuzzyComparePoints(points.at(i), points.at(j)))
if (not VFuzzyComparePoints(points.at(i), points.at(j), accuracy))
{
p.append(points.at(j));
i = j-1;
@ -266,7 +269,7 @@ QVector<T> VAbstractPiece::RemoveDublicates(const QVector<T> &points, bool remov
{
// Path can't be closed
// See issue #686
if (VFuzzyComparePoints(ConstFirst(p), ConstLast(p)))
if (VFuzzyComparePoints(ConstFirst(p), ConstLast(p), accuracy))
{
p.removeLast();
}

View File

@ -2,18 +2,8 @@
"vector": [
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.69715639185932
"x": -815.5965354330709,
"y": -46.674417477891
},
{
"type": "QPointF",
@ -102,18 +92,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +107,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +117,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -217,28 +207,13 @@
},
{
"type": "QPointF",
"x": -818.0929557813755,
"y": 371.2795759163598
"x": -815.5965354330709,
"y": 371.9998875942574
},
{
"type": "QPointF",
"x": -823.6929755287612,
"y": 369.27180555079025
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -815.5965354330709,
"y": -46.674417477891
}
]
}

View File

@ -2,13 +2,13 @@
"vector": [
{
"type": "QPointF",
"x": -941.4607963790727,
"y": 276.12689835165446
"x": -947.2972331766374,
"y": 289.2203760039845
},
{
"type": "QPointF",
"x": -797.7132813112017,
"y": -48.52244559084082
"x": -798.0818654565176,
"y": -48.48343672425784
},
{
"type": "QPointF",
@ -97,18 +97,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -117,8 +112,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -127,83 +122,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -222,18 +222,13 @@
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
"x": -830.3240189199333,
"y": 366.2903226290697
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -941.4607963790727,
"y": 276.12689835165446
"x": -947.2972331766374,
"y": 289.2203760039845
}
]
}

View File

@ -2,18 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -814.7149606299213,
"y": 372.2542552635805
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
"x": -815.5965354330709,
"y": 330.73235512986395
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.69715639185932
"x": -815.5965354330709,
"y": -46.674417477891
},
{
"type": "QPointF",
@ -102,18 +102,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +117,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +127,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -217,28 +217,8 @@
},
{
"type": "QPointF",
"x": -818.0929557813755,
"y": 371.2795759163598
},
{
"type": "QPointF",
"x": -823.6929755287612,
"y": 369.27180555079025
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -814.7149606299213,
"y": 372.2542552635805
}
]
}

View File

@ -7,13 +7,13 @@
},
{
"type": "QPointF",
"x": -925.5802587835234,
"y": 240.26119236421624
"x": -931.807697294311,
"y": 254.16450069585994
},
{
"type": "QPointF",
"x": -797.7132813112017,
"y": -48.52244559084082
"x": -798.0818654565176,
"y": -48.48343672425784
},
{
"type": "QPointF",
@ -102,18 +102,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +117,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +127,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",

View File

@ -2,18 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -857.1852307228518,
"y": 348.5923207994125
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
"x": -815.5965354330709,
"y": 330.7323551298638
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.69715639185932
"x": -815.5965354330709,
"y": -46.674417477891
},
{
"type": "QPointF",
@ -102,18 +102,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +117,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +127,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -227,18 +227,13 @@
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
"x": -830.3240189199333,
"y": 366.2903226290697
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -857.1852307228518,
"y": 348.5923207994125
}
]
}

View File

@ -2,18 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": -957.6750155239142,
"y": 262.8104036603184
"x": -957.9068567017657,
"y": 282.2300310434755
},
{
"type": "QPointF",
"x": -925.5802587835236,
"y": 240.26119236421533
"x": -931.8076972943111,
"y": 254.16450069585898
},
{
"type": "QPointF",
"x": -797.7132813112017,
"y": -48.52244559084082
"x": -798.0818654565176,
"y": -48.48343672425784
},
{
"type": "QPointF",
@ -102,18 +102,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +117,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +127,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -227,18 +227,13 @@
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
"x": -830.3240189199333,
"y": 366.2903226290697
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -957.6750155239142,
"y": 262.8104036603184
"x": -957.9068567017657,
"y": 282.2300310434755
}
]
}

View File

@ -2,18 +2,8 @@
"vector": [
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.69715639185932
"x": -815.5965354330709,
"y": -46.674417477891
},
{
"type": "QPointF",
@ -102,18 +92,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +107,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +117,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -217,28 +207,13 @@
},
{
"type": "QPointF",
"x": -818.0929557813755,
"y": 371.2795759163598
"x": -815.5965354330709,
"y": 371.9998875942574
},
{
"type": "QPointF",
"x": -823.6929755287612,
"y": 369.27180555079025
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -815.5965354330709,
"y": -46.674417477891
}
]
}

View File

@ -2,13 +2,13 @@
"vector": [
{
"type": "QPointF",
"x": -1086.319675233741,
"y": 603.286223243
"x": -1056.1954258619298,
"y": 535.6784682965732
},
{
"type": "QPointF",
"x": -797.7132813112017,
"y": -48.52244559084082
"x": -798.0818654565176,
"y": -48.48343672425784
},
{
"type": "QPointF",
@ -97,18 +97,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -117,8 +112,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -127,93 +122,98 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -807.3585969245805,
"y": 374.1796788445591
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
"x": -1086.319675233741,
"y": 603.286223243
"x": -810.1810632465665,
"y": 373.5624561175904
},
{
"type": "QPointF",
"x": -1056.1954258619298,
"y": 535.6784682965732
}
]
}

View File

@ -2,18 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -836.3908830779596,
"y": 362.2930579577354
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
"x": -815.5965354330709,
"y": 330.732355129864
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.69715639185932
"x": -815.5965354330709,
"y": -46.674417477891
},
{
"type": "QPointF",
@ -102,18 +102,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +117,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +127,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -227,18 +227,13 @@
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
"x": -830.3240189199333,
"y": 366.2903226290697
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -836.3908830779596,
"y": 362.2930579577354
}
]
}

View File

@ -2,18 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": -949.5679059514944,
"y": 269.4686510059864
"x": -952.6020449392,
"y": 285.72520352373
},
{
"type": "QPointF",
"x": -925.5802587835218,
"y": 240.2611923642134
"x": -931.8076972943066,
"y": 254.16450069585156
},
{
"type": "QPointF",
"x": -797.7132813112017,
"y": -48.52244559084082
"x": -798.0818654565176,
"y": -48.48343672425784
},
{
"type": "QPointF",
@ -102,18 +102,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +117,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +127,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -227,18 +227,13 @@
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
"x": -830.3240189199333,
"y": 366.2903226290697
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -949.5679059514944,
"y": 269.4686510059864
"x": -952.6020449392,
"y": 285.72520352373
}
]
}

View File

@ -2,18 +2,13 @@
"vector": [
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -815.5965354330709,
"y": 28.923105387765915
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.69715639185932
"x": -815.5965354330709,
"y": -46.674417477891
},
{
"type": "QPointF",
@ -47,8 +42,8 @@
},
{
"type": "QPointF",
"x": -631.5852394687809,
"y": -90.99511806183605
"x": -631.4401659175292,
"y": -90.77191564053457
},
{
"type": "QPointF",
@ -102,18 +97,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -122,8 +112,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -132,83 +122,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -217,28 +212,13 @@
},
{
"type": "QPointF",
"x": -818.0929557813755,
"y": 371.2795759163598
"x": -814.7149606299213,
"y": 372.2542552635805
},
{
"type": "QPointF",
"x": -823.6929755287612,
"y": 369.27180555079025
},
{
"type": "QPointF",
"x": -829.5753368833404,
"y": 366.62694879394627
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
"x": -815.5965354330709,
"y": 28.923105387765915
}
]
}

View File

@ -2,13 +2,13 @@
"vector": [
{
"type": "QPointF",
"x": -831.5531621884527,
"y": 27.903885123156257
"x": -831.8430732289739,
"y": 27.924836507053584
},
{
"type": "QPointF",
"x": -797.7132813112017,
"y": -48.52244559084082
"x": -798.0818654565176,
"y": -48.48343672425784
},
{
"type": "QPointF",
@ -42,8 +42,8 @@
},
{
"type": "QPointF",
"x": -631.8008980267215,
"y": -91.35633060009329
"x": -631.8055148117791,
"y": -91.36450012929774
},
{
"type": "QPointF",
@ -97,18 +97,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -117,8 +112,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -127,83 +122,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -222,8 +222,8 @@
},
{
"type": "QPointF",
"x": -831.5531621884527,
"y": 27.903885123156257
"x": -831.8430732289739,
"y": 27.924836507053584
}
]
}

View File

@ -47,18 +47,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -67,8 +62,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -77,83 +72,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -177,23 +177,13 @@
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
"x": -853.9227948909871,
"y": 352.053679699833
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.697156391859295
"x": -811.5379953513618,
"y": -47.0593158485711
},
{
"type": "QPointF",

View File

@ -52,18 +52,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -72,8 +67,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -82,83 +77,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -182,23 +182,13 @@
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
"x": -853.9227948909871,
"y": 352.053679699833
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.697156391859295
"x": -811.5379953513618,
"y": -47.0593158485711
},
{
"type": "QPointF",

View File

@ -2,8 +2,8 @@
"vector": [
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.78021234074653
"x": -811.5266694123162,
"y": -47.16596562653473
},
{
"type": "QPointF",
@ -97,18 +97,13 @@
},
{
"type": "QPointF",
"x": -247.36754301589642,
"y": 354.40670968863236
"x": -247.4259188169727,
"y": 355.684725526716
},
{
"type": "QPointF",
"x": -268.81339627908176,
"y": 365.98652087653426
},
{
"type": "QPointF",
"x": -274.5095925153328,
"y": 368.5444651427917
"x": -274.1103616347323,
"y": 368.39650194198157
},
{
"type": "QPointF",
@ -117,8 +112,8 @@
},
{
"type": "QPointF",
"x": -287.39383270204445,
"y": 372.87515785586334
"x": -285.6974576466219,
"y": 372.38739828360394
},
{
"type": "QPointF",
@ -127,83 +122,88 @@
},
{
"type": "QPointF",
"x": -309.89377622824026,
"y": 377.93937224400145
"x": -308.3295870292442,
"y": 377.6522566136316
},
{
"type": "QPointF",
"x": -324.3767295101649,
"y": 380.2653300530379
"x": -323.20961073643133,
"y": 380.0950323212031
},
{
"type": "QPointF",
"x": -340.2009018235332,
"y": 382.3115147150371
"x": -339.2933747725014,
"y": 382.20466538395215
},
{
"type": "QPointF",
"x": -357.3015804224907,
"y": 384.10843195749214
"x": -356.571621703457,
"y": 384.0385765592796
},
{
"type": "QPointF",
"x": -394.4224543531813,
"y": 386.9889713429367
"x": -374.97963878344376,
"y": 385.6272715746786
},
{
"type": "QPointF",
"x": -435.9520270040894,
"y": 389.07661798449516
"x": -414.7876067251059,
"y": 388.13579550460213
},
{
"type": "QPointF",
"x": -480.15529936788164,
"y": 390.3673559353522
"x": -457.7859582653625,
"y": 389.818484035946
},
{
"type": "QPointF",
"x": -525.9503830211974,
"y": 390.90684349642925
"x": -502.9230721502445,
"y": 390.728524359008
},
{
"type": "QPointF",
"x": -572.2222728858704,
"y": 390.7329321107656
"x": -549.0970864147907,
"y": 390.9068680348474
},
{
"type": "QPointF",
"x": -617.8429427582322,
"y": 389.87963542037477
"x": -595.1846601171007,
"y": 390.3891909827686
},
{
"type": "QPointF",
"x": -661.6840517509004,
"y": 388.3781346110808
"x": -640.0561486385066,
"y": 389.208081776043
},
{
"type": "QPointF",
"x": -702.630213618707,
"y": 386.255904969502
"x": -682.5877079123347,
"y": 387.3931112039713
},
{
"type": "QPointF",
"x": -739.6019742862287,
"y": 383.5327301728105
"x": -721.6778577696439,
"y": 384.9687413227849
},
{
"type": "QPointF",
"x": -772.4984867981542,
"y": 380.09530156453326
"x": -756.2820913691256,
"y": 381.94700726179155
},
{
"type": "QPointF",
"x": -786.7031623321698,
"y": 378.11617548261546
"x": -771.6116072858362,
"y": 380.2069813195123
},
{
"type": "QPointF",
"x": -799.6540182965299,
"y": 375.86453190867064
"x": -785.5087261025127,
"y": 378.3004611599152
},
{
"type": "QPointF",
"x": -797.9392812498397,
"y": 376.198189302873
},
{
"type": "QPointF",
@ -227,23 +227,13 @@
},
{
"type": "QPointF",
"x": -835.8151397150936,
"y": 362.8920896668543
"x": -853.9227948909871,
"y": 352.053679699833
},
{
"type": "QPointF",
"x": -838.7026077978918,
"y": 360.52065549216434
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": 331.31319685039375
},
{
"type": "QPointF",
"x": -815.2818897637795,
"y": -46.78021234074653
"x": -811.5266694123162,
"y": -47.16596562653473
}
]
}

View File

@ -2,13 +2,13 @@
"vector": [
{
"type": "VSAPoint",
"x": -2156.8299086198917,
"y": -1158.1589877154822
"x": -2156.977007454767,
"y": -1158.1060618158292
},
{
"type": "VSAPoint",
"x": -2156.8299086198917,
"y": -1158.1589877154822
"x": -2156.977007454767,
"y": -1158.1060618158292
},
{
"angle": 6,
@ -336,170 +336,170 @@
{
"angle": 6,
"type": "VSAPoint",
"x": -1862.1173247182855,
"y": -305.5597287233503
"x": -1862.117267293463,
"y": -305.55979764283995
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1879.5350971045639,
"y": -296.74677456948064
"x": -1879.534393650491,
"y": -296.74761883322964
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1894.97918940723,
"y": -287.1824141888054
"x": -1894.9772800318883,
"y": -287.18470576183853
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1908.6664259498061,
"y": -276.92620597191535
"x": -1908.6628368984125,
"y": -276.93051344002276
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1920.8136310558161,
"y": -266.0377083094013
"x": -1920.8079747108195,
"y": -266.0444968791385
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1931.6376290487833,
"y": -254.57647959185377
"x": -1931.6296039298668,
"y": -254.58611109054183
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1941.355244252231,
"y": -242.60207820986355
"x": -1941.344635016311,
"y": -242.61481108558894
},
{
"type": "VSAPoint",
"x": -1943.005300247141,
"y": -240.27915229902752
"x": -1943.0045700947767,
"y": -240.2778715824784
},
{
"type": "VSAPoint",
"x": -1943.005300247141,
"y": -240.27915229902752
"x": -1943.0045700947767,
"y": -240.2778715824784
},
{
"type": "VSAPoint",
"x": -1943.005300247141,
"y": -240.27915229902752
"x": -1943.0045700947767,
"y": -240.2778715824784
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1950.1833009896823,
"y": -230.1740625540214
"x": -1950.169978430909,
"y": -230.19005187563596
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1962.2752043869723,
"y": -210.84988607337476
"x": -1962.2577472409937,
"y": -210.870837598249
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1977.195858948178,
"y": -183.98686980566714
"x": -1977.1732335681927,
"y": -184.01402408461598
},
{
"angle": 6,
"type": "VSAPoint",
"x": -1992.461117468819,
"y": -156.38144747318444
"x": -1992.4343575016283,
"y": -156.41356395539296
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2005.2853042799093,
"y": -135.4796581048908
"x": -2005.256606224966,
"y": -135.51410061987724
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2014.8025689362314,
"y": -121.5668303194985
"x": -2014.7732248520372,
"y": -121.60204817874421
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2019.9946087699598,
"y": -114.64227284447125
"x": -2019.9652072609433,
"y": -114.67755962320668
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2025.5708476604545,
"y": -107.6392404367361
"x": -2025.542364948595,
"y": -107.67342450363606
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2041.0440391256577,
"y": -91.8224981894505
"x": -2041.0214137456724,
"y": -91.84965246839926
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2055.0381782994405,
"y": -79.79014057801157
"x": -2055.020721153462,
"y": -79.81109210288574
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2072.180323419328,
"y": -67.3653915263489
"x": -2072.16837905629,
"y": -67.37972678021018
},
{
"type": "VSAPoint",
"x": -2086.4100710715898,
"y": -58.78881061616937
"x": -2086.396726689685,
"y": -58.80156844441596
},
{
"type": "VSAPoint",
"x": -2086.4100710715898,
"y": -58.78881061616937
"x": -2086.396726689685,
"y": -58.80156844441596
},
{
"type": "VSAPoint",
"x": -2086.4100710715898,
"y": -58.78881061616937
"x": -2086.396726689685,
"y": -58.80156844441596
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2092.4656708107664,
"y": -55.372309247519084
"x": -2092.458894681735,
"y": -55.38044174730577
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2109.8374805046105,
"y": -47.215056647037734
"x": -2109.833891453217,
"y": -47.21936411514508
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2122.3330524590992,
"y": -42.31482016198807
"x": -2122.3311430837584,
"y": -42.317111735021186
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2135.6117229145393,
"y": -37.98603311499098
"x": -2135.6110194604657,
"y": -37.98687737874003
},
{
"angle": 6,
"type": "VSAPoint",
"x": -2149.672891411611,
"y": -34.33170278267855
"x": -2149.6728339867886,
"y": -34.33177170216827
},
{
"type": "VSAPoint",

View File

@ -2,18 +2,18 @@
"vector": [
{
"type": "QPointF",
"x": -2165.385424573768,
"y": -1195.2534638392945
"x": -2165.5230070748394,
"y": -1195.203893497471
},
{
"type": "QPointF",
"x": -2158.364241613096,
"y": -1197.537569688092
"x": -2159.656181390153,
"y": -1197.1196600534631
},
{
"type": "QPointF",
"x": -2117.551298201531,
"y": -1210.8146888395456
"x": -2119.2660186265457,
"y": -1210.3087553449043
},
{
"type": "QPointF",
@ -32,38 +32,38 @@
},
{
"type": "QPointF",
"x": -1999.5159517577238,
"y": -1235.2925715725582
"x": -2000.7720676634235,
"y": -1235.123481062411
},
{
"type": "QPointF",
"x": -1967.527727293887,
"y": -1239.0335034446366
"x": -1968.7530433918066,
"y": -1238.9096357786952
},
{
"type": "QPointF",
"x": -1933.0956581345815,
"y": -1241.9298024790799
"x": -1934.276180505223,
"y": -1241.8484543045458
},
{
"type": "QPointF",
"x": -1896.0506375252946,
"y": -1243.8835827573118
"x": -1897.176862759615,
"y": -1243.8405012214678
},
{
"type": "QPointF",
"x": -1856.2700265374328,
"y": -1244.797931233776
"x": -1857.2859834004687,
"y": -1244.7878906108847
},
{
"type": "QPointF",
"x": -1823.3293436753797,
"y": -1244.6474803367735
"x": -1824.9135995733182,
"y": -1244.6863419234678
},
{
"type": "QPointF",
"x": -1801.270222316667,
"y": -1243.6025282481694
"x": -1803.0205578206715,
"y": -1243.7229719810343
},
{
"type": "QPointF",
@ -117,8 +117,13 @@
},
{
"type": "QPointF",
"x": -1592.433553865018,
"y": -1150.9286376239052
"x": -1593.6509385806078,
"y": -1152.054467448629
},
{
"type": "QPointF",
"x": -1581.7841285357254,
"y": -1140.6376333658143
},
{
"type": "QPointF",
@ -147,28 +152,28 @@
},
{
"type": "QPointF",
"x": -1522.4036091395494,
"y": -1046.252179826669
"x": -1523.1058623452752,
"y": -1047.9433160764725
},
{
"type": "QPointF",
"x": -1514.5717321017187,
"y": -1025.9222563900455
"x": -1515.1322333229639,
"y": -1027.4693158094647
},
{
"type": "QPointF",
"x": -1507.4683782139964,
"y": -1004.8046200871603
"x": -1507.9207888672506,
"y": -1006.2369025681319
},
{
"type": "QPointF",
"x": -1501.0852301488674,
"y": -983.0130006883825
"x": -1501.4536691809508,
"y": -984.3565638131766
},
{
"type": "QPointF",
"x": -1495.376021554108,
"y": -960.4554511358866
"x": -1495.722556936548,
"y": -961.9420293149676
},
{
"type": "QPointF",
@ -187,8 +192,8 @@
},
{
"type": "QPointF",
"x": -1476.7146436911478,
"y": -809.9932106818161
"x": -1476.7294502491347,
"y": -811.215979092322
},
{
"type": "QPointF",
@ -202,168 +207,173 @@
},
{
"type": "QPointF",
"x": -1484.217948117173,
"y": -737.1537757721749
"x": -1483.8831958907294,
"y": -738.9896477933227
},
{
"type": "QPointF",
"x": -1490.8757295803644,
"y": -705.2665106804025
"x": -1490.5674483318728,
"y": -706.6230944555641
},
{
"type": "QPointF",
"x": -1499.0539104826737,
"y": -672.178241701873
"x": -1498.7818041073879,
"y": -673.2175331511079
},
{
"type": "QPointF",
"x": -1508.4497515727314,
"y": -638.3137371209444
"x": -1508.1756355670327,
"y": -639.2554363199135
},
{
"type": "QPointF",
"x": -1523.9697357927892,
"y": -587.5233762153806
"x": -1523.6204956340039,
"y": -588.608708480878
},
{
"type": "QPointF",
"x": -1545.712845445419,
"y": -523.3245306458938
"x": -1545.4160042456608,
"y": -524.1684186557045
},
{
"type": "QPointF",
"x": -1566.1548356341827,
"y": -467.3584741326522
"x": -1565.8850885378445,
"y": -468.0746921559055
},
{
"type": "QPointF",
"x": -1589.3590438113763,
"y": -407.6118309532849
"x": -1589.0697995672176,
"y": -408.3347001699124
},
{
"type": "QPointF",
"x": -1598.609971168324,
"y": -385.1653631281647
"x": -1598.6099724133842,
"y": -385.16536010714833
},
{
"type": "QPointF",
"x": -1845.6827116738714,
"y": -271.5173550563447
"x": -1845.68300886284,
"y": -271.5172607451683
},
{
"type": "QPointF",
"x": -1861.019382062914,
"y": -263.7573860996875
"x": -1861.0195624746113,
"y": -263.75774577239144
},
{
"type": "QPointF",
"x": -1873.655653404066,
"y": -255.93187906397046
"x": -1873.6548113143617,
"y": -255.93344510049894
},
{
"type": "QPointF",
"x": -1884.674542722777,
"y": -247.67513397009958
"x": -1884.6718877650587,
"y": -247.67866804967016
},
{
"type": "QPointF",
"x": -1894.4151989393617,
"y": -238.94381581748522
"x": -1894.410120816591,
"y": -238.9500255336163
},
{
"type": "QPointF",
"x": -1903.184757419558,
"y": -229.6579756354422
"x": -1903.1768621691442,
"y": -229.66743947443217
},
{
"type": "QPointF",
"x": -1911.2442785982337,
"y": -219.72673844199227
"x": -1911.2333770932817,
"y": -219.73983797804524
},
{
"type": "QPointF",
"x": -1918.7301892347405,
"y": -209.18817742504052
"x": -1918.7162324577712,
"y": -209.2051004909007
},
{
"type": "QPointF",
"x": -1929.7129001033381,
"y": -191.6366112168402
"x": -1929.6945995058259,
"y": -191.65898186889132
},
{
"type": "QPointF",
"x": -1960.2460320011792,
"y": -136.61604524408278
"x": -1959.358542701253,
"y": -138.1249518632531
},
{
"type": "QPointF",
"x": -1974.0904588850167,
"y": -114.14038731710832
"x": -1973.041169681248,
"y": -115.74927061141838
},
{
"type": "QPointF",
"x": -1984.5634596707787,
"y": -98.8935172003726
"x": -1983.5782586194068,
"y": -100.26295403886209
},
{
"type": "QPointF",
"x": -1997.2051328041664,
"y": -82.58752869213653
"x": -1989.7260859457829,
"y": -92.00426257463948
},
{
"type": "QPointF",
"x": -2015.1669643320547,
"y": -64.22689118534491
"x": -1997.176308608974,
"y": -82.62215263779356
},
{
"type": "QPointF",
"x": -2031.5869934545,
"y": -50.10871928937255
"x": -2015.1429098062172,
"y": -64.25542963561085
},
{
"type": "QPointF",
"x": -2051.4273628312376,
"y": -35.72827805087996
"x": -2031.5669911453977,
"y": -50.13170987645992
},
{
"type": "QPointF",
"x": -2074.776055519778,
"y": -21.924087907458294
"x": -2051.4120230364992,
"y": -35.7448564253106
},
{
"type": "QPointF",
"x": -2094.889981957966,
"y": -12.479223979324637
"x": -2074.7655190704963,
"y": -21.934204167892126
},
{
"type": "QPointF",
"x": -2109.565617761303,
"y": -6.724058368119403
"x": -2094.8828475306,
"y": -12.485046768101734
},
{
"type": "QPointF",
"x": -2124.99134854044,
"y": -1.6953392797686782
"x": -2109.560752424014,
"y": -6.727397300348135
},
{
"type": "QPointF",
"x": -2141.1199442289458,
"y": 2.49629077248366
"x": -2124.9886037790247,
"y": -1.696762218666568
},
{
"type": "QPointF",
"x": -2191.958265274672,
"y": 12.91435825472845
"x": -2141.1190007119844,
"y": 2.496032764132394
},
{
"type": "QPointF",
"x": -2269.021795666304,
"y": -1184.1391471617617
"x": -2191.9582442870897,
"y": 12.914684261837335
},
{
"type": "QPointF",
"x": -2165.385424573768,
"y": -1195.2534638392945
"x": -2269.022984105699,
"y": -1184.1576075870253
},
{
"type": "QPointF",
"x": -2165.5230070748394,
"y": -1195.203893497471
}
]
}

View File

@ -67,13 +67,8 @@
},
{
"type": "QPointF",
"x": 284.4072000868026,
"y": -68.45268234011405
},
{
"type": "QPointF",
"x": 284.6164363645234,
"y": -69.30417703672788
"x": 284.4959443876258,
"y": -68.43087536087263
},
{
"type": "QPointF",
@ -167,8 +162,8 @@
},
{
"type": "QPointF",
"x": 1003.1926540422378,
"y": 599.1363247745379
"x": 1003.0419281414149,
"y": 597.870394747796
},
{
"type": "QPointF",

View File

@ -2,8 +2,8 @@
"vector": [
{
"type": "QPointF",
"x": 10.185624773347756,
"y": 2.204598425196849
"x": 2.858911098099826,
"y": 2.2045984251968456
},
{
"type": "QPointF",
@ -93,17 +93,17 @@
{
"type": "QPointF",
"x": 293.1661864923215,
"y": 180.51562637269953
"y": 180.51562637269956
},
{
"type": "QPointF",
"x": 295.67056116540294,
"y": 175.36866212621038
"y": 175.3686621262104
},
{
"type": "QPointF",
"x": 297.03278914138764,
"y": 169.78727745627393
"y": 169.78727745627396
},
{
"type": "QPointF",
@ -120,11 +120,6 @@
"x": 296.9126887137917,
"y": 147.81469899066454
},
{
"type": "QPointF",
"x": 295.9596189912135,
"y": 146.7730393764622
},
{
"type": "QPointF",
"x": 294.21114346945865,
@ -165,11 +160,6 @@
"x": 247.5665032053911,
"y": 159.21880811798434
},
{
"type": "QPointF",
"x": 246.2542887728834,
"y": 160.25987541854803
},
{
"type": "QPointF",
"x": 243.53306498622524,
@ -302,18 +292,13 @@
},
{
"type": "QPointF",
"x": -9.960881193587724,
"y": 42.34587460321338
"x": -9.998651935091887,
"y": 40.33269882581348
},
{
"type": "QPointF",
"x": -6.297329478268652,
"y": 26.037464411020956
},
{
"type": "QPointF",
"x": 10.185624773347756,
"y": 2.204598425196849
"x": 2.858911098099826,
"y": 2.2045984251968456
}
]
}

View File

@ -1,12 +1,148 @@
{
"vector": [
{
"angle": 4,
"saAfter": 37.795275590551185,
"saBefore": 26.45669291338583,
"type": "VSAPoint",
"x": -3124.2446685548284,
"y": -340.15748031496076
},
{
"angle": 4,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -3111.699193070806,
"y": -396.7435550909303
},
{
"type": "VSAPoint",
"x": -2725.3596865816003,
"y": -585.8267716535435
},
{
"saAfter": 37.795275590551185,
"type": "VSAPoint",
"x": -2687.564410991049,
"y": -585.8267716535435
},
{
"saAfter": 37.795275590551185,
"type": "VSAPoint",
"x": -2687.564410991049,
"y": -585.8267716535435
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2686.744083533202,
"y": -584.3112091223634
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2677.584153935651,
"y": -569.337827522347
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2665.147969570406,
"y": -552.0311379883882
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2654.7360691906415,
"y": -539.3394774398887
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2642.6513240904537,
"y": -526.5195113622979
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2629.029301173131,
"y": -514.3745819491517
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2621.628594879396,
"y": -508.88463584200656
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2617.633373633117,
"y": -506.20298598216414
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2607.587562023298,
"y": -500.7572518468842
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2589.350099272166,
"y": -492.64567687392986
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2562.155018309574,
"y": -482.70396253517566
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2536.974474203726,
"y": -474.74917338261656
},
{
"angle": 5,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2527.256410822591,
"y": -472.0553685667312
"x": -2527.248645113392,
"y": -472.00579107008224
},
{
"angle": 5,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2527.248645113392,
"y": -472.00579107008224
},
{
"angle": 5,
@ -250,142 +386,6 @@
"type": "VSAPoint",
"x": -3124.2446685548284,
"y": -340.15748031496076
},
{
"angle": 4,
"saAfter": 37.795275590551185,
"saBefore": 26.45669291338583,
"type": "VSAPoint",
"x": -3124.2446685548284,
"y": -340.15748031496076
},
{
"angle": 4,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -3111.699943251791,
"y": -396.7401714170824
},
{
"type": "VSAPoint",
"x": -2725.3596865816003,
"y": -585.8267716535435
},
{
"saAfter": 37.795275590551185,
"type": "VSAPoint",
"x": -2687.564410991049,
"y": -585.8267716535435
},
{
"saAfter": 37.795275590551185,
"type": "VSAPoint",
"x": -2687.564410991049,
"y": -585.8267716535435
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2686.7442528592233,
"y": -584.3116737525777
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2677.58560358191,
"y": -569.3428170188263
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2665.1502732124804,
"y": -552.0412529412208
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2654.7385639979766,
"y": -539.3532784199779
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2642.6534846020877,
"y": -526.5369475528651
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2629.0304140300964,
"y": -514.3953398593414
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2621.6288162143724,
"y": -508.90682548803926
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2617.633216578171,
"y": -506.2259849672243
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2607.5875815658464,
"y": -500.78291850199804
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2589.3518167947404,
"y": -492.6769341780546
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2562.160275286112,
"y": -482.74399225847844
},
{
"angle": 6,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2536.9822947561124,
"y": -474.79665668016196
},
{
"angle": 5,
"saAfter": 37.795275590551185,
"saBefore": 37.795275590551185,
"type": "VSAPoint",
"x": -2527.256410822591,
"y": -472.0553685667312
}
]
}

View File

@ -1,5 +1,85 @@
{
"vector": [
{
"type": "QPointF",
"x": -3172.1513358684783,
"y": -338.48757438307484
},
{
"type": "QPointF",
"x": -3158.3267929568797,
"y": -361.0450257727724
},
{
"type": "QPointF",
"x": -3148.354391707624,
"y": -406.02530918291706
},
{
"type": "QPointF",
"x": -3111.455103901402,
"y": -397.84451360055175
},
{
"type": "QPointF",
"x": -2725.7472241002715,
"y": -586.6185979003744
},
{
"type": "QPointF",
"x": -2643.5250016445493,
"y": -586.7083464566931
},
{
"type": "QPointF",
"x": -2635.160623357441,
"y": -575.0681444535669
},
{
"type": "QPointF",
"x": -2626.3410373235647,
"y": -564.3174468827575
},
{
"type": "QPointF",
"x": -2616.2745747844374,
"y": -553.638553186361
},
{
"type": "QPointF",
"x": -2605.1461895171597,
"y": -543.7168657561108
},
{
"type": "QPointF",
"x": -2598.0518504254646,
"y": -538.5794217115023
},
{
"type": "QPointF",
"x": -2590.876101008608,
"y": -534.6895196246073
},
{
"type": "QPointF",
"x": -2575.1654239953878,
"y": -527.7017968142784
},
{
"type": "QPointF",
"x": -2549.967896326438,
"y": -518.4903286641326
},
{
"type": "QPointF",
"x": -2533.7261838705895,
"y": -513.3594070478375
},
{
"type": "QPointF",
"x": -2496.3862079979426,
"y": -519.2082581141625
},
{
"type": "QPointF",
"x": -2471.2062472153243,
@ -22,83 +102,83 @@
},
{
"type": "QPointF",
"x": -2553.167799186371,
"y": -294.3428373746984
"x": -2551.964296727414,
"y": -294.69088222251
},
{
"type": "QPointF",
"x": -2579.9225974675223,
"y": -287.3069305434689
"x": -2578.953777574135,
"y": -287.542977929239
},
{
"type": "QPointF",
"x": -2619.990081627151,
"y": -278.3608694684806
"x": -2619.0002014465895,
"y": -278.562608711608
},
{
"type": "QPointF",
"x": -2665.4968144310456,
"y": -269.9954984287601
"x": -2664.8846077056214,
"y": -270.1007234947015
},
{
"type": "QPointF",
"x": -2695.791405702967,
"y": -265.3804184489778
"x": -2694.6820012709004,
"y": -265.51892528449633
},
{
"type": "QPointF",
"x": -2732.0787910936237,
"y": -261.6473418100125
"x": -2731.0429239345062,
"y": -261.73396344539333
},
{
"type": "QPointF",
"x": -2777.197185087822,
"y": -258.7804721011971
"x": -2776.3147226086057,
"y": -258.8220537751141
},
{
"type": "QPointF",
"x": -2830.9306026127674,
"y": -257.1584693256739
"x": -2830.1550514705064,
"y": -257.1706690674935
},
{
"type": "QPointF",
"x": -2885.504465434865,
"y": -257.1465105418511
"x": -2883.937804080391,
"y": -257.10176290390996
},
{
"type": "QPointF",
"x": -2903.932685644061,
"y": -258.24499648326326
"x": -2902.7840412372802,
"y": -258.15295647103284
},
{
"type": "QPointF",
"x": -2932.689494194475,
"y": -261.20525340400195
"x": -2931.5631820092667,
"y": -261.06579927957097
},
{
"type": "QPointF",
"x": -2969.0289823829885,
"y": -266.51212829661677
"x": -2968.1886203459094,
"y": -266.3758834068452
},
{
"type": "QPointF",
"x": -2997.113235349967,
"y": -271.5431281398549
"x": -2996.311844885558,
"y": -271.3871358702711
},
{
"type": "QPointF",
"x": -3049.6785855152784,
"y": -282.75900904833264
"x": -3048.324234419811,
"y": -282.43294631892115
},
{
"type": "QPointF",
"x": -3075.618916688395,
"y": -289.7800926082317
"x": -3074.11111531609,
"y": -289.32628612210004
},
{
"type": "QPointF",
"x": -3093.818214371114,
"y": -295.9157568061722
"x": -3092.1652735988505,
"y": -295.30217792373617
},
{
"type": "QPointF",
@ -107,103 +187,13 @@
},
{
"type": "QPointF",
"x": -3129.342114096473,
"y": -312.2515465102798
"x": -3129.342114096471,
"y": -312.25154651027896
},
{
"type": "QPointF",
"x": -3172.1513358684783,
"y": -338.4875743830751
},
{
"type": "QPointF",
"x": -3158.32679295688,
"y": -361.0450257727725
},
{
"type": "QPointF",
"x": -3148.4422597423313,
"y": -405.6289824602926
},
{
"type": "QPointF",
"x": -3111.5429719361164,
"y": -397.44818687792895
},
{
"type": "QPointF",
"x": -2725.6089100584036,
"y": -586.3359831041486
},
{
"type": "QPointF",
"x": -2687.564410991049,
"y": -586.3937007874017
},
{
"type": "QPointF",
"x": -2654.3265534732623,
"y": -603.8192057466126
},
{
"type": "QPointF",
"x": -2646.077388368299,
"y": -590.2635801166397
},
{
"type": "QPointF",
"x": -2635.165693887321,
"y": -575.0818860522613
},
{
"type": "QPointF",
"x": -2626.3471284741554,
"y": -564.3353572190997
},
{
"type": "QPointF",
"x": -2616.2811919146543,
"y": -553.6603447340499
},
{
"type": "QPointF",
"x": -2605.152528643642,
"y": -543.7418859786677
},
{
"type": "QPointF",
"x": -2598.0578610376156,
"y": -538.6061651952249
},
{
"type": "QPointF",
"x": -2590.883226957164,
"y": -534.7187046100388
},
{
"type": "QPointF",
"x": -2575.1752701573723,
"y": -527.7363568347463
},
{
"type": "QPointF",
"x": -2549.9817887921495,
"y": -518.5332968657749
},
{
"type": "QPointF",
"x": -2533.733248010216,
"y": -513.4045056150975
},
{
"type": "QPointF",
"x": -2496.393272137569,
"y": -519.2533566814225
},
{
"type": "QPointF",
"x": -2471.2062472153243,
"y": -358.4554679618417
"y": -338.48757438307484
}
]
}

View File

@ -2,484 +2,484 @@
"vector": [
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
"x": 712.6495183789233,
"y": 616.8985631548287
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
"x": 712.6495183789233,
"y": 616.8985631548287
},
{
"angle": 6,
"type": "VSAPoint",
"x": 726.8079975280607,
"y": 622.888701781939
"x": 726.8071026249381,
"y": 622.8994219964841
},
{
"angle": 6,
"type": "VSAPoint",
"x": 754.3673278571332,
"y": 635.630828583758
"x": 754.3664564976093,
"y": 635.6407032765856
},
{
"angle": 6,
"type": "VSAPoint",
"x": 781.0280722651629,
"y": 649.2144985332973
"x": 781.0272464738941,
"y": 649.2227367324783
},
{
"angle": 6,
"type": "VSAPoint",
"x": 806.799580767585,
"y": 663.5877413692597
"x": 806.7988210502864,
"y": 663.5936066526531
},
{
"angle": 6,
"type": "VSAPoint",
"x": 831.6912033798346,
"y": 678.6985868303482
"x": 831.6905287232796,
"y": 678.7013973256012
},
{
"angle": 6,
"type": "VSAPoint",
"x": 855.7122901173473,
"y": 694.4950646552657
"x": 855.7117179893664,
"y": 694.4941930398136
},
{
"angle": 6,
"type": "VSAPoint",
"x": 878.872190995558,
"y": 710.925204582715
"x": 878.8717373450409,
"y": 710.9200780837816
},
{
"angle": 6,
"type": "VSAPoint",
"x": 901.180256029902,
"y": 727.9370363513991
"x": 901.1799352867962,
"y": 727.9271367459964
},
{
"angle": 6,
"type": "VSAPoint",
"x": 922.6458352358145,
"y": 745.4785897000208
"x": 922.6456603111258,
"y": 745.4634533149493
},
{
"angle": 6,
"type": "VSAPoint",
"x": 943.278278628731,
"y": 763.4978943672834
"x": 943.2782609145231,
"y": 763.4771120791308
},
{
"angle": 6,
"type": "VSAPoint",
"x": 963.0869362240865,
"y": 781.9429800918895
"x": 963.0870855934813,
"y": 781.9161973270327
},
{
"angle": 6,
"type": "VSAPoint",
"x": 982.0811580373162,
"y": 800.7618766125419
"x": 982.0814828444941,
"y": 800.7287933471456
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1000.2702940838556,
"y": 819.9026136679438
"x": 1000.2708011640545,
"y": 819.8629844279609
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1017.6636943791395,
"y": 839.3132209967978
"x": 1017.6643890486564,
"y": 839.2668548579697
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1042.37878853631,
"y": 868.8039607286885
"x": 1042.379771045306,
"y": 868.7472574049925
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1072.5033748045694,
"y": 908.6207538915453
"x": 1072.5047461626777,
"y": 908.5500858220648
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1099.6133183456423,
"y": 948.5815634448637
"x": 1099.615072477095,
"y": 948.4971488287515
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1123.7834192830105,
"y": 988.2706272982668
"x": 1123.7855379605057,
"y": 988.1731207329817
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1145.088477740156,
"y": 1027.2721833613782
"x": 1145.0909305848566,
"y": 1027.1626758426846
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1163.6032938405606,
"y": 1065.1704695438207
"x": 1163.6060383220954,
"y": 1065.050488465789
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1179.4026677077059,
"y": 1101.5497237552183
"x": 1179.4056491441684,
"y": 1101.4212329102238
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1192.5613994650748,
"y": 1135.994183905194
"x": 1192.5645510230233,
"y": 1135.859583483919
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1203.154289236148,
"y": 1168.0880879033707
"x": 1203.1575319306075,
"y": 1167.9502144948026
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1207.4096833403676,
"y": 1182.9997307219853
"x": 1207.41293413585,
"y": 1182.8615663812132
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1212.022828871306,
"y": 1200.3588500903552
"x": 1212.0260796667885,
"y": 1200.220685749583
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1219.4041899368062,
"y": 1235.235880725122
"x": 1219.4074407322887,
"y": 1235.0977163843497
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1224.3720535154303,
"y": 1270.0050432406642
"x": 1224.3753043109127,
"y": 1269.866878899892
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1226.7046623947076,
"y": 1304.3347616404735
"x": 1226.70791319019,
"y": 1304.1965972997014
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1226.496853277681,
"y": 1329.562335863055
"x": 1226.5001040731636,
"y": 1329.424171522283
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1225.4788193061186,
"y": 1346.086759479433
"x": 1225.482070101601,
"y": 1345.948595138661
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1223.6772332277046,
"y": 1362.3148105688415
"x": 1223.680484023187,
"y": 1362.1766462280693
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1221.0643753908807,
"y": 1378.2050421317176
"x": 1221.0676261863632,
"y": 1378.0668777909455
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1217.612526144088,
"y": 1393.7160071684975
"x": 1217.6157769395704,
"y": 1393.5778428277254
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1213.293965835767,
"y": 1408.8062586796173
"x": 1213.2972166312495,
"y": 1408.668094338845
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1208.0809748143597,
"y": 1423.4343496655133
"x": 1208.0842256098422,
"y": 1423.2961853247411
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1201.945833428307,
"y": 1437.5588331266226
"x": 1201.9490842237894,
"y": 1437.4206687858505
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1194.86082202605,
"y": 1451.1382620633813
"x": 1194.8640728215325,
"y": 1451.000097722609
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1186.79822095603,
"y": 1464.131189476226
"x": 1186.8014717515125,
"y": 1463.9930251354538
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1177.7303105666883,
"y": 1476.4961683655927
"x": 1177.7335613621708,
"y": 1476.3580040248205
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1167.6293712064657,
"y": 1488.1917517319184
"x": 1167.6326220019482,
"y": 1488.0535873911463
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1156.4676832238038,
"y": 1499.1764925756397
"x": 1156.4709340192862,
"y": 1499.0383282348675
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1144.2175269671434,
"y": 1509.408943897192
"x": 1144.2207777626259,
"y": 1509.27077955642
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1130.851182784926,
"y": 1518.847658697013
"x": 1130.8544335804086,
"y": 1518.7094943562408
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1116.3409310255927,
"y": 1527.4511899755385
"x": 1116.3441818210752,
"y": 1527.3130256347663
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1100.6590520375842,
"y": 1535.178090733205
"x": 1100.6623028330666,
"y": 1535.0399263924328
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1083.7778261693425,
"y": 1541.986913970449
"x": 1083.781076964825,
"y": 1541.8487496296768
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1065.6695337693086,
"y": 1547.836212687707
"x": 1065.672784564791,
"y": 1547.698048346935
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1046.3064551859234,
"y": 1552.6845398854152
"x": 1046.3097059814058,
"y": 1552.546375544643
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1025.660870767628,
"y": 1556.4904485640104
"x": 1025.6641215631105,
"y": 1556.3522842232383
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1003.7050608628641,
"y": 1559.212491723929
"x": 1003.7083116583466,
"y": 1559.0743273831567
},
{
"angle": 6,
"type": "VSAPoint",
"x": 980.4113058200722,
"y": 1560.8092223656067
"x": 980.4145566155547,
"y": 1560.6710580248346
},
{
"angle": 6,
"type": "VSAPoint",
"x": 955.751885987694,
"y": 1561.239193489481
"x": 955.7551367831765,
"y": 1561.101029148709
},
{
"angle": 6,
"type": "VSAPoint",
"x": 942.8427542065093,
"y": 1560.9524866274971
"x": 942.8460050019918,
"y": 1560.814322286725
},
{
"angle": 6,
"type": "VSAPoint",
"x": 932.8408996655451,
"y": 1560.5035571702351
"x": 932.8441488737251,
"y": 1560.365465562514
},
{
"angle": 6,
"type": "VSAPoint",
"x": 913.8735721859588,
"y": 1558.1857240870427
"x": 913.8768029417474,
"y": 1558.0484780010388
},
{
"angle": 6,
"type": "VSAPoint",
"x": 896.1053882153979,
"y": 1554.2537835922294
"x": 896.1085832568806,
"y": 1554.1181739998724
},
{
"angle": 6,
"type": "VSAPoint",
"x": 879.4868872941008,
"y": 1548.8075818977768
"x": 879.4900305498402,
"y": 1548.6743452212072
},
{
"angle": 6,
"type": "VSAPoint",
"x": 863.9686089623065,
"y": 1541.9469652156642
"x": 863.9716855513418,
"y": 1541.8167833272355
},
{
"angle": 6,
"type": "VSAPoint",
"x": 849.5010927602539,
"y": 1533.7717797578728
"x": 849.5040889921011,
"y": 1533.6452799801486
},
{
"angle": 6,
"type": "VSAPoint",
"x": 836.0348782281815,
"y": 1524.3818717363822
"x": 836.0377816028334,
"y": 1524.2596268421394
},
{
"angle": 6,
"type": "VSAPoint",
"x": 823.5205049063281,
"y": 1513.8770873631734
"x": 823.5233041142545,
"y": 1513.7596155754
},
{
"angle": 6,
"type": "VSAPoint",
"x": 811.9085123349323,
"y": 1502.3572728502265
"x": 811.9111972570802,
"y": 1502.2450378421222
},
{
"angle": 6,
"type": "VSAPoint",
"x": 801.149440054233,
"y": 1489.9222744095218
"x": 801.1520017620256,
"y": 1489.8156853044984
},
{
"angle": 6,
"type": "VSAPoint",
"x": 791.1938276044689,
"y": 1476.67193825304
"x": 791.1962583598068,
"y": 1476.5713496247208
},
{
"angle": 6,
"type": "VSAPoint",
"x": 781.9922145258788,
"y": 1462.706110592761
"x": 781.9945077811392,
"y": 1462.6118224649813
},
{
"angle": 6,
"type": "VSAPoint",
"x": 773.4951403587014,
"y": 1448.1246376406655
"x": 773.4972907567385,
"y": 1448.036895487472
},
{
"angle": 6,
"type": "VSAPoint",
"x": 765.6531446431753,
"y": 1433.027365608734
"x": 765.65514801732,
"y": 1432.946360354386
},
{
"angle": 6,
"type": "VSAPoint",
"x": 754.9437999982238,
"y": 1409.6660208185863
"x": 754.9455777770032,
"y": 1409.595352749106
},
{
"angle": 6,
"type": "VSAPoint",
"x": 742.5967537599449,
"y": 1377.57483681947
"x": 742.5982267766478,
"y": 1377.5181334957742
},
{
"angle": 6,
"type": "VSAPoint",
"x": 731.9797330525687,
"y": 1345.217688316655
"x": 731.9809060691027,
"y": 1345.1747315395914
},
{
"angle": 6,
"type": "VSAPoint",
"x": 718.3398397741655,
"y": 1297.7142208606672
"x": 718.3405889809369,
"y": 1297.6906838082095
},
{
"angle": 6,
"type": "VSAPoint",
"x": 706.5519873349563,
"y": 1254.5381527444517
"x": 706.5523841605766,
"y": 1254.5307624293077
},
{
"angle": 6,
"type": "VSAPoint",
"x": 698.8982319702905,
"y": 1229.1048431852737
"x": 698.8984430815203,
"y": 1229.105962637092
},
{
"angle": 6,
"type": "VSAPoint",
"x": 690.9960837460767,
"y": 1207.3994176016122
"x": 690.9961615238983,
"y": 1207.4066466297113
},
{
"angle": 6,
"type": "VSAPoint",
"x": 684.6390350732308,
"y": 1194.2074612599308
"x": 684.6390551129246,
"y": 1194.2173359527587
},
{
"angle": 6,
"type": "VSAPoint",
"x": 680.1307128682538,
"y": 1186.8995080395903
"x": 680.1307144555562,
"y": 1186.9102282541355
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
"y": 1183.8276970130964
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
"y": 1183.8276970130964
},
{
"type": "VSAPoint",
"x": 677.76,
"y": 1183.8169040655002
"y": 1183.8276970130964
},
{
"angle": 6,
@ -513,8 +513,8 @@
},
{
"type": "VSAPoint",
"x": 712.6504153073016,
"y": 616.8877702072326
"x": 712.6495183789233,
"y": 616.8985631548287
}
]
}

View File

@ -2,388 +2,393 @@
"vector": [
{
"type": "QPointF",
"x": 679.3851616778779,
"y": 560.5071958351052
"x": 679.3841716061438,
"y": 560.5190335238417
},
{
"type": "QPointF",
"x": 771.5253642394297,
"y": 601.9546553381315
"x": 769.8553508610224,
"y": 601.1649580581737
},
{
"type": "QPointF",
"x": 799.4376087748578,
"y": 616.2058356936133
"x": 798.1836184130696,
"y": 615.5457155036013
},
{
"type": "QPointF",
"x": 826.4126763608873,
"y": 631.2797030782433
"x": 825.2060032227265,
"y": 630.583630865988
},
{
"type": "QPointF",
"x": 852.4578079793142,
"y": 647.1196224652111
"x": 851.3006778666988,
"y": 646.3915705303594
},
{
"type": "QPointF",
"x": 877.5809531604997,
"y": 663.6690296577056
"x": 876.4748810859865,
"y": 662.9129657807447
},
{
"type": "QPointF",
"x": 901.7907248274646,
"y": 680.8715248752063
"x": 900.7365581906681,
"y": 680.0913177072385
},
{
"type": "QPointF",
"x": 925.0963403503594,
"y": 698.6709507275484
"x": 924.0943162464257,
"y": 697.870290567419
},
{
"type": "QPointF",
"x": 947.5075534628146,
"y": 717.0114538453757
"x": 946.5573654918338,
"y": 716.1937896285207
},
{
"type": "QPointF",
"x": 969.0345813622434,
"y": 735.8375305507107
"x": 968.1354516130542,
"y": 735.0060227507894
},
{
"type": "QPointF",
"x": 989.6880307490753,
"y": 755.0940578223057
"x": 988.8387831783768,
"y": 754.2515460828602
},
{
"type": "QPointF",
"x": 1009.4788258609301,
"y": 774.7263114219681
"x": 1008.6779579740884,
"y": 773.8752951086171
},
{
"type": "QPointF",
"x": 1028.4181408179645,
"y": 794.6799734175851
"x": 1027.6638912896856,
"y": 793.8226028959107
},
{
"type": "QPointF",
"x": 1046.6313379043359,
"y": 815.0365143510681
"x": 1045.8077484656164,
"y": 814.0392077680493
},
{
"type": "QPointF",
"x": 1072.5195471519162,
"y": 846.0000679241381
"x": 1071.3430848192243,
"y": 844.4653853149052
},
{
"type": "QPointF",
"x": 1103.2326972486792,
"y": 886.5947879276818
"x": 1103.2303115075101,
"y": 886.5188719299211
},
{
"type": "QPointF",
"x": 1131.8938186908024,
"y": 928.9231770809744
"x": 1130.8885140109408,
"y": 927.2732304441776
},
{
"type": "QPointF",
"x": 1156.952462519591,
"y": 970.1516475329622
"x": 1156.0630248229138,
"y": 968.5097868647616
},
{
"type": "QPointF",
"x": 1179.0478403597917,
"y": 1010.68168766554
"x": 1178.2575077448091,
"y": 1009.0391823478132
},
{
"type": "QPointF",
"x": 1198.2703716433202,
"y": 1050.1146874790124
"x": 1197.5634888958748,
"y": 1048.456079543062
},
{
"type": "QPointF",
"x": 1214.7092455016766,
"y": 1088.0616393306495
"x": 1214.071357228348,
"y": 1086.362297357269
},
{
"type": "QPointF",
"x": 1228.4522431131863,
"y": 1124.1480790942294
"x": 1227.8702729039567,
"y": 1122.3692588239405
},
{
"type": "QPointF",
"x": 1239.498617577997,
"y": 1157.7163641148504
"x": 1239.047985620763,
"y": 1156.1029282705015
},
{
"type": "QPointF",
"x": 1243.9371430484484,
"y": 1173.292643401877
"x": 1243.7572038671706,
"y": 1172.4896372133692
},
{
"type": "QPointF",
"x": 1248.798757776046,
"y": 1191.586744425441
"x": 1248.8020085715284,
"y": 1191.448580084669
},
{
"type": "QPointF",
"x": 1256.6412809572312,
"y": 1228.6427722795033
"x": 1256.6445317527136,
"y": 1228.5046079387312
},
{
"type": "QPointF",
"x": 1261.9854393682826,
"y": 1266.0455530446939
"x": 1261.988690163765,
"y": 1265.9073887039217
},
{
"type": "QPointF",
"x": 1264.5105042440828,
"y": 1303.207705215837
"x": 1264.5137550395652,
"y": 1303.0695408750648
},
{
"type": "QPointF",
"x": 1264.2825490193795,
"y": 1330.8809730344592
"x": 1264.285799814862,
"y": 1330.742808693687
},
{
"type": "QPointF",
"x": 1263.0433176952379,
"y": 1350.2570493662236
"x": 1263.2058227640803,
"y": 1348.27267388639
},
{
"type": "QPointF",
"x": 1261.1324256351706,
"y": 1367.4696901324185
"x": 1261.1356764306531,
"y": 1367.3315257916463
},
{
"type": "QPointF",
"x": 1258.1870795248535,
"y": 1385.3819665165963
"x": 1258.190330320336,
"y": 1385.2438021758242
},
{
"type": "QPointF",
"x": 1254.259895289484,
"y": 1403.028860402362
"x": 1254.2631460849664,
"y": 1402.8906960615898
},
{
"type": "QPointF",
"x": 1249.2997133041586,
"y": 1420.3611166071119
"x": 1249.302964099641,
"y": 1420.2229522663397
},
{
"type": "QPointF",
"x": 1243.2551308267514,
"y": 1437.3227231182614
"x": 1243.2583816222339,
"y": 1437.1845587774892
},
{
"type": "QPointF",
"x": 1236.076406635598,
"y": 1453.8497702928087
"x": 1236.0796574310805,
"y": 1453.7116059520365
},
{
"type": "QPointF",
"x": 1227.7179800037757,
"y": 1469.869880074677
"x": 1227.7212307992581,
"y": 1469.7317157339048
},
{
"type": "QPointF",
"x": 1218.1413963843438,
"y": 1485.3025989639923
"x": 1218.1446471798263,
"y": 1485.1644346232201
},
{
"type": "QPointF",
"x": 1207.318198770456,
"y": 1500.0610829217153
"x": 1207.3214495659386,
"y": 1499.9229185809431
},
{
"type": "QPointF",
"x": 1195.2321442955154,
"y": 1514.05517323754
"x": 1195.2353950909978,
"y": 1513.9170088967678
},
{
"type": "QPointF",
"x": 1181.8800595132454,
"y": 1527.195586343914
"x": 1181.883310308728,
"y": 1527.057422003142
},
{
"type": "QPointF",
"x": 1167.2708519352282,
"y": 1539.3985331681424
"x": 1167.2741027307106,
"y": 1539.2603688273703
},
{
"type": "QPointF",
"x": 1151.4226411637437,
"y": 1550.5898312164527
"x": 1151.4258919592262,
"y": 1550.4516668756805
},
{
"type": "QPointF",
"x": 1134.3585074135146,
"y": 1560.707630059371
"x": 1134.3617582089971,
"y": 1560.5694657185988
},
{
"type": "QPointF",
"x": 1116.1017451381758,
"y": 1569.703247890992
"x": 1116.1049959336583,
"y": 1569.56508355022
},
{
"type": "QPointF",
"x": 1096.6715820282905,
"y": 1577.5401518645901
"x": 1096.674832823773,
"y": 1577.401987523818
},
{
"type": "QPointF",
"x": 1076.0800742491963,
"y": 1584.191573068637
"x": 1076.0833250446788,
"y": 1584.0534087278647
},
{
"type": "QPointF",
"x": 1054.3304683092908,
"y": 1589.63746358464
"x": 1054.3337191047733,
"y": 1589.4992992438679
},
{
"type": "QPointF",
"x": 1031.4169229882777,
"y": 1593.861459342171
"x": 1031.4201737837602,
"y": 1593.7232950013988
},
{
"type": "QPointF",
"x": 1007.3252389313808,
"y": 1596.8483044680145
"x": 1007.3284897268633,
"y": 1596.7101401272423
},
{
"type": "QPointF",
"x": 982.0341722455236,
"y": 1598.5819459982806
"x": 982.037423041006,
"y": 1598.4437816575085
},
{
"type": "QPointF",
"x": 954.9126743758827,
"y": 1599.02515094508
"x": 956.4140495815975,
"y": 1598.8905606473904
},
{
"type": "QPointF",
"x": 929.6966471777685,
"y": 1598.195756755684
"x": 942.0067933901805,
"y": 1598.600279742324
},
{
"type": "QPointF",
"x": 907.483440354716,
"y": 1595.4812728246357
"x": 929.7008654795463,
"y": 1598.0577191905634
},
{
"type": "QPointF",
"x": 886.1127249748149,
"y": 1590.7521242889954
"x": 907.4891444119198,
"y": 1595.344409610129
},
{
"type": "QPointF",
"x": 865.9269655274252,
"y": 1584.136863512658
"x": 886.1199104222235,
"y": 1590.617566553191
},
{
"type": "QPointF",
"x": 846.989714534499,
"y": 1575.764722138622
"x": 865.93535231705,
"y": 1584.0056021881453
},
{
"type": "QPointF",
"x": 829.3502587762655,
"y": 1565.797163078442
"x": 846.9989173644151,
"y": 1575.6375851894622
},
{
"type": "QPointF",
"x": 813.0301529589129,
"y": 1554.417254332673
"x": 829.3598492455591,
"y": 1565.6747898085903
},
{
"type": "QPointF",
"x": 798.0173460754563,
"y": 1541.8152410243486
"x": 813.0397272681538,
"y": 1554.300104854346
},
{
"type": "QPointF",
"x": 784.2682736561633,
"y": 1528.175311182722
"x": 798.0265761495427,
"y": 1541.7036336042645
},
{
"type": "QPointF",
"x": 771.7152579891342,
"y": 1513.6669292169577
"x": 784.2769305984903,
"y": 1528.069470187589
},
{
"type": "QPointF",
"x": 760.2756390298981,
"y": 1498.441467450863
"x": 771.7232100759278,
"y": 1513.5670273139199
},
{
"type": "QPointF",
"x": 749.8599308295067,
"y": 1482.6329364417857
"x": 760.2828340467671,
"y": 1498.3476535000752
},
{
"type": "QPointF",
"x": 739.954732735659,
"y": 1465.546575347063
"x": 749.8663730801347,
"y": 1482.545348435518
},
{
"type": "QPointF",
"x": 731.2959376388606,
"y": 1448.777450809409
"x": 740.8458268763198,
"y": 1467.072776434555
},
{
"type": "QPointF",
"x": 720.0938869758143,
"y": 1424.3413180139733
"x": 732.11805591686,
"y": 1450.3746795622467
},
{
"type": "QPointF",
"x": 706.9812877693627,
"y": 1390.260386775834
"x": 720.0980737097842,
"y": 1424.2764020121176
},
{
"type": "QPointF",
"x": 695.6523318331946,
"y": 1355.64854530984
"x": 706.9845817511386,
"y": 1390.2088229239253
},
{
"type": "QPointF",
"x": 682.0124385547914,
"y": 1308.1450778538522
"x": 696.0709698803022,
"y": 1356.9628331629317
},
{
"type": "QPointF",
"x": 670.219541387873,
"y": 1264.96282546516
"x": 682.0144055801992,
"y": 1308.12578114852
},
{
"type": "QPointF",
"x": 663.0158295671732,
"y": 1241.0250035749032
"x": 670.2209905920099,
"y": 1264.9590990634113
},
{
"type": "QPointF",
"x": 656.1276142232095,
"y": 1222.104623785708
"x": 663.0172045666401,
"y": 1241.029620700668
},
{
"type": "QPointF",
"x": 651.4423683209832,
"y": 1212.3819423067657
"x": 656.1290125019129,
"y": 1222.1149496348314
},
{
"type": "QPointF",
"x": 648.9851082478891,
"y": 1208.3987439354166
"x": 651.4436445338823,
"y": 1212.3940530867537
},
{
"type": "QPointF",
"x": 639.4512595200423,
"y": 1196.0020170393075
"x": 648.9858448561539,
"y": 1208.4104572780716
},
{
"type": "QPointF",
"x": 642.759451136787,
"y": 1112.6635482583558
"x": 639.4513296048895,
"y": 1196.013164528916
},
{
"type": "QPointF",
"x": 642.7594419324198,
"y": 1112.663780148585
},
{
"type": "QPointF",
@ -407,8 +412,8 @@
},
{
"type": "QPointF",
"x": 679.3851616778779,
"y": 560.5071958351052
"x": 679.3841716061438,
"y": 560.5190335238417
}
]
}

View File

@ -12,13 +12,13 @@
},
{
"type": "QPointF",
"x": 167.30604170523088,
"y": 274.50013264093303
"x": 167.2238637734682,
"y": 274.49674146302095
},
{
"type": "QPointF",
"x": 167.19749972538847,
"y": 269.95767347494336
"x": 167.17190074847466,
"y": 270.89345471196157
},
{
"type": "QPointF",
@ -27,108 +27,138 @@
},
{
"type": "QPointF",
"x": 171.2459135294844,
"y": 247.0901582437869
"x": 170.26491480048924,
"y": 250.9305560889531
},
{
"type": "QPointF",
"x": 176.64841312963426,
"y": 231.89367477880018
"x": 173.85805304713168,
"y": 238.74278094672138
},
{
"type": "QPointF",
"x": 181.60851258888675,
"y": 223.02525030282638
"x": 176.1588063520679,
"y": 232.97579942669557
},
{
"type": "QPointF",
"x": 184.8167066465138,
"y": 218.45272205761742
"x": 177.93688037147942,
"y": 229.19777409213205
},
{
"type": "QPointF",
"x": 186.39376078521363,
"y": 217.17940045276504
"x": 181.91287045638833,
"y": 222.2532555407452
},
{
"type": "QPointF",
"x": 187.2901543369056,
"y": 215.92418137543507
"x": 185.34924920384145,
"y": 218.63895201542962
},
{
"type": "QPointF",
"x": 196.89081710839,
"y": 208.34478105780212
"x": 187.59805492897718,
"y": 215.57858305365193
},
{
"type": "QPointF",
"x": 206.91766056957408,
"y": 202.6653456860961
"x": 192.86969320132343,
"y": 211.19915416203753
},
{
"type": "QPointF",
"x": 218.16643746973782,
"y": 198.0034374929712
"x": 198.55721503265246,
"y": 207.26607790393052
},
{
"type": "QPointF",
"x": 229.8999689979584,
"y": 194.5122323575353
"x": 205.83297494667457,
"y": 203.19880909959312
},
{
"type": "QPointF",
"x": 241.98385054517243,
"y": 192.18126436552825
"x": 213.3989366119302,
"y": 199.80187668782906
},
{
"type": "QPointF",
"x": 258.32256210111353,
"y": 190.9510874021363
"x": 225.05715280056634,
"y": 195.80179705712058
},
{
"type": "QPointF",
"x": 282.88849327137484,
"y": 192.3327170360014
"x": 236.9777013259064,
"y": 192.99296851089122
},
{
"type": "QPointF",
"x": 288.2031868096645,
"y": 193.48305021794997
"x": 248.8397134110682,
"y": 191.43789012059054
},
{
"type": "QPointF",
"x": 297.61571920551216,
"y": 197.69023243490062
"x": 269.76947892966894,
"y": 191.0530084873955
},
{
"type": "QPointF",
"x": 310.57923284664963,
"y": 206.8104493101314
"x": 279.2591974403315,
"y": 191.80775842288307
},
{
"type": "QPointF",
"x": 320.37180984256605,
"y": 216.47325684819089
"x": 285.439435808936,
"y": 192.76911175153845
},
{
"type": "QPointF",
"x": 328.8995060022702,
"y": 227.14525040044498
"x": 291.75990032994855,
"y": 194.67499362913034
},
{
"type": "QPointF",
"x": 337.94611732452876,
"y": 240.8170859291849
"x": 297.18679591702266,
"y": 197.42691871701587
},
{
"type": "QPointF",
"x": 351.57469774103606,
"y": 263.8115467734212
"x": 301.84093082749814,
"y": 200.22448982773844
},
{
"type": "QPointF",
"x": 353.2512234548283,
"y": 263.3673080331528
"x": 309.63111646503364,
"y": 206.01821170428622
},
{
"type": "QPointF",
"x": 317.06291126733686,
"y": 212.92042336152053
},
{
"type": "QPointF",
"x": 322.7375828174322,
"y": 219.2152311107592
},
{
"type": "QPointF",
"x": 331.0285705097705,
"y": 230.15366159083862
},
{
"type": "QPointF",
"x": 340.96073277166533,
"y": 245.8168833793835
},
{
"type": "QPointF",
"x": 351.508785916176,
"y": 263.5628001891992
},
{
"type": "QPointF",
"x": 353.38281358068747,
"y": 262.39889326973366
},
{
"type": "QPointF",
@ -137,93 +167,113 @@
},
{
"type": "QPointF",
"x": 357.4736650430952,
"y": 210.79601581293596
"x": 357.40176367500453,
"y": 211.37984262676693
},
{
"type": "QPointF",
"x": 359.3073327569976,
"y": 200.02799414967882
"x": 359.0152017123353,
"y": 201.34020894719677
},
{
"type": "QPointF",
"x": 359.73199799735687,
"y": 195.76084622496757
"x": 361.1564007628898,
"y": 191.48767720713363
},
{
"type": "QPointF",
"x": 364.2921931987103,
"y": 186.1786983822252
"x": 367.2653423421729,
"y": 181.82507147660937
},
{
"type": "QPointF",
"x": 366.5306945072866,
"y": 182.93652936261128
"x": 374.33721518192135,
"y": 175.90560727292873
},
{
"type": "QPointF",
"x": 374.66587589785377,
"y": 175.5116088179777
"x": 377.14677256730516,
"y": 173.82943142819826
},
{
"type": "QPointF",
"x": 377.2538085237466,
"y": 173.8065326338944
"x": 381.33993617958185,
"y": 171.06579257618037
},
{
"type": "QPointF",
"x": 400.5329831004733,
"y": 162.36522176917418
"x": 393.1258145202469,
"y": 165.36639816936875
},
{
"type": "QPointF",
"x": 421.8791603554242,
"y": 155.51865193116913
"x": 408.3932500523315,
"y": 159.53363294737295
},
{
"type": "QPointF",
"x": 419.8611668067176,
"y": 155.48279077619534
"x": 423.1107481311983,
"y": 155.20594081388518
},
{
"type": "QPointF",
"x": 438.0633612753594,
"y": 153.03192944510397
"x": 430.0549996585841,
"y": 153.83670980296333
},
{
"type": "QPointF",
"x": 455.2191266225963,
"y": 153.05624563323727
"x": 440.7217089018201,
"y": 152.89988245716148
},
{
"type": "QPointF",
"x": 472.13962450478647,
"y": 155.14589827825722
"x": 454.5967442920567,
"y": 153.02154037878523
},
{
"type": "QPointF",
"x": 482.43834619808706,
"y": 158.29886734863854
"x": 467.78325484552295,
"y": 154.35289761896638
},
{
"type": "QPointF",
"x": 495.6447785087039,
"y": 165.95919540294628
"x": 475.1843172784661,
"y": 155.8295594673801
},
{
"type": "QPointF",
"x": 504.30214237411684,
"y": 173.73502446586204
"x": 479.9522604569063,
"y": 157.29490896808338
},
{
"type": "QPointF",
"x": 514.3692225121746,
"y": 184.8069411568055
"x": 485.0792840213212,
"y": 159.41726665756525
},
{
"type": "QPointF",
"x": 536.0426969749838,
"y": 211.60401356856727
"x": 489.58701833895236,
"y": 161.80472441230555
},
{
"type": "QPointF",
"x": 493.4116565843028,
"y": 164.28248666249897
},
{
"type": "QPointF",
"x": 499.98932468698433,
"y": 169.60791455977923
},
{
"type": "QPointF",
"x": 506.4354164747994,
"y": 175.93514943202254
},
{
"type": "QPointF",
"x": 518.9290933463765,
"y": 190.23021103578333
},
{
"type": "QPointF",
@ -247,28 +297,33 @@
},
{
"type": "QPointF",
"x": 593.6592659318968,
"y": 309.1009580349592
"x": 591.1019941479228,
"y": 302.05819169893664
},
{
"type": "QPointF",
"x": 594.5621538949604,
"y": 317.9492631765719
"x": 594.463807359789,
"y": 311.31911963852787
},
{
"type": "QPointF",
"x": 590.6510591717047,
"y": 340.91518746861993
"x": 593.6990292243912,
"y": 323.99124776525537
},
{
"type": "QPointF",
"x": 585.4872424358157,
"y": 361.2157855904426
"x": 589.7646953400841,
"y": 344.94570527898077
},
{
"type": "QPointF",
"x": 579.9229547052828,
"y": 377.65318039832954
"x": 584.2227365031622,
"y": 365.3132293687304
},
{
"type": "QPointF",
"x": 578.3133019054566,
"y": 381.7770200926223
},
{
"type": "QPointF",
@ -282,88 +337,108 @@
},
{
"type": "QPointF",
"x": 538.9087372946932,
"y": 461.18462682908535
"x": 539.2526248226795,
"y": 460.5912850366147
},
{
"type": "QPointF",
"x": 526.817689287619,
"y": 478.6960129039927
"x": 534.3876922246633,
"y": 468.5735164170166
},
{
"type": "QPointF",
"x": 519.0740546654762,
"y": 485.9591789956344
"x": 529.1781397661937,
"y": 475.8694871231909
},
{
"type": "QPointF",
"x": 509.94726195445895,
"y": 491.73200570919147
"x": 525.6308691899918,
"y": 480.03088094824324
},
{
"type": "QPointF",
"x": 499.48882330035383,
"y": 496.0219887131292
"x": 522.3855115979824,
"y": 483.23007109206713
},
{
"type": "QPointF",
"x": 483.1823868029168,
"y": 500.5066198031956
"x": 518.6010861895568,
"y": 486.3563701329734
},
{
"type": "QPointF",
"x": 469.31906002715755,
"y": 502.76699104452376
"x": 515.0521032817236,
"y": 488.8336091875258
},
{
"type": "QPointF",
"x": 458.61213259187986,
"y": 503.1196305607171
"x": 509.7246407122665,
"y": 491.8835609983093
},
{
"type": "QPointF",
"x": 443.8536819162971,
"y": 501.9185119737654
"x": 500.2577698167626,
"y": 495.75628862214256
},
{
"type": "QPointF",
"x": 427.1929958670552,
"y": 499.2248924703412
"x": 487.15963071843686,
"y": 499.5912335331815
},
{
"type": "QPointF",
"x": 415.2822129385592,
"y": 496.2167954717386
"x": 473.6956752771007,
"y": 502.2287291443895
},
{
"type": "QPointF",
"x": 405.51268591803284,
"y": 492.34625734655305
"x": 463.49780394389967,
"y": 503.15298507625994
},
{
"type": "QPointF",
"x": 402.3392744400787,
"y": 490.58869592553793
"x": 451.7842745191419,
"y": 502.7209516449965
},
{
"type": "QPointF",
"x": 397.6192436403225,
"y": 487.3958668879086
"x": 435.80322693895295,
"y": 500.79071434419745
},
{
"type": "QPointF",
"x": 395.8065790202349,
"y": 485.71619133980585
"x": 420.165515152396,
"y": 497.60262899958593
},
{
"type": "QPointF",
"x": 388.7637811139682,
"y": 475.5345799921174
"x": 411.8448883490633,
"y": 495.0871479242162
},
{
"type": "QPointF",
"x": 384.02761759391484,
"y": 464.5866207957423
"x": 406.55105784085293,
"y": 492.93119876405945
},
{
"type": "QPointF",
"x": 398.9854953771213,
"y": 488.5978201545317
},
{
"type": "QPointF",
"x": 392.54725416985286,
"y": 481.8269057857766
},
{
"type": "QPointF",
"x": 388.6017131401174,
"y": 475.3093396372153
},
{
"type": "QPointF",
"x": 384.28967096039423,
"y": 465.30500833370485
},
{
"type": "QPointF",
@ -377,13 +452,8 @@
},
{
"type": "QPointF",
"x": 367.6462390140756,
"y": 411.29354992278223
},
{
"type": "QPointF",
"x": 366.64848225314825,
"y": 411.33744639475356
"x": 366.600134420795,
"y": 411.4580674097551
},
{
"type": "QPointF",
@ -392,78 +462,108 @@
},
{
"type": "QPointF",
"x": 349.5264395561675,
"y": 456.53775435663135
"x": 349.9245366242492,
"y": 455.72615718311806
},
{
"type": "QPointF",
"x": 339.0381408643451,
"y": 473.9103469636046
"x": 343.6771811948498,
"y": 467.09348043002854
},
{
"type": "QPointF",
"x": 328.4003671533969,
"y": 485.7230912940063
"x": 338.2073934961957,
"y": 474.99984130187386
},
{
"type": "QPointF",
"x": 321.5584979241992,
"y": 491.67184971202573
"x": 334.98425692830125,
"y": 478.9526059571727
},
{
"type": "QPointF",
"x": 306.70041004704234,
"y": 497.47875631537966
"x": 330.74891265688393,
"y": 483.5228111238356
},
{
"type": "QPointF",
"x": 290.47717224660175,
"y": 501.3077427754172
"x": 321.4103537755966,
"y": 491.6954836904387
},
{
"type": "QPointF",
"x": 276.78725103080393,
"y": 503.25309046316846
"x": 311.8770733508292,
"y": 495.78704070384396
},
{
"type": "QPointF",
"x": 264.6092166309341,
"y": 503.7252445480846
"x": 296.2585603634165,
"y": 500.1424697548824
},
{
"type": "QPointF",
"x": 252.35742731035515,
"y": 502.981505596202
"x": 281.22657947205425,
"y": 502.7566141079534
},
{
"type": "QPointF",
"x": 240.16140370368174,
"y": 500.98447655539013
"x": 269.643612257968,
"y": 503.681902950646
},
{
"type": "QPointF",
"x": 228.17162935681384,
"y": 497.48744007705824
"x": 257.35990373752395,
"y": 503.4303221013898
},
{
"type": "QPointF",
"x": 220.20894480356736,
"y": 493.9717974895532
"x": 245.2299614750519,
"y": 501.97969107245706
},
{
"type": "QPointF",
"x": 214.23653207492043,
"y": 491.72898244053755
"x": 237.28901472295553,
"y": 500.30472078747965
},
{
"type": "QPointF",
"x": 199.2867956563084,
"y": 474.27137643587264
"x": 229.47069121160965,
"y": 497.9568546130952
},
{
"type": "QPointF",
"x": 191.6431490210782,
"y": 460.4373249360896
"x": 221.80693076938473,
"y": 494.7841817976641
},
{
"type": "QPointF",
"x": 217.7605879719979,
"y": 492.6267636491804
},
{
"type": "QPointF",
"x": 213.00213630271307,
"y": 489.5440149769562
},
{
"type": "QPointF",
"x": 207.77905047853176,
"y": 484.96579090071515
},
{
"type": "QPointF",
"x": 203.54654967368148,
"y": 480.17262128419
},
{
"type": "QPointF",
"x": 198.12170691741215,
"y": 472.4540019775285
},
{
"type": "QPointF",
"x": 191.93071975565823,
"y": 461.04614002105444
},
{
"type": "QPointF",

View File

@ -149,5 +149,7 @@
<file>valid_allowance_case3/base.json</file>
<file>smart_pattern_#145/input.json</file>
<file>smart_pattern_#145/output.json</file>
<file>women_jacket/input.json</file>
<file>women_jacket/output.json</file>
</qresource>
</RCC>

View File

@ -0,0 +1,268 @@
{
"vector": [
{
"angle": 1,
"type": "VSAPoint",
"x": 1757.5596850393704,
"y": 2348.3168503937004
},
{
"angle": 4,
"type": "VSAPoint",
"x": 1757.5596850393704,
"y": 1290.0491338582679
},
{
"angle": 4,
"type": "VSAPoint",
"x": 1757.5596850393704,
"y": 1290.0491338582679
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1759.7912938759064,
"y": 1287.1278334010926
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1764.1822572849478,
"y": 1281.1948680109103
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1768.4871147052577,
"y": 1275.155205603556
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1772.7065318347309,
"y": 1269.0107799055045
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1776.8411743712643,
"y": 1262.7635246432294
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1780.8917080127517,
"y": 1256.4153735432055
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1784.8587984570895,
"y": 1249.9682603319068
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1788.7431114021726,
"y": 1243.424118735807
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1792.5453125458966,
"y": 1236.7848824813811
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1796.2660675861569,
"y": 1230.052485295103
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1799.9060422208486,
"y": 1223.2288609034467
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1803.4659021478674,
"y": 1216.315943032887
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1806.9463130651081,
"y": 1209.3156654098975
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1810.3479406704669,
"y": 1202.2299617609528
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1813.6714506618382,
"y": 1195.0607658125273
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1816.9175087371186,
"y": 1187.8100112910947
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1820.0867805942025,
"y": 1180.4796319231295
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1823.1799319309857,
"y": 1173.071561435106
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1826.1976284453635,
"y": 1165.5877335534983
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1829.140535835231,
"y": 1158.0300820047808
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1832.0093197984838,
"y": 1150.4005405154276
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1834.8046460330174,
"y": 1142.7010428119129
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1837.527180236727,
"y": 1134.9335226207108
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1840.177588107508,
"y": 1127.0999136682956
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1842.7565353432558,
"y": 1119.202149681142
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1845.2646876418657,
"y": 1111.2421643857233
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1847.7027107012332,
"y": 1103.2218915085145
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1850.0712702192538,
"y": 1095.1432647759896
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1852.3710318938226,
"y": 1087.0082179146227
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1854.6026614228351,
"y": 1078.8186846508884
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1856.7668245041864,
"y": 1070.5765987112604
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1858.8641868357727,
"y": 1062.2838938222133
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1861.8945772046159,
"y": 1049.7598790642978
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1865.6964857439384,
"y": 1032.893960307379
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1869.2431738463158,
"y": 1015.8603728293192
},
{
"angle": 6,
"type": "VSAPoint",
"x": 1872.539967094911,
"y": 998.6745864419124
},
{
"type": "VSAPoint",
"x": 1872.687545744951,
"y": 997.8092862318668
},
{
"type": "VSAPoint",
"x": 1872.687545744951,
"y": 997.8092862318668
},
{
"type": "VSAPoint",
"x": 2265.327771139798,
"y": 1170.387598811537
},
{
"type": "VSAPoint",
"x": 2657.967996534599,
"y": 1342.9659113912467
},
{
"type": "VSAPoint",
"x": 2656.1423622047246,
"y": 1834.301102362205
},
{
"type": "VSAPoint",
"x": 2265.327771139798,
"y": 2057.8585550849384
}
]
}

View File

@ -0,0 +1,79 @@
{
"vector": [
{
"type": "QPointF",
"x": 1757.5596850393704,
"y": 2391.8588727177203
},
{
"type": "QPointF",
"x": 1719.7644094488192,
"y": 2369.93686082615
},
{
"type": "QPointF",
"x": 1719.7644094488192,
"y": 1227.7886349977343
},
{
"type": "QPointF",
"x": 1754.0719713708854,
"y": 1227.7886349977343
},
{
"type": "QPointF",
"x": 1766.5587070320596,
"y": 1205.4401540147435
},
{
"type": "QPointF",
"x": 1776.2755472432077,
"y": 1185.8728573991182
},
{
"type": "QPointF",
"x": 1788.302784728011,
"y": 1158.5090252566972
},
{
"type": "QPointF",
"x": 1799.2782438989425,
"y": 1129.8030736549547
},
{
"type": "QPointF",
"x": 1809.2165874181878,
"y": 1099.8835849309908
},
{
"type": "QPointF",
"x": 1818.1370232965867,
"y": 1068.8818796809192
},
{
"type": "QPointF",
"x": 1825.0896552609504,
"y": 1041.159385364977
},
{
"type": "QPointF",
"x": 1845.6878874516358,
"y": 945.2861252995574
},
{
"type": "QPointF",
"x": 2695.855122546167,
"y": 1318.3163126506975
},
{
"type": "QPointF",
"x": 2693.856271020773,
"y": 1856.2696584444384
},
{
"type": "QPointF",
"x": 1757.5596850393704,
"y": 2391.8588727177203
}
]
}

View File

@ -249,7 +249,8 @@ void TST_VAbstractPiece::EquidistantRemoveLoop_data()
QStringLiteral("://loop_by_intersection/output.json"),
39.685039370078741 /*seam allowance width (1.05 cm)*/);
// See file src/app/share/collection/bugs/loop_start_point_on_line.val (private collection)
// See file valentina_private_collection/bugs/loop_start_point_on_line/loop_start_point_on_line.val
// (private collection)
ASSERT_TEST_CASE("Loop for start point on line",
QStringLiteral("://loop_start_point_on_line/input.json"),
QStringLiteral("://loop_start_point_on_line/output.json"),
@ -347,13 +348,13 @@ void TST_VAbstractPiece::LayoutAllowanceRemoveLoop_data()
QStringLiteral("://smart_pattern_#99/output.json"),
28.346456692913389 /*seam allowance width*/);
// See file src/app/share/collection/test/smart_pattern_#120.val (private collection)
// See file valentina_private_collection/test/smart_pattern_#120/smart_pattern_#120.val (private collection)
ASSERT_TEST_CASE("Piece 1",
QStringLiteral("://smart_pattern_#120_piece_1/input.json"),
QStringLiteral("://smart_pattern_#120_piece_1/output.json"),
37.795275590551185);
// See file src/app/share/collection/test/smart_pattern_#120.val (private collection)
// See file valentina_private_collection/test/smart_pattern_#120/smart_pattern_#120.val (private collection)
ASSERT_TEST_CASE("Piece 2",
QStringLiteral("://smart_pattern_#120_piece_2/input.json"),
QStringLiteral("://smart_pattern_#120_piece_2/output.json"),
@ -949,6 +950,13 @@ void TST_VAbstractPiece::BrokenDetailEquidistant_data()
QStringLiteral("://smart_pattern_#145/input.json"),
QStringLiteral("://smart_pattern_#145/output.json"),
37.795275590551185 /*seam allowance width*/);
// See private test cases in file valentina_private_collection/bugs/women_jacket/women_jacket.val
// Point A38, size 32
ASSERT_TEST_CASE("women_jacket_A38",
QStringLiteral("://women_jacket/input.json"),
QStringLiteral("://women_jacket/output.json"),
37.795275590551185 /*seam allowance width*/);
}
//---------------------------------------------------------------------------------------------------------------------
@ -1048,7 +1056,7 @@ void TST_VAbstractPiece::EquidistantAngleType_data()
QStringLiteral("://panties_case2/output.json"),
26.45669291338583 /*seam allowance width*/);
// See file src/app/share/collection/bugs/smart_pattern_#113.val (private collection)
// See file valentina_private_collection/bugs/smart_pattern_#113/smart_pattern_#113.val (private collection)
ASSERT_TEST_CASE("Эдит 6",
QStringLiteral("://smart_pattern_#113/input.json"),
QStringLiteral("://smart_pattern_#113/output.json"),