diff --git a/drafter_10/annotations/C110_D1_P1.xml b/drafter_10/annotations/C110_D1_P1.xml index 81883bed6f4e1f96af4168f4b303c699c2ade5ec..93e47041501e4322139f924dc14e7d0d0b2bd3a4 100644 --- a/drafter_10/annotations/C110_D1_P1.xml +++ b/drafter_10/annotations/C110_D1_P1.xml @@ -168,6 +168,7 @@ 391 854 522 + 116 diff --git a/drafter_10/annotations/C110_D1_P2.xml b/drafter_10/annotations/C110_D1_P2.xml index a2c8da7d8ccda549ad196c1aa4827175b5014df2..bb0dca616b68959951100d8a214b16c08f2bff76 100644 --- a/drafter_10/annotations/C110_D1_P2.xml +++ b/drafter_10/annotations/C110_D1_P2.xml @@ -130,6 +130,7 @@ 479 345 607 + 19 @@ -142,6 +143,7 @@ 366 809 489 + 125 diff --git a/drafter_10/annotations/C110_D1_P3.xml b/drafter_10/annotations/C110_D1_P3.xml index cfe51681f015e5bb74026eb7965cc72a87ce0f56..a04c84372987baf4de1f790a1fcc7b9b112cf77d 100644 --- a/drafter_10/annotations/C110_D1_P3.xml +++ b/drafter_10/annotations/C110_D1_P3.xml @@ -181,6 +181,7 @@ 406 785 519 + 110 diff --git a/drafter_10/annotations/C110_D1_P4.xml b/drafter_10/annotations/C110_D1_P4.xml index 74261a4198d65d59144fef5cf3444ac55ddcdd61..605e2fb23bbecb0f53d288f04161c8abbd6a3c77 100644 --- a/drafter_10/annotations/C110_D1_P4.xml +++ b/drafter_10/annotations/C110_D1_P4.xml @@ -130,6 +130,7 @@ 373 353 484 + 21 @@ -181,6 +182,7 @@ 313 748 419 + 125 diff --git a/drafter_10/annotations/C110_D2_P1.xml b/drafter_10/annotations/C110_D2_P1.xml index 3408cf56e93741ede79598a1f99571d37c3fcf48..2ea2ab28fa825213436e10ec2c008e9ff6189a8e 100644 --- a/drafter_10/annotations/C110_D2_P1.xml +++ b/drafter_10/annotations/C110_D2_P1.xml @@ -194,6 +194,7 @@ 337 799 458 + 90 diff --git a/drafter_10/annotations/C110_D2_P2.xml b/drafter_10/annotations/C110_D2_P2.xml index 37dfbb17ff75ac1a1840592357308f343b50ed25..3c296feb0cfba9c86ece1ed2efae4176ad731485 100644 --- a/drafter_10/annotations/C110_D2_P2.xml +++ b/drafter_10/annotations/C110_D2_P2.xml @@ -130,6 +130,7 @@ 375 363 494 + 21 @@ -168,6 +169,7 @@ 264 705 375 + 110 diff --git a/drafter_10/annotations/C110_D2_P3.xml b/drafter_10/annotations/C110_D2_P3.xml index db92ce9c1fd43a736d5c56ae7a7760d877a80db7..404d4be9d841f2b561cbb722402737ed3126cc11 100644 --- a/drafter_10/annotations/C110_D2_P3.xml +++ b/drafter_10/annotations/C110_D2_P3.xml @@ -194,6 +194,7 @@ 372 843 493 + 90 diff --git a/drafter_10/annotations/C110_D2_P4.xml b/drafter_10/annotations/C110_D2_P4.xml index 1742c4697752d5246a4d42f13080285ad2804fca..683fe8578dfa532e94286084fec0f5689106a102 100644 --- a/drafter_10/annotations/C110_D2_P4.xml +++ b/drafter_10/annotations/C110_D2_P4.xml @@ -143,6 +143,7 @@ 422 382 565 + 19 @@ -168,6 +169,7 @@ 322 807 454 + 110 diff --git a/drafter_10/annotations/C111_D1_P1.xml b/drafter_10/annotations/C111_D1_P1.xml index bbf771c4b152ab49ee1f63fe47dde5cd6ae51c66..64f85d62cda3afc2974dab30b480f35de9c8a31c 100644 --- a/drafter_10/annotations/C111_D1_P1.xml +++ b/drafter_10/annotations/C111_D1_P1.xml @@ -208,6 +208,7 @@ 505 899 664 + 105 diff --git a/drafter_10/annotations/C111_D1_P2.xml b/drafter_10/annotations/C111_D1_P2.xml index 5cb8adf4d3bafbc2aac07958c00f03ed835315f2..6a85a4a5571d9d5333fae4b3c438fd418e7e8e74 100644 --- a/drafter_10/annotations/C111_D1_P2.xml +++ b/drafter_10/annotations/C111_D1_P2.xml @@ -144,6 +144,7 @@ 422 404 542 + 25 @@ -182,6 +183,7 @@ 414 920 547 + 125 diff --git a/drafter_10/annotations/C111_D1_P3.xml b/drafter_10/annotations/C111_D1_P3.xml index e74b39adcacf12a468c70aea511a3047de358075..e6da204a78f8012c6958a7005a75c0d01aee997a 100644 --- a/drafter_10/annotations/C111_D1_P3.xml +++ b/drafter_10/annotations/C111_D1_P3.xml @@ -208,6 +208,7 @@ 444 855 591 + 105 diff --git a/drafter_10/annotations/C111_D1_P4.xml b/drafter_10/annotations/C111_D1_P4.xml index c22dcc3c38fb7fe39dc1102d4135dd3be97cf201..5e8b706de19da7627054a60666c2a0667611aacc 100644 --- a/drafter_10/annotations/C111_D1_P4.xml +++ b/drafter_10/annotations/C111_D1_P4.xml @@ -132,6 +132,7 @@ 232 512 336 + 343 @@ -208,6 +209,7 @@ 504 850 655 + 81 diff --git a/drafter_10/annotations/C111_D2_P1.xml b/drafter_10/annotations/C111_D2_P1.xml index 4dbf655f4096187142d54e552e17bc2148ec23fe..30e5baf83ec6a57a8ffdf561bddfd9bef3cfcad7 100644 --- a/drafter_10/annotations/C111_D2_P1.xml +++ b/drafter_10/annotations/C111_D2_P1.xml @@ -171,6 +171,7 @@ 286 372 403 + 6 @@ -208,6 +209,7 @@ 515 844 612 + 100 diff --git a/drafter_10/annotations/C111_D2_P2.xml b/drafter_10/annotations/C111_D2_P2.xml index bdfd3c5767e9a78ccbe25fb816602a4e1111b62c..a615659fc99fd745da535450af862f026c1d4101 100644 --- a/drafter_10/annotations/C111_D2_P2.xml +++ b/drafter_10/annotations/C111_D2_P2.xml @@ -170,6 +170,7 @@ 400 388 526 + 21 @@ -195,6 +196,7 @@ 476 906 565 + 120 diff --git a/drafter_10/annotations/C111_D2_P3.xml b/drafter_10/annotations/C111_D2_P3.xml index c8c31994fd3ccdf1e28bf33c0dbdbe694a7bf8c8..bdf1ddfe29f7d2c60bbba29fbea8eae00b439c31 100644 --- a/drafter_10/annotations/C111_D2_P3.xml +++ b/drafter_10/annotations/C111_D2_P3.xml @@ -146,6 +146,7 @@ 352 445 470 + 8 @@ -208,6 +209,7 @@ 558 904 648 + 100 diff --git a/drafter_10/annotations/C111_D2_P4.xml b/drafter_10/annotations/C111_D2_P4.xml index 97e6a0c0f8924107e8ecb5ff6bd51b327b669c1c..ab3e6ff354ab9629c936fc003dd4610f14dfadc0 100644 --- a/drafter_10/annotations/C111_D2_P4.xml +++ b/drafter_10/annotations/C111_D2_P4.xml @@ -196,6 +196,7 @@ 463 930 547 + 120 diff --git a/drafter_10/annotations/C112_D1_P2.xml b/drafter_10/annotations/C112_D1_P2.xml index ba69deeac0f3f692b6f22ebfd3d4e661ef16d46e..dbdb62fb90eab857a1088f64086d5145cf56a98e 100644 --- a/drafter_10/annotations/C112_D1_P2.xml +++ b/drafter_10/annotations/C112_D1_P2.xml @@ -217,6 +217,7 @@ 443 379 559 + 21 diff --git a/drafter_10/annotations/C112_D1_P4.xml b/drafter_10/annotations/C112_D1_P4.xml index b249b0b2ca24a7d8a7d3e81bbd2cdde7b18d6999..d894a3d52ff36c937e624f459ceaca78eec5f169 100644 --- a/drafter_10/annotations/C112_D1_P4.xml +++ b/drafter_10/annotations/C112_D1_P4.xml @@ -230,6 +230,7 @@ 468 372 579 + 23 diff --git a/drafter_10/annotations/C112_D2_P2.xml b/drafter_10/annotations/C112_D2_P2.xml index 85994515c4475906d2103ba46248aae765c00821..62eb78d58e6556dfd42d1480cd766cb96e86e3fb 100644 --- a/drafter_10/annotations/C112_D2_P2.xml +++ b/drafter_10/annotations/C112_D2_P2.xml @@ -230,6 +230,7 @@ 463 349 613 + 21 diff --git a/drafter_10/annotations/C112_D2_P4.xml b/drafter_10/annotations/C112_D2_P4.xml index 61e0d9ba4c49ef8a67606d752efe309a6c190789..76add74c5e3a40718060d8cc85c28f0e137f51a4 100644 --- a/drafter_10/annotations/C112_D2_P4.xml +++ b/drafter_10/annotations/C112_D2_P4.xml @@ -192,6 +192,7 @@ 403 391 555 + 21 diff --git a/drafter_10/annotations/C113_D2_P2.xml b/drafter_10/annotations/C113_D2_P2.xml index e867f8411394817ba2417e2d8b307e36123c72df..2c3d10042dd40dc04da63757599b7f830009b563 100644 --- a/drafter_10/annotations/C113_D2_P2.xml +++ b/drafter_10/annotations/C113_D2_P2.xml @@ -134,7 +134,7 @@ 283 534 342 - 260 + 256 diff --git a/drafter_10/annotations/C113_D2_P3.xml b/drafter_10/annotations/C113_D2_P3.xml index b203d2c9a23ed074b92225ec3fa78573d8832d7a..c7f4a3d405d596c5c14560eb02ac11f17f6c175c 100644 --- a/drafter_10/annotations/C113_D2_P3.xml +++ b/drafter_10/annotations/C113_D2_P3.xml @@ -96,7 +96,7 @@ 260 817 321 - 6 + 350 diff --git a/drafter_10/annotations/C114_D1_P1.xml b/drafter_10/annotations/C114_D1_P1.xml index a035f36bbe18961feda1838d02966b0082d2991c..a0afe2290987d552e53d1a799548fb5afb46c522 100644 --- a/drafter_10/annotations/C114_D1_P1.xml +++ b/drafter_10/annotations/C114_D1_P1.xml @@ -69,6 +69,7 @@ 413 539 555 + 4 diff --git a/drafter_10/annotations/C114_D1_P2.xml b/drafter_10/annotations/C114_D1_P2.xml index 4e65cf58ab58efc519a2b37c4ebf20008094e6aa..c131c18ec1c521874deaa57779c4c3989c8f92be 100644 --- a/drafter_10/annotations/C114_D1_P2.xml +++ b/drafter_10/annotations/C114_D1_P2.xml @@ -69,6 +69,7 @@ 247 584 410 + 347 diff --git a/drafter_10/annotations/C114_D1_P3.xml b/drafter_10/annotations/C114_D1_P3.xml index 898d095e3e573dc4ac814e5a4ff46abb1550544d..f3a590d2ee564c416b67dd6ad1393b27fb14cc41 100644 --- a/drafter_10/annotations/C114_D1_P3.xml +++ b/drafter_10/annotations/C114_D1_P3.xml @@ -82,6 +82,7 @@ 412 476 584 + 2 diff --git a/drafter_10/annotations/C114_D2_P1.xml b/drafter_10/annotations/C114_D2_P1.xml index 93ac020f1226720c9769bd5e18d17fbd0a151e8d..eca5c3af002be27f7b7b2dd9f01ae6cc123aec41 100644 --- a/drafter_10/annotations/C114_D2_P1.xml +++ b/drafter_10/annotations/C114_D2_P1.xml @@ -70,6 +70,7 @@ 319 462 478 + 358 @@ -94,7 +95,7 @@ 197 920 283 - 6 + 354 diff --git a/drafter_10/annotations/C114_D2_P2.xml b/drafter_10/annotations/C114_D2_P2.xml index de71a375ccf727dd169059b8ba603a3b6c4ddaaa..28fff78c276910f5369801af9f6028d93feae62d 100644 --- a/drafter_10/annotations/C114_D2_P2.xml +++ b/drafter_10/annotations/C114_D2_P2.xml @@ -69,6 +69,7 @@ 389 374 554 + 17 diff --git a/drafter_10/annotations/C114_D2_P3.xml b/drafter_10/annotations/C114_D2_P3.xml index 4bc88e1908a56be08e0967b36ed897ce775c32a8..0b4f8b2d05787f0202a2ea9efe25b8ec43d3f22e 100644 --- a/drafter_10/annotations/C114_D2_P3.xml +++ b/drafter_10/annotations/C114_D2_P3.xml @@ -120,7 +120,7 @@ 228 918 300 - 360 + 347 diff --git a/drafter_10/annotations/C114_D2_P4.xml b/drafter_10/annotations/C114_D2_P4.xml index a028f030f8200c934c11bf864ae0154b213f62a5..1f3e49650cce7df82bdad0f31a338a06329e36f6 100644 --- a/drafter_10/annotations/C114_D2_P4.xml +++ b/drafter_10/annotations/C114_D2_P4.xml @@ -70,7 +70,7 @@ 180 544 340 - 331 + 343 diff --git a/drafter_10/annotations/C115_D1_P2.xml b/drafter_10/annotations/C115_D1_P2.xml index c1771b5cb77241d7eb3e257bd8014f6682fede55..2d1d7a53624f27c5d2bf580eec4458cb4d8dd439 100644 --- a/drafter_10/annotations/C115_D1_P2.xml +++ b/drafter_10/annotations/C115_D1_P2.xml @@ -109,6 +109,7 @@ 175 1002 249 + 30 diff --git a/drafter_10/annotations/C115_D1_P3.xml b/drafter_10/annotations/C115_D1_P3.xml index 1e00d225379e7f648d59385f1347f8e365833cd6..be33faeea8e4f3a9483ce52ddd7bd34e473011d7 100644 --- a/drafter_10/annotations/C115_D1_P3.xml +++ b/drafter_10/annotations/C115_D1_P3.xml @@ -108,6 +108,7 @@ 237 1089 294 + 8 diff --git a/drafter_10/annotations/C115_D1_P4.xml b/drafter_10/annotations/C115_D1_P4.xml index c2959843c00c86707f4ff3b6182297c871f40ec0..1f3e5417b77e6f676055a14c0bc764d7559903b1 100644 --- a/drafter_10/annotations/C115_D1_P4.xml +++ b/drafter_10/annotations/C115_D1_P4.xml @@ -96,6 +96,7 @@ 268 1110 354 + 337 diff --git a/drafter_10/annotations/C115_D2_P2.xml b/drafter_10/annotations/C115_D2_P2.xml index ad371856588b042a77f52aefb641fc3882d8af01..60c34ccb2693a8e54ce72f0510d0b712c82c6f54 100644 --- a/drafter_10/annotations/C115_D2_P2.xml +++ b/drafter_10/annotations/C115_D2_P2.xml @@ -122,6 +122,7 @@ 349 1115 430 + 343 diff --git a/drafter_10/annotations/C115_D2_P4.xml b/drafter_10/annotations/C115_D2_P4.xml index 3c5a3d3cd8009383e4743bd36411c75f1895d955..2e246c7eb4f1097951c47cde7e8770c6e2c48f95 100644 --- a/drafter_10/annotations/C115_D2_P4.xml +++ b/drafter_10/annotations/C115_D2_P4.xml @@ -148,6 +148,7 @@ 469 1140 576 + 331 diff --git a/drafter_10/annotations/C116_D1_P1.xml b/drafter_10/annotations/C116_D1_P1.xml index 56dbb25cb591cac0f766f9d3011f9aa6bc8f5357..814ad4e97b557a4a222bbca1540cbb806ee450b2 100644 --- a/drafter_10/annotations/C116_D1_P1.xml +++ b/drafter_10/annotations/C116_D1_P1.xml @@ -60,7 +60,7 @@ 1218 539 - No T + NOT junction @@ -155,7 +155,7 @@ 414 235 - 597 + 599 382 @@ -167,8 +167,9 @@ 431 522 - 605 + 611 640 + 4 diff --git a/drafter_10/annotations/C116_D1_P2.xml b/drafter_10/annotations/C116_D1_P2.xml index d21a1f4d97dda046e521033c778624f789b8ad79..f4ed9c393037620f9fbfd819a39f5c01d2f03417 100644 --- a/drafter_10/annotations/C116_D1_P2.xml +++ b/drafter_10/annotations/C116_D1_P2.xml @@ -72,7 +72,7 @@ 1111 385 - Not + NOT junction @@ -133,6 +133,7 @@ 267 1093 345 + 17 @@ -145,6 +146,7 @@ 330 873 457 + 23 @@ -157,6 +159,7 @@ 325 483 473 + 19 @@ -193,6 +196,7 @@ 572 581 706 + 21 diff --git a/drafter_10/annotations/C116_D2_P2.xml b/drafter_10/annotations/C116_D2_P2.xml index d13713643c0327f7765bd8ae4e78b9180b7b9dd6..6e3250cc389a7869cf3dae0ea2cdada4b390df46 100644 --- a/drafter_10/annotations/C116_D2_P2.xml +++ b/drafter_10/annotations/C116_D2_P2.xml @@ -121,6 +121,7 @@ 351 467 457 + 348 @@ -133,6 +134,7 @@ 340 855 468 + 345 @@ -205,6 +207,7 @@ 178 499 277 + 348 @@ -217,6 +220,7 @@ 431 1075 510 + 339 diff --git a/drafter_10/annotations/C116_D2_P3.xml b/drafter_10/annotations/C116_D2_P3.xml index 698974cc5eb49b88a35d37c49b5527d6c7bfa101..c3561d576f1747fd692eb39ea84fded3b3ec05d9 100644 --- a/drafter_10/annotations/C116_D2_P3.xml +++ b/drafter_10/annotations/C116_D2_P3.xml @@ -133,6 +133,7 @@ 433 1103 502 + 354 diff --git a/drafter_10/annotations/C116_D2_P4.xml b/drafter_10/annotations/C116_D2_P4.xml index 11f8378195cf2db7731e70c9590dcd35be7b93f4..cd24316f1867702f06c1826ae2060f5bc7794d83 100644 --- a/drafter_10/annotations/C116_D2_P4.xml +++ b/drafter_10/annotations/C116_D2_P4.xml @@ -121,6 +121,7 @@ 426 876 548 + 343 @@ -133,6 +134,7 @@ 523 1083 600 + 341 @@ -145,6 +147,7 @@ 251 544 350 + 343 @@ -157,6 +160,7 @@ 420 512 524 + 347 diff --git a/drafter_10/annotations/C117_D1_P2.xml b/drafter_10/annotations/C117_D1_P2.xml index 1ed5c3cd8b711a5cda80d5d75971e44e042f1d91..14fcf85f1b0c8dc27b7b070dbcc0e81b56066668 100644 --- a/drafter_10/annotations/C117_D1_P2.xml +++ b/drafter_10/annotations/C117_D1_P2.xml @@ -119,6 +119,7 @@ 480 523 566 + 15 @@ -131,6 +132,7 @@ 267 885 392 + 21 @@ -156,6 +158,7 @@ 350 474 452 + 15 diff --git a/drafter_10/annotations/C117_D2_P2.xml b/drafter_10/annotations/C117_D2_P2.xml index 4204f28f0790490d6782e82e7c9edf3bcdfb76b0..66faedc0803b732d346ac5dd1b85063bf9718578 100644 --- a/drafter_10/annotations/C117_D2_P2.xml +++ b/drafter_10/annotations/C117_D2_P2.xml @@ -118,6 +118,7 @@ 479 449 574 + 23 @@ -130,6 +131,7 @@ 234 871 366 + 17 @@ -142,6 +144,7 @@ 316 372 398 + 19 diff --git a/drafter_10/annotations/C117_D2_P4.xml b/drafter_10/annotations/C117_D2_P4.xml index cd2b8362e268ffbfbf796a3b56bfbac6ffe04ecc..b76ad108a32cbc70504cd0131746c507b10a9a7e 100644 --- a/drafter_10/annotations/C117_D2_P4.xml +++ b/drafter_10/annotations/C117_D2_P4.xml @@ -118,6 +118,7 @@ 460 1058 596 + 341 @@ -130,6 +131,7 @@ 382 520 487 + 339 @@ -142,6 +144,7 @@ 192 570 290 + 331 diff --git a/drafter_10/annotations/C118_D1_P1.xml b/drafter_10/annotations/C118_D1_P1.xml index c4d2b1aa59c7b85fd80164b4c3e5a6018a0bc359..d2b7e92b22ac22a00b006f77c66f50ed606884c5 100644 --- a/drafter_10/annotations/C118_D1_P1.xml +++ b/drafter_10/annotations/C118_D1_P1.xml @@ -72,7 +72,7 @@ 1080 560 - AND + NAND junction diff --git a/drafter_10/annotations/C118_D1_P2.xml b/drafter_10/annotations/C118_D1_P2.xml index a6150039e854cb0cb5fffbc9708f9a13287fcd3f..3ed4ba9dc742161e7dbe8cebb2e1b606881a2535 100644 --- a/drafter_10/annotations/C118_D1_P2.xml +++ b/drafter_10/annotations/C118_D1_P2.xml @@ -34,7 +34,7 @@ 1035 387 - AND + NAND junction @@ -156,6 +156,7 @@ 299 485 454 + 27 @@ -180,6 +181,7 @@ 511 578 670 + 31 @@ -192,6 +194,7 @@ 231 1012 351 + 19 diff --git a/drafter_10/annotations/C118_D1_P4.xml b/drafter_10/annotations/C118_D1_P4.xml index 2857c72e59242b353b7b830b7fd56d124ca65524..78b098e4b5bd493d67f6841a9d593e350c4186b9 100644 --- a/drafter_10/annotations/C118_D1_P4.xml +++ b/drafter_10/annotations/C118_D1_P4.xml @@ -120,6 +120,7 @@ 118 604 255 + 348 @@ -180,6 +181,7 @@ 373 1106 486 + 348 @@ -192,6 +194,7 @@ 337 565 479 + 339 diff --git a/drafter_10/annotations/C118_D2_P1.xml b/drafter_10/annotations/C118_D2_P1.xml index 1b6b0dad0261a2843ba5c8c33a07acb3d7d432fa..8331fa3cccb207d6fe5cd2824b016142e0055d0c 100644 --- a/drafter_10/annotations/C118_D2_P1.xml +++ b/drafter_10/annotations/C118_D2_P1.xml @@ -22,7 +22,7 @@ 556 672 - OR + NOR text diff --git a/drafter_10/annotations/C118_D2_P2.xml b/drafter_10/annotations/C118_D2_P2.xml index acf1848a3683f719a29bcaf6e74319b7560ca977..2efe4a325a28858f6fdc42258884589c890f6f92 100644 --- a/drafter_10/annotations/C118_D2_P2.xml +++ b/drafter_10/annotations/C118_D2_P2.xml @@ -168,6 +168,7 @@ 215 1008 334 + 8 @@ -180,6 +181,7 @@ 449 504 595 + 12 @@ -192,6 +194,7 @@ 213 415 362 + 12 diff --git a/drafter_10/annotations/C118_D2_P3.xml b/drafter_10/annotations/C118_D2_P3.xml index 95ddd3e8f182145c02655f17c080b49f4d51f92b..58ac2cf53dfac25d8d6035d6132f92509d79573d 100644 --- a/drafter_10/annotations/C118_D2_P3.xml +++ b/drafter_10/annotations/C118_D2_P3.xml @@ -35,7 +35,7 @@ 1100 493 - AND + NAND text diff --git a/drafter_10/annotations/C118_D2_P4.xml b/drafter_10/annotations/C118_D2_P4.xml index 8ddf02cd9e61cc9b023db135b0a023d2bf247973..96b77679585ae0fd2f4d6174f310efd583657dcd 100644 --- a/drafter_10/annotations/C118_D2_P4.xml +++ b/drafter_10/annotations/C118_D2_P4.xml @@ -108,6 +108,7 @@ 409 1102 522 + 345 @@ -120,6 +121,7 @@ 133 615 276 + 345 @@ -132,6 +134,7 @@ 370 610 491 + 333 diff --git a/drafter_10/annotations/C119_D1_P1.xml b/drafter_10/annotations/C119_D1_P1.xml index 026355447b5b87ee3cd0bfbaf85a408af895b05f..8233e1a753f78c6367ebdc30bb449eab0fa5ea84 100644 --- a/drafter_10/annotations/C119_D1_P1.xml +++ b/drafter_10/annotations/C119_D1_P1.xml @@ -278,6 +278,7 @@ 177 884 289 + 6 @@ -338,6 +339,7 @@ 173 527 316 + 2 diff --git a/drafter_10/annotations/C119_D1_P2.xml b/drafter_10/annotations/C119_D1_P2.xml index 7da0f93d6b9e7d1cf8bf47488fb98a6272462b6b..3e9b382c468d31862603d7588dc7e1d416f8c3ba 100644 --- a/drafter_10/annotations/C119_D1_P2.xml +++ b/drafter_10/annotations/C119_D1_P2.xml @@ -289,6 +289,7 @@ 471 526 578 + 10 @@ -313,6 +314,7 @@ 295 880 409 + 15 @@ -325,6 +327,7 @@ 141 831 249 + 21 @@ -350,6 +353,7 @@ 240 1181 355 + 19 @@ -362,6 +366,7 @@ 210 481 348 + 17 diff --git a/drafter_10/annotations/C119_D1_P4.xml b/drafter_10/annotations/C119_D1_P4.xml index 32bdb6b908ce2e39032b3d18502dd460554444a4..fce843bd5c200042094e722b27e0dddb7d3e872e 100644 --- a/drafter_10/annotations/C119_D1_P4.xml +++ b/drafter_10/annotations/C119_D1_P4.xml @@ -229,6 +229,7 @@ 275 791 383 + 17 @@ -265,6 +266,7 @@ 448 481 545 + 13 @@ -277,6 +279,7 @@ 220 1066 322 + 21 @@ -289,6 +292,7 @@ 214 428 341 + 19 @@ -325,6 +329,7 @@ 136 739 240 + 25 diff --git a/drafter_10/annotations/C119_D2_P2.xml b/drafter_10/annotations/C119_D2_P2.xml index 70de418894d21cf033f251e7a9f4dd31dc9a5e5b..1304f5c47535340cbeed14f484daa281361e1163 100644 --- a/drafter_10/annotations/C119_D2_P2.xml +++ b/drafter_10/annotations/C119_D2_P2.xml @@ -278,6 +278,7 @@ 163 857 263 + 347 @@ -290,6 +291,7 @@ 101 474 206 + 347 @@ -314,6 +316,7 @@ 332 847 456 + 352 @@ -338,6 +341,7 @@ 402 394 482 + 350 @@ -350,6 +354,7 @@ 401 1164 531 + 350 diff --git a/drafter_10/annotations/C119_D2_P4.xml b/drafter_10/annotations/C119_D2_P4.xml index e348bd0ca6eb3841fd609909ef786a234f66ac3d..0d4999e6c7818dbe5752e31a7a16a62fc2d3e247 100644 --- a/drafter_10/annotations/C119_D2_P4.xml +++ b/drafter_10/annotations/C119_D2_P4.xml @@ -242,6 +242,7 @@ 137 858 242 + 348 @@ -278,6 +279,7 @@ 52 462 165 + 343 @@ -302,6 +304,7 @@ 370 376 456 + 350 @@ -314,6 +317,7 @@ 388 1156 516 + 347 @@ -326,6 +330,7 @@ 312 845 438 + 354 diff --git a/drafter_10/annotations/C120_D1_P2.xml b/drafter_10/annotations/C120_D1_P2.xml index 876bec09c8d8b1ecba32ea48446c0e8fcbf1a0ab..2fc614f4cbaec4b19b57079a956e1349fc454218 100644 --- a/drafter_10/annotations/C120_D1_P2.xml +++ b/drafter_10/annotations/C120_D1_P2.xml @@ -157,6 +157,7 @@ 312 396 435 + 21 @@ -169,6 +170,7 @@ 224 663 345 + 19 @@ -193,6 +195,7 @@ 304 1054 429 + 21 @@ -205,6 +208,7 @@ 524 489 637 + 23 diff --git a/drafter_10/annotations/C120_D1_P4.xml b/drafter_10/annotations/C120_D1_P4.xml index 698a690f4556d49e03b24b22be30bdceab084f23..0ae32a7eeac1aca691631300be634c86247e3893 100644 --- a/drafter_10/annotations/C120_D1_P4.xml +++ b/drafter_10/annotations/C120_D1_P4.xml @@ -169,6 +169,7 @@ 200 705 318 + 15 @@ -181,6 +182,7 @@ 273 447 388 + 15 @@ -205,6 +207,7 @@ 482 518 592 + 19 @@ -217,6 +220,7 @@ 296 1098 423 + 21 diff --git a/drafter_10/annotations/C120_D2_P4.xml b/drafter_10/annotations/C120_D2_P4.xml index bac6e927d38be855ad39eb74f7e9c7d534259250..4d3d3177fc8a872af7d6e864a35360ee8ab9ea06 100644 --- a/drafter_10/annotations/C120_D2_P4.xml +++ b/drafter_10/annotations/C120_D2_P4.xml @@ -181,6 +181,7 @@ 168 757 286 + 10 @@ -193,6 +194,7 @@ 391 490 505 + 13 @@ -205,6 +207,7 @@ 270 1075 401 + 10 @@ -217,6 +220,7 @@ 229 440 312 + 15 diff --git a/drafter_10/instances/C111_D2_P4.json b/drafter_10/instances/C111_D2_P4.json index c0f90bb127ac1fb2870dc43757d48248db76d10e..e75b09df59f7961b1bdcec3760b9f89515d87c73 100644 --- a/drafter_10/instances/C111_D2_P4.json +++ b/drafter_10/instances/C111_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -59,6 +60,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -85,6 +87,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -111,6 +114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -137,6 +141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -189,6 +195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -215,6 +222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -241,6 +249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -267,6 +276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -293,6 +303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -319,6 +330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -371,6 +384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -397,6 +411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -423,6 +438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -449,6 +465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_10/instances/C112_D1_P3.json b/drafter_10/instances/C112_D1_P3.json index 42fd333c732a758e964f170c1e60698aff0a8526..0ae10f7f4551f31c46773323044d2d2f17f83787 100644 --- a/drafter_10/instances/C112_D1_P3.json +++ b/drafter_10/instances/C112_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_10/instances/C113_D1_P2.json b/drafter_10/instances/C113_D1_P2.json index 95829ead895facc5f66fcd4b535baf1544f2c50f..6ff458e5455ab465af554a1f6b85677d5b1b9816 100644 --- a/drafter_10/instances/C113_D1_P2.json +++ b/drafter_10/instances/C113_D1_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -189,6 +195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -215,6 +222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -241,6 +249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -267,6 +276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_10/instances/C114_D2_P4.json b/drafter_10/instances/C114_D2_P4.json index 76679c6cac521c2d591d920c14f0e175723895aa..762a45007b38dc4f6ea7cc7b34c8da7c7d28d26a 100644 --- a/drafter_10/instances/C114_D2_P4.json +++ b/drafter_10/instances/C114_D2_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 350.0, @@ -24,13 +24,15 @@ 547.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 493.0, @@ -49,13 +51,15 @@ 108.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 269.0, @@ -74,13 +78,15 @@ 190.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1016.0, @@ -99,13 +105,15 @@ 727.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.ac", "line_color": null, "fill_color": null, + "label": "voltage.ac", "points": [ [ 353.0, @@ -124,13 +132,15 @@ 180.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 994.0, @@ -149,13 +159,15 @@ 488.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1105.0, @@ -174,13 +186,15 @@ 310.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 880.0, @@ -199,13 +213,15 @@ 118.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1143.0, @@ -224,13 +240,15 @@ 519.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 777.3440860215053, @@ -249,10 +267,16 @@ 216.1290322580645 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C114_D2_P4.jpg", + "imageData": null, + "imageHeight": 1042, + "imageWidth": 1392, "lineColor": [ 0, 255, @@ -264,9 +288,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C114_D2_P4.jpg", - "imageData": null, - "imageHeight": 1042, - "imageWidth": 1392 + ] } \ No newline at end of file diff --git a/drafter_10/instances/C115_D2_P1.json b/drafter_10/instances/C115_D2_P1.json index 876aa3b8abcc12432eb3e57acca0672fa7ce305c..495bb6ffd969cc1f9fce9fd0303081cc27f45038 100644 --- a/drafter_10/instances/C115_D2_P1.json +++ b/drafter_10/instances/C115_D2_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -241,6 +249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -267,6 +276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -293,6 +303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_10/instances/C115_D2_P3.json b/drafter_10/instances/C115_D2_P3.json index 9fa234960eca34ac51a32a64aac92cf8dcab14ae..a32d562d357a85be8479a67ec47ca96206891a72 100644 --- a/drafter_10/instances/C115_D2_P3.json +++ b/drafter_10/instances/C115_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -293,6 +303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_10/instances/C116_D1_P4.json b/drafter_10/instances/C116_D1_P4.json index fd94cedb18b8a37e5c2f5b4df62d003854b30126..90ae198d4f394eded66a0c338125e127c803b091 100644 --- a/drafter_10/instances/C116_D1_P4.json +++ b/drafter_10/instances/C116_D1_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 364.1666666666667, @@ -24,13 +24,15 @@ 600.4166666666667 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 975.5102040816327, @@ -49,13 +51,15 @@ 291.83673469387753 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 553.0, @@ -74,13 +78,15 @@ 400.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 564.0, @@ -99,13 +105,15 @@ 493.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 289.7196261682243, @@ -124,13 +132,15 @@ 353.7383177570093 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 517.0, @@ -149,13 +159,15 @@ 250.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1205.0, @@ -174,13 +186,15 @@ 206.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 731.6326530612245, @@ -199,13 +213,15 @@ 356.6326530612245 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 548.0, @@ -224,13 +240,15 @@ 359.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "not", "line_color": null, "fill_color": null, + "label": "not", "points": [ [ 929.5918367346939, @@ -249,13 +267,15 @@ 237.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 217.7570093457944, @@ -274,13 +294,15 @@ 232.24299065420558 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "or", "line_color": null, "fill_color": null, + "label": "or", "points": [ [ 643.8775510204082, @@ -299,13 +321,15 @@ 281.12244897959187 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 275.4166666666667, @@ -324,13 +348,15 @@ 488.33333333333337 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 147.0, @@ -349,13 +375,15 @@ 602.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 170.0, @@ -374,13 +402,15 @@ 653.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 88.0, @@ -399,13 +429,15 @@ 392.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 65.0, @@ -424,10 +456,16 @@ 343.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C116_D1_P4.jpg", + "imageData": null, + "imageHeight": 1042, + "imageWidth": 1392, "lineColor": [ 0, 255, @@ -439,9 +477,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C116_D1_P4.jpg", - "imageData": null, - "imageHeight": 1042, - "imageWidth": 1392 + ] } \ No newline at end of file diff --git a/drafter_10/instances/C117_D1_P1.json b/drafter_10/instances/C117_D1_P1.json index dbeb8624e9dc3e3e31e4b82bd1d80a1bb6a9bc5f..4831b96524ad149c7b992b8cb8d94f3f8b025b38 100644 --- a/drafter_10/instances/C117_D1_P1.json +++ b/drafter_10/instances/C117_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 495.50561797752806, @@ -24,13 +24,15 @@ 334.2696629213483 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 503.38983050847463, @@ -49,13 +51,15 @@ 463.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 858.0, @@ -74,13 +78,15 @@ 430.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 745.0, @@ -99,13 +105,15 @@ 411.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 744.0, @@ -124,13 +132,15 @@ 375.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 753.0, @@ -149,13 +159,15 @@ 335.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 747.0, @@ -174,13 +186,15 @@ 296.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 341.0, @@ -199,13 +213,15 @@ 431.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1169.0, @@ -224,13 +240,15 @@ 330.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 305.0, @@ -249,13 +267,15 @@ 289.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "not", "line_color": null, "fill_color": null, + "label": "not", "points": [ [ 545.9473684210526, @@ -286,13 +306,15 @@ 288.57894736842104 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "not", "line_color": null, "fill_color": null, + "label": "not", "points": [ [ 565.9473684210526, @@ -319,13 +341,15 @@ 406.4736842105263 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 846.0, @@ -344,10 +368,16 @@ 297.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C117_D1_P1.jpg", + "imageData": null, + "imageHeight": 1042, + "imageWidth": 1392, "lineColor": [ 0, 255, @@ -359,9 +389,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C117_D1_P1.jpg", - "imageData": null, - "imageHeight": 1042, - "imageWidth": 1392 + ] } \ No newline at end of file diff --git a/drafter_10/instances/C118_D1_P1.json b/drafter_10/instances/C118_D1_P1.json index 923b801679c75a1306b93d7d4534573d75bee975..65a849b821ff5dce90190c816d457135d1313be0 100644 --- a/drafter_10/instances/C118_D1_P1.json +++ b/drafter_10/instances/C118_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 505.0561797752809, @@ -28,13 +28,15 @@ 412.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 789.0, @@ -53,13 +55,15 @@ 560.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 441.0, @@ -78,13 +82,15 @@ 656.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 771.0, @@ -103,13 +109,15 @@ 343.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 952.0, @@ -128,13 +136,15 @@ 512.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 794.0, @@ -153,13 +163,15 @@ 483.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 788.0, @@ -178,13 +190,15 @@ 433.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1252.0, @@ -203,13 +217,15 @@ 449.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 209.0, @@ -228,13 +244,15 @@ 568.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 187.0, @@ -253,13 +271,15 @@ 400.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 161.0, @@ -278,13 +298,15 @@ 334.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 217.0, @@ -303,13 +325,15 @@ 630.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "nand", "line_color": null, "fill_color": null, + "label": "nand", "points": [ [ 918.0, @@ -328,13 +352,15 @@ 407.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "nor", "line_color": null, "fill_color": null, + "label": "nor", "points": [ [ 467.0, @@ -369,13 +395,15 @@ 546.4736842105262 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "or", "line_color": null, "fill_color": null, + "label": "or", "points": [ [ 332.0, @@ -410,10 +438,16 @@ 299.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C118_D1_P1.jpg", + "imageData": null, + "imageHeight": 1042, + "imageWidth": 1392, "lineColor": [ 0, 255, @@ -425,9 +459,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C118_D1_P1.jpg", - "imageData": null, - "imageHeight": 1042, - "imageWidth": 1392 + ] } \ No newline at end of file diff --git a/drafter_10/instances/C119_D2_P1.json b/drafter_10/instances/C119_D2_P1.json index a15ce4459713e26e02523c61c7d4c6dff46c045a..ba20d2d9c0aad6205a09ee5ac9403e975fefd918 100644 --- a/drafter_10/instances/C119_D2_P1.json +++ b/drafter_10/instances/C119_D2_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 725.0, @@ -24,13 +24,15 @@ 421.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1131.268436578171, @@ -53,13 +55,15 @@ 411.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 930.0, @@ -78,13 +82,15 @@ 457.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 787.8172588832488, @@ -107,13 +113,15 @@ 220.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 526.0, @@ -132,13 +140,15 @@ 178.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 311.0, @@ -157,13 +167,15 @@ 531.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 378.4503631961259, @@ -186,13 +198,15 @@ 232.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 555.0, @@ -211,13 +225,15 @@ 384.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 929.0, @@ -236,13 +252,15 @@ 376.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 176.0, @@ -261,13 +279,15 @@ 506.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 620.0, @@ -286,13 +306,15 @@ 198.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 625.0, @@ -311,13 +333,15 @@ 320.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 257.0, @@ -336,13 +360,15 @@ 465.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 220.0, @@ -361,13 +387,15 @@ 169.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1301.0, @@ -386,13 +414,15 @@ 351.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 92.0, @@ -411,13 +441,15 @@ 354.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 225.0, @@ -436,13 +468,15 @@ 211.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1288.0, @@ -461,13 +495,15 @@ 167.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 161.0, @@ -486,13 +522,15 @@ 345.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 241.0, @@ -511,13 +549,15 @@ 339.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 546.0, @@ -536,13 +576,15 @@ 324.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 146.0, @@ -561,13 +603,15 @@ 218.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "xor", "line_color": null, "fill_color": null, + "label": "xor", "points": [ [ 761.7368421052631, @@ -602,13 +646,15 @@ 159.1052631578947 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "xor", "line_color": null, "fill_color": null, + "label": "xor", "points": [ [ 368.05263157894734, @@ -647,13 +693,15 @@ 177.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 695.0, @@ -672,13 +720,15 @@ 298.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 304.0, @@ -697,13 +747,15 @@ 448.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 102.0, @@ -722,13 +774,15 @@ 176.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 112.0, @@ -747,13 +801,15 @@ 218.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "or", "line_color": null, "fill_color": null, + "label": "or", "points": [ [ 1011.0, @@ -788,10 +844,16 @@ 299.10526315789474 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C119_D2_P1.jpg", + "imageData": null, + "imageHeight": 1042, + "imageWidth": 1392, "lineColor": [ 0, 255, @@ -803,9 +865,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C119_D2_P1.jpg", - "imageData": null, - "imageHeight": 1042, - "imageWidth": 1392 + ] } \ No newline at end of file diff --git a/drafter_10/instances/C120_D2_P2.json b/drafter_10/instances/C120_D2_P2.json index 6413429c92816621847167929deb77c475641c0d..0ed901e8dbd8a858991db09f7c5db2f01454f3ce 100644 --- a/drafter_10/instances/C120_D2_P2.json +++ b/drafter_10/instances/C120_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -401,6 +415,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -447,6 +462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -481,6 +497,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/annotations/C61_D1_P1.xml b/drafter_6/annotations/C61_D1_P1.xml index 9f46fd0c39770e9d0a6a52d60c6d0b7cce2e5d55..edaab88e0d645e7d23089872692eda98313c1727 100644 --- a/drafter_6/annotations/C61_D1_P1.xml +++ b/drafter_6/annotations/C61_D1_P1.xml @@ -321,7 +321,7 @@ 154 416 - 3,3μF + 3,3µF text diff --git a/drafter_6/annotations/C61_D1_P2.xml b/drafter_6/annotations/C61_D1_P2.xml index 7a1091d9300e692f6af40d96d882959b4fd04b07..1873fc5b663373f20cc3e283ede58867c40ce5e4 100644 --- a/drafter_6/annotations/C61_D1_P2.xml +++ b/drafter_6/annotations/C61_D1_P2.xml @@ -21,6 +21,7 @@ 192 559 364 + 343 @@ -1124,7 +1125,7 @@ 127 346 - 3,3μF + 3,3µF text diff --git a/drafter_6/annotations/C61_D1_P3.xml b/drafter_6/annotations/C61_D1_P3.xml index e93cb941a046a9fdd9277ea6d90210f03822d245..a2aba8f7fe24e2a8ec511f2a440a6e9170c687dc 100644 --- a/drafter_6/annotations/C61_D1_P3.xml +++ b/drafter_6/annotations/C61_D1_P3.xml @@ -852,7 +852,7 @@ 129 407 - 3,3μF + 3,3µF capacitor.polarized diff --git a/drafter_6/annotations/C61_D1_P4.xml b/drafter_6/annotations/C61_D1_P4.xml index 3daf8aeb51211a2fe06cf462cadb873c1429b86f..6d1af3ff855210ad1e0df0c81289f40eae9fe34d 100644 --- a/drafter_6/annotations/C61_D1_P4.xml +++ b/drafter_6/annotations/C61_D1_P4.xml @@ -436,7 +436,7 @@ 118 450 - 3,3μF + 3,3µF text diff --git a/drafter_6/annotations/C61_D2_P1.xml b/drafter_6/annotations/C61_D2_P1.xml index 67d46cce61aa209874867d1122104d7193bb3ab9..f1e61b2f397ab140ab52cce855f2c38505169195 100644 --- a/drafter_6/annotations/C61_D2_P1.xml +++ b/drafter_6/annotations/C61_D2_P1.xml @@ -669,7 +669,7 @@ 128 477 - 3,3μF + 3,3µF capacitor.unpolarized diff --git a/drafter_6/annotations/C61_D2_P2.xml b/drafter_6/annotations/C61_D2_P2.xml index 51939240136c365fa1168a344b2d894d1ca905c6..fd4f6af280942f60491afbb61041c93c29cf369d 100644 --- a/drafter_6/annotations/C61_D2_P2.xml +++ b/drafter_6/annotations/C61_D2_P2.xml @@ -408,7 +408,7 @@ 113 560 - 3,3μF + 3,3µF capacitor.unpolarized diff --git a/drafter_6/annotations/C61_D2_P3.xml b/drafter_6/annotations/C61_D2_P3.xml index 913f7d8a321da102cf554200cfda5f1c5169a455..e5eebd39b18e6a988fc66c54c1bf05e74a7c6498 100644 --- a/drafter_6/annotations/C61_D2_P3.xml +++ b/drafter_6/annotations/C61_D2_P3.xml @@ -191,7 +191,7 @@ 147 350 - 3,3μF + 3,3µF text diff --git a/drafter_6/annotations/C61_D2_P4.xml b/drafter_6/annotations/C61_D2_P4.xml index 769557968b555758396a7180c2fe37a7fefdc80b..16b2b5278a9073d53231504946f2ff56d5221a08 100644 --- a/drafter_6/annotations/C61_D2_P4.xml +++ b/drafter_6/annotations/C61_D2_P4.xml @@ -1000,6 +1000,7 @@ 249 455 431 + 343 diff --git a/drafter_6/annotations/C62_D1_P1.xml b/drafter_6/annotations/C62_D1_P1.xml index 34466fea6b9e1debd30987586190e5650bca0474..4d5826e4b5fcdc6aa97c135a8e041a00166fc01c 100644 --- a/drafter_6/annotations/C62_D1_P1.xml +++ b/drafter_6/annotations/C62_D1_P1.xml @@ -46,7 +46,7 @@ 808 482 - Roytet + Restet text @@ -59,7 +59,7 @@ 690 423 - 100Ω + 100n text @@ -395,7 +395,7 @@ 1011 596 - OV + 0V junction diff --git a/drafter_6/annotations/C62_D1_P2.xml b/drafter_6/annotations/C62_D1_P2.xml index 06c8ba293458f65dd10797ac39de5033cade285c..b57523817d989e0991a950a4a50dfe784f059b46 100644 --- a/drafter_6/annotations/C62_D1_P2.xml +++ b/drafter_6/annotations/C62_D1_P2.xml @@ -19,9 +19,10 @@ 642 395 - 731 + 716 420 + 100n text @@ -443,6 +444,7 @@ 836 482 + Restet switch diff --git a/drafter_6/annotations/C62_D1_P3.xml b/drafter_6/annotations/C62_D1_P3.xml index 0be75b3b57997fc5a512441598ce2b16ff1c12bc..6597dd25dc86e88c32020078ad44f01a602ce749 100644 --- a/drafter_6/annotations/C62_D1_P3.xml +++ b/drafter_6/annotations/C62_D1_P3.xml @@ -59,7 +59,7 @@ 1042 513 - OV + 0V terminal @@ -122,7 +122,7 @@ 741 396 - 100Ω + 100n text @@ -293,7 +293,7 @@ 849 435 - Roytet + Restet text diff --git a/drafter_6/annotations/C62_D1_P4.xml b/drafter_6/annotations/C62_D1_P4.xml index fc78fe6253ee8805cff464676af8f1119c56dd4e..e9297902f666c5c738d17b103d26c83ad37d5814 100644 --- a/drafter_6/annotations/C62_D1_P4.xml +++ b/drafter_6/annotations/C62_D1_P4.xml @@ -46,7 +46,7 @@ 703 456 - Roytet + Restet text @@ -111,7 +111,7 @@ 841 536 - oV + 0V terminal diff --git a/drafter_6/annotations/C62_D2_P1.xml b/drafter_6/annotations/C62_D2_P1.xml index 7f9641d7e5a98415b2a91de144a19117c822ffac..a4123283361b7664f97e92ddcfa103b341c8d1df 100644 --- a/drafter_6/annotations/C62_D2_P1.xml +++ b/drafter_6/annotations/C62_D2_P1.xml @@ -60,7 +60,7 @@ 914 647 - OV + 0V text @@ -269,7 +269,7 @@ 766 457 - 100Ω + 100n text diff --git a/drafter_6/annotations/C62_D2_P2.xml b/drafter_6/annotations/C62_D2_P2.xml index bf11a35c7504b1b59866369b61fef9c1aad306e0..db6bc40964e826b895812cf494ff514c92081ebc 100644 --- a/drafter_6/annotations/C62_D2_P2.xml +++ b/drafter_6/annotations/C62_D2_P2.xml @@ -59,7 +59,7 @@ 683 391 - 100Ω + 100n text @@ -72,7 +72,7 @@ 639 261 - 100kΩ + 100KΩ resistor @@ -111,7 +111,7 @@ 282 258 - 100kΩ + 100KΩ text @@ -124,7 +124,7 @@ 831 554 - OV + 0V switch diff --git a/drafter_6/annotations/C62_D2_P3.xml b/drafter_6/annotations/C62_D2_P3.xml index 597372a5374d1e18de82c5ea0eba00543e2226d2..a5a6ce77a8b2b705d069cb631ebed4edee34c330 100644 --- a/drafter_6/annotations/C62_D2_P3.xml +++ b/drafter_6/annotations/C62_D2_P3.xml @@ -61,7 +61,7 @@ 885 520 - OV + 0V text @@ -74,7 +74,7 @@ 690 380 - 100Ω + 100n switch diff --git a/drafter_6/annotations/C62_D2_P4.xml b/drafter_6/annotations/C62_D2_P4.xml index 03c22981dfcba38283f431704c52d4f765b0d4be..be26ee8a61d55dfb9a130078531650aec687dffb 100644 --- a/drafter_6/annotations/C62_D2_P4.xml +++ b/drafter_6/annotations/C62_D2_P4.xml @@ -110,7 +110,7 @@ 696 598 - OV + 0V text @@ -123,7 +123,7 @@ 597 409 - 100Ω + 100n text diff --git a/drafter_6/annotations/C63_D1_P1.xml b/drafter_6/annotations/C63_D1_P1.xml index 6a92a6ccefea1c504282cd238d2e810138e59599..5b7edf8f0fe539e916af101d8d3d2f8bfa7ddabf 100644 --- a/drafter_6/annotations/C63_D1_P1.xml +++ b/drafter_6/annotations/C63_D1_P1.xml @@ -211,7 +211,7 @@ 1033 316 - Um-off + On-off text @@ -539,7 +539,7 @@ 532 73 - 78105 + 78L05 text diff --git a/drafter_6/annotations/C63_D1_P2.xml b/drafter_6/annotations/C63_D1_P2.xml index cb263c1d9cb01ab4516e33bf3a1333b1a0e8a65d..06cc3ba64f11e42ec27880fba98c1595c4ce511a 100644 --- a/drafter_6/annotations/C63_D1_P2.xml +++ b/drafter_6/annotations/C63_D1_P2.xml @@ -445,7 +445,7 @@ 504 147 - 78a05 + 78L05 integrated_circuit.voltage_regulator @@ -662,7 +662,7 @@ 978 361 - um-off + On-off text @@ -675,7 +675,7 @@ 980 449 - 121 + 12V terminal diff --git a/drafter_6/annotations/C63_D1_P3.xml b/drafter_6/annotations/C63_D1_P3.xml index c89b6df2b632aa50dcd69043cb9aa3d130a45ab9..b6ea2a65ab302360c58e9d83e3827a08e9a08c68 100644 --- a/drafter_6/annotations/C63_D1_P3.xml +++ b/drafter_6/annotations/C63_D1_P3.xml @@ -98,7 +98,7 @@ 586 154 - 78105 + 78L05 text @@ -906,7 +906,7 @@ 939 376 - A2V + 12V text @@ -919,7 +919,7 @@ 936 320 - um-off + On-off switch diff --git a/drafter_6/annotations/C63_D1_P4.xml b/drafter_6/annotations/C63_D1_P4.xml index 0a5eea429b209d020c57523a9682b6749b8cbde3..01d366597d25c631ebb88dfdf5e369e07e929a37 100644 --- a/drafter_6/annotations/C63_D1_P4.xml +++ b/drafter_6/annotations/C63_D1_P4.xml @@ -773,7 +773,7 @@ 167 771 191 - 360 + 13 @@ -799,7 +799,7 @@ 278 659 302 - 360 + 8 diff --git a/drafter_6/annotations/C63_D2_P1.xml b/drafter_6/annotations/C63_D2_P1.xml index e572aa962a218053d3e71deaf140e581a2431afd..e0b8688537065d3af7451009df88f284777964f2 100644 --- a/drafter_6/annotations/C63_D2_P1.xml +++ b/drafter_6/annotations/C63_D2_P1.xml @@ -86,7 +86,7 @@ 552 101 - 78105 + 78L05 text @@ -334,7 +334,7 @@ 1006 368 - om-off + On-off terminal diff --git a/drafter_6/annotations/C63_D2_P2.xml b/drafter_6/annotations/C63_D2_P2.xml index 18453bb6695507d98c9f7b39025fdc1c0ef2855d..61379e57cf8b10877d7b547c7661893c7cb950d1 100644 --- a/drafter_6/annotations/C63_D2_P2.xml +++ b/drafter_6/annotations/C63_D2_P2.xml @@ -344,7 +344,7 @@ 318 590 346 - 346 + 10 @@ -357,7 +357,7 @@ 278 635 304 - 360 + 10 @@ -370,7 +370,7 @@ 239 680 270 - 360 + 10 @@ -383,7 +383,7 @@ 204 724 236 - 360 + 12 @@ -475,7 +475,7 @@ 515 134 - 78605 + 78L05 text @@ -735,7 +735,7 @@ 669 294 - Bc547 + BC547 junction @@ -880,7 +880,7 @@ 929 308 - on-off + On-off text diff --git a/drafter_6/annotations/C63_D2_P3.xml b/drafter_6/annotations/C63_D2_P3.xml index 89a730d92527d65b06cdb6ce21a697e7498b4a52..8b886009a7042e6a16f906ea77a3027a61152036 100644 --- a/drafter_6/annotations/C63_D2_P3.xml +++ b/drafter_6/annotations/C63_D2_P3.xml @@ -34,7 +34,7 @@ 994 272 - on-off + On-off text @@ -177,7 +177,7 @@ 544 110 - 100Ω + 100n text diff --git a/drafter_6/annotations/C63_D2_P4.xml b/drafter_6/annotations/C63_D2_P4.xml index 30634fcaf876b202e49dac66e3072f8c1ec67c87..1a0bb6f4ee24b5467657a9009a51ac5241b114f3 100644 --- a/drafter_6/annotations/C63_D2_P4.xml +++ b/drafter_6/annotations/C63_D2_P4.xml @@ -388,7 +388,7 @@ 457 188 - 100Ω + 100n text @@ -529,6 +529,7 @@ 134 354 + 1n text @@ -689,7 +690,7 @@ 991 326 - on-off + On-off switch @@ -1191,5 +1192,6 @@ 201 363 + 4 diff --git a/drafter_6/annotations/C64_D1_P1.xml b/drafter_6/annotations/C64_D1_P1.xml index 6fa8a49cf3e72caa16ac2166d268fbeab2228633..c7f382a4224da3c90465990d7ffcb882794e0441 100644 --- a/drafter_6/annotations/C64_D1_P1.xml +++ b/drafter_6/annotations/C64_D1_P1.xml @@ -188,7 +188,7 @@ 877 473 - ov + 0V terminal diff --git a/drafter_6/annotations/C64_D1_P2.xml b/drafter_6/annotations/C64_D1_P2.xml index c75aebe2cafe9a63ca3c3d888a6b9acd2683044e..cd618c95e4fa9ca84269c616e6fbf1ca5d138c43 100644 --- a/drafter_6/annotations/C64_D1_P2.xml +++ b/drafter_6/annotations/C64_D1_P2.xml @@ -125,7 +125,7 @@ 903 440 - ov + 0V text diff --git a/drafter_6/annotations/C64_D1_P3.xml b/drafter_6/annotations/C64_D1_P3.xml index 9f9acf6d7f46cd7fff0140d2e114bcce6442b8e4..fc66df19efc6d302399bb4b175618418fab5b544 100644 --- a/drafter_6/annotations/C64_D1_P3.xml +++ b/drafter_6/annotations/C64_D1_P3.xml @@ -213,7 +213,7 @@ 1002 450 - ov + 0V terminal diff --git a/drafter_6/annotations/C64_D1_P4.xml b/drafter_6/annotations/C64_D1_P4.xml index 3185fc4ec6b96ce0dd79c5966d6bf01a21be5568..2b3eef999b2b479618ddf983a74ae49c8d49a853 100644 --- a/drafter_6/annotations/C64_D1_P4.xml +++ b/drafter_6/annotations/C64_D1_P4.xml @@ -85,7 +85,7 @@ 328 683 363 - 5 + 354 @@ -215,7 +215,7 @@ 739 366 - Bc557 + BC557 text @@ -254,7 +254,7 @@ 707 532 - ov + 0V text diff --git a/drafter_6/annotations/C64_D2_P1.xml b/drafter_6/annotations/C64_D2_P1.xml index 96e600378ce450485e95fde2c799f44eec8ac5cf..c6a9c12261aa9dfeb74d4db801658f155a412ae3 100644 --- a/drafter_6/annotations/C64_D2_P1.xml +++ b/drafter_6/annotations/C64_D2_P1.xml @@ -112,7 +112,7 @@ 773 241 - Bc557 + BC557 text @@ -229,7 +229,7 @@ 62 241 - 3KΩ + 3sKΩ text @@ -242,7 +242,7 @@ 950 489 - ov + 0V text diff --git a/drafter_6/annotations/C64_D2_P2.xml b/drafter_6/annotations/C64_D2_P2.xml index 865be2a103c27efca60db6fbb79453110751f016..a912df858a44b6e19d6317f1ef9427d461eaf04c 100644 --- a/drafter_6/annotations/C64_D2_P2.xml +++ b/drafter_6/annotations/C64_D2_P2.xml @@ -384,7 +384,7 @@ 789 262 - Bc557 + BC557 text @@ -545,7 +545,7 @@ 985 515 - ov + 0V text diff --git a/drafter_6/annotations/C64_D2_P3.xml b/drafter_6/annotations/C64_D2_P3.xml index eec361f1e321f29b5d6b73ca6153570890c05864..3fe51abb04261cd294eaca088a56d52d2f33c178 100644 --- a/drafter_6/annotations/C64_D2_P3.xml +++ b/drafter_6/annotations/C64_D2_P3.xml @@ -402,7 +402,7 @@ 776 227 - Bc557 + BC557 text @@ -558,7 +558,7 @@ 988 466 - ov + 0V terminal diff --git a/drafter_6/annotations/C64_D2_P4.xml b/drafter_6/annotations/C64_D2_P4.xml index be89c5f8104aeadaf6e0cf29495e1abb4e055cec..d32b870c20c5aec638b549f7e5f8fa93b3c28bef 100644 --- a/drafter_6/annotations/C64_D2_P4.xml +++ b/drafter_6/annotations/C64_D2_P4.xml @@ -203,7 +203,7 @@ 930 482 - ov + 0V terminal @@ -253,7 +253,7 @@ 729 256 - Bc557 + BC557 text diff --git a/drafter_6/annotations/C65_D1_P1.xml b/drafter_6/annotations/C65_D1_P1.xml index cf8d23319d9b42675e4bc3ac56cac32f2a89d476..a24b3a044fdb4fbf7f07b6e0e4cd05666c359e09 100644 --- a/drafter_6/annotations/C65_D1_P1.xml +++ b/drafter_6/annotations/C65_D1_P1.xml @@ -99,7 +99,7 @@ 421 578 - ov + 0V text diff --git a/drafter_6/annotations/C65_D1_P2.xml b/drafter_6/annotations/C65_D1_P2.xml index 396d01f1468810012d1e1fe32c7dab576bc00765..f5cde210799c9f4ac47e2005c42ae2ffe7a6bf46 100644 --- a/drafter_6/annotations/C65_D1_P2.xml +++ b/drafter_6/annotations/C65_D1_P2.xml @@ -98,7 +98,7 @@ 213 611 - ov + 0V text diff --git a/drafter_6/annotations/C65_D1_P3.xml b/drafter_6/annotations/C65_D1_P3.xml index e0753f9e31923049ebe9d4d4013a1646a5b10493..54af2c80b76a7e126e77e659649e72098a4a4f35 100644 --- a/drafter_6/annotations/C65_D1_P3.xml +++ b/drafter_6/annotations/C65_D1_P3.xml @@ -86,7 +86,7 @@ 364 638 - ov + 0V text diff --git a/drafter_6/annotations/C65_D1_P4.xml b/drafter_6/annotations/C65_D1_P4.xml index ebbf2661f047b6a0b492ce3397608d051d126d60..dfa102e9c7c68b8149035eb5d9332ea62bcaa70e 100644 --- a/drafter_6/annotations/C65_D1_P4.xml +++ b/drafter_6/annotations/C65_D1_P4.xml @@ -270,7 +270,7 @@ 316 657 - ov + 0V text @@ -335,6 +335,7 @@ 520 453 + 2 text diff --git a/drafter_6/annotations/C65_D2_P1.xml b/drafter_6/annotations/C65_D2_P1.xml index b20b03d6bd01228c8220cca5f0e6094728f678fc..4075b7287310a185b760808ce1e6c6645cf8cd10 100644 --- a/drafter_6/annotations/C65_D2_P1.xml +++ b/drafter_6/annotations/C65_D2_P1.xml @@ -258,7 +258,7 @@ 145 655 - ov + 0V terminal diff --git a/drafter_6/annotations/C65_D2_P2.xml b/drafter_6/annotations/C65_D2_P2.xml index 34ee020b369183c7fd5ba3935d6d92800f1e7b6a..d0b8e615186b7565e456d8e7419abff4e080e897 100644 --- a/drafter_6/annotations/C65_D2_P2.xml +++ b/drafter_6/annotations/C65_D2_P2.xml @@ -246,7 +246,7 @@ 252 716 - ov + 0V junction diff --git a/drafter_6/annotations/C65_D2_P3.xml b/drafter_6/annotations/C65_D2_P3.xml index 6261f464c645445031d26eec6885cb25d79d2f11..a7f5602e2d99728059896a539768683f429ff8f9 100644 --- a/drafter_6/annotations/C65_D2_P3.xml +++ b/drafter_6/annotations/C65_D2_P3.xml @@ -60,7 +60,7 @@ 165 630 - ov + 0V text diff --git a/drafter_6/annotations/C65_D2_P4.xml b/drafter_6/annotations/C65_D2_P4.xml index 68fac988ee84fa5f9e38de8c532a1f4fe199fbfa..7ab3680b7756369b25b21a3f9722442a045eee0d 100644 --- a/drafter_6/annotations/C65_D2_P4.xml +++ b/drafter_6/annotations/C65_D2_P4.xml @@ -275,7 +275,7 @@ 155 480 - ov + 0V terminal diff --git a/drafter_6/annotations/C66_D1_P1.xml b/drafter_6/annotations/C66_D1_P1.xml index 661177a5eb35fd66c8a485f2f8570b8e7f19cf0c..7cc72eb7a5f50ee42be5e7bc5e27a8dffdd079be 100644 --- a/drafter_6/annotations/C66_D1_P1.xml +++ b/drafter_6/annotations/C66_D1_P1.xml @@ -358,7 +358,7 @@ 945 524 - ov + 0V text diff --git a/drafter_6/annotations/C66_D1_P2.xml b/drafter_6/annotations/C66_D1_P2.xml index d1eb326983cb5f95eb3eedd46a0e8383f939f807..a9d7ff2a1ab62771b34924079406ee08c9667d6b 100644 --- a/drafter_6/annotations/C66_D1_P2.xml +++ b/drafter_6/annotations/C66_D1_P2.xml @@ -358,7 +358,7 @@ 1080 544 - ov + 0V text diff --git a/drafter_6/annotations/C66_D1_P3.xml b/drafter_6/annotations/C66_D1_P3.xml index 2191c96f1f6532ee31d82269723588362a8cd1ac..1572a2f33f6f53512cc71c8d6420234fb70b551d 100644 --- a/drafter_6/annotations/C66_D1_P3.xml +++ b/drafter_6/annotations/C66_D1_P3.xml @@ -410,7 +410,7 @@ 1048 474 - ov + 0V terminal diff --git a/drafter_6/annotations/C66_D1_P4.xml b/drafter_6/annotations/C66_D1_P4.xml index 71469ab39919f886556aa3bf3f0ace04ff16e32e..439826bb9a702b6a3e2214eeb071b9413213a3ff 100644 --- a/drafter_6/annotations/C66_D1_P4.xml +++ b/drafter_6/annotations/C66_D1_P4.xml @@ -475,7 +475,7 @@ 968 496 - ov + 0V text diff --git a/drafter_6/annotations/C66_D2_P1.xml b/drafter_6/annotations/C66_D2_P1.xml index 87817d6f7eb7d1aa37bfafbb595c3bd6c4da2a8f..9a6339c56530722b281fa2c1d0ab30bf8287afb0 100644 --- a/drafter_6/annotations/C66_D2_P1.xml +++ b/drafter_6/annotations/C66_D2_P1.xml @@ -131,7 +131,7 @@ 991 484 - ov + 0V text diff --git a/drafter_6/annotations/C66_D2_P2.xml b/drafter_6/annotations/C66_D2_P2.xml index 1c13188b20ef916e6001b479728a2227090a05d8..55069cec152485ee47da86de3e85da17790aa987 100644 --- a/drafter_6/annotations/C66_D2_P2.xml +++ b/drafter_6/annotations/C66_D2_P2.xml @@ -894,6 +894,7 @@ 870 519 + Green LED text @@ -906,7 +907,7 @@ 922 627 - ov + 0V text diff --git a/drafter_6/annotations/C66_D2_P3.xml b/drafter_6/annotations/C66_D2_P3.xml index 306e6cdaee6494150291596d333b327f806b59a0..888bf971c907e0365659d25fe8e4101cb91c1be9 100644 --- a/drafter_6/annotations/C66_D2_P3.xml +++ b/drafter_6/annotations/C66_D2_P3.xml @@ -594,7 +594,7 @@ 1003 505 - ov + 0V text diff --git a/drafter_6/annotations/C66_D2_P4.xml b/drafter_6/annotations/C66_D2_P4.xml index 837188c4a41ed3a174a5d2e36407c93ab4346db3..fa236c92df64ee831884d5e6e6f3ea5f1df21105 100644 --- a/drafter_6/annotations/C66_D2_P4.xml +++ b/drafter_6/annotations/C66_D2_P4.xml @@ -660,6 +660,7 @@ 797 489 + Green LED text @@ -698,7 +699,7 @@ 847 553 - ov + 0V text diff --git a/drafter_6/annotations/C67_D1_P1.xml b/drafter_6/annotations/C67_D1_P1.xml index 3d20abadb8a8483ceb1021dd0f4ca42540ed89db..66445ad9eceefdcf36b0f067ef0108f88820d0e3 100644 --- a/drafter_6/annotations/C67_D1_P1.xml +++ b/drafter_6/annotations/C67_D1_P1.xml @@ -22,7 +22,7 @@ 615 632 - 100Ω + 100n capacitor.unpolarized @@ -47,7 +47,7 @@ 488 664 539 - 90 + 83 @@ -60,6 +60,7 @@ 604 924 672 + 180 @@ -317,7 +318,7 @@ 1121 360 - 1Ω + 1M text @@ -368,7 +369,7 @@ 392 675 452 - 90 + 85 diff --git a/drafter_6/annotations/C67_D1_P2.xml b/drafter_6/annotations/C67_D1_P2.xml index 11176c2a0996656e0d06b6bd755f69eddd0a6036..1aa933f53ed3ff7ad3a1783bf0a705a1f7fd29d5 100644 --- a/drafter_6/annotations/C67_D1_P2.xml +++ b/drafter_6/annotations/C67_D1_P2.xml @@ -111,7 +111,7 @@ 1006 299 - 1Ω + 1M text @@ -346,6 +346,7 @@ 554 853 621 + 185 diff --git a/drafter_6/annotations/C67_D1_P3.xml b/drafter_6/annotations/C67_D1_P3.xml index 282fb5363066388fa68bfe5b08f54edde787f88e..803ef301f9ea3645d4faa9cfc333dc9fb8969577 100644 --- a/drafter_6/annotations/C67_D1_P3.xml +++ b/drafter_6/annotations/C67_D1_P3.xml @@ -72,6 +72,7 @@ 589 785 679 + 177 @@ -380,7 +381,7 @@ 371 635 - 100Ω + 100n text @@ -549,7 +550,7 @@ 1059 253 - 1Ω + 1M text diff --git a/drafter_6/annotations/C67_D1_P4.xml b/drafter_6/annotations/C67_D1_P4.xml index 45f9cd504af14cf868618ee91f33eac947f072cb..7e9eb6d034819adddfbefbea48acab411b35e0a4 100644 --- a/drafter_6/annotations/C67_D1_P4.xml +++ b/drafter_6/annotations/C67_D1_P4.xml @@ -72,6 +72,7 @@ 577 903 680 + 180 @@ -362,7 +363,7 @@ 242 1256 310 - 90 + 96 @@ -373,7 +374,7 @@ 1213 132 - 1309 + 1287 214 271 diff --git a/drafter_6/annotations/C67_D2_P1.xml b/drafter_6/annotations/C67_D2_P1.xml index 724e24be744da13b1f71813c4ee47098d6f2e211..8797162ac84227db9c594e1673c2608806ad6139 100644 --- a/drafter_6/annotations/C67_D2_P1.xml +++ b/drafter_6/annotations/C67_D2_P1.xml @@ -347,6 +347,7 @@ 683 863 780 + 179 @@ -432,7 +433,7 @@ 1056 373 - 1Ω + 1M text diff --git a/drafter_6/annotations/C67_D2_P2.xml b/drafter_6/annotations/C67_D2_P2.xml index e40a421556fd29ba0fef711470b3695525fda009..dbb42acb5d6542082322db53614feadc5c9be033 100644 --- a/drafter_6/annotations/C67_D2_P2.xml +++ b/drafter_6/annotations/C67_D2_P2.xml @@ -34,6 +34,7 @@ 727 817 829 + 167 diff --git a/drafter_6/annotations/C67_D2_P3.xml b/drafter_6/annotations/C67_D2_P3.xml index a8a43dfdbdc851eece40cd3535a25143937f740b..13b1a82697bd7acf7ba39860033359416683513e 100644 --- a/drafter_6/annotations/C67_D2_P3.xml +++ b/drafter_6/annotations/C67_D2_P3.xml @@ -215,7 +215,7 @@ 643 883 - 10Ω + 10n text @@ -562,6 +562,7 @@ 784 728 905 + 177 diff --git a/drafter_6/annotations/C67_D2_P4.xml b/drafter_6/annotations/C67_D2_P4.xml index d853ce8156a5bb07185e345b1ad15380fda18d7b..d5c56b495b575d1c79166ce0461390ff86d0f372 100644 --- a/drafter_6/annotations/C67_D2_P4.xml +++ b/drafter_6/annotations/C67_D2_P4.xml @@ -58,6 +58,7 @@ 687 762 788 + 173 @@ -238,7 +239,7 @@ 677 769 - 10Ω + 10n text diff --git a/drafter_6/annotations/C68_D1_P1.xml b/drafter_6/annotations/C68_D1_P1.xml index bd043698f46c74daf4f78d9f827c0ed131c7e39a..5a89428e9b025b073efa66de3e485834d783a351 100644 --- a/drafter_6/annotations/C68_D1_P1.xml +++ b/drafter_6/annotations/C68_D1_P1.xml @@ -211,7 +211,7 @@ 457 690 - Bc547 + BC547 text @@ -250,7 +250,7 @@ 1355 775 - ov + 0V text diff --git a/drafter_6/annotations/C68_D1_P2.xml b/drafter_6/annotations/C68_D1_P2.xml index 98ea5bbf98d38aec831282a9887f295fa0811779..1f12133cf75880ff6f3cbfaf938ced0d17257fa7 100644 --- a/drafter_6/annotations/C68_D1_P2.xml +++ b/drafter_6/annotations/C68_D1_P2.xml @@ -34,7 +34,7 @@ 1382 727 - ov + 0V terminal @@ -201,7 +201,7 @@ 1060 706 - 10Ω + 10n text @@ -227,7 +227,7 @@ 440 700 - Bc547 + BC547 text diff --git a/drafter_6/annotations/C68_D1_P3.xml b/drafter_6/annotations/C68_D1_P3.xml index f3573bd173a8e2a25f9c79d4e70bf2b0da2c0e16..a049d35a01bd3407465f4a404ceaa960458fb4fa 100644 --- a/drafter_6/annotations/C68_D1_P3.xml +++ b/drafter_6/annotations/C68_D1_P3.xml @@ -58,7 +58,7 @@ 482 540 - Bc547 + BC547 text @@ -175,7 +175,7 @@ 1021 618 - 10Ω + 10n junction @@ -524,7 +524,7 @@ 1312 656 - ov + 0V text diff --git a/drafter_6/annotations/C68_D1_P4.xml b/drafter_6/annotations/C68_D1_P4.xml index c17c2e9a11e6f34810a54c8dacb659131cec4d7f..5e4d2bda3be3d6553aa1d6563dac276d5c59a241 100644 --- a/drafter_6/annotations/C68_D1_P4.xml +++ b/drafter_6/annotations/C68_D1_P4.xml @@ -48,7 +48,7 @@ 920 744 - 10Ω + 10n text @@ -61,7 +61,7 @@ 1197 808 - ov + 0V text @@ -229,7 +229,7 @@ 498 662 - Bc547 + BC547 text diff --git a/drafter_6/annotations/C68_D2_P1.xml b/drafter_6/annotations/C68_D2_P1.xml index 5271ff407fb64cd6e069c812a752143fdf3748a5..a022385822a81752d6dc16192ea37a22ed5b2772 100644 --- a/drafter_6/annotations/C68_D2_P1.xml +++ b/drafter_6/annotations/C68_D2_P1.xml @@ -47,7 +47,7 @@ 1258 757 - ov + 0V text @@ -73,6 +73,7 @@ 1113 687 + 10n capacitor.polarized @@ -370,7 +371,7 @@ 607 676 - Bc547 + BC547 text diff --git a/drafter_6/annotations/C68_D2_P2.xml b/drafter_6/annotations/C68_D2_P2.xml index 9081f307ae458673e1b491c1b663b53dc528bb7a..505e36a9249e1ff6cced456f79b76cece99d5352 100644 --- a/drafter_6/annotations/C68_D2_P2.xml +++ b/drafter_6/annotations/C68_D2_P2.xml @@ -71,7 +71,7 @@ 1318 686 - ov + 0V text @@ -240,7 +240,7 @@ 510 739 - Bc547 + BC547 text diff --git a/drafter_6/annotations/C68_D2_P3.xml b/drafter_6/annotations/C68_D2_P3.xml index 252ce4b8b2c59552fe2282fb6b9b3372a97b978d..11f17e69fd2d248d5e7078b754119129ee569f76 100644 --- a/drafter_6/annotations/C68_D2_P3.xml +++ b/drafter_6/annotations/C68_D2_P3.xml @@ -147,7 +147,7 @@ 485 597 - Bc547 + BC547 text @@ -341,7 +341,7 @@ 1255 884 - OV + 0V terminal diff --git a/drafter_6/annotations/C68_D2_P4.xml b/drafter_6/annotations/C68_D2_P4.xml index 20ac1820c9a50499da7ed5ec6ef34c3c0e725ac9..396cd31eb4fbbd37150c28cf0a7b99c50df55d07 100644 --- a/drafter_6/annotations/C68_D2_P4.xml +++ b/drafter_6/annotations/C68_D2_P4.xml @@ -35,7 +35,7 @@ 1202 815 - OV + 0V text diff --git a/drafter_6/annotations/C69_D1_P1.xml b/drafter_6/annotations/C69_D1_P1.xml index 10660725dd7943b4a84b408cf70cc1760a1ce4aa..58dcb41d0fc280a10dfdaa51f1684714273556c3 100644 --- a/drafter_6/annotations/C69_D1_P1.xml +++ b/drafter_6/annotations/C69_D1_P1.xml @@ -531,6 +531,7 @@ 484 985 606 + 85 diff --git a/drafter_6/annotations/C69_D1_P2.xml b/drafter_6/annotations/C69_D1_P2.xml index 35be6b4a445d0c2678a6fbb99865a2b5cab40bc6..bcfcf04604c2cb806cd0625b024158624de74ba8 100644 --- a/drafter_6/annotations/C69_D1_P2.xml +++ b/drafter_6/annotations/C69_D1_P2.xml @@ -225,7 +225,7 @@ 614 680 - 10Ω + 10n text @@ -531,6 +531,7 @@ 442 845 542 + 75 diff --git a/drafter_6/annotations/C69_D1_P3.xml b/drafter_6/annotations/C69_D1_P3.xml index 161bc98750ce8d32a8a355a5ad11d2aedb0d94ef..e199f1c334260286dad34513c4d77726751ed417 100644 --- a/drafter_6/annotations/C69_D1_P3.xml +++ b/drafter_6/annotations/C69_D1_P3.xml @@ -150,7 +150,7 @@ 669 780 - 10Ω + 10n text @@ -531,6 +531,7 @@ 517 870 615 + 104 diff --git a/drafter_6/annotations/C69_D1_P4.xml b/drafter_6/annotations/C69_D1_P4.xml index c88a7219241002be960a83a2339c0ff6d74ac1f5..43491094d4322f83ee98246750b06de25d51ed15 100644 --- a/drafter_6/annotations/C69_D1_P4.xml +++ b/drafter_6/annotations/C69_D1_P4.xml @@ -170,6 +170,7 @@ 943 594 + 12V text @@ -304,7 +305,7 @@ 679 729 - 10Ω + 10n text @@ -420,7 +421,7 @@ 584 355 616 - 360 + 8 @@ -530,6 +531,7 @@ 562 841 624 + 90 diff --git a/drafter_6/annotations/C69_D2_P1.xml b/drafter_6/annotations/C69_D2_P1.xml index 892fdc3ded4c8bea002ba8466b06c24916211268..55bd8edaa577a645d977dca2f968b58d9c9e8511 100644 --- a/drafter_6/annotations/C69_D2_P1.xml +++ b/drafter_6/annotations/C69_D2_P1.xml @@ -507,6 +507,7 @@ 593 918 696 + 90 diff --git a/drafter_6/annotations/C69_D2_P2.xml b/drafter_6/annotations/C69_D2_P2.xml index aae8846d13ed7c78d5c24b6c4f27cb0804629f92..1dae95e031d3d34c328128399d511b8557d6c33a 100644 --- a/drafter_6/annotations/C69_D2_P2.xml +++ b/drafter_6/annotations/C69_D2_P2.xml @@ -132,7 +132,9 @@ 474 900 593 + 90 + 1N4004 text @@ -505,6 +507,7 @@ 429 979 501 + 123 diff --git a/drafter_6/annotations/C69_D2_P3.xml b/drafter_6/annotations/C69_D2_P3.xml index 4d3e14abb6a7c97667b015ad2998ca1a1bf3e47a..1cd45e18369b5689e7fceb1256941e74bd0a5ae3 100644 --- a/drafter_6/annotations/C69_D2_P3.xml +++ b/drafter_6/annotations/C69_D2_P3.xml @@ -228,7 +228,7 @@ 417 345 471 - 360 + 4 @@ -507,6 +507,7 @@ 436 963 532 + 112 diff --git a/drafter_6/annotations/C69_D2_P4.xml b/drafter_6/annotations/C69_D2_P4.xml index 95a8a938f9a632269c85838b363c91b2c3d344cc..741ff2a905b6e783d45e093cc7645c97047f1fef 100644 --- a/drafter_6/annotations/C69_D2_P4.xml +++ b/drafter_6/annotations/C69_D2_P4.xml @@ -507,6 +507,7 @@ 616 864 679 + 110 diff --git a/drafter_6/annotations/C70_D1_P1.xml b/drafter_6/annotations/C70_D1_P1.xml index 31fb2ea2d13140ddae9d0f650cc49f563c042bb3..4253e94069a98c4c90c6b87bd5fbdccaf7435982 100644 --- a/drafter_6/annotations/C70_D1_P1.xml +++ b/drafter_6/annotations/C70_D1_P1.xml @@ -21,6 +21,7 @@ 482 309 567 + 90 @@ -146,7 +147,7 @@ 1030 178 1154 - 357 + 286 @@ -210,7 +211,7 @@ 182 838 - 6V + 0V text @@ -277,6 +278,7 @@ 504 1373 600 + 87 @@ -375,6 +377,7 @@ 1134 390 + 1N4148 junction @@ -708,6 +711,7 @@ 489 726 + 1µF crossover @@ -817,6 +821,7 @@ 188 1150 283 + 90 diff --git a/drafter_6/annotations/C70_D1_P2.xml b/drafter_6/annotations/C70_D1_P2.xml index 0b51eb08a2fd6133be7b95e8f6c15f73252860a8..a8f106b87e8e197ee74f3a2ff9eaae808dfc78dd 100644 --- a/drafter_6/annotations/C70_D1_P2.xml +++ b/drafter_6/annotations/C70_D1_P2.xml @@ -21,6 +21,7 @@ 393 293 443 + 96 @@ -33,6 +34,7 @@ 305 919 358 + 100 @@ -139,7 +141,7 @@ 821 375 - 2K@ + 2K2 text @@ -310,7 +312,7 @@ 234 614 - 6V + 0V terminal @@ -417,7 +419,7 @@ 674 162 755 - 256 + 216 @@ -819,6 +821,7 @@ 163 748 213 + 108 diff --git a/drafter_6/annotations/C70_D1_P3.xml b/drafter_6/annotations/C70_D1_P3.xml index 17ca17189886bd62ccbf9ec66565eb9780b8916e..950b6ef8dab7e65fa9a91bfe2f2229f2b6b19a9b 100644 --- a/drafter_6/annotations/C70_D1_P3.xml +++ b/drafter_6/annotations/C70_D1_P3.xml @@ -20,7 +20,7 @@ 878 162 996 - 303 + 247 @@ -59,6 +59,7 @@ 444 1153 530 + 83 @@ -197,6 +198,7 @@ 548 911 605 + 90 10ΩF @@ -238,7 +240,7 @@ 199 614 - 6V + 0V text @@ -250,6 +252,7 @@ 329 398 378 + 90 1KΩ @@ -418,6 +421,7 @@ 363 323 426 + 79 @@ -827,6 +831,7 @@ 166 990 244 + 73 diff --git a/drafter_6/annotations/C70_D1_P4.xml b/drafter_6/annotations/C70_D1_P4.xml index 3257e67bed267c6b83228cf3e69939d568c99f01..b8037190fe8d203530d7a45713b17bf7fef19fab 100644 --- a/drafter_6/annotations/C70_D1_P4.xml +++ b/drafter_6/annotations/C70_D1_P4.xml @@ -137,6 +137,7 @@ 401 456 458 + 90 1KΩ @@ -177,7 +178,7 @@ 197 722 - 6V + 0V text @@ -189,6 +190,7 @@ 652 934 708 + 90 2K2 @@ -202,7 +204,9 @@ 628 1043 690 + 90 + 10µF text @@ -265,7 +269,7 @@ 967 254 1069 - 402 + 337 @@ -304,6 +308,7 @@ 430 360 504 + 81 @@ -316,6 +321,7 @@ 493 1271 580 + 87 @@ -839,6 +845,7 @@ 258 1063 334 + 90 diff --git a/drafter_6/annotations/C70_D2_P1.xml b/drafter_6/annotations/C70_D2_P1.xml index eb1090e04f74dfac867df14dab098eb3f2c401c3..fb74a007277721a2513382b989dd2427cb94b6fb 100644 --- a/drafter_6/annotations/C70_D2_P1.xml +++ b/drafter_6/annotations/C70_D2_P1.xml @@ -119,10 +119,10 @@ 0 0 - 1047 + 1059 264 - 1206 - 474 + 1209 + 391 @@ -245,6 +245,7 @@ 683 1387 783 + 90 @@ -257,6 +258,7 @@ 675 283 773 + 90 @@ -391,6 +393,7 @@ 809 430 871 + 90 1µF @@ -404,6 +407,7 @@ 468 437 550 + 90 1kΩ @@ -534,6 +538,7 @@ 761 988 843 + 90 2K2 @@ -899,6 +904,7 @@ 275 1201 381 + 90 diff --git a/drafter_6/annotations/C70_D2_P2.xml b/drafter_6/annotations/C70_D2_P2.xml index 80119182ab8195aa6657f8f7f3f63f88246ccc24..3fabe914b867501241eb81e01741fc4e9a354b41 100644 --- a/drafter_6/annotations/C70_D2_P2.xml +++ b/drafter_6/annotations/C70_D2_P2.xml @@ -33,6 +33,7 @@ 627 1392 719 + 104 @@ -45,6 +46,7 @@ 681 307 788 + 92 @@ -55,8 +57,8 @@ 1013 279 - 1137 - 452 + 1132 + 385 @@ -121,7 +123,7 @@ 1191 615 - Bc338 + BC338 text @@ -174,7 +176,7 @@ 1232 804 - 10μF + 10µF junction @@ -404,7 +406,7 @@ 144 1051 - ov + 0V text @@ -416,8 +418,9 @@ 814 489 884 + 90 - 1μF + 1µF capacitor.polarized @@ -901,6 +904,7 @@ 294 1125 376 + 110 diff --git a/drafter_6/annotations/C70_D2_P3.xml b/drafter_6/annotations/C70_D2_P3.xml index 79eca39caf60386cc95f355882db1c499696baaa..a92f7969a38a7021a89ad7474b46b9fdc31f7c90 100644 --- a/drafter_6/annotations/C70_D2_P3.xml +++ b/drafter_6/annotations/C70_D2_P3.xml @@ -21,6 +21,7 @@ 672 372 770 + 92 @@ -71,6 +72,7 @@ 612 1391 696 + 108 @@ -508,7 +510,7 @@ 1017 310 1129 - 473 + 403 @@ -655,7 +657,7 @@ 236 975 - OV + 0V terminal @@ -707,7 +709,7 @@ 1210 776 - 10μF + 10µF text @@ -720,7 +722,7 @@ 1173 613 - Bc338 + BC338 text @@ -888,8 +890,9 @@ 789 519 850 + 90 - 1μF + 1µF inductor @@ -901,6 +904,7 @@ 318 1125 400 + 102 diff --git a/drafter_6/annotations/C70_D2_P4.xml b/drafter_6/annotations/C70_D2_P4.xml index 6b5fbd04d2c2b8676240823de8adac3efe008575..a210b0d54657e89a1827123ed6c3946831c6ad59 100644 --- a/drafter_6/annotations/C70_D2_P4.xml +++ b/drafter_6/annotations/C70_D2_P4.xml @@ -21,6 +21,7 @@ 554 280 641 + 81 @@ -33,6 +34,7 @@ 698 1401 814 + 89 @@ -132,10 +134,10 @@ 0 0 - 1025 - 228 - 1205 - 458 + 1059 + 242 + 1203 + 375 @@ -187,7 +189,7 @@ 140 809 - ov + 0V terminal @@ -342,7 +344,7 @@ 757 90 - 1μF + 1µF text @@ -355,7 +357,7 @@ 1154 648 - Bc338 + BC338 text @@ -902,6 +904,7 @@ 261 1200 372 + 77 diff --git a/drafter_6/annotations/C71_D1_P1.xml b/drafter_6/annotations/C71_D1_P1.xml index bc7be7a8f33b3c445e501b52a7d01aa91a07ffda..644c749bf987b5fb614c8f17daac195ceabb779f 100644 --- a/drafter_6/annotations/C71_D1_P1.xml +++ b/drafter_6/annotations/C71_D1_P1.xml @@ -111,6 +111,7 @@ 387 1138 469 + 180 @@ -202,7 +203,7 @@ 188 90 - 10KΩ + 47KΩ text @@ -229,7 +230,7 @@ 519 265 - 100Ω + 100n text @@ -257,7 +258,7 @@ 411 90 - 1μF + 1µF text @@ -284,7 +285,7 @@ 708 256 - Bc547 + BC547 text @@ -296,6 +297,7 @@ 159 769 225 + 90 10kΩ @@ -415,7 +417,7 @@ 1204 331 - 10μF + 10µF text @@ -428,7 +430,7 @@ 1268 398 - 10μF + 10µF text diff --git a/drafter_6/annotations/C71_D1_P2.xml b/drafter_6/annotations/C71_D1_P2.xml index de2c5441d646b279ba02d6ee02c935474fd1dedc..61c2417c94eea68e8b6663225958c4bbe35a2b6f 100644 --- a/drafter_6/annotations/C71_D1_P2.xml +++ b/drafter_6/annotations/C71_D1_P2.xml @@ -98,6 +98,7 @@ 472 1128 582 + 189 @@ -574,7 +575,7 @@ 579 90 - 1μF + 1µF text @@ -600,8 +601,9 @@ 489 488 570 + 90 - 10Ω + 1kΩ text @@ -669,7 +671,7 @@ 509 364 - Bc547 + BC547 text @@ -787,7 +789,7 @@ 1183 387 - 10μF + 10µF text @@ -800,7 +802,7 @@ 1278 466 - 10μF + 10µF text diff --git a/drafter_6/annotations/C71_D1_P3.xml b/drafter_6/annotations/C71_D1_P3.xml index c9bb51241d6269304876c3d94d173de719752790..c1fca41474705a5f169c63bc7f8be7c446218fd5 100644 --- a/drafter_6/annotations/C71_D1_P3.xml +++ b/drafter_6/annotations/C71_D1_P3.xml @@ -98,6 +98,7 @@ 572 1106 694 + 177 @@ -188,7 +189,7 @@ 1304 601 - 10μF + 10µF text @@ -201,7 +202,7 @@ 1224 496 - 10μF + 10µF text @@ -265,6 +266,7 @@ 332 928 489 + 90 NE555 @@ -330,6 +332,7 @@ 474 360 551 + 90 1µF @@ -343,6 +346,7 @@ 478 438 558 + 90 1kΩ @@ -356,6 +360,7 @@ 366 288 470 + 90 100kΩ @@ -370,7 +375,7 @@ 263 337 - 100Ω + 100n text @@ -383,7 +388,7 @@ 509 328 - Bc547 + BC547 text @@ -409,8 +414,9 @@ 111 153 230 + 90 - 10kΩ + 47kΩ text @@ -422,6 +428,7 @@ 147 314 271 + 90 680kΩ diff --git a/drafter_6/annotations/C71_D1_P4.xml b/drafter_6/annotations/C71_D1_P4.xml index 099f64c9d4b58a63106b65eaf2474126cdf7a618..17ec6363503073d0946ac7fac01fa02c2f4efa1d 100644 --- a/drafter_6/annotations/C71_D1_P4.xml +++ b/drafter_6/annotations/C71_D1_P4.xml @@ -111,6 +111,7 @@ 691 1158 801 + 177 @@ -525,7 +526,7 @@ 1307 712 - 10μF + 10µF text @@ -657,7 +658,7 @@ 287 90 - 10kΩ + 47kΩ text @@ -684,7 +685,7 @@ 319 424 - 100Ω + 100n text @@ -697,7 +698,7 @@ 630 435 - Bc547 + BC547 text @@ -725,7 +726,7 @@ 678 90 - 1μF + 1µF text diff --git a/drafter_6/annotations/C71_D2_P1.xml b/drafter_6/annotations/C71_D2_P1.xml index 862a302a7f29d228a644855b339017311fbb65e7..7c63b50f1eafa90682791710356fe7b1d6265b3a 100644 --- a/drafter_6/annotations/C71_D2_P1.xml +++ b/drafter_6/annotations/C71_D2_P1.xml @@ -111,6 +111,7 @@ 566 1037 658 + 180 @@ -428,7 +429,7 @@ 1131 531 - 10μF + 10µF text @@ -441,7 +442,7 @@ 1234 606 - 10μF + 10µF text @@ -454,7 +455,7 @@ 503 461 - Bc547 + BC547 text @@ -481,7 +482,7 @@ 224 500 - 100Ω + 100n text @@ -523,7 +524,7 @@ 692 90 - 1μF + 1µF text @@ -801,7 +802,7 @@ 716 587 - 1Ω + 1n capacitor.polarized diff --git a/drafter_6/annotations/C71_D2_P2.xml b/drafter_6/annotations/C71_D2_P2.xml index 17f8743ee352d9c9e112815a693a177872af6bfa..032dad78d686b4954ec80149a93a5cbde5f91e7f 100644 --- a/drafter_6/annotations/C71_D2_P2.xml +++ b/drafter_6/annotations/C71_D2_P2.xml @@ -111,6 +111,7 @@ 546 1108 636 + 180 @@ -229,7 +230,7 @@ 276 474 - 100Ω + 100n text @@ -257,7 +258,7 @@ 671 90 - 1μF + 1µF text @@ -284,7 +285,7 @@ 779 565 - 1Ω + 1n text @@ -311,7 +312,7 @@ 569 437 - Bc547 + BC547 text @@ -427,7 +428,7 @@ 1199 513 - 10μF + 10µF text @@ -440,7 +441,7 @@ 1316 587 - 10μF + 10µF text diff --git a/drafter_6/annotations/C71_D2_P3.xml b/drafter_6/annotations/C71_D2_P3.xml index c4595dc188aa5d4a4f70ed4289d6252cd12961b8..c1af6c5421d6a9c02f30f3b576c421f1ef6d88a7 100644 --- a/drafter_6/annotations/C71_D2_P3.xml +++ b/drafter_6/annotations/C71_D2_P3.xml @@ -98,6 +98,7 @@ 552 1040 626 + 180 @@ -212,7 +213,7 @@ 364 418 - 100Ω + 100n text @@ -240,7 +241,7 @@ 602 90 - 1μF + 1µF text @@ -267,7 +268,7 @@ 609 415 - Bc547 + BC547 text @@ -308,7 +309,7 @@ 1118 531 - 10μF + 10µF text @@ -321,7 +322,7 @@ 1216 593 - 10μF + 10µF text diff --git a/drafter_6/annotations/C71_D2_P4.xml b/drafter_6/annotations/C71_D2_P4.xml index 98d3a58152c600f55192d07668325efcb55f346d..14967f2d1a16c9658358e6d826afb11b32535b19 100644 --- a/drafter_6/annotations/C71_D2_P4.xml +++ b/drafter_6/annotations/C71_D2_P4.xml @@ -111,6 +111,7 @@ 604 981 696 + 177 @@ -238,7 +239,7 @@ 1092 578 - 10μF + 10µF text @@ -251,7 +252,7 @@ 1203 663 - 10μF + 10µF text @@ -290,7 +291,7 @@ 675 605 - 1Ω + 1n text @@ -381,7 +382,7 @@ 489 466 - Bc547 + BC547 text @@ -464,7 +465,7 @@ 665 90 - 1μF + 1µF text diff --git a/drafter_6/annotations/C72_D1_P1.xml b/drafter_6/annotations/C72_D1_P1.xml index 69e64d9c0d1463130a066599f228f7de2ef8261c..c00f70ad9d2bae2a58131eeb310c3317e025a668 100644 --- a/drafter_6/annotations/C72_D1_P1.xml +++ b/drafter_6/annotations/C72_D1_P1.xml @@ -317,6 +317,7 @@ 191 850 237 + 90 1KΩ @@ -332,7 +333,7 @@ 261 90 - 100μF + 100µF capacitor.polarized @@ -431,7 +432,7 @@ 836 374 - Bc107 + BC107 text @@ -457,7 +458,7 @@ 594 191 - 100Ω + 100n text @@ -483,8 +484,9 @@ 247 339 313 + 90 - 100μF + 100µF diode @@ -570,7 +572,7 @@ 1356 154 - 12V + +12V text @@ -1048,7 +1050,7 @@ 119 1235 147 - 358 + 350 @@ -1499,7 +1501,7 @@ 739 90 - 100μF + 100µF resistor.adjustable @@ -1552,7 +1554,7 @@ 1282 375 - 100Ω + 100n text @@ -1565,7 +1567,7 @@ 1235 279 - B0A39 + BDA39 text @@ -1603,6 +1605,7 @@ 665 1255 737 + 90 NE555 @@ -2046,6 +2049,7 @@ 155 784 204 + 90 @@ -2132,7 +2136,7 @@ 443 394 - Bc107 + BC107 crossover @@ -2169,6 +2173,7 @@ 228 767 266 + 90 1KΩ diff --git a/drafter_6/annotations/C72_D1_P2.xml b/drafter_6/annotations/C72_D1_P2.xml index b6b666ed6203cd6e95dbd6304c212a0f5d133228..4318ccef36efaa92012b622d5ca273cc929ecbe3 100644 --- a/drafter_6/annotations/C72_D1_P2.xml +++ b/drafter_6/annotations/C72_D1_P2.xml @@ -536,7 +536,7 @@ 393 90 - 100μF + 100µF text @@ -549,7 +549,7 @@ 415 455 - Bc107 + BC107 transistor.bjt @@ -736,7 +736,7 @@ 617 90 - 100μF + 100µF capacitor.polarized @@ -833,7 +833,7 @@ 1251 438 - 1298 + 1279 470 281 @@ -889,7 +889,7 @@ 1116 241 - B0139 + BD139 text @@ -928,7 +928,7 @@ 1189 125 - 12V + +12V terminal @@ -966,7 +966,7 @@ 784 375 - Bc107 + BC107 text @@ -1008,7 +1008,7 @@ 267 90 - 100μF + 100µF text @@ -1059,7 +1059,9 @@ 245 697 280 + 90 + 1KΩ text @@ -1859,6 +1861,7 @@ 181 704 223 + 106 @@ -2137,7 +2140,7 @@ 1018 324 - 2k2Ω + 2k2 junction @@ -2175,4 +2178,16 @@ 310 + + junction + Unspecified + 0 + 0 + + 1288 + 449 + 1296 + 458 + + diff --git a/drafter_6/annotations/C72_D1_P3.xml b/drafter_6/annotations/C72_D1_P3.xml index ed4612d8e23a817b521e7b49251920ae8d929ec7..547470f01f936396b4f4cd67fb38528c690a9e42 100644 --- a/drafter_6/annotations/C72_D1_P3.xml +++ b/drafter_6/annotations/C72_D1_P3.xml @@ -172,7 +172,7 @@ 1157 530 - 1222 + 1200 571 269 @@ -229,7 +229,7 @@ 774 90 - 100μF + 100µF text @@ -308,6 +308,7 @@ 250 615 294 + 90 1KΩ @@ -375,7 +376,7 @@ 435 90 - 100μF + 100µF diode.light_emitting @@ -442,7 +443,7 @@ 390 297 - 100Ω + 100n text @@ -482,7 +483,7 @@ 272 497 - Bc107 + BC107 text @@ -1760,6 +1761,7 @@ 227 552 273 + 90 @@ -1922,7 +1924,7 @@ 1156 125 - 12V + +12V terminal @@ -2174,4 +2176,16 @@ 356 + + junction + Unspecified + 0 + 0 + + 1214 + 546 + 1224 + 557 + + diff --git a/drafter_6/annotations/C72_D1_P4.xml b/drafter_6/annotations/C72_D1_P4.xml index 9554d59e0031d8198679fb11b05b2e1a05f0c28c..82e8a3afc86eb1c7adad6af03c2ca0f1b9d461be 100644 --- a/drafter_6/annotations/C72_D1_P4.xml +++ b/drafter_6/annotations/C72_D1_P4.xml @@ -113,7 +113,7 @@ 1225 366 - 100 + 100n text @@ -167,7 +167,7 @@ 989 343 - 2k2Ω + 2k2 text @@ -195,7 +195,7 @@ 226 90 - 100μF + 100µF text @@ -248,7 +248,7 @@ 492 160 - 100μ + 100µ text @@ -275,7 +275,7 @@ 240 90 - 2K2Ω + 2K2 text @@ -288,7 +288,7 @@ 394 354 - Bc107 + BC107 text @@ -302,7 +302,7 @@ 281 90 - 100μF + 100µF capacitor.polarized @@ -764,7 +764,7 @@ 1352 79 - 12V + +12V terminal @@ -1750,7 +1750,7 @@ 766 1315 802 - 271 + 266 @@ -1809,7 +1809,7 @@ 1260 558 - 1328 + 1301 603 264 @@ -2122,6 +2122,7 @@ 113 663 168 + 90 @@ -2176,4 +2177,16 @@ 162 + + junction + Unspecified + 0 + 0 + + 1316 + 583 + 1330 + 596 + + diff --git a/drafter_6/annotations/C72_D2_P1.xml b/drafter_6/annotations/C72_D2_P1.xml index 3ebae7e1d099a313dc6ef73a53d735141a518df1..7ff163543535482fa9ee99f357953019513e26b9 100644 --- a/drafter_6/annotations/C72_D2_P1.xml +++ b/drafter_6/annotations/C72_D2_P1.xml @@ -72,7 +72,7 @@ 658 90 - 100μF + 100µF text @@ -243,7 +243,7 @@ 1020 433 - 2k2Ω + 2k2 text @@ -309,7 +309,7 @@ 766 374 - Bc107 + BC107 text @@ -334,6 +334,7 @@ 293 716 321 + 90 1kΩ @@ -363,7 +364,7 @@ 309 90 - 100μF + 100µF text @@ -430,7 +431,7 @@ 498 367 - Bc107 + BC107 capacitor.polarized @@ -576,7 +577,7 @@ 1256 829 - ov + 0V text @@ -589,7 +590,7 @@ 1215 206 - 12V + +12V terminal @@ -1193,7 +1194,7 @@ 1138 381 - 100μ + 100n junction @@ -1577,6 +1578,7 @@ 223 733 268 + 77 @@ -2181,6 +2183,7 @@ 494 970 535 + 90 47KΩ diff --git a/drafter_6/annotations/C72_D2_P2.xml b/drafter_6/annotations/C72_D2_P2.xml index c104afbb6b5a27195071188a44a28f1cdf0ebfa2..db85236e92a7b870573f54ecc8e6e995f4c34b9f 100644 --- a/drafter_6/annotations/C72_D2_P2.xml +++ b/drafter_6/annotations/C72_D2_P2.xml @@ -45,7 +45,7 @@ 76 1167 108 - 360 + 358 @@ -252,7 +252,7 @@ 1281 703 - 100μF + 100µF text @@ -638,6 +638,7 @@ 105 624 164 + 85 @@ -785,7 +786,7 @@ 223 541 255 - 360 + 354 @@ -827,7 +828,7 @@ 673 219 - 100μF + 100µF text @@ -1339,7 +1340,7 @@ 418 501 443 - 185 + 175 @@ -1352,7 +1353,7 @@ 384 506 414 - 184 + 175 @@ -1649,7 +1650,7 @@ 1155 328 - 100Ω + 100n text @@ -1675,7 +1676,7 @@ 987 393 - 2K2Ω + 2K2 text @@ -2179,7 +2180,7 @@ 1268 94 - 12V + +12V text @@ -2192,7 +2193,7 @@ 432 142 - 100μ + 100µ text diff --git a/drafter_6/annotations/C72_D2_P3.xml b/drafter_6/annotations/C72_D2_P3.xml index 9855cdc7618cc0425dd72b1d2ce45e9a3f36109c..31189f27c6fb794cc139b28b5ce29b13a52801c4 100644 --- a/drafter_6/annotations/C72_D2_P3.xml +++ b/drafter_6/annotations/C72_D2_P3.xml @@ -402,6 +402,7 @@ 128 552 194 + 77 @@ -909,7 +910,7 @@ 1155 316 - 100Ω + 100n text @@ -1098,7 +1099,7 @@ 246 90 - 100μF + 100µF capacitor.polarized @@ -1789,7 +1790,7 @@ 734 90 - 100μF + 100µF text @@ -1816,7 +1817,7 @@ 1380 1009 - ov + 0V terminal @@ -1853,7 +1854,7 @@ 1269 43 - 12V + +12V text @@ -1904,6 +1905,7 @@ 110 890 155 + 6 diff --git a/drafter_6/annotations/C72_D2_P4.xml b/drafter_6/annotations/C72_D2_P4.xml index bc5d35b450f2aa686e69dc22c0b2bd8aa7fd14de..f886ce16d1a7595d907e92564e7284fb4941b517 100644 --- a/drafter_6/annotations/C72_D2_P4.xml +++ b/drafter_6/annotations/C72_D2_P4.xml @@ -70,7 +70,7 @@ 1213 297 - 12V + +12V text @@ -135,7 +135,7 @@ 1096 505 - 100Ω + 100n text @@ -161,7 +161,7 @@ 952 553 - 2k2Ω + 2k2 text @@ -212,6 +212,7 @@ 366 692 402 + 90 1KΩ @@ -225,6 +226,7 @@ 379 608 410 + 90 1kΩ @@ -1416,6 +1418,7 @@ 322 888 359 + 348 @@ -1441,6 +1444,7 @@ 298 622 353 + 89 @@ -1724,7 +1728,7 @@ 703 90 - 100kΩ + 100KΩ text @@ -1752,7 +1756,7 @@ 823 90 - 100μF + 100µF text @@ -2041,6 +2045,7 @@ 611 892 649 + 90 47KΩ @@ -2067,7 +2072,7 @@ 406 403 433 - 360 + 352 @@ -2142,7 +2147,7 @@ 1206 1000 - ov + 0V junction @@ -2166,8 +2171,9 @@ 357 668 402 + 90 - 100μF + 100µF resistor diff --git a/drafter_6/instances/C61_D2_P2.json b/drafter_6/instances/C61_D2_P2.json index 659d4a1cc666eaff039b8173b110b0e36032ac28..db31e03143eb81eb1c062704a84b43190b875910 100644 --- a/drafter_6/instances/C61_D2_P2.json +++ b/drafter_6/instances/C61_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -133,6 +137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -159,6 +164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -185,6 +191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -341,6 +353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -367,6 +380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -393,6 +407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -947,6 +982,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -973,6 +1009,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -999,6 +1036,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1025,6 +1063,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1055,6 +1094,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1089,6 +1129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1127,6 +1168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1157,6 +1199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1191,6 +1234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1247,6 +1292,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1273,6 +1319,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1346,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1373,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1400,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1377,6 +1427,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1403,6 +1454,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1508,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1535,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1507,6 +1562,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1533,6 +1589,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1559,6 +1616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1585,6 +1643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1611,6 +1670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1637,6 +1697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1663,6 +1724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1689,6 +1751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1715,6 +1778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1741,6 +1805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1767,6 +1832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1793,6 +1859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1819,6 +1886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1845,6 +1913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1871,6 +1940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1897,6 +1967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1923,6 +1994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1949,6 +2021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1975,6 +2048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2001,6 +2075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2027,6 +2102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2053,6 +2129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2079,6 +2156,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2105,6 +2183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2131,6 +2210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2157,6 +2237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2183,6 +2264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2209,6 +2291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2235,6 +2318,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2261,6 +2345,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2287,6 +2372,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2313,6 +2399,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2339,6 +2426,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2365,6 +2453,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2391,6 +2480,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2417,6 +2507,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2443,6 +2534,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2469,6 +2561,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2495,6 +2588,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2521,6 +2615,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2547,6 +2642,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2573,6 +2669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2599,6 +2696,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2625,6 +2723,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2651,6 +2750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2677,6 +2777,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2703,6 +2804,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2729,6 +2831,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2755,6 +2858,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2781,6 +2885,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2807,6 +2912,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2833,6 +2939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2859,6 +2966,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2885,6 +2993,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2911,6 +3020,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2949,6 +3059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2975,6 +3086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3001,6 +3113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3027,6 +3140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3053,6 +3167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3087,6 +3202,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3113,6 +3229,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3139,6 +3256,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3165,6 +3283,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3191,6 +3310,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3217,6 +3337,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3247,6 +3368,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3273,6 +3395,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3307,6 +3430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3341,6 +3465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3375,6 +3500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3425,6 +3551,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3455,6 +3582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3497,6 +3625,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3539,6 +3668,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3581,6 +3711,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3619,6 +3750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3645,6 +3777,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3671,6 +3804,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C62_D1_P1.json b/drafter_6/instances/C62_D1_P1.json index dd4d94b0a1e3726e604c2898a3dbe44887d572e3..a9f90b9babf707c32609d5667e19baeb4c4d9a4a 100644 --- a/drafter_6/instances/C62_D1_P1.json +++ b/drafter_6/instances/C62_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "integrated_circuit.ne555", "line_color": null, "fill_color": null, + "label": "integrated_circuit.ne555", "points": [ [ 399.375, @@ -24,13 +24,15 @@ 285.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "switch", "line_color": null, "fill_color": null, + "label": "switch", "points": [ [ 712.0, @@ -49,13 +51,15 @@ 451.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "switch", "line_color": null, "fill_color": null, + "label": "switch", "points": [ [ 168.0, @@ -74,13 +78,15 @@ 508.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 751.0, @@ -99,13 +105,15 @@ 452.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 625.0, @@ -124,13 +132,15 @@ 399.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 188.0, @@ -149,13 +159,15 @@ 425.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 423.0, @@ -174,13 +186,15 @@ 298.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 467.0, @@ -199,13 +213,15 @@ 335.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 567.0, @@ -224,13 +240,15 @@ 284.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 409.8692033293698, @@ -261,13 +279,15 @@ 344.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 407.0, @@ -286,13 +306,15 @@ 399.4836488812392 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 407.0, @@ -315,13 +337,15 @@ 433.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 442.0, @@ -340,13 +364,15 @@ 438.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 309.0, @@ -365,13 +391,15 @@ 410.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 535.0, @@ -390,13 +418,15 @@ 273.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 540.0, @@ -415,13 +445,15 @@ 340.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 428.0, @@ -440,13 +472,15 @@ 239.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 545.0, @@ -465,13 +499,15 @@ 241.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 327.0, @@ -490,13 +526,15 @@ 240.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 314.0, @@ -515,13 +553,15 @@ 490.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 314.0, @@ -540,13 +580,15 @@ 511.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 313.0, @@ -565,13 +607,15 @@ 526.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 310.0, @@ -590,13 +634,15 @@ 560.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 309.0, @@ -615,13 +661,15 @@ 600.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 437.0, @@ -640,13 +688,15 @@ 600.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 399.0, @@ -665,13 +715,15 @@ 559.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 594.0, @@ -690,13 +742,15 @@ 598.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 709.0, @@ -715,13 +769,15 @@ 601.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 968.0, @@ -740,13 +796,15 @@ 596.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 963.0, @@ -765,13 +823,15 @@ 233.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 953.0, @@ -790,13 +850,15 @@ 199.99999999999997 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 968.0, @@ -815,13 +877,15 @@ 568.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 350.0, @@ -840,13 +904,15 @@ 490.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 359.0, @@ -865,13 +931,15 @@ 407.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 598.0, @@ -890,13 +958,15 @@ 341.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 595.0, @@ -915,13 +985,15 @@ 403.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 721.0, @@ -940,10 +1012,16 @@ 346.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C62_D1_P1.jpg", + "imageData": null, + "imageHeight": 810, + "imageWidth": 1080, "lineColor": [ 0, 255, @@ -955,9 +1033,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C62_D1_P1.jpg", - "imageData": null, - "imageHeight": 810, - "imageWidth": 1080 + ] } \ No newline at end of file diff --git a/drafter_6/instances/C63_D2_P3.json b/drafter_6/instances/C63_D2_P3.json index 90c94959e2c0b6d946a4cdff940dc0896b2a9951..5b471c72a62e058225dad4f9a836c9b8160988d9 100644 --- a/drafter_6/instances/C63_D2_P3.json +++ b/drafter_6/instances/C63_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -107,6 +110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -133,6 +137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -159,6 +164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -185,6 +191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -341,6 +353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -367,6 +380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -401,6 +415,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -465,6 +481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -491,6 +508,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -525,6 +543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -551,6 +570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -577,6 +597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -603,6 +624,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -629,6 +651,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -655,6 +678,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -681,6 +705,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -707,6 +732,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -733,6 +759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -759,6 +786,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -785,6 +813,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -811,6 +840,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -837,6 +867,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -863,6 +894,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -889,6 +921,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -915,6 +948,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -941,6 +975,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -967,6 +1002,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1009,6 +1045,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1035,6 +1072,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1061,6 +1099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1087,6 +1126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1113,6 +1153,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1139,6 +1180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1165,6 +1207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1191,6 +1234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1217,6 +1261,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1243,6 +1288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1269,6 +1315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1295,6 +1342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1321,6 +1369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1347,6 +1396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1373,6 +1423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1399,6 +1450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1425,6 +1477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1451,6 +1504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1477,6 +1531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1503,6 +1558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1529,6 +1585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1555,6 +1612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1581,6 +1639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1607,6 +1666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1633,6 +1693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1659,6 +1720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1685,6 +1747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1711,6 +1774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1737,6 +1801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1771,6 +1836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1797,6 +1863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1823,6 +1890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1849,6 +1917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1875,6 +1944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1901,6 +1971,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1927,6 +1998,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1953,6 +2025,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1983,6 +2056,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2009,6 +2083,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2035,6 +2110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2061,6 +2137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2087,6 +2164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2113,6 +2191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2139,6 +2218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2165,6 +2245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2191,6 +2272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2217,6 +2299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2243,6 +2326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2269,6 +2353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2295,6 +2380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2321,6 +2407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2351,6 +2438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2377,6 +2465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2403,6 +2492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2429,6 +2519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2455,6 +2546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2481,6 +2573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2507,6 +2600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2533,6 +2627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C64_D1_P3.json b/drafter_6/instances/C64_D1_P3.json index 8d1896d1e9811d1213e2928ee80c00f943990c84..cc7886f6fc0574ed1c9302c3f5784e24643160e7 100644 --- a/drafter_6/instances/C64_D1_P3.json +++ b/drafter_6/instances/C64_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1169,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1195,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C65_D1_P3.json b/drafter_6/instances/C65_D1_P3.json index 2b01652aad6cb3b5316f2e9d8070437e02254aa4..9e86d953ca93e2062b5c10a8cef324fe77524c67 100644 --- a/drafter_6/instances/C65_D1_P3.json +++ b/drafter_6/instances/C65_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C66_D1_P3.json b/drafter_6/instances/C66_D1_P3.json index dbe406dfc2ce0bb2b4fd9be665b0fe8a05f8aaf4..322c4a5058c0401a03fb57cd764cc4e3acfc1fed 100644 --- a/drafter_6/instances/C66_D1_P3.json +++ b/drafter_6/instances/C66_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -145,6 +149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -179,6 +184,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -205,6 +211,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -231,6 +238,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -257,6 +265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -283,6 +292,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -309,6 +319,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -335,6 +346,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -361,6 +373,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -387,6 +400,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -413,6 +427,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -439,6 +454,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -465,6 +481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -491,6 +508,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -517,6 +535,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -543,6 +562,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -569,6 +589,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -595,6 +616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -621,6 +643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -647,6 +670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -673,6 +697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -699,6 +724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -729,6 +755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -755,6 +782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -781,6 +809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -807,6 +836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -833,6 +863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -859,6 +890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -885,6 +917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -911,6 +944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -949,6 +983,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -975,6 +1010,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1001,6 +1037,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1027,6 +1064,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1053,6 +1091,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1079,6 +1118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1105,6 +1145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1131,6 +1172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1157,6 +1199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1183,6 +1226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1209,6 +1253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1235,6 +1280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1261,6 +1307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1287,6 +1334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1313,6 +1361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1339,6 +1388,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1365,6 +1415,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1391,6 +1442,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1417,6 +1469,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1443,6 +1496,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1469,6 +1523,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1495,6 +1550,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1521,6 +1577,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1547,6 +1604,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1581,6 +1639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1607,6 +1666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1633,6 +1693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1659,6 +1720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1685,6 +1747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1711,6 +1774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1737,6 +1801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1763,6 +1828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1789,6 +1855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1815,6 +1882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1841,6 +1909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1867,6 +1936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1893,6 +1963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1919,6 +1990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1945,6 +2017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1971,6 +2044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C66_D2_P4.json b/drafter_6/instances/C66_D2_P4.json index c973f38f6b62b499e4fc46e90e1b1f27081279f1..c537306c462a281075eddc185fd085a7f273de33 100644 --- a/drafter_6/instances/C66_D2_P4.json +++ b/drafter_6/instances/C66_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -111,6 +114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -137,6 +141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -197,6 +203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -223,6 +230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -249,6 +257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -275,6 +284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -405,6 +419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -431,6 +446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -457,6 +473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -483,6 +500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -509,6 +527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -535,6 +554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -561,6 +581,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -587,6 +608,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -613,6 +635,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -639,6 +662,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -665,6 +689,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -691,6 +716,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -717,6 +743,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -743,6 +770,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -769,6 +797,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -795,6 +824,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -821,6 +851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -847,6 +878,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -873,6 +905,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -899,6 +932,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -925,6 +959,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -951,6 +986,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -977,6 +1013,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1003,6 +1040,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1029,6 +1067,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1055,6 +1094,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1081,6 +1121,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1107,6 +1148,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1133,6 +1175,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1159,6 +1202,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1185,6 +1229,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1211,6 +1256,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1253,6 +1299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1283,6 +1330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1321,6 +1369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1400,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1385,6 +1435,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1411,6 +1462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1489,6 +1543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1624,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1651,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1619,6 +1678,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1645,6 +1705,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1671,6 +1732,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1697,6 +1759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1723,6 +1786,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1749,6 +1813,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1775,6 +1840,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1801,6 +1867,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1827,6 +1894,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1853,6 +1921,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1879,6 +1948,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1905,6 +1975,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1931,6 +2002,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1957,6 +2029,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1983,6 +2056,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2009,6 +2083,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2035,6 +2110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C67_D2_P2.json b/drafter_6/instances/C67_D2_P2.json index 2585099409972458814094f93a03fa6dc73db945..5771053a10d8e5891b1a78b79646f8f56e6f0061 100644 --- a/drafter_6/instances/C67_D2_P2.json +++ b/drafter_6/instances/C67_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -33,6 +33,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -59,6 +60,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -85,6 +87,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -111,6 +114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -137,6 +141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -189,6 +195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -215,6 +222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -241,6 +249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -267,6 +276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -293,6 +303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -319,6 +330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -371,6 +384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -397,6 +411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -423,6 +438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -449,6 +465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -475,6 +492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -501,6 +519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -527,6 +546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -553,6 +573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -579,6 +600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -605,6 +627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -631,6 +654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -657,6 +681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -683,6 +708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -709,6 +735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -735,6 +762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -761,6 +789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -787,6 +816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -813,6 +843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -839,6 +870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -865,6 +897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -891,6 +924,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -917,6 +951,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -943,6 +978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -969,6 +1005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -995,6 +1032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1021,6 +1059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1047,6 +1086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1073,6 +1113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1099,6 +1140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1125,6 +1167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1151,6 +1194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1177,6 +1221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1229,6 +1275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C68_D1_P1.json b/drafter_6/instances/C68_D1_P1.json index 6b5c25198642e2eace55da863fbcda6a448fcc15..eb5229ad32f00029e8581a5df210898f0f4fc788 100644 --- a/drafter_6/instances/C68_D1_P1.json +++ b/drafter_6/instances/C68_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 203.0, @@ -24,13 +24,15 @@ 544.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1308.0, @@ -49,13 +51,15 @@ 778.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1273.521850899743, @@ -74,13 +78,15 @@ 272.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "integrated_circuit.ne555", "line_color": null, "fill_color": null, + "label": "integrated_circuit.ne555", "points": [ [ 858.0, @@ -99,13 +105,15 @@ 349.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.polarized", "line_color": null, "fill_color": null, + "label": "capacitor.polarized", "points": [ [ 658.0, @@ -128,13 +136,15 @@ 628.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 948.5560081466394, @@ -153,13 +163,15 @@ 700.7128309572302 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode.light_emitting", "line_color": null, "fill_color": null, + "label": "diode.light_emitting", "points": [ [ 1113.0, @@ -178,13 +190,15 @@ 576.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1124.0, @@ -203,13 +217,15 @@ 647.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 471.0, @@ -228,13 +244,15 @@ 351.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 682.0, @@ -253,13 +271,15 @@ 387.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 694.0, @@ -278,13 +298,15 @@ 496.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 448.0, @@ -303,13 +325,15 @@ 550.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 471.0, @@ -328,13 +352,15 @@ 515.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 395.0, @@ -353,13 +379,15 @@ 361.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 195.0, @@ -378,13 +406,15 @@ 485.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 363.0, @@ -403,13 +433,15 @@ 619.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 595.0, @@ -432,13 +464,15 @@ 655.1111111111111 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1169.0, @@ -457,13 +491,15 @@ 648.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1289.0, @@ -482,13 +518,15 @@ 733.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 986.0488798370671, @@ -507,13 +545,15 @@ 709.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1223.0, @@ -532,13 +572,15 @@ 226.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 730.0, @@ -557,13 +599,15 @@ 379.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 919.0, @@ -582,13 +626,15 @@ 432.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1029.0, @@ -607,13 +653,15 @@ 528.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 959.0, @@ -632,13 +680,15 @@ 630.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 896.0, @@ -657,13 +707,15 @@ 637.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 877.0, @@ -682,13 +734,15 @@ 573.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 877.0, @@ -707,13 +761,15 @@ 521.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 875.0, @@ -732,13 +788,15 @@ 464.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 921.0, @@ -757,13 +815,15 @@ 371.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 979.0, @@ -782,13 +842,15 @@ 371.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1142.0, @@ -807,13 +869,15 @@ 787.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 951.0, @@ -832,13 +896,15 @@ 794.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 885.0, @@ -857,13 +923,15 @@ 795.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 687.0, @@ -882,13 +950,15 @@ 805.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 692.0, @@ -907,13 +977,15 @@ 596.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 695.0, @@ -932,13 +1004,15 @@ 534.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 494.0, @@ -957,13 +1031,15 @@ 287.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 702.0, @@ -982,13 +1058,15 @@ 286.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 920.0, @@ -1007,13 +1085,15 @@ 291.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 981.0, @@ -1032,13 +1112,15 @@ 292.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1133.0, @@ -1057,13 +1139,15 @@ 534.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 450.0, @@ -1082,13 +1166,15 @@ 807.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 141.0, @@ -1107,13 +1193,15 @@ 289.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 110.0, @@ -1132,10 +1220,16 @@ 805.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C68_D1_P1.jpg", + "imageData": null, + "imageHeight": 1067, + "imageWidth": 1424, "lineColor": [ 0, 255, @@ -1147,9 +1241,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C68_D1_P1.jpg", - "imageData": null, - "imageHeight": 1067, - "imageWidth": 1424 + ] } \ No newline at end of file diff --git a/drafter_6/instances/C70_D2_P1.json b/drafter_6/instances/C70_D2_P1.json index 87644fc8281dd74da4cad9df4366f439b273f882..187cfaeefe8ec8ea92c540e9fc996df5e9daa023 100644 --- a/drafter_6/instances/C70_D2_P1.json +++ b/drafter_6/instances/C70_D2_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -137,6 +141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -193,6 +199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -219,6 +226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -228,23 +236,36 @@ "label": "relay", "points": [ [ - 1074.0, - 269.0 + 1167.9833679833678, + 268.8149688149688 ], [ - 1074.0, - 380.0 + 1071.7255717255716, + 269.2307692307692 ], [ - 1202.0, - 380.0 + 1082.5363825363825, + 380.87318087318084 ], [ - 1202.0, - 269.0 + 1113.7214137214137, + 381.4968814968815 + ], + [ + 1158.004158004158, + 379.002079002079 + ], + [ + 1197.5051975051974, + 381.4968814968815 + ], + [ + 1202.7027027027025, + 277.1309771309771 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +292,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -297,6 +319,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -323,6 +346,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -349,6 +373,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -375,6 +400,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -401,6 +427,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -427,6 +454,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -453,6 +481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -479,6 +508,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -505,6 +535,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -531,6 +562,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -557,6 +589,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -583,6 +616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -609,6 +643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -635,6 +670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -661,6 +697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -687,6 +724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -713,6 +751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -739,6 +778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -765,6 +805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -791,6 +832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -817,6 +859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -843,6 +886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -869,6 +913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -895,6 +940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -921,6 +967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -947,6 +994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -973,6 +1021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -999,6 +1048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1025,6 +1075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1051,6 +1102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1077,6 +1129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1111,6 +1164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1145,6 +1199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1171,6 +1226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1209,6 +1265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1235,6 +1292,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1261,6 +1319,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1287,6 +1346,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1313,6 +1373,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1339,6 +1400,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1365,6 +1427,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1391,6 +1454,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1417,6 +1481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1443,6 +1508,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1469,6 +1535,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1495,6 +1562,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1521,6 +1589,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1547,6 +1616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1573,6 +1643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1599,6 +1670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1625,6 +1697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1651,6 +1724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1677,6 +1751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1703,6 +1778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1729,6 +1805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1755,6 +1832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1781,6 +1859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1807,6 +1886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1833,6 +1913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1859,6 +1940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1885,6 +1967,88 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "switch", + "points": [ + [ + 1074.0554156171283, + 270.27581863979844 + ], + [ + 1131.7380352644836, + 271.53526448362715 + ], + [ + 1113.097713097713, + 379.002079002079 + ], + [ + 1085.6423173803526, + 379.09193954659946 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 1139.294710327456, + 271.0314861460957 + ], + [ + 1164.735516372796, + 271.0314861460957 + ], + [ + 1157.7962577962576, + 372.7650727650727 + ], + [ + 1132.241813602015, + 374.30604534005033 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1165.7430730478588, + 274.0541561712846 + ], + [ + 1159.6673596673595, + 375.6756756756756 + ], + [ + 1194.7103274559192, + 378.58816120906795 + ], + [ + 1200.2518891687657, + 279.8476070528967 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C70_D2_P4.json b/drafter_6/instances/C70_D2_P4.json index 6f2606bbe5db2ce8b8ba41acf35409bfe4893253..361aa36f7b71363f93f140dce59d6c16688b07a1 100644 --- a/drafter_6/instances/C70_D2_P4.json +++ b/drafter_6/instances/C70_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -29,6 +29,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -55,6 +56,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -81,6 +83,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -107,6 +110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -141,6 +145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -175,6 +180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -201,6 +207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -235,6 +242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -269,6 +277,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -295,6 +304,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -321,6 +331,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -347,6 +358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -373,6 +385,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -399,6 +412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -425,6 +439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -451,6 +466,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -477,6 +493,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -503,6 +520,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -529,6 +547,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -555,6 +574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -581,6 +601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -607,6 +628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -633,6 +655,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -659,6 +682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -693,6 +717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -719,6 +744,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -745,6 +771,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -771,6 +798,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +837,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -843,6 +872,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +907,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -911,6 +942,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -937,6 +969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -963,6 +996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -989,6 +1023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1015,6 +1050,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1041,6 +1077,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1067,6 +1104,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1093,6 +1131,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1119,6 +1158,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1145,6 +1185,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1171,6 +1212,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1197,6 +1239,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1223,6 +1266,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1249,6 +1293,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1275,6 +1320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1301,6 +1347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1327,6 +1374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1353,6 +1401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1379,6 +1428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1405,6 +1455,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1431,6 +1482,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1457,6 +1509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1483,6 +1536,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1509,6 +1563,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1535,6 +1590,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1561,6 +1617,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1587,6 +1644,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1613,6 +1671,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1639,6 +1698,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1665,6 +1725,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1691,6 +1752,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1717,6 +1779,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1743,6 +1806,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1769,6 +1833,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1795,6 +1860,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1821,6 +1887,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1847,6 +1914,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1873,6 +1941,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1899,6 +1968,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1925,6 +1995,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_6/instances/C71_D2_P1.json b/drafter_6/instances/C71_D2_P1.json index 844b8732454bfc84ef8c0817baca1db40a31e2f4..d5314e1d6d1515a2f872fb2514fa56ce114edbf2 100644 --- a/drafter_6/instances/C71_D2_P1.json +++ b/drafter_6/instances/C71_D2_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 81.50537634408602, @@ -24,13 +24,15 @@ 319.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 259.0, @@ -49,13 +51,15 @@ 321.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 259.0, @@ -74,13 +78,15 @@ 566.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 453.0, @@ -99,13 +105,15 @@ 639.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 634.3085106382979, @@ -124,13 +132,15 @@ 362.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 419.0, @@ -149,13 +159,15 @@ 463.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "integrated_circuit.ne555", "line_color": null, "fill_color": null, + "label": "integrated_circuit.ne555", "points": [ [ 740.0, @@ -174,13 +186,15 @@ 361.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "speaker", "line_color": null, "fill_color": null, + "label": "speaker", "points": [ [ 988.0, @@ -199,13 +213,15 @@ 566.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "microphone", "line_color": null, "fill_color": null, + "label": "microphone", "points": [ [ 54.0, @@ -224,13 +240,15 @@ 589.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 175.0, @@ -249,13 +267,15 @@ 499.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 630.0, @@ -274,13 +294,15 @@ 543.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1263.0, @@ -299,13 +321,15 @@ 271.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1281.0, @@ -324,13 +348,15 @@ 704.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 888.0, @@ -349,13 +375,15 @@ 312.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 800.0, @@ -374,13 +402,15 @@ 310.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 649.0, @@ -399,13 +429,15 @@ 608.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 561.0, @@ -424,13 +456,15 @@ 614.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 466.0, @@ -449,13 +483,15 @@ 726.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 372.0, @@ -474,13 +510,15 @@ 728.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 373.0, @@ -499,13 +537,15 @@ 600.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 463.0, @@ -524,13 +564,15 @@ 597.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 559.0, @@ -549,13 +591,15 @@ 458.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 648.0, @@ -574,13 +618,15 @@ 452.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 651.0, @@ -599,13 +645,15 @@ 508.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 645.0, @@ -624,13 +672,15 @@ 313.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 800.0, @@ -649,13 +699,15 @@ 268.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 884.0, @@ -674,13 +726,15 @@ 271.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1012.0, @@ -699,13 +753,15 @@ 313.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1009.0, @@ -724,13 +780,15 @@ 446.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1013.0, @@ -749,13 +807,15 @@ 539.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1102.0, @@ -774,13 +834,15 @@ 536.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.polarized", "line_color": null, "fill_color": null, + "label": "capacitor.polarized", "points": [ [ 996.0, @@ -799,13 +861,15 @@ 473.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.polarized", "line_color": null, "fill_color": null, + "label": "capacitor.polarized", "points": [ [ 1089.0, @@ -824,13 +888,15 @@ 567.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1047.0, @@ -849,13 +915,15 @@ 485.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1145.0, @@ -874,13 +942,15 @@ 563.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 404.0, @@ -899,13 +969,15 @@ 390.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 215.15957446808508, @@ -924,13 +996,15 @@ 284.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 151.0, @@ -949,13 +1023,15 @@ 472.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 44.0, @@ -974,13 +1050,15 @@ 288.17204301075265 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 220.0, @@ -999,13 +1077,15 @@ 545.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 317.55319148936167, @@ -1024,13 +1104,15 @@ 607.7127659574468 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 413.0, @@ -1049,13 +1131,15 @@ 633.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 599.0, @@ -1074,13 +1158,15 @@ 324.46808510638294 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 884.0, @@ -1099,13 +1185,15 @@ 380.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 897.0, @@ -1124,13 +1212,15 @@ 439.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 794.0, @@ -1149,13 +1239,15 @@ 461.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 759.0, @@ -1174,13 +1266,15 @@ 499.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 761.0, @@ -1199,13 +1293,15 @@ 444.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 793.0, @@ -1224,13 +1320,15 @@ 381.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1108.0, @@ -1249,13 +1347,15 @@ 219.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 269.0, @@ -1274,13 +1374,15 @@ 501.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 277.0, @@ -1299,13 +1401,15 @@ 727.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 90.0, @@ -1324,13 +1428,15 @@ 738.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 89.0, @@ -1349,13 +1455,15 @@ 506.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 274.0, @@ -1374,13 +1482,15 @@ 271.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 94.0, @@ -1399,13 +1509,15 @@ 276.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 652.0, @@ -1424,13 +1536,15 @@ 725.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 838.0, @@ -1449,13 +1563,15 @@ 721.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1013.0, @@ -1474,13 +1590,15 @@ 718.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1103.0, @@ -1499,13 +1617,15 @@ 711.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 825.0, @@ -1524,13 +1644,15 @@ 601.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 759.0, @@ -1549,13 +1671,15 @@ 592.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 673.0, @@ -1574,13 +1698,15 @@ 553.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.polarized", "line_color": null, "fill_color": null, + "label": "capacitor.polarized", "points": [ [ 357.0, @@ -1599,10 +1725,16 @@ 611.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C71_D2_P1.jpg", + "imageData": null, + "imageHeight": 1067, + "imageWidth": 1424, "lineColor": [ 0, 255, @@ -1614,9 +1746,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C71_D2_P1.jpg", - "imageData": null, - "imageHeight": 1067, - "imageWidth": 1424 + ] } \ No newline at end of file diff --git a/drafter_6/instances/C72_D1_P1.json b/drafter_6/instances/C72_D1_P1.json index 3f630bdc619bff3a313a515ad68f9356439fa174..3713ec01c3b95a3aa8ebd2e9e077a84d270d24d6 100644 --- a/drafter_6/instances/C72_D1_P1.json +++ b/drafter_6/instances/C72_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -193,6 +199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -219,6 +226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -297,6 +307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -369,6 +381,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -395,6 +408,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -421,6 +435,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -447,6 +462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -473,6 +489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -499,6 +516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -525,6 +543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -551,6 +570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -577,6 +597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -603,6 +624,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -629,6 +651,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -655,6 +678,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -693,6 +717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -735,6 +760,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -761,6 +787,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -787,6 +814,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -813,6 +841,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -839,6 +868,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -865,6 +895,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -891,6 +922,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -917,6 +949,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -943,6 +976,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -969,6 +1003,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -995,6 +1030,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1021,6 +1057,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1047,6 +1084,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1073,6 +1111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1099,6 +1138,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1125,6 +1165,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1151,6 +1192,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1177,6 +1219,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1246,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1229,6 +1273,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1300,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1281,6 +1327,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1307,6 +1354,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1345,6 +1393,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1371,6 +1420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1397,6 +1447,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1423,6 +1474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1449,6 +1501,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1475,6 +1528,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1501,6 +1555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1527,6 +1582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1553,6 +1609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1579,6 +1636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1605,6 +1663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1631,6 +1690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1657,6 +1717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1683,6 +1744,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1709,6 +1771,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1735,6 +1798,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1761,6 +1825,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1787,6 +1852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1813,6 +1879,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1839,6 +1906,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1865,6 +1933,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1891,6 +1960,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1917,6 +1987,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1943,6 +2014,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1969,6 +2041,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1995,6 +2068,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2021,6 +2095,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2047,6 +2122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2073,6 +2149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2099,6 +2176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2125,6 +2203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2151,6 +2230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2177,6 +2257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2203,6 +2284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2245,6 +2327,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2279,6 +2362,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2305,6 +2389,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2331,6 +2416,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2357,6 +2443,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2383,6 +2470,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2409,6 +2497,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2435,6 +2524,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2461,6 +2551,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2487,6 +2578,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2513,6 +2605,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2539,6 +2632,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2565,6 +2659,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2591,6 +2686,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2617,6 +2713,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2643,6 +2740,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2669,6 +2767,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2695,6 +2794,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2721,6 +2821,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2747,6 +2848,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2773,6 +2875,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2799,6 +2902,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2825,6 +2929,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2851,6 +2956,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2877,6 +2983,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2903,6 +3010,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2929,6 +3037,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2955,6 +3064,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2981,6 +3091,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3007,6 +3118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3033,6 +3145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3059,6 +3172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3085,6 +3199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3111,6 +3226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3137,6 +3253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3175,6 +3292,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3217,6 +3335,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3247,6 +3366,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3277,6 +3397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3303,6 +3424,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3329,6 +3451,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3355,6 +3478,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3381,6 +3505,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3407,6 +3532,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3433,6 +3559,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3459,6 +3586,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3485,6 +3613,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3511,6 +3640,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3537,6 +3667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3563,6 +3694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3589,6 +3721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3615,6 +3748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3641,6 +3775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3675,6 +3810,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3701,6 +3837,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3727,6 +3864,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3753,6 +3891,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3779,6 +3918,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3805,6 +3945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3831,6 +3972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3857,6 +3999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3883,6 +4026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3909,6 +4053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3935,6 +4080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3961,6 +4107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3987,6 +4134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4013,6 +4161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4039,6 +4188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4065,6 +4215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4091,6 +4242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4117,6 +4269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4143,6 +4296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4169,6 +4323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4195,6 +4350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4221,6 +4377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4247,6 +4404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4273,6 +4431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4299,6 +4458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4325,6 +4485,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4351,6 +4512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4377,6 +4539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4411,6 +4574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4437,6 +4601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4463,6 +4628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4489,6 +4655,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4515,6 +4682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4541,6 +4709,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4567,6 +4736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4597,6 +4767,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4623,6 +4794,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4649,6 +4821,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4679,6 +4852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4705,6 +4879,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_7/annotations/C73_D1_P1.xml b/drafter_7/annotations/C73_D1_P1.xml index 0dd4c4b73d8eecb79c8f29f62f2fe98dc36776c4..270f18475744f7b98c1224a6f6cd97b4d56accb1 100644 --- a/drafter_7/annotations/C73_D1_P1.xml +++ b/drafter_7/annotations/C73_D1_P1.xml @@ -21,7 +21,7 @@ 378 356 428 - 360 + 350 @@ -34,7 +34,7 @@ 529 337 581 - 360 + 350 @@ -47,7 +47,7 @@ 682 317 735 - 360 + 347 diff --git a/drafter_7/annotations/C73_D1_P3.xml b/drafter_7/annotations/C73_D1_P3.xml index 5d7893f3bad936d66d232fb54ad1bb92e245b2cf..8cbe8656b1e5be4333415819cea1e9ee4493caf0 100644 --- a/drafter_7/annotations/C73_D1_P3.xml +++ b/drafter_7/annotations/C73_D1_P3.xml @@ -199,10 +199,10 @@ 0 0 - 906 - 246 - 1031 - 372 + 931 + 259 + 1000 + 369 353 diff --git a/drafter_7/annotations/C73_D1_P4.xml b/drafter_7/annotations/C73_D1_P4.xml index 7c516f3103ed68fc1e93c09c7c38629c36dc2057..dcd049beea9473f52af8d8ca7cf70f2679783feb 100644 --- a/drafter_7/annotations/C73_D1_P4.xml +++ b/drafter_7/annotations/C73_D1_P4.xml @@ -122,7 +122,7 @@ 0 331 - 322 + 324 460 392 7 @@ -148,9 +148,9 @@ 0 973 - 67 + 79 1087 - 130 + 125 2 @@ -160,9 +160,9 @@ 0 0 - 1177 + 1181 104 - 1249 + 1232 192 105 @@ -173,9 +173,9 @@ 0 0 - 613 - 73 - 741 + 625 + 85 + 707 204 5 @@ -186,10 +186,10 @@ 0 0 - 630 - 249 - 747 - 392 + 649 + 252 + 728 + 390 9 @@ -199,11 +199,11 @@ 0 0 - 660 - 442 - 775 - 600 - 360 + 676 + 446 + 753 + 597 + 10 @@ -216,7 +216,7 @@ 256 1076 378 - 355 + 4 diff --git a/drafter_7/annotations/C73_D2_P1.xml b/drafter_7/annotations/C73_D2_P1.xml index 7f9154e4586a129ffd9561db9883c8a67d020bb5..6c6080671f545d196dd891d50d1d492b0a28226c 100644 --- a/drafter_7/annotations/C73_D2_P1.xml +++ b/drafter_7/annotations/C73_D2_P1.xml @@ -122,9 +122,9 @@ 0 342 - 227 + 242 463 - 300 + 287 360 @@ -135,9 +135,9 @@ 0 328 - 379 + 392 460 - 446 + 440 2 @@ -148,9 +148,9 @@ 0 308 - 564 + 571 439 - 630 + 624 4 @@ -161,9 +161,9 @@ 0 989 - 207 + 222 1117 - 275 + 267 360 @@ -225,9 +225,9 @@ 0 0 - 1140 + 1147 278 - 1201 + 1188 371 84 diff --git a/drafter_7/annotations/C73_D2_P2.xml b/drafter_7/annotations/C73_D2_P2.xml index 47efe7570483f6c9ff36432d7f5b4a27d5f349b2..152174b926968158b5ffb62b50fa68f24bbc2b28 100644 --- a/drafter_7/annotations/C73_D2_P2.xml +++ b/drafter_7/annotations/C73_D2_P2.xml @@ -148,7 +148,7 @@ 0 359 - 590 + 596 506 654 360 diff --git a/drafter_7/annotations/C73_D2_P3.xml b/drafter_7/annotations/C73_D2_P3.xml index e6d6116244c210c5343d0a63a5df3cdf4366fa63..72f9f19affdb0726ae980e62e78814dddfeadf83 100644 --- a/drafter_7/annotations/C73_D2_P3.xml +++ b/drafter_7/annotations/C73_D2_P3.xml @@ -175,7 +175,7 @@ 1208 200 - 1256 + 1248 288 90 diff --git a/drafter_7/annotations/C73_D2_P4.xml b/drafter_7/annotations/C73_D2_P4.xml index 57826f777bd99865ce3daacbb4320bbf9f6ca06d..2855612ce35c4b30a64bdee925f8920ded0d87ec 100644 --- a/drafter_7/annotations/C73_D2_P4.xml +++ b/drafter_7/annotations/C73_D2_P4.xml @@ -161,9 +161,9 @@ 0 1022 - 111 + 115 1162 - 175 + 171 17 @@ -175,7 +175,7 @@ 1193 149 - 1263 + 1249 230 108 @@ -186,9 +186,9 @@ 0 0 - 666 + 682 195 - 799 + 766 312 10 @@ -199,11 +199,11 @@ 0 0 - 695 - 348 - 830 - 476 - 360 + 711 + 351 + 792 + 473 + 10 @@ -212,9 +212,9 @@ 0 0 - 724 - 518 - 851 + 751 + 521 + 826 673 9 @@ -225,9 +225,9 @@ 0 0 - 1032 + 1041 327 - 1160 + 1128 447 7 diff --git a/drafter_7/annotations/C74_D2_P4.xml b/drafter_7/annotations/C74_D2_P4.xml index 6f48d2ff53cd52c9996b23e9b4b7e5358f254916..a06ce7bd3e4f2a81fb13fb6621aefbc2f53bcd66 100644 --- a/drafter_7/annotations/C74_D2_P4.xml +++ b/drafter_7/annotations/C74_D2_P4.xml @@ -33,7 +33,7 @@ 270 408 335 - 360 + 356 @@ -59,7 +59,7 @@ 196 757 444 - 351 + 6 diff --git a/drafter_7/annotations/C75_D1_P4.xml b/drafter_7/annotations/C75_D1_P4.xml index 59d61bc272db799e5bb64eb5dac3d74865b3834f..5377e234c87df4fc42156c97216079f65ffacf3e 100644 --- a/drafter_7/annotations/C75_D1_P4.xml +++ b/drafter_7/annotations/C75_D1_P4.xml @@ -355,7 +355,7 @@ 381 480 539 - 257 + 271 @@ -381,7 +381,7 @@ 283 871 423 - 355 + 6 diff --git a/drafter_7/annotations/C76_D2_P1.xml b/drafter_7/annotations/C76_D2_P1.xml index 083721a4c8510dd668d9fea4ee648966d8d7727a..ab1f29dcbe202539bd64d3e35764c0e9eb512e37 100644 --- a/drafter_7/annotations/C76_D2_P1.xml +++ b/drafter_7/annotations/C76_D2_P1.xml @@ -149,7 +149,7 @@ 258 580 387 - 14 + 360 diff --git a/drafter_7/annotations/C76_D2_P2.xml b/drafter_7/annotations/C76_D2_P2.xml index 1ee3e2d499825bf6ffd471e7f6bf2d6761acd489..802c48d5acfbe38491095b1e8fa2cbcd664160c0 100644 --- a/drafter_7/annotations/C76_D2_P2.xml +++ b/drafter_7/annotations/C76_D2_P2.xml @@ -197,7 +197,7 @@ 335 801 511 - 7 + 356 diff --git a/drafter_7/annotations/C77_D1_P1.xml b/drafter_7/annotations/C77_D1_P1.xml index fe89dcc28ea1851945870fb0b85a35b31396c178..63c5806f8e9f1cbc5bfc055f2765550ad34f2fdd 100644 --- a/drafter_7/annotations/C77_D1_P1.xml +++ b/drafter_7/annotations/C77_D1_P1.xml @@ -308,7 +308,7 @@ - junction + crossover Unspecified 0 0 @@ -523,7 +523,7 @@ - junction + crossover Unspecified 0 0 diff --git a/drafter_7/annotations/C77_D1_P2.xml b/drafter_7/annotations/C77_D1_P2.xml index cc26c0a062d8a803a6cb46d5709a55e3119476c8..210df3ec45e84e3ac0095d55472a1e8448b473b9 100644 --- a/drafter_7/annotations/C77_D1_P2.xml +++ b/drafter_7/annotations/C77_D1_P2.xml @@ -272,7 +272,7 @@ - junction + crossover Unspecified 0 0 @@ -284,7 +284,7 @@ - junction + crossover Unspecified 0 0 @@ -531,7 +531,7 @@ 306 1202 406 - 14 + 358 diff --git a/drafter_7/annotations/C77_D1_P3.xml b/drafter_7/annotations/C77_D1_P3.xml index 1c01c9a56bb173e0fe3f3db695ea269e5e05a728..35b538217f0c6e83e5b99d02495e8924d31291ee 100644 --- a/drafter_7/annotations/C77_D1_P3.xml +++ b/drafter_7/annotations/C77_D1_P3.xml @@ -284,7 +284,7 @@ - junction + crossover Unspecified 0 0 @@ -296,7 +296,7 @@ - junction + crossover Unspecified 0 0 @@ -563,11 +563,11 @@ 0 0 - 892 + 901 804 - 951 + 944 903 - 90 + 77 @@ -576,10 +576,10 @@ 0 0 - 258 - 872 - 320 - 923 + 269 + 878 + 317 + 917 273 @@ -590,9 +590,9 @@ 0 545 - 871 - 594 - 918 + 878 + 592 + 910 267 diff --git a/drafter_7/annotations/C77_D1_P4.xml b/drafter_7/annotations/C77_D1_P4.xml index a2f4d65fd7c8c5a54d7e25f306165ae0f1a3c8bf..d74fc9dc6e5848d37843b362abf53215ddcd7f62 100644 --- a/drafter_7/annotations/C77_D1_P4.xml +++ b/drafter_7/annotations/C77_D1_P4.xml @@ -272,7 +272,7 @@ - junction + crossover Unspecified 0 0 @@ -284,7 +284,7 @@ - junction + crossover Unspecified 0 0 @@ -576,10 +576,10 @@ 0 0 - 179 - 761 - 240 - 816 + 186 + 769 + 236 + 809 264 @@ -589,11 +589,11 @@ 0 0 - 471 - 785 - 520 - 836 - 271 + 472 + 794 + 518 + 828 + 266 diff --git a/drafter_7/annotations/C77_D2_P1.xml b/drafter_7/annotations/C77_D2_P1.xml index 7af27a8db6fb61a87737a59af99989a7485ee70a..1a114ae4e402c9a4cffced19b493367011e6b341 100644 --- a/drafter_7/annotations/C77_D2_P1.xml +++ b/drafter_7/annotations/C77_D2_P1.xml @@ -248,7 +248,7 @@ - junction + crossover Unspecified 0 0 @@ -260,7 +260,7 @@ - junction + crossover Unspecified 0 0 diff --git a/drafter_7/annotations/C77_D2_P2.xml b/drafter_7/annotations/C77_D2_P2.xml index 5fd9fda8916ca1c5441f25c91cc085be6eca9c93..44f1a7830d7d68edd495a76caac8a57062e5342a 100644 --- a/drafter_7/annotations/C77_D2_P2.xml +++ b/drafter_7/annotations/C77_D2_P2.xml @@ -296,7 +296,7 @@ - junction + crossover Unspecified 0 0 @@ -308,7 +308,7 @@ - junction + crossover Unspecified 0 0 diff --git a/drafter_7/annotations/C77_D2_P3.xml b/drafter_7/annotations/C77_D2_P3.xml index c378e62aa920cb3168bf85838723db7c78dda84c..a1f64586eea75557798657ba8a1ce06c9c8f939f 100644 --- a/drafter_7/annotations/C77_D2_P3.xml +++ b/drafter_7/annotations/C77_D2_P3.xml @@ -308,7 +308,7 @@ - junction + crossover Unspecified 0 0 @@ -320,7 +320,7 @@ - junction + crossover Unspecified 0 0 @@ -567,7 +567,7 @@ 486 1181 561 - 5 + 12 @@ -576,9 +576,9 @@ 0 0 - 247 - 865 - 301 + 254 + 872 + 297 913 286 @@ -589,10 +589,10 @@ 0 0 - 556 - 774 - 609 - 824 + 562 + 780 + 601 + 818 283 diff --git a/drafter_7/annotations/C77_D2_P4.xml b/drafter_7/annotations/C77_D2_P4.xml index aebb5485f4d96c277e1ad2592a4fab21c762abc3..e5248411af616ef570e36a25f64018de174c5331 100644 --- a/drafter_7/annotations/C77_D2_P4.xml +++ b/drafter_7/annotations/C77_D2_P4.xml @@ -284,7 +284,7 @@ - junction + crossover Unspecified 0 0 @@ -296,7 +296,7 @@ - junction + crossover Unspecified 0 0 diff --git a/drafter_7/annotations/C78_D1_P1.xml b/drafter_7/annotations/C78_D1_P1.xml index 44613cb188c991c899423ec7ca85714f33d382fe..aae0d21064deeb09b9bdac5001967e7a3a750e3a 100644 --- a/drafter_7/annotations/C78_D1_P1.xml +++ b/drafter_7/annotations/C78_D1_P1.xml @@ -18,9 +18,10 @@ 0 668 - 361 + 367 825 - 600 + 573 + 354 diff --git a/drafter_7/annotations/C78_D1_P2.xml b/drafter_7/annotations/C78_D1_P2.xml index 46ea020dd01f7cf50655dc63511ee81e7083f681..3c04d9f08c29bb580f0871c706f6f17641524988 100644 --- a/drafter_7/annotations/C78_D1_P2.xml +++ b/drafter_7/annotations/C78_D1_P2.xml @@ -216,7 +216,7 @@ 369 1024 622 - 3 + 358 diff --git a/drafter_7/annotations/C78_D1_P3.xml b/drafter_7/annotations/C78_D1_P3.xml index 0925a059544e525b6bfaaf7920bd59d1fa689349..e8f29afcfe6aab8626fa49091f8b704fc59432d6 100644 --- a/drafter_7/annotations/C78_D1_P3.xml +++ b/drafter_7/annotations/C78_D1_P3.xml @@ -399,7 +399,7 @@ 731 396 970 - 700 + 684 diff --git a/drafter_7/annotations/C78_D1_P4.xml b/drafter_7/annotations/C78_D1_P4.xml index 14ff698c28e5751fb43f68f784acb20a61cb74ef..9cfd1a173c14e33dc7d3bac54c9ee840675b56a6 100644 --- a/drafter_7/annotations/C78_D1_P4.xml +++ b/drafter_7/annotations/C78_D1_P4.xml @@ -396,10 +396,11 @@ 0 0 - 699 + 707 408 951 - 692 + 685 + 10 diff --git a/drafter_7/annotations/C78_D2_P1.xml b/drafter_7/annotations/C78_D2_P1.xml index b24289e823d4844c2cf180f86f3a11dcf94c52b3..ff3545238dbb616aaf58963a780df3f069c5b7b2 100644 --- a/drafter_7/annotations/C78_D2_P1.xml +++ b/drafter_7/annotations/C78_D2_P1.xml @@ -348,8 +348,8 @@ 662 160 - 876 - 448 + 866 + 423 diff --git a/drafter_7/annotations/C78_D2_P3.xml b/drafter_7/annotations/C78_D2_P3.xml index 9dda9e6765af326bbfa103f5a37d3f50a08e5091..9332eab880895e0f3edf8ce1f3b1bcc73469f357 100644 --- a/drafter_7/annotations/C78_D2_P3.xml +++ b/drafter_7/annotations/C78_D2_P3.xml @@ -375,6 +375,7 @@ 335 1047 658 + 15 diff --git a/drafter_7/annotations/C78_D2_P4.xml b/drafter_7/annotations/C78_D2_P4.xml index ba8794e197c1100743738fe250000ea353dfbb64..f6f65cb174f858963b9a00b229f2ece57bcceb66 100644 --- a/drafter_7/annotations/C78_D2_P4.xml +++ b/drafter_7/annotations/C78_D2_P4.xml @@ -387,6 +387,7 @@ 90 843 306 + 4 diff --git a/drafter_7/annotations/C79_D1_P1.xml b/drafter_7/annotations/C79_D1_P1.xml index dc5647181509f01a64aae863ef06a412c27aa7e6..f8f781d8792d4f701a37605615760f034554b344 100644 --- a/drafter_7/annotations/C79_D1_P1.xml +++ b/drafter_7/annotations/C79_D1_P1.xml @@ -420,7 +420,7 @@ 120 1135 215 - 97 + 83 diff --git a/drafter_7/annotations/C79_D2_P1.xml b/drafter_7/annotations/C79_D2_P1.xml index 05c757b5b663cfff805556ab0878291915a5faec..e4e8ea8fa152ec7ed1bb45e6039b96a19949b67c 100644 --- a/drafter_7/annotations/C79_D2_P1.xml +++ b/drafter_7/annotations/C79_D2_P1.xml @@ -496,7 +496,7 @@ 1121 2084 1284 - 180 + 177 diff --git a/drafter_7/annotations/C79_D2_P2.xml b/drafter_7/annotations/C79_D2_P2.xml index 1c8f79bc19b4194c2d8274c1ebf889000695a478..9a5148ec06dd09ec5466ebee8bf97fc12e72c2a3 100644 --- a/drafter_7/annotations/C79_D2_P2.xml +++ b/drafter_7/annotations/C79_D2_P2.xml @@ -496,7 +496,7 @@ 1535 3150 1753 - 180 + 171 diff --git a/drafter_7/annotations/C79_D2_P3.xml b/drafter_7/annotations/C79_D2_P3.xml index ca7a71932760a7fd03dfd567dd86000b2e7fe79d..76ed7e45bb0be2e19aceaede6ecb557a4fd73c1d 100644 --- a/drafter_7/annotations/C79_D2_P3.xml +++ b/drafter_7/annotations/C79_D2_P3.xml @@ -509,7 +509,7 @@ 526 1720 697 - 91 + 87 diff --git a/drafter_7/annotations/C79_D2_P4.xml b/drafter_7/annotations/C79_D2_P4.xml index 42ceadf7ebad7a9671dd6e22725d307f92310169..94f7bce61581220c37c1a9ecabb011a18b9bd0bf 100644 --- a/drafter_7/annotations/C79_D2_P4.xml +++ b/drafter_7/annotations/C79_D2_P4.xml @@ -469,8 +469,8 @@ 410 577 - 803 - 848 + 749 + 830 180 diff --git a/drafter_7/annotations/C80_D2_P3.xml b/drafter_7/annotations/C80_D2_P3.xml index 745f134776cc44060078104dae896dde0681dbf3..248b711a2011d4613e3c41f741f3d43e735be24a 100644 --- a/drafter_7/annotations/C80_D2_P3.xml +++ b/drafter_7/annotations/C80_D2_P3.xml @@ -81,7 +81,7 @@ 156 89 240 - 93 + 83 diff --git a/drafter_7/annotations/C81_D1_P1.xml b/drafter_7/annotations/C81_D1_P1.xml index 16f3df7b88c7fb515dac6add5fc9ff7d8fcb73ed..e46f1ce8ffd2f1c2aa060f728eeb17a31a1165fb 100644 --- a/drafter_7/annotations/C81_D1_P1.xml +++ b/drafter_7/annotations/C81_D1_P1.xml @@ -450,7 +450,7 @@ 330 467 - 468 + 455 691 185 diff --git a/drafter_7/annotations/C81_D1_P2.xml b/drafter_7/annotations/C81_D1_P2.xml index 5ca18db7c48043d81babe8937a1f1004027ea44f..d745a10be756cc148f5b02491b6921502dea6f62 100644 --- a/drafter_7/annotations/C81_D1_P2.xml +++ b/drafter_7/annotations/C81_D1_P2.xml @@ -462,7 +462,7 @@ 504 494 - 663 + 648 738 183 diff --git a/drafter_7/annotations/C81_D1_P4.xml b/drafter_7/annotations/C81_D1_P4.xml index 6fc5356b3dbc09ec4bf3c6e6458a8b245746b9cd..7f355d94867c1a2ca92e9b92a2ed61f690f567ee 100644 --- a/drafter_7/annotations/C81_D1_P4.xml +++ b/drafter_7/annotations/C81_D1_P4.xml @@ -503,7 +503,7 @@ 334 1222 548 - 360 + 17 diff --git a/drafter_7/annotations/C81_D2_P3.xml b/drafter_7/annotations/C81_D2_P3.xml index 5f58c577e8771f50b15c4504f10524ebbffd7afe..0f65f8a1821674f93d55d9bd1e5d301621ff052f 100644 --- a/drafter_7/annotations/C81_D2_P3.xml +++ b/drafter_7/annotations/C81_D2_P3.xml @@ -479,7 +479,7 @@ 363 1241 605 - 357 + 12 diff --git a/drafter_7/annotations/C82_D1_P1.xml b/drafter_7/annotations/C82_D1_P1.xml index 216d969ee8485a602ae38d7d2dbc7e248a91dd5e..0782ed1f53b3b9c2ae1d5a316339211991cdbc01 100644 --- a/drafter_7/annotations/C82_D1_P1.xml +++ b/drafter_7/annotations/C82_D1_P1.xml @@ -379,7 +379,7 @@ 288 347 510 - 355 + 358 diff --git a/drafter_7/annotations/C82_D1_P3.xml b/drafter_7/annotations/C82_D1_P3.xml index 56cc51ff3188af3a316f24fe57695c31d3bb2196..bf44e1824ea6bfabb64589d6a7e2566f3f9ab849 100644 --- a/drafter_7/annotations/C82_D1_P3.xml +++ b/drafter_7/annotations/C82_D1_P3.xml @@ -367,7 +367,7 @@ 406 1004 585 - 5 + 15 diff --git a/drafter_7/annotations/C83_D1_P3.xml b/drafter_7/annotations/C83_D1_P3.xml index 00718d7a0d11194328484e08615cfe73ed2fdd1a..fd46395fb97cd6d858b2017dc953daec52d09325 100644 --- a/drafter_7/annotations/C83_D1_P3.xml +++ b/drafter_7/annotations/C83_D1_P3.xml @@ -352,7 +352,6 @@ 411 430 512 - 9 diff --git a/drafter_7/annotations/C83_D1_P4.xml b/drafter_7/annotations/C83_D1_P4.xml index 3d8a5102d7a9d9337bd2270b988b184f704c49a6..5b456990f957f7fdc11e1bd24234eea399095f3f 100644 --- a/drafter_7/annotations/C83_D1_P4.xml +++ b/drafter_7/annotations/C83_D1_P4.xml @@ -378,7 +378,7 @@ 447 888 557 - 360 + 354 @@ -404,7 +404,7 @@ 473 194 523 - 182 + 181 @@ -417,7 +417,7 @@ 557 189 598 - 183 + 173 diff --git a/drafter_7/annotations/C83_D2_P1.xml b/drafter_7/annotations/C83_D2_P1.xml index 8cbab71361a551e343c671723508336ae6a3d0e6..bfd33698b8ca7b810fbcb942b7f91caebac80796 100644 --- a/drafter_7/annotations/C83_D2_P1.xml +++ b/drafter_7/annotations/C83_D2_P1.xml @@ -402,9 +402,9 @@ 103 500 - 161 - 552 - 177 + 146 + 544 + 181 @@ -413,11 +413,11 @@ 0 0 - 101 + 104 588 - 156 - 635 - 174 + 148 + 630 + 179 diff --git a/drafter_7/annotations/C83_D2_P2.xml b/drafter_7/annotations/C83_D2_P2.xml index 61cf94f7accbfb68e0998280649db0b2272113ed..943f7a5f84e1d559c26f0b8849924eb82975be2d 100644 --- a/drafter_7/annotations/C83_D2_P2.xml +++ b/drafter_7/annotations/C83_D2_P2.xml @@ -134,7 +134,7 @@ 839 446 898 - 98 + 112 @@ -407,7 +407,7 @@ 233 797 297 - 24 + 10 diff --git a/drafter_7/annotations/C83_D2_P3.xml b/drafter_7/annotations/C83_D2_P3.xml index 79dc0a023a7e4d821a52563851f57b39d18ac10e..5662688df9bef0c3b19e89a9ecb449014973655e 100644 --- a/drafter_7/annotations/C83_D2_P3.xml +++ b/drafter_7/annotations/C83_D2_P3.xml @@ -443,6 +443,7 @@ 776 496 824 + 89 diff --git a/drafter_7/annotations/C84_D1_P1.xml b/drafter_7/annotations/C84_D1_P1.xml index 85ffe1d5b6e45d19a5159fa2b367233884b422b4..edfe12c9e66263e7b932167403e62f510c98794a 100644 --- a/drafter_7/annotations/C84_D1_P1.xml +++ b/drafter_7/annotations/C84_D1_P1.xml @@ -144,7 +144,7 @@ - junction + crossover Unspecified 0 0 @@ -257,10 +257,10 @@ 0 0 - 984 - 102 - 1025 - 142 + 990 + 110 + 1018 + 134 @@ -269,10 +269,10 @@ 0 0 - 979 - 300 - 1012 - 338 + 985 + 307 + 1009 + 331 @@ -281,9 +281,9 @@ 0 0 - 160 + 163 753 - 196 + 194 784 diff --git a/drafter_7/annotations/C84_D1_P2.xml b/drafter_7/annotations/C84_D1_P2.xml index 72bedc8038dcf63d8c3772b169dd92d63a51ba91..8fc43c130551a07a4363282c137b4725348b0f11 100644 --- a/drafter_7/annotations/C84_D1_P2.xml +++ b/drafter_7/annotations/C84_D1_P2.xml @@ -120,7 +120,7 @@ - junction + crossover Unspecified 0 0 @@ -542,8 +542,8 @@ 364 289 - 402 - 321 + 396 + 310 diff --git a/drafter_7/annotations/C84_D1_P3.xml b/drafter_7/annotations/C84_D1_P3.xml index 52b90250823013411885f1a03fcd27189a120f2e..5084010bff8e1cbd9a97387fcfec677e6b69990d 100644 --- a/drafter_7/annotations/C84_D1_P3.xml +++ b/drafter_7/annotations/C84_D1_P3.xml @@ -209,7 +209,7 @@ - junction + crossover Unspecified 0 0 @@ -454,8 +454,8 @@ 513 436 - 553 - 477 + 548 + 471 273 @@ -528,10 +528,10 @@ 0 0 - 159 - 747 - 203 - 787 + 164 + 751 + 198 + 784 @@ -543,7 +543,7 @@ 581 122 609 - 153 + 140 diff --git a/drafter_7/annotations/C84_D1_P4.xml b/drafter_7/annotations/C84_D1_P4.xml index cd4f40896a07ab5fdb5ed78bcd9c2a7252e70849..697602e4b6c10352fd46ec029bfd3ad7d4d980c1 100644 --- a/drafter_7/annotations/C84_D1_P4.xml +++ b/drafter_7/annotations/C84_D1_P4.xml @@ -297,10 +297,10 @@ 0 0 - 157 - 773 - 203 - 815 + 160 + 776 + 191 + 807 @@ -309,10 +309,10 @@ 0 0 - 1111 - 87 - 1147 - 123 + 1118 + 91 + 1145 + 119 @@ -321,10 +321,10 @@ 0 0 - 1099 - 303 - 1131 - 345 + 1105 + 311 + 1128 + 336 @@ -484,7 +484,7 @@ - junction + crossover Unspecified 0 0 @@ -528,9 +528,9 @@ 0 618 - 165 + 168 650 - 201 + 190 diff --git a/drafter_7/annotations/C84_D2_P1.xml b/drafter_7/annotations/C84_D2_P1.xml index b54b1215801c6b78061073f0dc2baa7aa78f6a76..36967998a976a91a1c593cbb873d39701273a300 100644 --- a/drafter_7/annotations/C84_D2_P1.xml +++ b/drafter_7/annotations/C84_D2_P1.xml @@ -149,7 +149,7 @@ - junction + crossover Unspecified 0 0 @@ -528,10 +528,10 @@ 0 0 - 915 + 922 130 - 956 - 158 + 945 + 154 @@ -540,10 +540,10 @@ 0 0 - 907 + 915 331 - 953 - 360 + 938 + 354 diff --git a/drafter_7/annotations/C84_D2_P2.xml b/drafter_7/annotations/C84_D2_P2.xml index 9d4d072b23f692f3d5a3f515fff29ef43ac15b54..382debbbfadcc836f1a01816c4499d3cc1871132 100644 --- a/drafter_7/annotations/C84_D2_P2.xml +++ b/drafter_7/annotations/C84_D2_P2.xml @@ -310,10 +310,10 @@ 0 0 - 167 + 177 885 - 223 - 915 + 204 + 913 @@ -322,10 +322,10 @@ 0 0 - 743 - 50 - 786 - 81 + 759 + 52 + 782 + 77 @@ -334,10 +334,10 @@ 0 0 - 787 + 803 257 - 833 - 288 + 827 + 284 @@ -497,7 +497,7 @@ - junction + crossover Unspecified 0 0 @@ -553,9 +553,9 @@ 0 330 - 249 - 363 - 286 + 253 + 358 + 274 diff --git a/drafter_7/annotations/C84_D2_P3.xml b/drafter_7/annotations/C84_D2_P3.xml index e3804a3e06d97ed78dd8cce092216d1fd773a226..1231b91d97d6f1ad9d579d51ee35d497da6f0085 100644 --- a/drafter_7/annotations/C84_D2_P3.xml +++ b/drafter_7/annotations/C84_D2_P3.xml @@ -156,7 +156,7 @@ - junction + crossover Unspecified 0 0 @@ -453,8 +453,8 @@ 182 837 - 257 - 877 + 219 + 871 @@ -552,10 +552,10 @@ 0 0 - 595 + 601 211 629 - 242 + 232 diff --git a/drafter_7/annotations/C84_D2_P4.xml b/drafter_7/annotations/C84_D2_P4.xml index 957a9e4df3a6f752abe20607a2af8551c7451d46..55b3865ea75087ab902adb9676d84b650d32fb9e 100644 --- a/drafter_7/annotations/C84_D2_P4.xml +++ b/drafter_7/annotations/C84_D2_P4.xml @@ -439,10 +439,10 @@ 0 0 - 178 - 798 - 225 - 829 + 181 + 801 + 208 + 827 @@ -451,9 +451,9 @@ 0 0 - 1045 - 324 - 1111 + 1064 + 328 + 1089 356 @@ -463,10 +463,10 @@ 0 0 - 1049 - 92 - 1097 - 121 + 1066 + 96 + 1089 + 119 @@ -540,14 +540,14 @@ 0 0 - 528 - 162 - 561 - 207 + 530 + 168 + 557 + 190 - junction + crossover Unspecified 0 0 diff --git a/drafter_7/instances/C73_D1_P1.json b/drafter_7/instances/C73_D1_P1.json index 7654bc8748cdf53538e91d3f2972d0b3719977bf..e68b3d00aff57e236e70c0464f9e1003ef7c04f4 100644 --- a/drafter_7/instances/C73_D1_P1.json +++ b/drafter_7/instances/C73_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 262.0, @@ -25,13 +25,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 247.0, @@ -51,13 +52,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 225.0, @@ -77,13 +79,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 817.0, @@ -103,13 +106,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 983.0, @@ -129,13 +133,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 716.0, @@ -155,13 +160,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 494.0, @@ -181,13 +187,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 783.0, @@ -207,13 +214,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 976.0, @@ -233,13 +241,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 480.0, @@ -259,13 +268,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 481.0, @@ -285,13 +295,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 476.0, @@ -311,13 +322,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 770.0, @@ -337,13 +349,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 990.0, @@ -363,13 +376,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 35.0, @@ -389,13 +403,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 33.0, @@ -415,13 +430,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 22.0, @@ -441,13 +457,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 30.0, @@ -467,13 +484,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1099.0, @@ -493,13 +511,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1113.0, @@ -519,13 +538,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1096.0, @@ -545,13 +565,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1139.0, @@ -571,13 +592,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 98.0, @@ -597,13 +619,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 94.0, @@ -623,13 +646,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 88.0, @@ -649,13 +673,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1050.0, @@ -675,13 +700,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1076.0, @@ -701,13 +727,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1080.0, @@ -727,13 +754,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 81.0, @@ -753,10 +781,15 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C73_D1_P1.jpg", + "imageData": null, + "imageHeight": 1152, + "imageWidth": 1536, "lineColor": [ 0, 255, @@ -768,9 +801,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C73_D1_P1.jpg", - "imageData": null, - "imageHeight": 1152, - "imageWidth": 1536 + ] } \ No newline at end of file diff --git a/drafter_7/instances/C74_D2_P1.json b/drafter_7/instances/C74_D2_P1.json index e4f22f6cc1972bfe414b05680db8cecb69933f0e..93f7e3b7ea30ebe01ede9aab081036511b613535 100644 --- a/drafter_7/instances/C74_D2_P1.json +++ b/drafter_7/instances/C74_D2_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 48.0, @@ -25,13 +25,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 223.0, @@ -51,13 +52,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 674.0, @@ -77,13 +79,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 591.0, @@ -103,13 +106,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 608.0, @@ -129,13 +133,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 498.0, @@ -155,13 +160,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1104.0, @@ -181,13 +187,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1067.0, @@ -207,13 +214,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1060.0, @@ -233,13 +241,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 601.0, @@ -259,13 +268,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 971.0, @@ -285,13 +295,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 979.0, @@ -311,13 +322,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1150.0, @@ -337,13 +349,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 488.0, @@ -363,10 +376,15 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C74_D2_P1.jpg", + "imageData": null, + "imageHeight": 628, + "imageWidth": 1356, "lineColor": [ 0, 255, @@ -378,9 +396,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C74_D2_P1.jpg", - "imageData": null, - "imageHeight": 628, - "imageWidth": 1356 + ] } \ No newline at end of file diff --git a/drafter_7/instances/C75_D1_P4.json b/drafter_7/instances/C75_D1_P4.json index 6b0d7e27d4e0f46cc6f4fe26b8c72ba8e9783df2..2c121aa6a91dbc3dc4389100566892d3ebb20f9c 100644 --- a/drafter_7/instances/C75_D1_P4.json +++ b/drafter_7/instances/C75_D1_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 47.0, @@ -25,13 +25,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 68.0, @@ -51,13 +52,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 88.0, @@ -77,13 +79,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1215.0, @@ -103,13 +106,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1252.0, @@ -129,13 +133,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1101.0, @@ -155,13 +160,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1143.0, @@ -181,13 +187,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1336.0, @@ -207,13 +214,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 123.0, @@ -233,13 +241,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 141.0, @@ -259,13 +268,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1145.0, @@ -285,13 +295,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1034.0, @@ -311,13 +322,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1260.0, @@ -337,13 +349,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 217.0, @@ -363,13 +376,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 315.0, @@ -389,13 +403,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 369.0, @@ -415,13 +430,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 698.0, @@ -441,13 +457,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 649.0, @@ -467,13 +484,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 613.0, @@ -493,13 +511,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 801.0, @@ -519,13 +538,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 726.0, @@ -545,13 +565,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 920.0, @@ -571,13 +592,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 351.0, @@ -597,13 +619,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 282.0, @@ -623,13 +646,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 352.0, @@ -649,13 +673,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 627.0, @@ -675,13 +700,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 798.0, @@ -701,13 +727,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 213.0, @@ -727,13 +754,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 805.0, @@ -753,13 +781,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 766.0, @@ -779,13 +808,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 590.0, @@ -805,13 +835,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 233.0, @@ -831,13 +862,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 327.0, @@ -857,13 +889,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 826.0, @@ -883,13 +916,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 857.0, @@ -909,13 +943,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 702.0, @@ -935,13 +970,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 244.0, @@ -961,10 +997,15 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C75_D1_P4.jpg", + "imageData": null, + "imageHeight": 1152, + "imageWidth": 1536, "lineColor": [ 0, 255, @@ -976,9 +1017,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C75_D1_P4.jpg", - "imageData": null, - "imageHeight": 1152, - "imageWidth": 1536 + ] } \ No newline at end of file diff --git a/drafter_7/instances/C76_D2_P3.json b/drafter_7/instances/C76_D2_P3.json index 84df106aebf324d39a6cf51a26591e2cf3c97564..73a73061f2ade23cb5cb89f788567c9d3469819c 100644 --- a/drafter_7/instances/C76_D2_P3.json +++ b/drafter_7/instances/C76_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_7/instances/C78_D1_P2.json b/drafter_7/instances/C78_D1_P2.json index 0e52dcc115cd2f6a9faca70c73a8ea22d2f04c6f..f3606f8c581fa5b50c4073e9fcd78512643190b8 100644 --- a/drafter_7/instances/C78_D1_P2.json +++ b/drafter_7/instances/C78_D1_P2.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "operational_amplifier", "line_color": null, "fill_color": null, + "label": "operational_amplifier", "points": [ [ 924.0930232558139, @@ -60,13 +60,15 @@ 473.74418604651163 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 217.0, @@ -85,13 +87,15 @@ 359.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 211.0, @@ -110,13 +114,15 @@ 543.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1339.0, @@ -135,13 +141,15 @@ 409.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1360.0, @@ -160,13 +168,15 @@ 476.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1340.0, @@ -185,13 +195,15 @@ 818.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 758.0, @@ -210,13 +222,15 @@ 356.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 896.0, @@ -235,13 +249,15 @@ 302.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 930.0, @@ -260,13 +276,15 @@ 310.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 937.0, @@ -285,13 +303,15 @@ 371.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 845.0, @@ -310,13 +330,15 @@ 401.5564202334631 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 837.0, @@ -339,13 +361,15 @@ 545.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 934.0, @@ -364,13 +388,15 @@ 572.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 758.0, @@ -389,13 +415,15 @@ 537.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 885.0, @@ -414,13 +442,15 @@ 660.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 921.0, @@ -439,13 +469,15 @@ 677.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 278.0, @@ -464,13 +496,15 @@ 380.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 282.0, @@ -489,13 +523,15 @@ 562.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1297.0, @@ -514,13 +550,15 @@ 472.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1271.0, @@ -539,13 +577,15 @@ 840.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 279.0, @@ -564,13 +604,15 @@ 844.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 443.0, @@ -589,13 +631,15 @@ 367.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 445.0, @@ -614,13 +658,15 @@ 555.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 675.0, @@ -639,13 +685,15 @@ 629.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 826.0, @@ -664,13 +712,15 @@ 227.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 687.0, @@ -689,13 +739,15 @@ 373.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 681.0, @@ -714,13 +766,15 @@ 560.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1101.0, @@ -739,13 +793,15 @@ 456.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1113.0, @@ -764,13 +820,15 @@ 239.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 677.0, @@ -789,13 +847,15 @@ 826.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 701.0, @@ -814,10 +874,16 @@ 245.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C78_D1_P2.jpg", + "imageData": null, + "imageHeight": 1152, + "imageWidth": 1536, "lineColor": [ 0, 255, @@ -829,9 +895,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C78_D1_P2.jpg", - "imageData": null, - "imageHeight": 1152, - "imageWidth": 1536 + ] } \ No newline at end of file diff --git a/drafter_7/instances/C83_D2_P2.json b/drafter_7/instances/C83_D2_P2.json index 0fa9307e14c06d06253020f38a2c3b6cef4832b6..45c2f79a7632532abbf0b67f3a6094fd10aaca4f 100644 --- a/drafter_7/instances/C83_D2_P2.json +++ b/drafter_7/instances/C83_D2_P2.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 329.0, @@ -24,13 +24,15 @@ 69.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 908.0, @@ -49,13 +51,15 @@ 361.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 559.2222222222222, @@ -74,13 +78,15 @@ 897.8888888888889 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 41.0, @@ -99,13 +105,15 @@ 729.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 19.0, @@ -124,13 +132,15 @@ 649.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 856.0, @@ -149,13 +159,15 @@ 378.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 24.0, @@ -174,13 +186,15 @@ 183.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 133.0, @@ -199,13 +213,15 @@ 229.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 187.0, @@ -224,13 +240,15 @@ 465.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 417.0, @@ -249,13 +267,15 @@ 839.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 563.0, @@ -274,13 +294,15 @@ 110.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 739.0, @@ -299,13 +321,15 @@ 57.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 119.0, @@ -324,13 +348,15 @@ 172.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 161.0, @@ -349,13 +375,15 @@ 371.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 306.0, @@ -374,13 +402,15 @@ 339.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 210.0, @@ -399,13 +429,15 @@ 604.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 223.0, @@ -424,13 +456,15 @@ 679.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 592.0, @@ -449,13 +483,15 @@ 285.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 619.0, @@ -474,13 +510,15 @@ 427.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 790.0, @@ -499,13 +537,15 @@ 394.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 670.0, @@ -524,13 +564,15 @@ 414.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 94.0, @@ -549,13 +591,15 @@ 625.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 114.0, @@ -574,13 +618,15 @@ 701.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode.zener", "line_color": null, "fill_color": null, + "label": "diode.zener", "points": [ [ 387.0, @@ -599,13 +645,15 @@ 707.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 555.0, @@ -624,13 +672,15 @@ 75.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 730.0, @@ -649,13 +699,15 @@ 32.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 403.0, @@ -674,13 +726,15 @@ 780.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 430.0, @@ -699,13 +753,15 @@ 921.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 705.0, @@ -724,13 +780,15 @@ 848.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 646.0, @@ -749,13 +807,15 @@ 702.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 343.0, @@ -774,13 +834,15 @@ 635.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 730.0, @@ -799,13 +861,15 @@ 233.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 273.0, @@ -824,13 +888,15 @@ 962.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 762.0, @@ -849,13 +915,15 @@ 829.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 806.0, @@ -874,10 +942,16 @@ 12.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C83_D2_P2.jpg", + "imageData": null, + "imageHeight": 987, + "imageWidth": 984, "lineColor": [ 0, 255, @@ -889,9 +963,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C83_D2_P2.jpg", - "imageData": null, - "imageHeight": 987, - "imageWidth": 984 + ] } \ No newline at end of file diff --git a/drafter_7/instances/C83_D2_P4.json b/drafter_7/instances/C83_D2_P4.json index d60ad7148feb77364ee594c266f5e1341bfa0ff7..13e5f42969ce3db6b37f131b5d33109272f222da 100644 --- a/drafter_7/instances/C83_D2_P4.json +++ b/drafter_7/instances/C83_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -901,6 +933,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -943,6 +976,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -977,6 +1011,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_7/instances/C84_D1_P2.json b/drafter_7/instances/C84_D1_P2.json index d28101f321ddd1d2adeda123cd245bdfd0022ae2..2027cd616f83c94c288b8d9a5004dc3c7707f1c4 100644 --- a/drafter_7/instances/C84_D1_P2.json +++ b/drafter_7/instances/C84_D1_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -865,6 +897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -899,6 +932,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -925,6 +959,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -951,6 +986,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -977,6 +1013,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1003,6 +1040,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1029,6 +1067,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1055,6 +1094,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1081,6 +1121,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1107,6 +1148,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1133,6 +1175,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_8/annotations/C85_D1_P1.xml b/drafter_8/annotations/C85_D1_P1.xml index d5dddac8e05462cf8a522db20543baf637c0d7fc..8ce35544cd4ccd4e58b707fd22dac7f331dcf4d7 100644 --- a/drafter_8/annotations/C85_D1_P1.xml +++ b/drafter_8/annotations/C85_D1_P1.xml @@ -21,6 +21,7 @@ 8 610 90 + 6 diff --git a/drafter_8/annotations/C85_D1_P2.xml b/drafter_8/annotations/C85_D1_P2.xml index 5c67268a2a0d73fb93b6deac32230b0eff3facff..a5d3b466f62c09895828299213caffbf45e8b97b 100644 --- a/drafter_8/annotations/C85_D1_P2.xml +++ b/drafter_8/annotations/C85_D1_P2.xml @@ -189,6 +189,7 @@ 2 568 67 + 6 diff --git a/drafter_8/annotations/C85_D1_P3.xml b/drafter_8/annotations/C85_D1_P3.xml index d4b74cb33db0a027a0ddcc3d63af620f78ea9ffe..5ee9cd63e289312c6ec4c14d6094fcc9c476360f 100644 --- a/drafter_8/annotations/C85_D1_P3.xml +++ b/drafter_8/annotations/C85_D1_P3.xml @@ -189,6 +189,7 @@ 11 647 78 + 2 diff --git a/drafter_8/annotations/C85_D1_P4.xml b/drafter_8/annotations/C85_D1_P4.xml index 6c4c8a53f993977bae6fe6b309c69c1566812e12..89c40f5e8c175c1ddff2644356b668be728d304b 100644 --- a/drafter_8/annotations/C85_D1_P4.xml +++ b/drafter_8/annotations/C85_D1_P4.xml @@ -189,6 +189,7 @@ 5 584 105 + 2 diff --git a/drafter_8/annotations/C85_D2_P2.xml b/drafter_8/annotations/C85_D2_P2.xml index e3908b33a113fd4b79d68b2774fa1b446bf8f887..94577518f2918c11e17f75a825b510e0f9080129 100644 --- a/drafter_8/annotations/C85_D2_P2.xml +++ b/drafter_8/annotations/C85_D2_P2.xml @@ -189,6 +189,7 @@ 111 786 206 + 358 diff --git a/drafter_8/annotations/C86_D1_P1.xml b/drafter_8/annotations/C86_D1_P1.xml index 06b99d201f48d0bde1ab7669bd5b586dd4ba5e4e..fa5fa65829370d74b77a106715193c083c93b1b5 100644 --- a/drafter_8/annotations/C86_D1_P1.xml +++ b/drafter_8/annotations/C86_D1_P1.xml @@ -354,6 +354,7 @@ 234 111 315 + 87 diff --git a/drafter_8/annotations/C86_D1_P2.xml b/drafter_8/annotations/C86_D1_P2.xml index 674c586a37e9568d2254ee99269490f9e6248885..6a45902f54b8fb777d17665cdfe39f8563638c27 100644 --- a/drafter_8/annotations/C86_D1_P2.xml +++ b/drafter_8/annotations/C86_D1_P2.xml @@ -354,6 +354,7 @@ 266 137 398 + 90 diff --git a/drafter_8/annotations/C86_D1_P3.xml b/drafter_8/annotations/C86_D1_P3.xml index 4ea7cd37c33a80e8bf31e194869add589148f4e5..0eb1da8d8286513f36bc4e3a3048e9693d9c15f3 100644 --- a/drafter_8/annotations/C86_D1_P3.xml +++ b/drafter_8/annotations/C86_D1_P3.xml @@ -354,6 +354,7 @@ 301 93 379 + 87 diff --git a/drafter_8/annotations/C86_D1_P4.xml b/drafter_8/annotations/C86_D1_P4.xml index 2545e82b24fb18cd0008bc3d858122d60298bc9a..9876c34baac0b246734e2766d6c776609a42f97a 100644 --- a/drafter_8/annotations/C86_D1_P4.xml +++ b/drafter_8/annotations/C86_D1_P4.xml @@ -354,6 +354,7 @@ 223 181 298 + 90 diff --git a/drafter_8/annotations/C86_D2_P2.xml b/drafter_8/annotations/C86_D2_P2.xml index 799c6772bedf54aa11148b4bb7a3d59ddc624fb3..52a524794c6a90bd1fd5b14b4d430794db23056c 100644 --- a/drafter_8/annotations/C86_D2_P2.xml +++ b/drafter_8/annotations/C86_D2_P2.xml @@ -341,6 +341,7 @@ 304 104 363 + 75 diff --git a/drafter_8/annotations/C86_D2_P3.xml b/drafter_8/annotations/C86_D2_P3.xml index c58cea2cbebdbc8f9b1516e38ac1aea7a7451230..b09083338bf0e297d05e0140c1031f42710af63f 100644 --- a/drafter_8/annotations/C86_D2_P3.xml +++ b/drafter_8/annotations/C86_D2_P3.xml @@ -328,6 +328,7 @@ 296 70 352 + 83 diff --git a/drafter_8/annotations/C86_D2_P4.xml b/drafter_8/annotations/C86_D2_P4.xml index 1ce10ea9e2e3c147d0131ca7c46f55b5b950bea0..1450d5b216c6bdfdf1cd00657f9329645ce6a5d9 100644 --- a/drafter_8/annotations/C86_D2_P4.xml +++ b/drafter_8/annotations/C86_D2_P4.xml @@ -316,6 +316,7 @@ 345 98 416 + 90 diff --git a/drafter_8/annotations/C87_D1_P2.xml b/drafter_8/annotations/C87_D1_P2.xml index ea0bba0444e3893f33da1e966b6053fe638072e4..4ed3f03f738bdcd92295ae4a3fd99f978e3e125d 100644 --- a/drafter_8/annotations/C87_D1_P2.xml +++ b/drafter_8/annotations/C87_D1_P2.xml @@ -429,6 +429,7 @@ 43 383 109 + 206 @@ -627,6 +628,7 @@ 409 309 462 + 25 @@ -639,6 +641,7 @@ 470 325 530 + 23 diff --git a/drafter_8/annotations/C87_D1_P3.xml b/drafter_8/annotations/C87_D1_P3.xml index 941df79b5654758a6a39fdc4c9ef94093e2b62b9..a824c126e85d9119a51ca3e821348c4f73b010a9 100644 --- a/drafter_8/annotations/C87_D1_P3.xml +++ b/drafter_8/annotations/C87_D1_P3.xml @@ -418,6 +418,7 @@ 8 452 93 + 180 diff --git a/drafter_8/annotations/C87_D1_P4.xml b/drafter_8/annotations/C87_D1_P4.xml index 0d28a7391116a762f08d53b3b0c7856775fcb2a7..a7f0d56c402e9a3c0f41d7b67efe80199a5b3e88 100644 --- a/drafter_8/annotations/C87_D1_P4.xml +++ b/drafter_8/annotations/C87_D1_P4.xml @@ -417,6 +417,7 @@ 181 434 240 + 180 diff --git a/drafter_8/annotations/C87_D2_P1.xml b/drafter_8/annotations/C87_D2_P1.xml index 9f4e62b0c41c4cf138a1025899a63ba341136f0d..c0ee3588d73b29f636089f566958d1b52bc2451f 100644 --- a/drafter_8/annotations/C87_D2_P1.xml +++ b/drafter_8/annotations/C87_D2_P1.xml @@ -429,6 +429,7 @@ 2 555 65 + 180 diff --git a/drafter_8/annotations/C87_D2_P2.xml b/drafter_8/annotations/C87_D2_P2.xml index ddd056cf7dd91be7f7e934a3f810747a6ad3397a..a6a76fbb3f2a24abdcd9ae5d781e05502cbf0b3d 100644 --- a/drafter_8/annotations/C87_D2_P2.xml +++ b/drafter_8/annotations/C87_D2_P2.xml @@ -417,6 +417,7 @@ 45 363 113 + 200 @@ -639,6 +640,7 @@ 403 237 450 + 23 @@ -651,6 +653,7 @@ 455 253 507 + 23 diff --git a/drafter_8/annotations/C87_D2_P3.xml b/drafter_8/annotations/C87_D2_P3.xml index 703b202465e462bcbb3137b6a44654128585e0f2..7888a7406dfaa21f435dea12eb3f940185349153 100644 --- a/drafter_8/annotations/C87_D2_P3.xml +++ b/drafter_8/annotations/C87_D2_P3.xml @@ -441,6 +441,7 @@ 45 596 118 + 181 @@ -651,6 +652,7 @@ 516 389 561 + 2 diff --git a/drafter_8/annotations/C87_D2_P4.xml b/drafter_8/annotations/C87_D2_P4.xml index 0cfe47f2b45425ae087eea1b01d0003f0cb8e8aa..76dbadd609bc0c64dc3c3a485d9c8ac94d695447 100644 --- a/drafter_8/annotations/C87_D2_P4.xml +++ b/drafter_8/annotations/C87_D2_P4.xml @@ -442,6 +442,7 @@ 31 606 105 + 181 @@ -651,6 +652,7 @@ 508 391 551 + 2 diff --git a/drafter_8/annotations/C88_D1_P3.xml b/drafter_8/annotations/C88_D1_P3.xml index 6716f1c4aba903df14f15c6dbe6bd33fa87977ab..6b57b246dea0ce7a091608573e9468b3e16e64cb 100644 --- a/drafter_8/annotations/C88_D1_P3.xml +++ b/drafter_8/annotations/C88_D1_P3.xml @@ -21,6 +21,7 @@ 140 503 209 + 8 @@ -107,6 +108,7 @@ 611 635 650 + 354 @@ -119,6 +121,7 @@ 317 485 354 + 8 diff --git a/drafter_8/annotations/C88_D2_P1.xml b/drafter_8/annotations/C88_D2_P1.xml index e08a488d8e08ee3090baf56369b1faee101ec3fa..d10fe1f948d6ead1f49808176848e373fb962858 100644 --- a/drafter_8/annotations/C88_D2_P1.xml +++ b/drafter_8/annotations/C88_D2_P1.xml @@ -273,6 +273,7 @@ 554 736 604 + 6 diff --git a/drafter_8/annotations/C88_D2_P4.xml b/drafter_8/annotations/C88_D2_P4.xml index a89901bb26de4d27f0536aabb01cff79f0163ec4..b91d8b22d3a22b00cbec22f06274e848d37d05f0 100644 --- a/drafter_8/annotations/C88_D2_P4.xml +++ b/drafter_8/annotations/C88_D2_P4.xml @@ -439,6 +439,7 @@ 620 662 677 + 6 diff --git a/drafter_8/annotations/C89_D1_P1.xml b/drafter_8/annotations/C89_D1_P1.xml index b19b311ace64750db2710b2fc6a159deca974f40..43a48c8e03d07edfe314c2c704c58e931d8dd8fb 100644 --- a/drafter_8/annotations/C89_D1_P1.xml +++ b/drafter_8/annotations/C89_D1_P1.xml @@ -192,6 +192,7 @@ 236 192 310 + 268 @@ -204,6 +205,7 @@ 512 193 583 + 270 diff --git a/drafter_8/annotations/C89_D1_P2.xml b/drafter_8/annotations/C89_D1_P2.xml index 24bc3d15c773e009dcb6497aaa5a304d128d6b90..75d7d9688cdb45f176771344ac056f03d66da933 100644 --- a/drafter_8/annotations/C89_D1_P2.xml +++ b/drafter_8/annotations/C89_D1_P2.xml @@ -132,6 +132,7 @@ 515 591 545 + 19 @@ -144,6 +145,7 @@ 800 599 832 + 19 @@ -168,6 +170,7 @@ 314 259 409 + 271 @@ -192,6 +195,7 @@ 646 279 726 + 273 diff --git a/drafter_8/annotations/C89_D1_P3.xml b/drafter_8/annotations/C89_D1_P3.xml index 28bbd72385b6a88555979dd6a14c0a44d46bab33..d7dcf219aa853594724012e8c2e36c33355cfc2c 100644 --- a/drafter_8/annotations/C89_D1_P3.xml +++ b/drafter_8/annotations/C89_D1_P3.xml @@ -168,6 +168,7 @@ 515 217 585 + 271 @@ -216,6 +217,7 @@ 242 215 320 + 270 diff --git a/drafter_8/annotations/C89_D1_P4.xml b/drafter_8/annotations/C89_D1_P4.xml index fdf72a2016146177798d12e4e57dc70be6819987..c6226e5c67551453abe756f26a6145eaa94220c4 100644 --- a/drafter_8/annotations/C89_D1_P4.xml +++ b/drafter_8/annotations/C89_D1_P4.xml @@ -168,6 +168,7 @@ 523 326 595 + 266 @@ -204,6 +205,7 @@ 257 344 329 + 266 diff --git a/drafter_8/annotations/C89_D2_P1.xml b/drafter_8/annotations/C89_D2_P1.xml index 210bb58096d316e579ef0e9e36a59e6e525ef2f7..a103bd73b00cb2e94abbbfd23d676230dbde5ad3 100644 --- a/drafter_8/annotations/C89_D2_P1.xml +++ b/drafter_8/annotations/C89_D2_P1.xml @@ -578,6 +578,7 @@ 309 223 375 + 268 @@ -590,6 +591,7 @@ 579 240 632 + 271 diff --git a/drafter_8/annotations/C89_D2_P2.xml b/drafter_8/annotations/C89_D2_P2.xml index d80b98016ffc2c5b5655f15489d6f57b505523f0..df45b29240c01008e54d6a9620babbf51b74bf54 100644 --- a/drafter_8/annotations/C89_D2_P2.xml +++ b/drafter_8/annotations/C89_D2_P2.xml @@ -540,6 +540,7 @@ 414 238 473 + 268 @@ -552,6 +553,7 @@ 671 255 723 + 271 diff --git a/drafter_8/annotations/C89_D2_P3.xml b/drafter_8/annotations/C89_D2_P3.xml index bf829e0109f898712a9201984342bab04ede9691..877a1cc6ecc6a92565cb39a49f5fe4140eea1acb 100644 --- a/drafter_8/annotations/C89_D2_P3.xml +++ b/drafter_8/annotations/C89_D2_P3.xml @@ -468,6 +468,7 @@ 424 447 463 + 12 @@ -480,6 +481,7 @@ 655 428 696 + 4 @@ -492,6 +494,7 @@ 168 472 216 + 17 @@ -504,6 +507,7 @@ 333 509 406 + 12 @@ -516,6 +520,7 @@ 56 509 113 + 21 @@ -528,6 +533,7 @@ 344 244 393 + 258 @@ -540,6 +546,7 @@ 563 232 610 + 264 @@ -552,6 +559,7 @@ 574 521 642 + 8 diff --git a/drafter_8/annotations/C89_D2_P4.xml b/drafter_8/annotations/C89_D2_P4.xml index 2bfac33d8a7e1cd9f654a1467991426d8f0c3965..592a4f333407702a5791cb685222fa516ab6de05 100644 --- a/drafter_8/annotations/C89_D2_P4.xml +++ b/drafter_8/annotations/C89_D2_P4.xml @@ -132,6 +132,7 @@ 239 540 283 + 347 @@ -156,6 +157,7 @@ 782 517 823 + 6 @@ -168,6 +170,7 @@ 357 286 432 + 264 @@ -216,6 +219,7 @@ 664 299 726 + 273 diff --git a/drafter_8/annotations/C90_D1_P1.xml b/drafter_8/annotations/C90_D1_P1.xml index 933427f4ae7bbf8b34b3a33c97189313b17659dd..fb1a6eac2bbbea3f879c892ebd6ff1d5a0982c1c 100644 --- a/drafter_8/annotations/C90_D1_P1.xml +++ b/drafter_8/annotations/C90_D1_P1.xml @@ -144,6 +144,7 @@ 580 482 610 + 10 @@ -180,6 +181,7 @@ 245 356 281 + 275 @@ -192,6 +194,7 @@ 512 358 554 + 271 @@ -216,6 +219,7 @@ 802 345 850 + 273 diff --git a/drafter_8/annotations/C90_D1_P2.xml b/drafter_8/annotations/C90_D1_P2.xml index 80353c73dececa82c7adfd2335cf61ba6b74135c..4378e439d62416569e05846b40355bbcedc17fe3 100644 --- a/drafter_8/annotations/C90_D1_P2.xml +++ b/drafter_8/annotations/C90_D1_P2.xml @@ -144,6 +144,7 @@ 592 480 623 + 12 @@ -168,6 +169,7 @@ 262 349 298 + 275 @@ -204,6 +206,7 @@ 526 354 568 + 270 @@ -228,6 +231,7 @@ 820 343 868 + 275 diff --git a/drafter_8/annotations/C90_D1_P3.xml b/drafter_8/annotations/C90_D1_P3.xml index 5ceaa3dfb25115b62d1ea74c45a7372aa26ffff5..799a7e3db276486db4b92c3b4bcc9ba14e4a2106 100644 --- a/drafter_8/annotations/C90_D1_P3.xml +++ b/drafter_8/annotations/C90_D1_P3.xml @@ -180,6 +180,7 @@ 257 413 290 + 268 @@ -204,6 +205,7 @@ 496 381 537 + 264 @@ -228,6 +230,7 @@ 773 330 821 + 264 diff --git a/drafter_8/annotations/C90_D1_P4.xml b/drafter_8/annotations/C90_D1_P4.xml index 1bd77022425135949ea4f6be842bc7cd3ba1e3da..56adfae507a993cfb200eea133f44e01864126ba 100644 --- a/drafter_8/annotations/C90_D1_P4.xml +++ b/drafter_8/annotations/C90_D1_P4.xml @@ -132,6 +132,7 @@ 353 521 380 + 341 @@ -144,6 +145,7 @@ 605 484 632 + 10 @@ -156,6 +158,7 @@ 875 445 904 + 8 @@ -168,6 +171,7 @@ 262 440 305 + 270 @@ -204,6 +208,7 @@ 534 403 575 + 258 @@ -216,6 +221,7 @@ 794 354 832 + 266 diff --git a/drafter_8/annotations/C90_D2_P1.xml b/drafter_8/annotations/C90_D2_P1.xml index a640f80d0f88e2aca4f3eaa5aff39b35879c2bf7..c8d658706497ca19c955c90a57555b0c02f28814 100644 --- a/drafter_8/annotations/C90_D2_P1.xml +++ b/drafter_8/annotations/C90_D2_P1.xml @@ -165,6 +165,7 @@ 527 301 562 + 268 @@ -177,6 +178,7 @@ 315 306 350 + 271 @@ -189,6 +191,7 @@ 98 308 132 + 270 diff --git a/drafter_8/annotations/C90_D2_P2.xml b/drafter_8/annotations/C90_D2_P2.xml index e0b20b27494ca3c810c7a59c635a2e171e28893d..3f33509f46ba7d6700a462803a47716b3935eb74 100644 --- a/drafter_8/annotations/C90_D2_P2.xml +++ b/drafter_8/annotations/C90_D2_P2.xml @@ -129,6 +129,7 @@ 458 307 494 + 270 @@ -141,6 +142,7 @@ 671 306 705 + 270 @@ -189,6 +191,7 @@ 233 305 269 + 271 diff --git a/drafter_8/annotations/C90_D2_P3.xml b/drafter_8/annotations/C90_D2_P3.xml index eb18db561009dfcd7b4782a78f60271b69de4788..0f70ee5a07252aa67a81da5bd6105038080e70a2 100644 --- a/drafter_8/annotations/C90_D2_P3.xml +++ b/drafter_8/annotations/C90_D2_P3.xml @@ -93,6 +93,7 @@ 758 554 778 + 8 @@ -105,6 +106,7 @@ 527 537 545 + 354 @@ -117,6 +119,7 @@ 300 520 323 + 350 @@ -129,6 +132,7 @@ 679 413 718 + 270 @@ -177,6 +181,7 @@ 434 403 476 + 270 @@ -189,6 +194,7 @@ 179 396 224 + 270 diff --git a/drafter_8/annotations/C90_D2_P4.xml b/drafter_8/annotations/C90_D2_P4.xml index 2362e6f75e105891a83b8f7a6f1f6fb2c8dca6a1..c16bda77e658aaa03af4ebec9b51c36495a12171 100644 --- a/drafter_8/annotations/C90_D2_P4.xml +++ b/drafter_8/annotations/C90_D2_P4.xml @@ -129,6 +129,7 @@ 204 284 238 + 270 @@ -153,6 +154,7 @@ 421 288 455 + 270 @@ -177,6 +179,7 @@ 622 287 656 + 270 diff --git a/drafter_8/annotations/C91_D1_P1.xml b/drafter_8/annotations/C91_D1_P1.xml index 4dbfc7c8c37ec8c6c51c2bf699aa51d868f96da1..7ca5ef06d4187adcabfd0bcef6eb390ed0f791ff 100644 --- a/drafter_8/annotations/C91_D1_P1.xml +++ b/drafter_8/annotations/C91_D1_P1.xml @@ -255,6 +255,7 @@ 188 478 275 + 270 @@ -267,6 +268,7 @@ 577 477 668 + 270 diff --git a/drafter_8/annotations/C91_D1_P2.xml b/drafter_8/annotations/C91_D1_P2.xml index 703b5a193d95ebca1bd2d968aa2c1938fb96c29a..fdc9fde65108c31598139c4c8afc1ff612965744 100644 --- a/drafter_8/annotations/C91_D1_P2.xml +++ b/drafter_8/annotations/C91_D1_P2.xml @@ -255,6 +255,7 @@ 380 487 460 + 264 @@ -267,6 +268,7 @@ 99 512 155 + 266 @@ -291,6 +293,7 @@ 203 621 235 + 10 diff --git a/drafter_8/annotations/C91_D1_P3.xml b/drafter_8/annotations/C91_D1_P3.xml index e409f128d04c1635f9c12f69b1be146f031f8e13..ca450d2bc78f3f4599f02373dc2a431960f1a869 100644 --- a/drafter_8/annotations/C91_D1_P3.xml +++ b/drafter_8/annotations/C91_D1_P3.xml @@ -255,6 +255,7 @@ 155 526 245 + 270 @@ -267,6 +268,7 @@ 533 516 623 + 266 diff --git a/drafter_8/annotations/C91_D1_P4.xml b/drafter_8/annotations/C91_D1_P4.xml index cde79e4ff066e55962fb85b2b4704aae98e35b95..22c6b154de90368c3104061a819f210c43f06ae6 100644 --- a/drafter_8/annotations/C91_D1_P4.xml +++ b/drafter_8/annotations/C91_D1_P4.xml @@ -255,6 +255,7 @@ 232 493 323 + 270 @@ -267,6 +268,7 @@ 629 488 725 + 270 diff --git a/drafter_8/annotations/C91_D2_P1.xml b/drafter_8/annotations/C91_D2_P1.xml index 3049e61cd59cbc5e49d3098703cd262f345da98e..da6d9bb574502f7bc7688ff13c8f89b05b15bff0 100644 --- a/drafter_8/annotations/C91_D2_P1.xml +++ b/drafter_8/annotations/C91_D2_P1.xml @@ -255,6 +255,7 @@ 117 419 184 + 270 @@ -267,6 +268,7 @@ 458 457 525 + 270 diff --git a/drafter_8/annotations/C91_D2_P2.xml b/drafter_8/annotations/C91_D2_P2.xml index 8279eedcd4b32644d984fac1a5131e0b8202530c..a86be8ee25379f64dc9b9a217facec81d2146733 100644 --- a/drafter_8/annotations/C91_D2_P2.xml +++ b/drafter_8/annotations/C91_D2_P2.xml @@ -255,6 +255,7 @@ 208 543 284 + 270 @@ -267,6 +268,7 @@ 560 569 623 + 270 diff --git a/drafter_8/annotations/C91_D2_P3.xml b/drafter_8/annotations/C91_D2_P3.xml index cb631f077c869a82733fc318462f91b90362d5a9..f695f0057b3558e1546e331ca81779fe163335be 100644 --- a/drafter_8/annotations/C91_D2_P3.xml +++ b/drafter_8/annotations/C91_D2_P3.xml @@ -255,7 +255,7 @@ 152 456 208 - 89 + 269 @@ -268,6 +268,7 @@ 456 503 517 + 270 @@ -280,6 +281,7 @@ 262 574 294 + 6 diff --git a/drafter_8/annotations/C91_D2_P4.xml b/drafter_8/annotations/C91_D2_P4.xml index db44486997c7a763821dce5adee64d805610eceb..4d6c99f88b218ec3a19f57449d1e36cf9e15aff8 100644 --- a/drafter_8/annotations/C91_D2_P4.xml +++ b/drafter_8/annotations/C91_D2_P4.xml @@ -255,6 +255,7 @@ 219 447 277 + 270 @@ -267,6 +268,7 @@ 510 487 570 + 270 @@ -291,6 +293,7 @@ 324 557 360 + 10 diff --git a/drafter_8/annotations/C92_D1_P1.xml b/drafter_8/annotations/C92_D1_P1.xml index 127a269145dc4cd035aeac11405fe6c3a3dea4c6..a1045bdb918f4732c1b1857fda1903eba06f671d 100644 --- a/drafter_8/annotations/C92_D1_P1.xml +++ b/drafter_8/annotations/C92_D1_P1.xml @@ -21,6 +21,7 @@ 630 635 790 + 270 @@ -46,7 +47,7 @@ 333 342 448 - 90 + 270 @@ -202,6 +203,7 @@ 465 588 512 + 90 470 @@ -254,6 +256,7 @@ 727 803 777 + 90 470 diff --git a/drafter_8/annotations/C92_D1_P2.xml b/drafter_8/annotations/C92_D1_P2.xml index cd7aedd6d80ab562258ab04d0998e6f533ab38a4..8d03d9b5dd98dd5f7d1ceef379a1d331c16401e7 100644 --- a/drafter_8/annotations/C92_D1_P2.xml +++ b/drafter_8/annotations/C92_D1_P2.xml @@ -21,6 +21,7 @@ 673 620 836 + 254 @@ -46,7 +47,7 @@ 357 390 475 - 87 + 268 @@ -72,6 +73,7 @@ 370 181 408 + 270 @@ -84,6 +86,7 @@ 613 167 656 + 270 diff --git a/drafter_8/annotations/C92_D1_P3.xml b/drafter_8/annotations/C92_D1_P3.xml index b53ccb37f81dcb0440aa3be095694a606eb59204..0d5a11750dfc42ef5b97bc4df8e63fd68a9b0b80 100644 --- a/drafter_8/annotations/C92_D1_P3.xml +++ b/drafter_8/annotations/C92_D1_P3.xml @@ -21,6 +21,7 @@ 558 646 683 + 287 @@ -46,7 +47,7 @@ 386 305 473 - 105 + 285 @@ -72,7 +73,7 @@ 434 111 479 - 96 + 275 @@ -85,7 +86,7 @@ 629 148 672 - 110 + 279 @@ -151,7 +152,7 @@ 470 413 - BC458 + BC548 text diff --git a/drafter_8/annotations/C92_D1_P4.xml b/drafter_8/annotations/C92_D1_P4.xml index f192232f087c2df2f8fe532048c106048fe3212b..426fb8e350f61fec5f725f86ef5577bbb3b02368 100644 --- a/drafter_8/annotations/C92_D1_P4.xml +++ b/drafter_8/annotations/C92_D1_P4.xml @@ -21,6 +21,7 @@ 388 632 537 + 279 @@ -46,7 +47,7 @@ 149 353 233 - 90 + 270 @@ -72,7 +73,7 @@ 158 178 183 - 72 + 268 @@ -85,7 +86,7 @@ 352 144 381 - 86 + 268 diff --git a/drafter_8/annotations/C92_D2_P1.xml b/drafter_8/annotations/C92_D2_P1.xml index 723623b503f29a3f4a3a354eee0ee7281ced97db..fe8ce3ce73e14aff2b74ff3b0d0fe4929b558573 100644 --- a/drafter_8/annotations/C92_D2_P1.xml +++ b/drafter_8/annotations/C92_D2_P1.xml @@ -21,6 +21,7 @@ 655 659 798 + 270 @@ -46,7 +47,7 @@ 314 386 442 - 90 + 270 @@ -71,6 +72,7 @@ 325 167 353 + 270 @@ -83,6 +85,7 @@ 713 162 743 + 270 diff --git a/drafter_8/annotations/C92_D2_P2.xml b/drafter_8/annotations/C92_D2_P2.xml index 903eae876c00f6219ad71d46e2789669e85421e6..7a60fab91c0c621cc8269e658d69391aca354f00 100644 --- a/drafter_8/annotations/C92_D2_P2.xml +++ b/drafter_8/annotations/C92_D2_P2.xml @@ -21,6 +21,7 @@ 634 695 788 + 270 diff --git a/drafter_8/annotations/C92_D2_P3.xml b/drafter_8/annotations/C92_D2_P3.xml index 428e8d4388729ad7a114f391eae161251be517f4..6d8edbfdecc8cb886ffc26f95ba84379a9969655 100644 --- a/drafter_8/annotations/C92_D2_P3.xml +++ b/drafter_8/annotations/C92_D2_P3.xml @@ -21,6 +21,7 @@ 560 645 693 + 231 @@ -46,7 +47,7 @@ 268 537 368 - 57 + 237 diff --git a/drafter_8/annotations/C92_D2_P4.xml b/drafter_8/annotations/C92_D2_P4.xml index 19a87f4342bb04b4f24b27e5f92b3b1513bd25ad..5946b21ebc464314acb15d3bdc4ddf227450f0a9 100644 --- a/drafter_8/annotations/C92_D2_P4.xml +++ b/drafter_8/annotations/C92_D2_P4.xml @@ -21,6 +21,7 @@ 668 644 818 + 268 diff --git a/drafter_8/annotations/C94_D1_P1.xml b/drafter_8/annotations/C94_D1_P1.xml index 49a22447062f2c85b12f496c6c9d8b49238a61ae..73f9a3c2f6ac86df1f4c16a7ec77f1cbe480a00b 100644 --- a/drafter_8/annotations/C94_D1_P1.xml +++ b/drafter_8/annotations/C94_D1_P1.xml @@ -56,7 +56,7 @@ 0 227 - 149 + 146 473 231 @@ -198,6 +198,7 @@ 195 109 225 + 90 R1 @@ -211,6 +212,7 @@ 175 172 213 + 90 1K6 @@ -948,8 +950,8 @@ 0 0 - 378 - 154 + 320 + 149 469 220 diff --git a/drafter_8/annotations/C94_D1_P2.xml b/drafter_8/annotations/C94_D1_P2.xml index 16faecf9cf8b8be6b0176baf89ddb9a9b9e6f69c..acd2870ce979c9b20c2f11878779f6ac2933d826 100644 --- a/drafter_8/annotations/C94_D1_P2.xml +++ b/drafter_8/annotations/C94_D1_P2.xml @@ -727,7 +727,7 @@ 0 237 - 230 + 228 445 304 @@ -936,7 +936,7 @@ 0 240 - 232 + 231 356 302 267 @@ -948,8 +948,8 @@ 0 0 - 364 - 232 + 315 + 231 444 288 diff --git a/drafter_8/annotations/C94_D1_P3.xml b/drafter_8/annotations/C94_D1_P3.xml index 66a43ec10ecf4ed3fd8756efe26c91478453eba7..46f5497cb5ae43e6f77bdff45d7b9cf7982fc2d8 100644 --- a/drafter_8/annotations/C94_D1_P3.xml +++ b/drafter_8/annotations/C94_D1_P3.xml @@ -541,7 +541,7 @@ 0 334 - 229 + 225 605 321 @@ -569,6 +569,7 @@ 466 1096 531 + 175 @@ -936,7 +937,7 @@ 0 338 - 231 + 228 496 318 267 @@ -948,8 +949,8 @@ 0 0 - 502 - 236 + 445 + 228 603 306 diff --git a/drafter_8/annotations/C94_D1_P4.xml b/drafter_8/annotations/C94_D1_P4.xml index 957797e2b4c9d093ac1ec3c9c0724df3db561d44..e98b9b8ea955f4991dda91a00e3d6e8aeea8c67a 100644 --- a/drafter_8/annotations/C94_D1_P4.xml +++ b/drafter_8/annotations/C94_D1_P4.xml @@ -18,7 +18,7 @@ 0 216 - 195 + 194 447 265 @@ -374,6 +374,7 @@ 399 536 421 + 90 R4 @@ -387,6 +388,7 @@ 377 585 409 + 90 330 @@ -934,7 +936,7 @@ 0 221 - 198 + 196 350 259 266 @@ -946,8 +948,8 @@ 0 0 - 357 - 203 + 305 + 196 443 253 diff --git a/drafter_8/annotations/C94_D2_P1.xml b/drafter_8/annotations/C94_D2_P1.xml index 1533dc79d359aba29c27bfdf10b54b393227d8ac..79e0d9280aec64b9f628d47ca0d1a6f4a0562b37 100644 --- a/drafter_8/annotations/C94_D2_P1.xml +++ b/drafter_8/annotations/C94_D2_P1.xml @@ -21,6 +21,7 @@ 400 1170 497 + 4 @@ -560,6 +561,7 @@ 427 545 466 + 90 330 @@ -599,6 +601,7 @@ 454 471 489 + 90 R4 @@ -935,7 +938,7 @@ 0 179 - 241 + 240 296 314 262 @@ -947,8 +950,8 @@ 0 0 - 287 - 242 + 252 + 240 392 316 diff --git a/drafter_8/annotations/C94_D2_P2.xml b/drafter_8/annotations/C94_D2_P2.xml index 7879f1e8724f4e52c789f122acca8f630f8efce2..852b0b53713b0e435e7f4e6d48da0cbc936c4025 100644 --- a/drafter_8/annotations/C94_D2_P2.xml +++ b/drafter_8/annotations/C94_D2_P2.xml @@ -422,7 +422,7 @@ 0 177 - 277 + 275 390 352 @@ -938,8 +938,8 @@ 0 183 - 281 - 293 + 277 + 296 349 266 @@ -962,8 +962,8 @@ 0 0 - 288 - 279 + 252 + 278 387 345 diff --git a/drafter_8/annotations/C94_D2_P3.xml b/drafter_8/annotations/C94_D2_P3.xml index fbc10e267ed89dbbfbd78e5d265cc210ad2df0a6..ccf0b896aaec41d7af131ca22bb715900f7a9a8a 100644 --- a/drafter_8/annotations/C94_D2_P3.xml +++ b/drafter_8/annotations/C94_D2_P3.xml @@ -963,8 +963,8 @@ 0 0 - 372 - 180 + 326 + 175 478 262 diff --git a/drafter_8/annotations/C94_D2_P4.xml b/drafter_8/annotations/C94_D2_P4.xml index 4f52c6b3d2182442fb36fd39c09a44dcdd2ccaa1..0515011988c506242429fab9a4309a876bc5848f 100644 --- a/drafter_8/annotations/C94_D2_P4.xml +++ b/drafter_8/annotations/C94_D2_P4.xml @@ -962,7 +962,7 @@ 0 0 - 272 + 239 221 374 296 diff --git a/drafter_8/annotations/C95_D1_P1.xml b/drafter_8/annotations/C95_D1_P1.xml index 41c16d1c952add5c0815dc84dd89052cc94e2436..e9fa69edea559ab5da96da86539f198f745c9e46 100644 --- a/drafter_8/annotations/C95_D1_P1.xml +++ b/drafter_8/annotations/C95_D1_P1.xml @@ -162,6 +162,7 @@ 481 1093 654 + 90 @@ -214,7 +215,7 @@ 606 663 - 0,22μF + 0,22µF text @@ -292,7 +293,7 @@ 980 360 - 470Ω + 470 text @@ -832,6 +833,7 @@ 420 148 512 + 92 @@ -844,6 +846,7 @@ 389 107 541 + 98 diff --git a/drafter_8/annotations/C95_D1_P2.xml b/drafter_8/annotations/C95_D1_P2.xml index 0ad295e3c9e5471b1bd3285ae18bb8f93b941591..1bd710619ee1c1f746185d62e747fd12f8f9ae0c 100644 --- a/drafter_8/annotations/C95_D1_P2.xml +++ b/drafter_8/annotations/C95_D1_P2.xml @@ -21,6 +21,7 @@ 444 1106 609 + 98 @@ -99,7 +100,7 @@ 688 621 - 0,22μF + 0,22µF text @@ -832,6 +833,7 @@ 341 176 448 + 92 @@ -844,6 +846,7 @@ 303 125 482 + 90 diff --git a/drafter_8/annotations/C95_D1_P3.xml b/drafter_8/annotations/C95_D1_P3.xml index 163b73de3cf6d3ce44aba9d810e771e465678daa..dc98823cff61595fe8ef1cf2af341065a721c23b 100644 --- a/drafter_8/annotations/C95_D1_P3.xml +++ b/drafter_8/annotations/C95_D1_P3.xml @@ -21,6 +21,7 @@ 467 1114 644 + 90 @@ -279,7 +280,7 @@ 616 646 - 0,22μF + 0,22µF text @@ -832,6 +833,7 @@ 379 137 480 + 90 @@ -844,6 +846,7 @@ 346 91 510 + 90 diff --git a/drafter_8/annotations/C95_D1_P4.xml b/drafter_8/annotations/C95_D1_P4.xml index d4dfb5bf425770d8ce78a2ae383467c2eed5d327..4588360e1d6e499156bd958ada6055ce0f487b51 100644 --- a/drafter_8/annotations/C95_D1_P4.xml +++ b/drafter_8/annotations/C95_D1_P4.xml @@ -21,6 +21,7 @@ 456 1032 617 + 90 @@ -807,7 +808,7 @@ 575 630 - 0,22μF + 0,22µF text @@ -832,6 +833,7 @@ 418 149 503 + 90 @@ -844,6 +846,7 @@ 390 111 528 + 90 diff --git a/drafter_8/annotations/C95_D2_P1.xml b/drafter_8/annotations/C95_D2_P1.xml index 3aafa10c75c6094cd4af4bc34b255c9bdd7ec0a2..ab0325b8b6432e87d4e6f78f15e8fa1e01e3830d 100644 --- a/drafter_8/annotations/C95_D2_P1.xml +++ b/drafter_8/annotations/C95_D2_P1.xml @@ -710,6 +710,7 @@ 553 1035 681 + 90 @@ -859,6 +860,7 @@ 405 105 470 + 90 @@ -871,6 +873,7 @@ 377 63 500 + 90 diff --git a/drafter_8/annotations/C95_D2_P2.xml b/drafter_8/annotations/C95_D2_P2.xml index 980adda7ccc51bdedeac950016706ae183688c8b..5a3e221b37cae74fb1824db688235a1d8edda341 100644 --- a/drafter_8/annotations/C95_D2_P2.xml +++ b/drafter_8/annotations/C95_D2_P2.xml @@ -488,6 +488,7 @@ 495 1079 615 + 90 @@ -630,7 +631,7 @@ 567 619 - 0,22μF + 0,22µF text @@ -859,6 +860,7 @@ 339 164 403 + 77 @@ -871,6 +873,7 @@ 310 122 431 + 79 diff --git a/drafter_8/annotations/C95_D2_P3.xml b/drafter_8/annotations/C95_D2_P3.xml index 6974cc052902e63c4d199dcaa40744271bdc3673..54d6abf4306c5a4a58e02325c87823f9152c36e8 100644 --- a/drafter_8/annotations/C95_D2_P3.xml +++ b/drafter_8/annotations/C95_D2_P3.xml @@ -385,6 +385,7 @@ 587 1003 715 + 90 @@ -606,7 +607,7 @@ 481 684 - 0,22μF + 0,22µF text @@ -859,6 +860,7 @@ 412 119 476 + 81 @@ -869,8 +871,9 @@ 45 381 - 75 + 78 500 + 77 diff --git a/drafter_8/annotations/C95_D2_P4.xml b/drafter_8/annotations/C95_D2_P4.xml index 2aea78c4bb7ad4c846d6b0da33d634baf12f8a5d..b1227476cf1ae0dc131d090e4fcd08cfb1b8c3f4 100644 --- a/drafter_8/annotations/C95_D2_P4.xml +++ b/drafter_8/annotations/C95_D2_P4.xml @@ -525,7 +525,7 @@ 453 670 - 0,22μF + 0,22µF text @@ -762,6 +762,7 @@ 553 984 680 + 90 @@ -859,6 +860,7 @@ 424 126 482 + 104 @@ -871,6 +873,7 @@ 404 95 509 + 102 diff --git a/drafter_8/annotations/C96_D1_P1.xml b/drafter_8/annotations/C96_D1_P1.xml index ccd2a942b6b5ae5c26b6f36e543ce20fe6c85b8b..03c01d28e60bbd312ad654caab4f6aac223b495a 100644 --- a/drafter_8/annotations/C96_D1_P1.xml +++ b/drafter_8/annotations/C96_D1_P1.xml @@ -468,7 +468,7 @@ 598 324 - 47μF + 47µF text @@ -533,7 +533,7 @@ 760 175 - 0,15μF + 0,15µF text @@ -689,7 +689,7 @@ 1055 489 - 0,1μF + 0,1µF text diff --git a/drafter_8/annotations/C96_D1_P2.xml b/drafter_8/annotations/C96_D1_P2.xml index 40a1d1119bfddf2dfb12209c8b9b9ce500b80fbc..18e0949ef12892a1c383d9b87183aa50588c91ff 100644 --- a/drafter_8/annotations/C96_D1_P2.xml +++ b/drafter_8/annotations/C96_D1_P2.xml @@ -150,7 +150,7 @@ 554 147 - 47μF + 47µF text @@ -202,7 +202,7 @@ 681 65 - 0,15μF + 0,15µF text @@ -345,7 +345,7 @@ 1003 251 - 0,1μF + 0,1µF text @@ -447,6 +447,7 @@ 148 1018 191 + 17 diff --git a/drafter_8/annotations/C96_D1_P3.xml b/drafter_8/annotations/C96_D1_P3.xml index 584a4076bac379416730a4b371070048d84baf6f..19dc399b6f929db1143c1fc522e07c63d80db12f 100644 --- a/drafter_8/annotations/C96_D1_P3.xml +++ b/drafter_8/annotations/C96_D1_P3.xml @@ -378,7 +378,7 @@ 519 290 - 47μF + 47µF text @@ -482,7 +482,7 @@ 994 540 - 0,1μF + 0,1µF text @@ -586,7 +586,7 @@ 689 136 - 0,15μF + 0,15µF text @@ -676,6 +676,7 @@ 371 1069 450 + 350 @@ -713,7 +714,7 @@ 465 957 502 - 90 + 85 diff --git a/drafter_8/annotations/C96_D1_P4.xml b/drafter_8/annotations/C96_D1_P4.xml index 7fdce3987be89cc1a7413567606ec0e1a0b6a589..874d2aeec839fc78ea2d43b039c44bb50e4b8b60 100644 --- a/drafter_8/annotations/C96_D1_P4.xml +++ b/drafter_8/annotations/C96_D1_P4.xml @@ -240,7 +240,7 @@ 1067 505 - 0,1μF + 0,1µF text @@ -447,7 +447,7 @@ 612 356 - 47μF + 47µF text @@ -551,7 +551,7 @@ 780 241 - 0,15μF + 0,15µF text @@ -713,6 +713,7 @@ 391 1110 436 + 15 diff --git a/drafter_8/annotations/C96_D2_P1.xml b/drafter_8/annotations/C96_D2_P1.xml index 81064809c77ff31c9c5f6be53deef13f6972d131..ba37901f9ace26f92aa847abf4ea4a757e9df4ff 100644 --- a/drafter_8/annotations/C96_D2_P1.xml +++ b/drafter_8/annotations/C96_D2_P1.xml @@ -163,7 +163,7 @@ 815 180 - 0,1μF + 0,1µF text @@ -176,7 +176,7 @@ 891 165 - 1KΩ + 1K text @@ -241,7 +241,7 @@ 1087 503 - 1000Ω + 100Ω text @@ -267,7 +267,7 @@ 1079 639 - 0,1μF + 0,1µF text @@ -306,7 +306,7 @@ 681 407 - 47μf + 47µf text @@ -680,6 +680,7 @@ 397 1101 433 + 354 @@ -879,16 +880,4 @@ 409 - - inductor - Unspecified - 0 - 0 - - 220 - 324 - 243 - 346 - - diff --git a/drafter_8/annotations/C96_D2_P2.xml b/drafter_8/annotations/C96_D2_P2.xml index 23836603c49b6cfcd1aab57d15ca47edcec21d14..8193c3055e4f2c2d8073c2a5218fcc1796cce6b8 100644 --- a/drafter_8/annotations/C96_D2_P2.xml +++ b/drafter_8/annotations/C96_D2_P2.xml @@ -33,7 +33,7 @@ 257 489 351 - 9 + 360 @@ -528,7 +528,7 @@ 816 235 - 0,15μF + 0,15µF text @@ -541,7 +541,7 @@ 888 221 - 1KΩ + 1K text @@ -671,7 +671,7 @@ 685 448 - 47μF + 47µF text @@ -826,7 +826,7 @@ 1076 686 - 0,1μF + 0,1µF text diff --git a/drafter_8/annotations/C96_D2_P3.xml b/drafter_8/annotations/C96_D2_P3.xml index dc2d4d3c0863761b00bf20d57a6249b2a387678a..c12b26193e1ae427f232b9d7b2995095049dc8bc 100644 --- a/drafter_8/annotations/C96_D2_P3.xml +++ b/drafter_8/annotations/C96_D2_P3.xml @@ -33,7 +33,7 @@ 248 475 331 - 7 + 360 @@ -219,7 +219,7 @@ 1045 649 - 0,1μF + 0,1µF text @@ -420,7 +420,7 @@ 773 251 - 0,15μF + 0,15µF text @@ -498,7 +498,7 @@ 662 438 - 47μF + 47µF text diff --git a/drafter_8/annotations/C96_D2_P4.xml b/drafter_8/annotations/C96_D2_P4.xml index 656dfc5f352a0a03fe3007ddcb618aa5b63544bd..30a752309c98da74e0cecce8419e0f4ce599899c 100644 --- a/drafter_8/annotations/C96_D2_P4.xml +++ b/drafter_8/annotations/C96_D2_P4.xml @@ -172,7 +172,7 @@ 1149 474 - 0.1μF + 0.1µF text @@ -237,7 +237,7 @@ 845 124 - 1KΩ + 1K text @@ -250,7 +250,7 @@ 780 145 - 0,15μF + 0,15µF text @@ -354,7 +354,7 @@ 705 348 - 47μF + 47µF text @@ -589,7 +589,7 @@ 87 686 133 - 2 + 6 diff --git a/drafter_8/instances/C85_D2_P4.json b/drafter_8/instances/C85_D2_P4.json index bbbf01187983312340448c5761851545e5d421c3..12bd826e76ea5dc58cc12f4b1672e751e073d7d8 100644 --- a/drafter_8/instances/C85_D2_P4.json +++ b/drafter_8/instances/C85_D2_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 193.0, @@ -24,13 +24,15 @@ 96.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 320.0, @@ -49,13 +51,15 @@ 191.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 314.0, @@ -74,13 +78,15 @@ 303.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 318.0, @@ -99,13 +105,15 @@ 359.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 314.0, @@ -124,13 +132,15 @@ 429.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 186.0, @@ -149,13 +159,15 @@ 361.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 316.0, @@ -174,13 +186,15 @@ 610.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 863.0, @@ -199,13 +213,15 @@ 600.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 850.0, @@ -224,13 +240,15 @@ 422.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 851.0, @@ -249,13 +267,15 @@ 357.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 850.0, @@ -274,13 +294,15 @@ 296.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1002.0, @@ -299,13 +321,15 @@ 360.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 858.0, @@ -324,13 +348,15 @@ 187.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1010.0, @@ -349,13 +375,15 @@ 89.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 541.0, @@ -374,13 +402,15 @@ 61.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 67.0, @@ -399,13 +429,15 @@ 357.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1114.0, @@ -424,13 +456,15 @@ 352.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 245.0, @@ -449,13 +483,15 @@ 224.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 368.0, @@ -474,13 +510,15 @@ 229.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 634.0, @@ -499,13 +537,15 @@ 244.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 638.0, @@ -524,13 +564,15 @@ 151.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 913.0, @@ -549,13 +591,15 @@ 494.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 803.0, @@ -574,13 +618,15 @@ 499.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 639.0, @@ -599,13 +645,15 @@ 523.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 637.0, @@ -624,13 +672,15 @@ 374.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 839.0, @@ -649,13 +699,15 @@ 490.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 299.0, @@ -674,13 +726,15 @@ 226.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 570.0, @@ -711,13 +765,15 @@ 160.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 617.8623853211009, @@ -756,13 +812,15 @@ 278.8135593220339 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 582.0, @@ -793,13 +851,15 @@ 405.36723163841805 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 609.6055045871559, @@ -834,10 +894,16 @@ 570.9039548022599 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C85_D2_P4.jpg", + "imageData": null, + "imageHeight": 907, + "imageWidth": 1210, "lineColor": [ 0, 255, @@ -849,9 +915,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C85_D2_P4.jpg", - "imageData": null, - "imageHeight": 907, - "imageWidth": 1210 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C86_D2_P1.json b/drafter_8/instances/C86_D2_P1.json index 063a0aba3b012ddd02d163f0a65c465ba4b7177b..686e290b204b677b44254d816db3145a8539bd94 100644 --- a/drafter_8/instances/C86_D2_P1.json +++ b/drafter_8/instances/C86_D2_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 307.0, @@ -25,13 +25,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 300.0, @@ -51,13 +52,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 51.0, @@ -77,13 +79,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 308.0, @@ -103,13 +106,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 309.0, @@ -129,13 +133,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 217.0, @@ -155,13 +160,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 390.0, @@ -181,13 +187,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 312.0, @@ -207,13 +214,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 200.0, @@ -233,13 +241,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 49.0, @@ -259,13 +268,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 310.0, @@ -285,13 +295,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 404.0, @@ -311,13 +322,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 726.0, @@ -337,13 +349,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1001.0, @@ -363,13 +376,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 996.0, @@ -389,13 +403,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 725.0, @@ -415,13 +430,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 731.0, @@ -441,13 +457,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1003.0, @@ -467,13 +484,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 89.0, @@ -493,13 +511,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 450.0, @@ -519,13 +538,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 541.0, @@ -545,13 +565,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 848.0, @@ -571,13 +592,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1052.0, @@ -597,13 +619,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1038.0, @@ -623,13 +646,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 561.0, @@ -649,13 +673,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 853.0, @@ -675,13 +700,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 21.0, @@ -701,13 +727,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 187.0, @@ -727,13 +754,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 378.0, @@ -753,13 +781,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 711.0, @@ -779,13 +808,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 709.0, @@ -805,13 +835,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 978.0, @@ -831,13 +862,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 977.0, @@ -857,10 +889,15 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C86_D2_P1.jpg", + "imageData": null, + "imageHeight": 907, + "imageWidth": 1210, "lineColor": [ 0, 255, @@ -872,9 +909,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C86_D2_P1.jpg", - "imageData": null, - "imageHeight": 907, - "imageWidth": 1210 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C88_D1_P1.json b/drafter_8/instances/C88_D1_P1.json index 7cabbc2f2aa293728f928e49eb529e0947fce832..bcd9c23e078deefab49ca9e11dff50c481a32133 100644 --- a/drafter_8/instances/C88_D1_P1.json +++ b/drafter_8/instances/C88_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "inductor", "line_color": null, "fill_color": null, + "label": "inductor", "points": [ [ 436.0, @@ -24,13 +24,15 @@ 261.4 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 305.0, @@ -49,13 +51,15 @@ 305.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 264.0, @@ -74,13 +78,15 @@ 277.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 237.0, @@ -99,13 +105,15 @@ 309.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 414.0, @@ -124,13 +132,15 @@ 699.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 380.0, @@ -149,13 +159,15 @@ 598.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1158.0, @@ -174,13 +186,15 @@ 390.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 464.0, @@ -199,13 +213,15 @@ 55.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 13.0, @@ -224,13 +240,15 @@ 410.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 121.0, @@ -249,13 +267,15 @@ 411.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 264.0, @@ -274,13 +294,15 @@ 410.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 262.0, @@ -299,13 +321,15 @@ 375.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 264.0, @@ -324,13 +348,15 @@ 476.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 261.0, @@ -349,13 +375,15 @@ 617.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 264.0, @@ -374,13 +402,15 @@ 724.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 577.0, @@ -399,13 +429,15 @@ 717.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 575.0, @@ -424,13 +456,15 @@ 608.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 921.0, @@ -449,13 +483,15 @@ 609.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 914.0, @@ -474,13 +510,15 @@ 466.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 911.0, @@ -499,13 +537,15 @@ 399.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 909.0, @@ -524,13 +564,15 @@ 364.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 911.0, @@ -549,13 +591,15 @@ 163.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 909.0, @@ -574,13 +618,15 @@ 262.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1052.0, @@ -599,13 +645,15 @@ 70.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1051.0, @@ -624,13 +672,15 @@ 393.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 569.0, @@ -649,13 +699,15 @@ 173.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 568.0, @@ -674,13 +726,15 @@ 267.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 127.0, @@ -699,13 +753,15 @@ 98.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "inductor", "line_color": null, "fill_color": null, + "label": "inductor", "points": [ [ 647.0, @@ -724,13 +780,15 @@ 593.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 616.0, @@ -749,13 +807,15 @@ 153.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 621.0, @@ -774,13 +834,15 @@ 256.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 556.0, @@ -799,13 +861,15 @@ 354.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 535.0, @@ -824,13 +888,15 @@ 459.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 521.0, @@ -849,13 +915,15 @@ 413.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 527.0, @@ -874,13 +942,15 @@ 310.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 648.0, @@ -899,13 +969,15 @@ 545.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 370.0, @@ -932,13 +1004,15 @@ 553.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 142.0, @@ -957,13 +1031,15 @@ 296.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 661.0709117221418, @@ -982,13 +1058,15 @@ 188.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 984.0, @@ -1007,13 +1085,15 @@ 492.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 843.0, @@ -1032,13 +1112,15 @@ 509.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 891.0, @@ -1057,13 +1139,15 @@ 520.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 438.0, @@ -1082,10 +1166,16 @@ 213.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C88_D1_P1.jpg", + "imageData": null, + "imageHeight": 907, + "imageWidth": 1210, "lineColor": [ 0, 255, @@ -1097,9 +1187,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C88_D1_P1.jpg", - "imageData": null, - "imageHeight": 907, - "imageWidth": 1210 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C88_D2_P2.json b/drafter_8/instances/C88_D2_P2.json index 0f8601628f22ae6db34df51d46fe80d38bc00188..44839fc87cc84d4cd9ac9d8862f0595ad88772f6 100644 --- a/drafter_8/instances/C88_D2_P2.json +++ b/drafter_8/instances/C88_D2_P2.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 328.0, @@ -24,13 +24,15 @@ 138.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 29.0, @@ -49,13 +51,15 @@ 417.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 798.0, @@ -74,13 +78,15 @@ 432.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 122.0, @@ -99,13 +105,15 @@ 418.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 213.0, @@ -124,13 +132,15 @@ 396.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 214.0, @@ -149,13 +159,15 @@ 423.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 218.0, @@ -174,13 +186,15 @@ 333.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 213.0, @@ -199,13 +213,15 @@ 481.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 206.0, @@ -224,13 +240,15 @@ 581.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 217.0, @@ -249,13 +267,15 @@ 703.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 375.0, @@ -274,13 +294,15 @@ 704.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 368.0, @@ -299,13 +321,15 @@ 593.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 603.0, @@ -324,13 +348,15 @@ 577.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 591.0, @@ -349,13 +375,15 @@ 495.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 592.0, @@ -374,13 +402,15 @@ 447.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 587.0, @@ -399,13 +429,15 @@ 405.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 705.0, @@ -424,13 +456,15 @@ 438.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 711.0, @@ -449,13 +483,15 @@ 124.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 582.0, @@ -474,13 +510,15 @@ 261.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 581.0, @@ -499,13 +537,15 @@ 339.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 415.0, @@ -524,13 +564,15 @@ 341.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 419.0, @@ -549,13 +591,15 @@ 270.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 137.0, @@ -574,13 +618,15 @@ 172.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 254.0, @@ -599,13 +645,15 @@ 357.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 143.0, @@ -628,13 +676,15 @@ 353.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 321.0, @@ -653,13 +703,15 @@ 283.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 346.0, @@ -678,13 +730,15 @@ 369.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 496.2328767123288, @@ -707,13 +761,15 @@ 292.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 384.0, @@ -736,13 +792,15 @@ 468.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 269.0, @@ -765,13 +823,15 @@ 534.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 432.0, @@ -790,13 +850,15 @@ 540.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 545.0, @@ -815,13 +877,15 @@ 525.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 663.0, @@ -840,13 +904,15 @@ 517.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "inductor", "line_color": null, "fill_color": null, + "label": "inductor", "points": [ [ 429.0, @@ -865,13 +931,15 @@ 572.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "inductor", "line_color": null, "fill_color": null, + "label": "inductor", "points": [ [ 324.6575342465753, @@ -890,13 +958,15 @@ 320.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 199.0, @@ -919,13 +989,15 @@ 364.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 576.0, @@ -944,13 +1016,15 @@ 530.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 277.0, @@ -969,13 +1043,15 @@ 692.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 450.0, @@ -998,13 +1074,15 @@ 243.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 248.0, @@ -1023,13 +1101,15 @@ 571.5753424657535 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 455.0, @@ -1060,13 +1140,15 @@ 330.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 363.0, @@ -1093,13 +1175,15 @@ 410.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 362.0, @@ -1126,10 +1210,16 @@ 501.027397260274 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C88_D2_P2.jpg", + "imageData": null, + "imageHeight": 1210, + "imageWidth": 907, "lineColor": [ 0, 255, @@ -1141,9 +1231,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C88_D2_P2.jpg", - "imageData": null, - "imageHeight": 1210, - "imageWidth": 907 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C91_D2_P3.json b/drafter_8/instances/C91_D2_P3.json index b883c9d338a3364e403f592c5d7794956e4065c2..e9c7d4861322d9ad94f1a6168e46c5723e826940 100644 --- a/drafter_8/instances/C91_D2_P3.json +++ b/drafter_8/instances/C91_D2_P3.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 452.0, @@ -24,13 +24,15 @@ 144.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 290.0, @@ -49,13 +51,15 @@ 279.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 464.0, @@ -74,13 +78,15 @@ 294.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 505.0, @@ -99,13 +105,15 @@ 212.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 645.0, @@ -124,13 +132,15 @@ 176.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 573.6543909348442, @@ -149,13 +159,15 @@ 286.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 499.0, @@ -174,13 +186,15 @@ 456.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 326.0, @@ -199,13 +213,15 @@ 459.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 512.0, @@ -224,13 +240,15 @@ 572.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 658.0, @@ -249,13 +267,15 @@ 561.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 599.0, @@ -274,13 +294,15 @@ 691.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 521.0, @@ -299,13 +321,15 @@ 695.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 329.0, @@ -324,13 +348,15 @@ 680.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 145.0, @@ -349,13 +375,15 @@ 524.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 401.0, @@ -374,13 +402,15 @@ 218.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 434.0, @@ -399,13 +429,15 @@ 535.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 405.0, @@ -424,13 +456,15 @@ 307.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 440.0, @@ -449,13 +483,15 @@ 708.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 388.0, @@ -474,13 +510,15 @@ 151.8413597733711 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 432.0, @@ -499,13 +537,15 @@ 456.3739376770538 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "inductor", "line_color": null, "fill_color": null, + "label": "inductor", "points": [ [ 502.0, @@ -524,13 +564,15 @@ 262.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "inductor", "line_color": null, "fill_color": null, + "label": "inductor", "points": [ [ 504.0, @@ -549,13 +591,15 @@ 619.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 670.0, @@ -574,13 +618,15 @@ 227.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 573.0, @@ -599,13 +645,15 @@ 326.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 667.0, @@ -624,13 +672,15 @@ 618.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 599.0, @@ -649,13 +699,15 @@ 754.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 264.0, @@ -674,13 +726,15 @@ 346.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 256.0, @@ -699,13 +753,15 @@ 781.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 328.0, @@ -724,13 +780,15 @@ 858.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 96.0, @@ -749,13 +807,15 @@ 858.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 878.0, @@ -774,13 +834,15 @@ 758.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 872.0, @@ -799,13 +861,15 @@ 324.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 798.0, @@ -824,13 +888,15 @@ 634.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 822.0, @@ -849,13 +915,15 @@ 760.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 462.0, @@ -874,13 +942,15 @@ 774.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 324.0, @@ -899,13 +969,15 @@ 783.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 454.0, @@ -924,13 +996,15 @@ 637.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 449.0, @@ -949,13 +1023,15 @@ 420.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 320.0, @@ -974,13 +1050,15 @@ 349.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 327.0, @@ -999,13 +1077,15 @@ 417.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 417.0, @@ -1024,13 +1104,15 @@ 342.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 418.0, @@ -1049,13 +1131,15 @@ 276.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 822.0, @@ -1074,13 +1158,15 @@ 317.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 823.0, @@ -1099,13 +1185,15 @@ 240.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 405.0, @@ -1124,13 +1212,15 @@ 91.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 113.0, @@ -1149,10 +1239,16 @@ 104.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C91_D2_P3.jpg", + "imageData": null, + "imageHeight": 1210, + "imageWidth": 907, "lineColor": [ 0, 255, @@ -1164,9 +1260,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C91_D2_P3.jpg", - "imageData": null, - "imageHeight": 1210, - "imageWidth": 907 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C92_D1_P3.json b/drafter_8/instances/C92_D1_P3.json index b207dfa4e2bfe5ffbec81266003d52423185908b..3dcc908233c135c0dbfff1f26147390e4926ecc8 100644 --- a/drafter_8/instances/C92_D1_P3.json +++ b/drafter_8/instances/C92_D1_P3.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 510.0, @@ -36,13 +36,15 @@ 552.054794520548 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode.light_emitting", "line_color": null, "fill_color": null, + "label": "diode.light_emitting", "points": [ [ 698.9285714285713, @@ -61,13 +63,15 @@ 656.7857142857142 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor.adjustable", "line_color": null, "fill_color": null, + "label": "resistor.adjustable", "points": [ [ 221.56565656565658, @@ -102,13 +106,15 @@ 378.7878787878788 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 378.0, @@ -135,13 +141,15 @@ 270.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.battery", "line_color": null, "fill_color": null, + "label": "voltage.battery", "points": [ [ 66.01010101010104, @@ -164,13 +172,15 @@ 428.2828282828283 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.battery", "line_color": null, "fill_color": null, + "label": "voltage.battery", "points": [ [ 36.0, @@ -189,13 +199,15 @@ 629.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 707.4999999999999, @@ -214,13 +226,15 @@ 505.71428571428567 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 463.35616438356163, @@ -239,13 +253,15 @@ 382.5342465753425 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 256.8493150684932, @@ -264,13 +280,15 @@ 360.6164383561644 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 267.4657534246575, @@ -289,13 +307,15 @@ 386.3013698630137 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 457.0121951219512, @@ -330,13 +350,15 @@ 369.9695121951219 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 514.3835616438356, @@ -355,13 +377,15 @@ 369.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 491.43835616438355, @@ -380,13 +404,15 @@ 418.83561643835617 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 590.068493150685, @@ -405,13 +431,15 @@ 560.9589041095891 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 597.2602739726027, @@ -430,13 +458,15 @@ 583.9041095890411 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 519.0, @@ -455,13 +485,15 @@ 608.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 743.9285714285713, @@ -480,13 +512,15 @@ 562.8571428571428 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 750.7142857142857, @@ -505,13 +539,15 @@ 482.1428571428571 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 833.5714285714284, @@ -530,13 +566,15 @@ 616.0714285714286 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 108.56164383561644, @@ -555,13 +593,15 @@ 647.2602739726027 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 72.26027397260275, @@ -580,13 +620,15 @@ 454.1095890410959 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 328.0, @@ -605,13 +647,15 @@ 309.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 195.0, @@ -630,13 +674,15 @@ 279.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 422.0, @@ -655,13 +701,15 @@ 229.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 337.0, @@ -680,13 +728,15 @@ 347.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 365.0, @@ -705,13 +755,15 @@ 431.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 529.0, @@ -730,13 +782,15 @@ 505.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 711.0, @@ -755,13 +809,15 @@ 468.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 835.0, @@ -780,13 +836,15 @@ 734.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 625.0, @@ -805,13 +863,15 @@ 787.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 361.0, @@ -830,13 +890,15 @@ 864.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 170.0, @@ -855,13 +917,15 @@ 945.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 38.0, @@ -880,10 +944,16 @@ 316.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C92_D1_P3.jpg", + "imageData": null, + "imageHeight": 1210, + "imageWidth": 907, "lineColor": [ 0, 255, @@ -895,9 +965,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C92_D1_P3.jpg", - "imageData": null, - "imageHeight": 1210, - "imageWidth": 907 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C92_D1_P4.json b/drafter_8/instances/C92_D1_P4.json index aecf941404b94ee3000f30d7237a3f9ade73f7f9..a5872a1d631e128e34eb96f132f52c52c55e72e1 100644 --- a/drafter_8/instances/C92_D1_P4.json +++ b/drafter_8/instances/C92_D1_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "varistor", "line_color": null, "fill_color": null, + "label": "varistor", "points": [ [ 521.0, @@ -44,13 +44,15 @@ 390.4761904761904 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode.light_emitting", "line_color": null, "fill_color": null, + "label": "diode.light_emitting", "points": [ [ 693.0, @@ -69,13 +71,15 @@ 570.6713780918727 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor.adjustable", "line_color": null, "fill_color": null, + "label": "resistor.adjustable", "points": [ [ 326.59123055162655, @@ -102,13 +106,15 @@ 219.5710455764075 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 449.0, @@ -131,13 +137,15 @@ 100.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.battery", "line_color": null, "fill_color": null, + "label": "voltage.battery", "points": [ [ 72.0, @@ -156,13 +164,15 @@ 158.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.battery", "line_color": null, "fill_color": null, + "label": "voltage.battery", "points": [ [ 29.0, @@ -181,13 +191,15 @@ 352.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 515.0, @@ -206,13 +218,15 @@ 225.70093457943926 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 722.1709006928406, @@ -231,13 +245,15 @@ 404.84988452655887 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 124.46982055464927, @@ -256,13 +272,15 @@ 180.5872756933116 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 97.5659229208925, @@ -281,13 +299,15 @@ 378.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 522.0, @@ -306,13 +326,15 @@ 441.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 600.0, @@ -331,13 +353,15 @@ 425.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 600.0, @@ -356,13 +380,15 @@ 458.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 569.3769470404985, @@ -381,13 +407,15 @@ 219.37694704049844 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 460.9, @@ -406,13 +434,15 @@ 200.69156293222682 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 407.0, @@ -431,13 +461,15 @@ 113.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 772.0762124711317, @@ -456,13 +488,15 @@ 402.1547344110854 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 816.9611307420495, @@ -481,13 +515,15 @@ 563.3533568904593 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 747.5750577367205, @@ -506,13 +542,15 @@ 475.51963048498845 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 548.0, @@ -531,13 +569,15 @@ 349.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 733.0, @@ -556,13 +596,15 @@ 360.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 799.0, @@ -581,13 +623,15 @@ 672.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 581.0, @@ -606,13 +650,15 @@ 665.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 280.0, @@ -631,13 +677,15 @@ 672.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 63.0, @@ -656,13 +704,15 @@ 702.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 138.0, @@ -681,13 +731,15 @@ 42.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 293.0, @@ -706,13 +758,15 @@ 51.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 408.0, @@ -731,13 +785,15 @@ 144.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 411.0, @@ -756,13 +812,15 @@ 228.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 515.0, @@ -781,13 +839,15 @@ 63.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 328.4144271570014, @@ -806,13 +866,15 @@ 143.42432814710043 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 329.0, @@ -831,13 +893,15 @@ 172.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 531.9314641744548, @@ -856,10 +920,16 @@ 259.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C92_D1_P4.jpg", + "imageData": null, + "imageHeight": 796, + "imageWidth": 895, "lineColor": [ 0, 255, @@ -871,9 +941,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C92_D1_P4.jpg", - "imageData": null, - "imageHeight": 796, - "imageWidth": 895 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C93_D1_P1.json b/drafter_8/instances/C93_D1_P1.json index 26ba90e2af95b83909a6ad9d767c7d9122c87b90..475c2ae7d9527e383dc16b0cdf3a6e8ace048bb5 100644 --- a/drafter_8/instances/C93_D1_P1.json +++ b/drafter_8/instances/C93_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 83.0, @@ -24,13 +24,15 @@ 113.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1092.0, @@ -49,13 +51,15 @@ 109.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1106.0, @@ -74,13 +78,15 @@ 690.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 86.0, @@ -99,13 +105,15 @@ 698.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 450.0, @@ -124,13 +132,15 @@ 419.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 451.0, @@ -149,13 +159,15 @@ 702.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 751.0, @@ -174,13 +186,15 @@ 700.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 959.0, @@ -199,13 +213,15 @@ 701.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 747.0, @@ -224,13 +240,15 @@ 420.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 446.0, @@ -249,13 +267,15 @@ 119.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 947.0, @@ -274,13 +294,15 @@ 118.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 50.0, @@ -299,13 +321,15 @@ 413.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 375.0, @@ -324,13 +348,15 @@ 529.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 369.0, @@ -349,13 +375,15 @@ 589.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 522.0, @@ -374,13 +402,15 @@ 468.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 511.0, @@ -399,13 +429,15 @@ 346.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 349.0, @@ -424,13 +456,15 @@ 256.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 505.0, @@ -449,13 +483,15 @@ 254.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 819.0, @@ -474,13 +510,15 @@ 449.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 967.0, @@ -499,13 +537,15 @@ 256.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1068.0, @@ -524,13 +564,15 @@ 355.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 148.0, @@ -557,13 +599,15 @@ 50.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 787.0, @@ -582,13 +626,15 @@ 579.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "fuse", "line_color": null, "fill_color": null, + "label": "fuse", "points": [ [ 148.58757062146893, @@ -607,13 +653,15 @@ 112.71186440677967 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 504.0, @@ -636,13 +684,15 @@ 405.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 436.0, @@ -661,13 +711,15 @@ 524.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 735.0, @@ -686,13 +738,15 @@ 552.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 910.0, @@ -711,13 +765,15 @@ 321.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode.zener", "line_color": null, "fill_color": null, + "label": "diode.zener", "points": [ [ 419.0, @@ -736,10 +792,16 @@ 266.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C93_D1_P1.jpg", + "imageData": null, + "imageHeight": 907, + "imageWidth": 1210, "lineColor": [ 0, 255, @@ -751,9 +813,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C93_D1_P1.jpg", - "imageData": null, - "imageHeight": 907, - "imageWidth": 1210 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C93_D2_P1.json b/drafter_8/instances/C93_D2_P1.json index 5b0b2aabbaf5f68874982ab2915e4160b0ed7171..f3e56c5539bad9d6628d02ce04751a5558f117bb 100644 --- a/drafter_8/instances/C93_D2_P1.json +++ b/drafter_8/instances/C93_D2_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 63.0, @@ -24,13 +24,15 @@ 129.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 62.0, @@ -49,13 +51,15 @@ 550.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1072.0, @@ -74,13 +78,15 @@ 538.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1076.0, @@ -99,13 +105,15 @@ 128.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 138.0, @@ -132,13 +140,15 @@ 54.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 54.0, @@ -157,13 +167,15 @@ 335.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 346.0, @@ -182,13 +194,15 @@ 255.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 504.0, @@ -207,13 +221,15 @@ 260.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 384.0, @@ -232,13 +248,15 @@ 450.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 381.0734463276836, @@ -257,13 +275,15 @@ 492.9378531073446 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 581.0, @@ -282,13 +302,15 @@ 339.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 576.0, @@ -307,13 +329,15 @@ 462.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 810.0, @@ -332,13 +356,15 @@ 418.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 824.2937853107345, @@ -357,13 +383,15 @@ 484.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 926.0, @@ -382,13 +410,15 @@ 250.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1057.0, @@ -407,13 +437,15 @@ 325.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 453.0, @@ -432,13 +464,15 @@ 416.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 452.0, @@ -457,13 +491,15 @@ 561.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 773.0, @@ -482,13 +518,15 @@ 542.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 768.0, @@ -507,13 +545,15 @@ 409.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 913.0, @@ -532,13 +572,15 @@ 544.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 904.0, @@ -557,13 +599,15 @@ 137.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 430.0, @@ -582,13 +626,15 @@ 126.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "fuse", "line_color": null, "fill_color": null, + "label": "fuse", "points": [ [ 248.63387978142075, @@ -611,13 +657,15 @@ 121.85792349726775 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 431.0, @@ -648,13 +696,15 @@ 458.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 564.0, @@ -673,13 +723,15 @@ 393.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 754.0, @@ -698,13 +750,15 @@ 458.47457627118644 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "thyristor", "line_color": null, "fill_color": null, + "label": "thyristor", "points": [ [ 869.0, @@ -723,13 +777,15 @@ 305.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode.zener", "line_color": null, "fill_color": null, + "label": "diode.zener", "points": [ [ 407.0, @@ -756,10 +812,16 @@ 245.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C93_D2_P1.jpg", + "imageData": null, + "imageHeight": 907, + "imageWidth": 1210, "lineColor": [ 0, 255, @@ -771,9 +833,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C93_D2_P1.jpg", - "imageData": null, - "imageHeight": 907, - "imageWidth": 1210 + ] } \ No newline at end of file diff --git a/drafter_8/instances/C94_D1_P2.json b/drafter_8/instances/C94_D1_P2.json index 8d502a0a8c676a425c1ff80207a2ccfe89e35247..84371a2ad7ac4abd997b05633eb7b511adf88b21 100644 --- a/drafter_8/instances/C94_D1_P2.json +++ b/drafter_8/instances/C94_D1_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -553,6 +573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -579,6 +600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -605,6 +627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -631,6 +654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -657,6 +681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -683,6 +708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -709,6 +735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -735,6 +762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -761,6 +789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -787,6 +816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -813,6 +843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -839,6 +870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -865,6 +897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -891,6 +924,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -917,6 +951,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -943,6 +978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -969,6 +1005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -995,6 +1032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1021,6 +1059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1047,6 +1086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1073,6 +1113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1099,6 +1140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1125,6 +1167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1151,6 +1194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1177,6 +1221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1229,6 +1275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1281,6 +1329,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1307,6 +1356,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1333,6 +1383,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1359,6 +1410,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1385,6 +1437,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1411,6 +1464,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1491,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1472,23 +1528,52 @@ "label": "optocoupler", "points": [ [ - 237.0, - 230.0 + 367.82973621103116, + 234.53237410071944 ], [ - 237.0, - 302.0 + 323.4652278177458, + 220.38369304556355 ], [ - 445.0, - 302.0 + 304.28057553956836, + 237.88968824940048 ], [ - 445.0, - 230.0 + 275.74340527577937, + 251.0791366906475 + ], + [ + 234.49640287769785, + 254.91606714628298 + ], + [ + 234.97601918465227, + 305.99520383693044 + ], + [ + 279.3405275779376, + 303.35731414868104 + ], + [ + 349.60431654676256, + 273.8609112709832 + ], + [ + 359.43645083932853, + 283.9328537170264 + ], + [ + 445.5275779376499, + 281.5347721822542 + ], + [ + 446.2470023980815, + 226.61870503597123 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1519,6 +1604,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1549,6 +1635,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1579,6 +1666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1605,6 +1693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1635,6 +1724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1665,6 +1755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1691,6 +1782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1717,6 +1809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1751,6 +1844,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1777,6 +1871,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1803,6 +1898,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1829,6 +1925,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1855,6 +1952,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1881,6 +1979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1907,6 +2006,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1933,6 +2033,136 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optical", + "points": [ + [ + 316.7505995203837, + 244.36450839328538 + ], + [ + 328.0215827338129, + 231.65467625899282 + ], + [ + 347.92565947242207, + 237.64988009592327 + ], + [ + 358.23741007194246, + 253.23741007194246 + ], + [ + 348.1654676258993, + 266.18705035971226 + ], + [ + 327.7817745803357, + 265.46762589928056 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "diode.light_emitting", + "points": [ + [ + 238.0935251798561, + 259.2326139088729 + ], + [ + 278.621103117506, + 257.07434052757793 + ], + [ + 313.63309352517985, + 243.4052757793765 + ], + [ + 327.5419664268585, + 227.09832134292566 + ], + [ + 353.2014388489208, + 233.81294964028777 + ], + [ + 361.8345323741007, + 253.47721822541968 + ], + [ + 351.5227817745803, + 269.0647482014388 + ], + [ + 279.58033573141483, + 300.47961630695437 + ], + [ + 238.57314148681053, + 302.1582733812949 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "triac", + "points": [ + [ + 325.1438848920863, + 267.8657074340527 + ], + [ + 351.0431654676259, + 269.7841726618705 + ], + [ + 363.0335731414868, + 279.8561151079137 + ], + [ + 443.3693045563549, + 278.17745803357315 + ], + [ + 443.84892086330933, + 229.25659472422063 + ], + [ + 366.3908872901679, + 237.41007194244605 + ], + [ + 354.88009592326136, + 231.65467625899282 + ], + [ + 326.82254196642685, + 224.46043165467626 + ], + [ + 309.7961630695444, + 241.72661870503597 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_8/instances/C96_D1_P1.json b/drafter_8/instances/C96_D1_P1.json index 8f7b84544aeb5540f3b7b5ab954d9d21258f5c9e..af151d8cab4bcd820176f2aab11ff773aa77d41f 100644 --- a/drafter_8/instances/C96_D1_P1.json +++ b/drafter_8/instances/C96_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -8,23 +8,72 @@ "label": "optocoupler", "points": [ [ - 188.0, - 267.0 + 278.14148681055156, + 274.5803357314149 ], [ - 188.0, - 349.0 + 270.7074340527578, + 281.5347721822542 ], [ - 306.0, - 349.0 + 261.8345323741007, + 281.294964028777 ], [ - 306.0, - 267.0 + 262.07434052757793, + 271.9424460431655 + ], + [ + 246.9664268585132, + 259.2326139088729 + ], + [ + 233.05755395683454, + 259.4724220623501 + ], + [ + 211.7146282973621, + 281.7745803357314 + ], + [ + 211.95443645083932, + 288.48920863309354 + ], + [ + 182.93764988009593, + 291.36690647482015 + ], + [ + 186.7745803357314, + 341.9664268585132 + ], + [ + 230.89928057553956, + 341.0071942446043 + ], + [ + 234.97601918465227, + 306.71462829736214 + ], + [ + 256.5587529976019, + 306.23501199040766 + ], + [ + 256.7985611510791, + 343.4052757793765 + ], + [ + 307.158273381295, + 350.59952038369306 + ], + [ + 307.6378896882494, + 266.6666666666667 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +100,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -89,6 +139,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -115,6 +166,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -141,6 +193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -167,6 +220,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -193,6 +247,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -219,6 +274,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +301,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -279,6 +336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -305,6 +363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -357,6 +417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +714,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +768,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -721,6 +795,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +822,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +930,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +957,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -903,6 +984,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -929,6 +1011,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -955,6 +1038,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -981,6 +1065,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1007,6 +1092,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1033,6 +1119,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1059,6 +1146,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1085,6 +1173,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1111,6 +1200,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1137,6 +1227,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1163,6 +1254,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1193,6 +1285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1219,6 +1312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1245,6 +1339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1271,6 +1366,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1297,6 +1393,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1323,6 +1420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1349,6 +1447,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1375,6 +1474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1401,6 +1501,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1427,6 +1528,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1453,6 +1555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1483,6 +1586,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1509,6 +1613,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1535,6 +1640,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1561,6 +1667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1587,6 +1694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1613,6 +1721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1639,6 +1748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1665,6 +1775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1691,6 +1802,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1717,6 +1829,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1743,6 +1856,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1777,6 +1891,156 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optical", + "points": [ + [ + 230.89928057553956, + 299.28057553956836 + ], + [ + 219.86810551558753, + 286.33093525179856 + ], + [ + 235.4556354916067, + 268.10551558752996 + ], + [ + 242.88968824940048, + 267.86570743405275 + ], + [ + 251.52278177458032, + 274.1007194244604 + ], + [ + 249.6043165467626, + 290.88729016786573 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "diode.light_emitting", + "points": [ + [ + 189.89208633093526, + 338.84892086330933 + ], + [ + 229.22062350119904, + 336.6906474820144 + ], + [ + 233.29736211031175, + 301.91846522781776 + ], + [ + 252.72182254196642, + 293.76498800959234 + ], + [ + 254.8800959232614, + 274.3405275779377 + ], + [ + 244.568345323741, + 265.22781774580335 + ], + [ + 235.2158273381295, + 265.46762589928056 + ], + [ + 216.7505995203837, + 285.85131894484414 + ], + [ + 216.27098321342925, + 290.88729016786573 + ], + [ + 186.5347721822542, + 293.52517985611513 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "transistor.photo", + "points": [ + [ + 218.66906474820144, + 288.48920863309354 + ], + [ + 229.46043165467626, + 303.59712230215825 + ], + [ + 258.7170263788969, + 303.59712230215825 + ], + [ + 259.1966426858513, + 340.28776978417267 + ], + [ + 304.5203836930456, + 347.48201438848923 + ], + [ + 305.2398081534772, + 269.5443645083933 + ], + [ + 279.8201438848921, + 276.7386091127098 + ], + [ + 272.3860911270983, + 284.652278177458 + ], + [ + 257.99760191846525, + 284.1726618705036 + ], + [ + 258.7170263788969, + 274.1007194244604 + ], + [ + 245.52757793764988, + 262.35011990407673 + ], + [ + 234.25659472422063, + 262.35011990407673 + ], + [ + 214.3525179856115, + 283.45323741007195 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_8/instances/C96_D2_P4.json b/drafter_8/instances/C96_D2_P4.json index 494e30d7b7228acf44abe9e6a01ee2a314f66e24..672d9e38d6d3b69b488be25040db672bc77a9056 100644 --- a/drafter_8/instances/C96_D2_P4.json +++ b/drafter_8/instances/C96_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -59,6 +60,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -85,6 +87,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -111,6 +114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -137,6 +141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -189,6 +195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -215,6 +222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -405,6 +419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -431,6 +446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -457,6 +473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -483,6 +500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -509,6 +527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -547,6 +566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -573,6 +593,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -599,6 +620,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -625,6 +647,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -651,6 +674,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -677,6 +701,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -703,6 +728,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -745,6 +771,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +810,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +837,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +864,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +891,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +918,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1069,6 +1107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1199,6 +1242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1300,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1293,6 +1339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1327,6 +1374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1369,6 +1417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1411,6 +1460,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1487,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1514,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1489,6 +1541,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1568,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1595,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1622,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1649,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1619,6 +1676,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1649,6 +1707,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1687,6 +1746,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1713,6 +1773,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1739,6 +1800,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1765,6 +1827,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1795,6 +1858,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1821,6 +1885,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1847,6 +1912,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1873,6 +1939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_9/annotations/C100_D1_P1.xml b/drafter_9/annotations/C100_D1_P1.xml index 64eb9dda851b4d584663c80e605a1646048e29c4..e32e7828aa11c52b4ab92bd5381b0f71f9948618 100644 --- a/drafter_9/annotations/C100_D1_P1.xml +++ b/drafter_9/annotations/C100_D1_P1.xml @@ -59,7 +59,7 @@ 682 365 734 - 276 + 264 @@ -132,10 +132,10 @@ 0 0 - 89 - 911 - 321 - 1026 + 111 + 931 + 287 + 1007 @@ -199,7 +199,7 @@ 714 184 753 - 278 + 268 @@ -265,7 +265,7 @@ 302 727 - +µ + 1M text @@ -473,7 +473,7 @@ 746 784 - BUFFER + BUZZER text @@ -830,4 +830,16 @@ 997 + + integrated_circuit + Unspecified + 0 + 0 + + 89 + 913 + 318 + 1024 + + diff --git a/drafter_9/annotations/C100_D1_P2.xml b/drafter_9/annotations/C100_D1_P2.xml index f357e4e50d3461dc2bab47a8c4d1f7db149e3fe3..4fde3ee76c1eace0eb4cdbde94156e929683beb2 100644 --- a/drafter_9/annotations/C100_D1_P2.xml +++ b/drafter_9/annotations/C100_D1_P2.xml @@ -34,6 +34,7 @@ 695 720 799 + 6 @@ -60,7 +61,7 @@ 772 841 - BUFFER + BUZZER text @@ -255,7 +256,7 @@ 326 799 - +µ + 1M text @@ -701,7 +702,7 @@ 748 391 806 - 281 + 273 @@ -782,7 +783,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -791,6 +792,7 @@ 999 375 1133 + 2 @@ -830,4 +832,16 @@ 1100 + + optocoupler + Unspecified + 0 + 0 + + 152 + 1020 + 341 + 1107 + + diff --git a/drafter_9/annotations/C100_D1_P3.xml b/drafter_9/annotations/C100_D1_P3.xml index 9338e8428d9f604970d2af3d79836d3a2066770c..73becf571b9a985af3a89f5d1796f8c2de830175 100644 --- a/drafter_9/annotations/C100_D1_P3.xml +++ b/drafter_9/annotations/C100_D1_P3.xml @@ -87,7 +87,7 @@ 807 898 - BUFFER + BUZZER text @@ -295,7 +295,7 @@ 384 799 - +µ + 1M text @@ -701,7 +701,7 @@ 753 452 811 - 271 + 264 @@ -714,7 +714,7 @@ 768 265 813 - 273 + 268 @@ -781,7 +781,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -829,4 +829,16 @@ 1096 + + optocoupler + Unspecified + 0 + 0 + + 191 + 1026 + 369 + 1098 + + diff --git a/drafter_9/annotations/C100_D1_P4.xml b/drafter_9/annotations/C100_D1_P4.xml index fc6451ba3c20a504c0b8c6db936f337aa4e8f1b6..4c23b9398c72093b6fab9886886535d68ed9f9cb 100644 --- a/drafter_9/annotations/C100_D1_P4.xml +++ b/drafter_9/annotations/C100_D1_P4.xml @@ -48,7 +48,7 @@ 434 703 - +µ + 1M text @@ -204,7 +204,7 @@ 872 789 - BUFFER + BUZZER text @@ -726,7 +726,7 @@ 857 796 907 - 15 + 2 @@ -782,7 +782,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -801,8 +801,8 @@ 242 955 - 325 - 997 + 329 + 999 267 @@ -830,4 +830,16 @@ 997 + + optocoupler + Unspecified + 0 + 0 + + 238 + 935 + 425 + 1008 + + diff --git a/drafter_9/annotations/C100_D2_P1.xml b/drafter_9/annotations/C100_D2_P1.xml index 8dfcc8e272b31d732d729c15fd115a75ba3bddec..ac0d09407cde1b286bbc791afaaae9ff0dbc600b 100644 --- a/drafter_9/annotations/C100_D2_P1.xml +++ b/drafter_9/annotations/C100_D2_P1.xml @@ -243,7 +243,7 @@ 248 843 - 1µ + 1M text @@ -334,7 +334,7 @@ 600 918 - Buffer + Buzzer text @@ -575,6 +575,7 @@ 780 641 917 + 4 @@ -600,7 +601,7 @@ 1015 625 1076 - 360 + 8 @@ -720,7 +721,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -729,6 +730,7 @@ 1058 341 1184 + 4 @@ -768,4 +770,16 @@ 1133 + + optocoupler + Unspecified + 0 + 0 + + 131 + 1091 + 288 + 1148 + + diff --git a/drafter_9/annotations/C100_D2_P2.xml b/drafter_9/annotations/C100_D2_P2.xml index 4466c0ecd74106b679830daa59ac65881c3777cb..9c05f3ce9fc383e2444ec21a4c4392b671928171 100644 --- a/drafter_9/annotations/C100_D2_P2.xml +++ b/drafter_9/annotations/C100_D2_P2.xml @@ -243,7 +243,7 @@ 305 921 - 1µ + 1M text @@ -308,7 +308,7 @@ 638 969 - Buffer + Buzzer text @@ -575,6 +575,7 @@ 840 675 964 + 6 @@ -720,7 +721,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -729,6 +730,7 @@ 1116 414 1249 + 4 @@ -768,4 +770,16 @@ 1199 + + optocoupler + Unspecified + 0 + 0 + + 216 + 1152 + 364 + 1203 + + diff --git a/drafter_9/annotations/C100_D2_P3.xml b/drafter_9/annotations/C100_D2_P3.xml index 2311882baab6447726334d367b5b2a34ae21aa7a..d3d333b4a03a223a718e4133352679162032a300 100644 --- a/drafter_9/annotations/C100_D2_P3.xml +++ b/drafter_9/annotations/C100_D2_P3.xml @@ -74,7 +74,7 @@ 673 902 - piezo + Piezo text @@ -87,7 +87,7 @@ 678 926 - Buffer + Buzzer text @@ -152,7 +152,7 @@ 528 1028 - 3C547 + BC547 text @@ -269,7 +269,7 @@ 329 851 - 1µ + 1M text @@ -588,6 +588,7 @@ 789 715 928 + 6 @@ -708,7 +709,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -717,6 +718,7 @@ 1062 417 1181 + 2 @@ -768,4 +770,16 @@ 1135 + + optocoupler + Unspecified + 0 + 0 + + 209 + 1091 + 366 + 1146 + + diff --git a/drafter_9/annotations/C100_D2_P4.xml b/drafter_9/annotations/C100_D2_P4.xml index b3d49782d01cf0d74a17dd6aba05599c08eb5d01..89968fe32b934b4d12b831a82341a001dc1ad2ae 100644 --- a/drafter_9/annotations/C100_D2_P4.xml +++ b/drafter_9/annotations/C100_D2_P4.xml @@ -126,7 +126,7 @@ 601 1063 - Buffer + Buzzer text @@ -204,7 +204,7 @@ 221 1021 - 1µ + 1M text @@ -575,6 +575,7 @@ 915 640 1055 + 12 @@ -626,7 +627,7 @@ 1159 638 1227 - 7 + 12 @@ -665,7 +666,7 @@ 983 262 1011 - 295 + 279 @@ -691,7 +692,7 @@ 1054 135 1095 - 87 + 89 @@ -704,7 +705,7 @@ 1045 254 1087 - 83 + 92 @@ -720,7 +721,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -729,6 +730,7 @@ 1234 350 1401 + 6 @@ -769,4 +771,16 @@ 1336 + + optocoupler + Unspecified + 0 + 0 + + 118 + 1280 + 293 + 1344 + + diff --git a/drafter_9/annotations/C101_D1_P1.xml b/drafter_9/annotations/C101_D1_P1.xml index af06c2a23f7adefe69b3d67d8649104e3d01b07f..87fe88a03e9d32996ceaf1b788c54a00d07ceae4 100644 --- a/drafter_9/annotations/C101_D1_P1.xml +++ b/drafter_9/annotations/C101_D1_P1.xml @@ -45,6 +45,7 @@ 853 193 943 + 87 @@ -94,7 +95,7 @@ 1070 430 1108 - 75 + 90 @@ -186,7 +187,7 @@ 339 1131 - 1µ + 1M text diff --git a/drafter_9/annotations/C101_D1_P2.xml b/drafter_9/annotations/C101_D1_P2.xml index d10a0a940c6424f1aec49276d990836416a8cf57..165cba0b67e3db041ab762f4be5665120591358f 100644 --- a/drafter_9/annotations/C101_D1_P2.xml +++ b/drafter_9/annotations/C101_D1_P2.xml @@ -45,6 +45,7 @@ 846 210 924 + 94 @@ -306,11 +307,11 @@ 0 0 - 377 + 380 1038 - 401 + 397 1077 - 87 + 96 @@ -323,7 +324,7 @@ 1160 434 1194 - 84 + 92 @@ -336,7 +337,7 @@ 1033 453 1071 - 173 + 90 @@ -441,7 +442,7 @@ 369 1097 - 1µ + 1M text diff --git a/drafter_9/annotations/C101_D1_P3.xml b/drafter_9/annotations/C101_D1_P3.xml index 8ebc9452945d4c0c8d33de1002de1331fa742092..6296aa6a4ef5337ac1a62934968cab1e45217986 100644 --- a/drafter_9/annotations/C101_D1_P3.xml +++ b/drafter_9/annotations/C101_D1_P3.xml @@ -45,6 +45,7 @@ 716 316 803 + 90 @@ -441,7 +442,7 @@ 438 1002 - 1µ + 1M text diff --git a/drafter_9/annotations/C101_D1_P4.xml b/drafter_9/annotations/C101_D1_P4.xml index b2e44673cf0f28dc1323b24f066d1b087f7ba8bf..16ed7ee078862f3c28c0d87a8ec2b810d4f3dc5e 100644 --- a/drafter_9/annotations/C101_D1_P4.xml +++ b/drafter_9/annotations/C101_D1_P4.xml @@ -45,6 +45,7 @@ 884 247 971 + 92 @@ -324,7 +325,7 @@ 394 1164 - 1µ + 1M text @@ -555,7 +556,7 @@ 409 1106 - 431 + 427 1144 87 diff --git a/drafter_9/annotations/C101_D2_P1.xml b/drafter_9/annotations/C101_D2_P1.xml index d4f8157901fe20d86244d7df9370d81e42bd4b68..20a91f647efc183e4529f5b59aa747cd41fe804f 100644 --- a/drafter_9/annotations/C101_D2_P1.xml +++ b/drafter_9/annotations/C101_D2_P1.xml @@ -253,7 +253,7 @@ 456 1057 - 1µ + 1M text @@ -317,7 +317,7 @@ 1005 483 1041 - 87 + 98 @@ -560,6 +560,7 @@ 968 287 1014 + 2 diff --git a/drafter_9/annotations/C101_D2_P2.xml b/drafter_9/annotations/C101_D2_P2.xml index 0da8c4e3c88345bf54dfb6cc5988ce5139812f45..7f2a13e3f2f5741cbb09fdaad414543686cc7cc7 100644 --- a/drafter_9/annotations/C101_D2_P2.xml +++ b/drafter_9/annotations/C101_D2_P2.xml @@ -201,7 +201,7 @@ 489 904 - 1µ + 1M text diff --git a/drafter_9/annotations/C101_D2_P3.xml b/drafter_9/annotations/C101_D2_P3.xml index 549080615a783470e90e453ec11b7a56b70eeb13..1cf66e061082a954e64090d9769792294a75eae7 100644 --- a/drafter_9/annotations/C101_D2_P3.xml +++ b/drafter_9/annotations/C101_D2_P3.xml @@ -201,7 +201,7 @@ 378 1085 - 1µ + 1M text diff --git a/drafter_9/annotations/C101_D2_P4.xml b/drafter_9/annotations/C101_D2_P4.xml index 90780149b31461ade3fd75bf31936bf70f779604..399f9583fd773cb3eebc997429fdda4f3f1b1c43 100644 --- a/drafter_9/annotations/C101_D2_P4.xml +++ b/drafter_9/annotations/C101_D2_P4.xml @@ -378,7 +378,7 @@ 454 1120 - 1µ + 1M text @@ -404,7 +404,7 @@ 594 926 - 0.1µ0.1µ + 0.1µ text diff --git a/drafter_9/annotations/C102_D1_P1.xml b/drafter_9/annotations/C102_D1_P1.xml index d93aac0f18db709bfdf2e9ba717e2f984a389c5d..44f053fca76264a1056712a217324dd2489e66d2 100644 --- a/drafter_9/annotations/C102_D1_P1.xml +++ b/drafter_9/annotations/C102_D1_P1.xml @@ -21,6 +21,7 @@ 841 946 895 + 2 @@ -33,7 +34,7 @@ 1012 924 1056 - 360 + 4 @@ -46,6 +47,7 @@ 826 539 1066 + 358 @@ -959,7 +961,7 @@ 1198 475 1229 - 351 + 2 diff --git a/drafter_9/annotations/C102_D1_P2.xml b/drafter_9/annotations/C102_D1_P2.xml index b470b5efc4dbf26ff31dd50b64c027b2cc47cb6a..5d2687709f3f1260119761d9af172addc5a73db5 100644 --- a/drafter_9/annotations/C102_D1_P2.xml +++ b/drafter_9/annotations/C102_D1_P2.xml @@ -719,6 +719,7 @@ 625 383 643 + 4 @@ -928,6 +929,7 @@ 786 496 1081 + 358 @@ -1026,6 +1028,7 @@ 614 172 633 + 4 diff --git a/drafter_9/annotations/C102_D1_P3.xml b/drafter_9/annotations/C102_D1_P3.xml index 0ff27cc9afdc62046581331b7100b9135be81c78..6985b9245ce8835ba5b75773d33045682b4bd8a0 100644 --- a/drafter_9/annotations/C102_D1_P3.xml +++ b/drafter_9/annotations/C102_D1_P3.xml @@ -47,6 +47,7 @@ 788 530 1081 + 4 @@ -812,7 +813,7 @@ 850 750 887 - 85 + 94 @@ -825,7 +826,7 @@ 844 861 879 - 89 + 100 @@ -851,6 +852,7 @@ 765 1046 832 + 6 @@ -863,6 +865,7 @@ 986 1022 1037 + 6 @@ -953,6 +956,7 @@ 621 199 644 + 6 @@ -963,8 +967,9 @@ 390 620 - 412 + 407 640 + 4 diff --git a/drafter_9/annotations/C102_D2_P1.xml b/drafter_9/annotations/C102_D2_P1.xml index 3eb0ec281a80c360f704485d949c22f541eb7723..17b26f57697db0dbb159ae97435f65b9e4b5e04a 100644 --- a/drafter_9/annotations/C102_D2_P1.xml +++ b/drafter_9/annotations/C102_D2_P1.xml @@ -627,8 +627,9 @@ 955 387 1037 + 270 - Lµ556 + LM556 text diff --git a/drafter_9/annotations/C102_D2_P2.xml b/drafter_9/annotations/C102_D2_P2.xml index 681d0eca91218a5f8de758e43b039cfdbd86c27e..01a7f99591606daf19374af1b38ad945fed65444 100644 --- a/drafter_9/annotations/C102_D2_P2.xml +++ b/drafter_9/annotations/C102_D2_P2.xml @@ -34,7 +34,7 @@ 894 162 929 - 281 + 271 @@ -464,8 +464,9 @@ 902 340 988 + 270 - Lµ556 + LM556 text diff --git a/drafter_9/annotations/C102_D2_P3.xml b/drafter_9/annotations/C102_D2_P3.xml index 521bc031d36fe253a09de95f9349a18a55f30edc..a19719a4832e29ed9568501be53980b3381dd351 100644 --- a/drafter_9/annotations/C102_D2_P3.xml +++ b/drafter_9/annotations/C102_D2_P3.xml @@ -384,8 +384,9 @@ 901 375 984 + 270 - Lµ556 + LM556 text diff --git a/drafter_9/annotations/C102_D2_P4.xml b/drafter_9/annotations/C102_D2_P4.xml index 7e34f46958852c6cc5371d3a7748b7484d47bf2e..26fe6386be3b7cc022d3e78b8f0b9cd3070e0b5d 100644 --- a/drafter_9/annotations/C102_D2_P4.xml +++ b/drafter_9/annotations/C102_D2_P4.xml @@ -348,6 +348,7 @@ 609 423 929 + 2 @@ -477,8 +478,9 @@ 728 344 826 + 270 - Lµ556 + LM556 text diff --git a/drafter_9/annotations/C104_D1_P1.xml b/drafter_9/annotations/C104_D1_P1.xml index 99e1bf98cafb779ec765ac1a47ea10815369e5bf..9e91432574cc518506839efc0be747afade9ce5d 100644 --- a/drafter_9/annotations/C104_D1_P1.xml +++ b/drafter_9/annotations/C104_D1_P1.xml @@ -390,6 +390,7 @@ 831 527 883 + 73 @@ -402,6 +403,7 @@ 829 592 881 + 79 diff --git a/drafter_9/annotations/C104_D1_P2.xml b/drafter_9/annotations/C104_D1_P2.xml index 85cccbb7b93bbcd2622e12d2e2f108d41c675d9c..08af0231778165e7dda0d3074132ae2f00e7da3e 100644 --- a/drafter_9/annotations/C104_D1_P2.xml +++ b/drafter_9/annotations/C104_D1_P2.xml @@ -351,7 +351,7 @@ 793 213 871 - 360 + 354 @@ -380,4 +380,42 @@ 90 + + inductor + Unspecified + 0 + 0 + + 409 + 854 + 426 + 896 + 79 + + + + inductor + Unspecified + 0 + 0 + + 463 + 854 + 484 + 895 + 71 + + + + magnetic + Unspecified + 0 + 0 + + 439 + 854 + 458 + 891 + + diff --git a/drafter_9/annotations/C104_D1_P3.xml b/drafter_9/annotations/C104_D1_P3.xml index 60927fd02ba74930375a7449f659788cb1d7b5c2..59ff3f7b15f430adba706d87802d3d2c2bcc233e 100644 --- a/drafter_9/annotations/C104_D1_P3.xml +++ b/drafter_9/annotations/C104_D1_P3.xml @@ -368,4 +368,42 @@ 90 + + inductor + Unspecified + 0 + 0 + + 466 + 867 + 490 + 911 + 87 + + + + magnetic + Unspecified + 0 + 0 + + 505 + 867 + 524 + 902 + + + + inductor + Unspecified + 0 + 0 + + 532 + 866 + 553 + 903 + 77 + + diff --git a/drafter_9/annotations/C104_D1_P4.xml b/drafter_9/annotations/C104_D1_P4.xml index 0c1abf7f6c875584e54485dc268f51078b517e9a..49e36460f0b065526b8b9c772ba0fc1150d5f7ad 100644 --- a/drafter_9/annotations/C104_D1_P4.xml +++ b/drafter_9/annotations/C104_D1_P4.xml @@ -17,9 +17,9 @@ 0 0 - 501 - 980 - 582 + 498 + 979 + 583 1033 @@ -380,4 +380,42 @@ 90 + + inductor + Unspecified + 0 + 0 + + 501 + 983 + 520 + 1030 + 83 + + + + magnetic + Unspecified + 0 + 0 + + 533 + 983 + 555 + 1021 + + + + inductor + Unspecified + 0 + 0 + + 559 + 981 + 581 + 1022 + 75 + + diff --git a/drafter_9/annotations/C104_D2_P1.xml b/drafter_9/annotations/C104_D2_P1.xml index 1ed2da37e45188fb369bc56d0b04da58b02adec1..fe14ceface8601b142060131f144ac9c1bb0fc77 100644 --- a/drafter_9/annotations/C104_D2_P1.xml +++ b/drafter_9/annotations/C104_D2_P1.xml @@ -82,8 +82,8 @@ 532 915 - 632 - 979 + 633 + 980 @@ -289,4 +289,42 @@ 757 + + inductor + Unspecified + 0 + 0 + + 536 + 920 + 563 + 976 + 75 + + + + magnetic + Unspecified + 0 + 0 + + 571 + 925 + 594 + 977 + + + + inductor + Unspecified + 0 + 0 + + 608 + 919 + 630 + 969 + 77 + + diff --git a/drafter_9/annotations/C104_D2_P2.xml b/drafter_9/annotations/C104_D2_P2.xml index 701e89c56e33d28f11c0892c0c957abc2286926b..c7216afa0b3d7939ca35b7b0a07a0a9ea049e275 100644 --- a/drafter_9/annotations/C104_D2_P2.xml +++ b/drafter_9/annotations/C104_D2_P2.xml @@ -17,10 +17,10 @@ 0 0 - 486 - 1004 + 483 + 1002 583 - 1065 + 1069 @@ -289,4 +289,42 @@ Transformer Coupling of Amplifiers + + inductor + Unspecified + 0 + 0 + + 486 + 1005 + 508 + 1066 + 69 + + + + magnetic + Unspecified + 0 + 0 + + 520 + 1012 + 542 + 1066 + + + + inductor + Unspecified + 0 + 0 + + 555 + 1008 + 581 + 1060 + 73 + + diff --git a/drafter_9/annotations/C104_D2_P3.xml b/drafter_9/annotations/C104_D2_P3.xml index a9c0c0d7848d64a33a60ff5d5a67dd40da5883d5..53937a329ef75a03b1dbfc28d736210c9710e572 100644 --- a/drafter_9/annotations/C104_D2_P3.xml +++ b/drafter_9/annotations/C104_D2_P3.xml @@ -17,9 +17,9 @@ 0 0 - 554 - 988 - 646 + 549 + 986 + 649 1051 @@ -289,4 +289,42 @@ 97 + + inductor + Unspecified + 0 + 0 + + 553 + 988 + 579 + 1047 + 71 + + + + magnetic + Unspecified + 0 + 0 + + 585 + 996 + 608 + 1047 + + + + inductor + Unspecified + 0 + 0 + + 618 + 990 + 646 + 1045 + 65 + + diff --git a/drafter_9/annotations/C104_D2_P4.xml b/drafter_9/annotations/C104_D2_P4.xml index 0007acadb7e32a66cfe82a16e777da91546c8f05..c90411331c406398eae0c01b5b96762d1cbebb9a 100644 --- a/drafter_9/annotations/C104_D2_P4.xml +++ b/drafter_9/annotations/C104_D2_P4.xml @@ -17,10 +17,10 @@ 0 0 - 499 - 832 - 600 - 895 + 493 + 830 + 602 + 901 @@ -289,4 +289,42 @@ 94 + + inductor + Unspecified + 0 + 0 + + 499 + 832 + 525 + 896 + 67 + + + + magnetic + Unspecified + 0 + 0 + + 533 + 839 + 558 + 895 + + + + inductor + Unspecified + 0 + 0 + + 570 + 833 + 599 + 895 + 64 + + diff --git a/drafter_9/annotations/C105_D2_P1.xml b/drafter_9/annotations/C105_D2_P1.xml index e3e76c8853aaa6f6a663c3c171ab014687bb487a..fbb35a27b541321711a5a06119955005d4d40117 100644 --- a/drafter_9/annotations/C105_D2_P1.xml +++ b/drafter_9/annotations/C105_D2_P1.xml @@ -722,7 +722,7 @@ 916 182 975 - 202 + 177 diff --git a/drafter_9/annotations/C105_D2_P2.xml b/drafter_9/annotations/C105_D2_P2.xml index 87bd6d8b8a062cce8d1059acd1959da74587e7cb..932b09e48312a5a7a21a2872aa29ca04dad1c6ab 100644 --- a/drafter_9/annotations/C105_D2_P2.xml +++ b/drafter_9/annotations/C105_D2_P2.xml @@ -48,7 +48,7 @@ 223 671 - 1.5 + 1.5K text @@ -268,7 +268,7 @@ 734 601 750 - 360 + 348 @@ -294,7 +294,7 @@ 658 688 692 - 90 + 87 @@ -505,6 +505,7 @@ 539 251 560 + 348 @@ -517,6 +518,7 @@ 593 696 611 + 352 @@ -713,7 +715,7 @@ 790 230 842 - 180 + 169 diff --git a/drafter_9/annotations/C105_D2_P4.xml b/drafter_9/annotations/C105_D2_P4.xml index cff7bcffc5f3e15508a1163a70b950f394a515c1..e1bfe0afd5b9b36312376f99722dd2dc8aeed8c0 100644 --- a/drafter_9/annotations/C105_D2_P4.xml +++ b/drafter_9/annotations/C105_D2_P4.xml @@ -165,7 +165,7 @@ 640 831 - 22OPF + 220PF text diff --git a/drafter_9/annotations/C106_D1_P1.xml b/drafter_9/annotations/C106_D1_P1.xml index d4435f7cff34c1ca7ae3ae2276642bd75dc19135..f8cdd5ad27bfc5df7622703d188cee07b4aeb5a7 100644 --- a/drafter_9/annotations/C106_D1_P1.xml +++ b/drafter_9/annotations/C106_D1_P1.xml @@ -1208,4 +1208,42 @@ 360 + + magnetic + Unspecified + 0 + 0 + + 1199 + 861 + 1223 + 1069 + + + + inductor + Unspecified + 0 + 0 + + 1231 + 927 + 1259 + 996 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1170 + 927 + 1196 + 1005 + 90 + + diff --git a/drafter_9/annotations/C106_D1_P2.xml b/drafter_9/annotations/C106_D1_P2.xml index 9fe55232ba5f12a05060a35838179ef6152eac40..6652e006ccd5c04bd833870217d8dbdb76d2b92c 100644 --- a/drafter_9/annotations/C106_D1_P2.xml +++ b/drafter_9/annotations/C106_D1_P2.xml @@ -1206,4 +1206,42 @@ 994 + + magnetic + Unspecified + 0 + 0 + + 1163 + 993 + 1194 + 1214 + + + + inductor + Unspecified + 0 + 0 + + 1201 + 1062 + 1229 + 1136 + 79 + + + + inductor + Unspecified + 0 + 0 + + 1136 + 1059 + 1164 + 1140 + 90 + + diff --git a/drafter_9/annotations/C106_D1_P3.xml b/drafter_9/annotations/C106_D1_P3.xml index cb1f1567405189d4020e6cb821bf6b47753c4825..c13a4693d4632b688e02f8f5d427d251b2c927e6 100644 --- a/drafter_9/annotations/C106_D1_P3.xml +++ b/drafter_9/annotations/C106_D1_P3.xml @@ -46,6 +46,7 @@ 897 1027 1331 + 358 @@ -409,10 +410,10 @@ 0 1072 - 1217 + 1218 1126 - 1242 - 360 + 1239 + 347 @@ -1208,4 +1209,42 @@ 1117 + + magnetic + Unspecified + 0 + 0 + + 1201 + 1012 + 1228 + 1223 + + + + inductor + Unspecified + 0 + 0 + + 1237 + 1078 + 1267 + 1150 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1173 + 1076 + 1200 + 1153 + 90 + + diff --git a/drafter_9/annotations/C106_D1_P4.xml b/drafter_9/annotations/C106_D1_P4.xml index 1a5090c6b9bddabe86b0ea437b1b2120f92270d1..0a9159f570a9986cc9f29c2c7a1488fbdc75c7e3 100644 --- a/drafter_9/annotations/C106_D1_P4.xml +++ b/drafter_9/annotations/C106_D1_P4.xml @@ -1074,7 +1074,7 @@ 0 0 - 1082 + 1080 944 1173 1147 @@ -1208,4 +1208,42 @@ 360 + + magnetic + Unspecified + 0 + 0 + + 1107 + 947 + 1138 + 1144 + + + + inductor + Unspecified + 0 + 0 + + 1145 + 1010 + 1171 + 1077 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1084 + 1005 + 1109 + 1078 + 90 + + diff --git a/drafter_9/annotations/C106_D2_P1.xml b/drafter_9/annotations/C106_D2_P1.xml index d0487ecbae98a7e15cf8e6bc808186f6100edf42..0b86df2afb91792aac36c3a188f5aeb336cab8d6 100644 --- a/drafter_9/annotations/C106_D2_P1.xml +++ b/drafter_9/annotations/C106_D2_P1.xml @@ -478,6 +478,7 @@ 918 481 1208 + 2 @@ -1087,7 +1088,7 @@ 1059 220 1093 - 183 + 179 @@ -1240,4 +1241,42 @@ 360 + + inductor + Unspecified + 0 + 0 + + 1103 + 958 + 1140 + 1057 + 77 + + + + inductor + Unspecified + 0 + 0 + + 1170 + 972 + 1199 + 1059 + 75 + + + + magnetic + Unspecified + 0 + 0 + + 1127 + 902 + 1167 + 1167 + + diff --git a/drafter_9/annotations/C106_D2_P2.xml b/drafter_9/annotations/C106_D2_P2.xml index d098f1199b6e3fb018f87ea1cb3875708b2cb6be..ba1e8d370f772734c83ab275921a92cf929c8d1c 100644 --- a/drafter_9/annotations/C106_D2_P2.xml +++ b/drafter_9/annotations/C106_D2_P2.xml @@ -1186,7 +1186,7 @@ 1191 544 1212 - 5 + 339 @@ -1240,4 +1240,42 @@ 703 + + inductor + Unspecified + 0 + 0 + + 1101 + 1015 + 1142 + 1110 + 73 + + + + inductor + Unspecified + 0 + 0 + + 1174 + 1022 + 1203 + 1109 + 73 + + + + magnetic + Unspecified + 0 + 0 + + 1126 + 952 + 1168 + 1224 + + diff --git a/drafter_9/annotations/C106_D2_P3.xml b/drafter_9/annotations/C106_D2_P3.xml index c76572b593d06a04aae572d4d48628cd1a9ddf4d..b85250895792fe2276ca01a19a8a72d89594c36c 100644 --- a/drafter_9/annotations/C106_D2_P3.xml +++ b/drafter_9/annotations/C106_D2_P3.xml @@ -442,6 +442,7 @@ 901 502 1169 + 2 @@ -1240,4 +1241,42 @@ 660 + + inductor + Unspecified + 0 + 0 + + 1081 + 965 + 1117 + 1046 + 81 + + + + inductor + Unspecified + 0 + 0 + + 1148 + 980 + 1178 + 1049 + 81 + + + + magnetic + Unspecified + 0 + 0 + + 1101 + 909 + 1139 + 1163 + + diff --git a/drafter_9/annotations/C106_D2_P4.xml b/drafter_9/annotations/C106_D2_P4.xml index a07c7f34eb5d8651e9bc4a79c67a141b112416cb..927fa9b0f5bd0b14235b2c7403e4dd343571bb8a 100644 --- a/drafter_9/annotations/C106_D2_P4.xml +++ b/drafter_9/annotations/C106_D2_P4.xml @@ -147,6 +147,7 @@ 975 491 1264 + 6 @@ -159,6 +160,7 @@ 817 938 1282 + 4 @@ -1240,4 +1242,42 @@ 1232 + + inductor + Unspecified + 0 + 0 + + 1098 + 997 + 1136 + 1085 + 83 + + + + inductor + Unspecified + 0 + 0 + + 1169 + 1010 + 1203 + 1088 + 83 + + + + magnetic + Unspecified + 0 + 0 + + 1130 + 941 + 1159 + 1205 + + diff --git a/drafter_9/annotations/C107_D1_P2.xml b/drafter_9/annotations/C107_D1_P2.xml index 2abf16e5ef5727aa32e0ac18af70aeab79d6584f..a635dddf7503aea77b2bc57e60b7ec988a4b975e 100644 --- a/drafter_9/annotations/C107_D1_P2.xml +++ b/drafter_9/annotations/C107_D1_P2.xml @@ -1053,6 +1053,7 @@ 838 157 880 + 354 diff --git a/drafter_9/annotations/C107_D1_P3.xml b/drafter_9/annotations/C107_D1_P3.xml index 5adefb6ebe81d567a8adbf7e3f71e957e0852087..6da9cf8a9b7100cbec5075c9be1ed8115eb69b31 100644 --- a/drafter_9/annotations/C107_D1_P3.xml +++ b/drafter_9/annotations/C107_D1_P3.xml @@ -1039,6 +1039,7 @@ 789 228 831 + 6 diff --git a/drafter_9/annotations/C107_D1_P4.xml b/drafter_9/annotations/C107_D1_P4.xml index 460eda4b12948651b8dd887d26a14a7533ac4864..ea3e8e82119508e39d6fb67304837dddc43f9d72 100644 --- a/drafter_9/annotations/C107_D1_P4.xml +++ b/drafter_9/annotations/C107_D1_P4.xml @@ -339,6 +339,7 @@ 883 167 929 + 10 diff --git a/drafter_9/annotations/C107_D2_P1.xml b/drafter_9/annotations/C107_D2_P1.xml index 053f4b855eb774cbef5a3437507a8d0da233b1a0..00dbb269a559b76038275652c4a3e2e1f34683f3 100644 --- a/drafter_9/annotations/C107_D2_P1.xml +++ b/drafter_9/annotations/C107_D2_P1.xml @@ -803,6 +803,7 @@ 859 201 893 + 89 diff --git a/drafter_9/annotations/C107_D2_P2.xml b/drafter_9/annotations/C107_D2_P2.xml index d306455c402955786f3225f0679526c39117113c..a90437200ae220dbe5adcb3245892f06517fb06c 100644 --- a/drafter_9/annotations/C107_D2_P2.xml +++ b/drafter_9/annotations/C107_D2_P2.xml @@ -890,6 +890,7 @@ 681 251 714 + 89 diff --git a/drafter_9/annotations/C107_D2_P3.xml b/drafter_9/annotations/C107_D2_P3.xml index f397efcddf1a9b769a98fe465a81ed3a60c2cf55..646a85f640127c4f6f8d996ceeffe3fdbc43760c 100644 --- a/drafter_9/annotations/C107_D2_P3.xml +++ b/drafter_9/annotations/C107_D2_P3.xml @@ -880,6 +880,7 @@ 842 231 874 + 92 diff --git a/drafter_9/annotations/C107_D2_P4.xml b/drafter_9/annotations/C107_D2_P4.xml index cd3617e5ca92ae052926891f46d173c654a50b9d..ff60a6778eb13f7d274ff4dc17c22a50dae53dcc 100644 --- a/drafter_9/annotations/C107_D2_P4.xml +++ b/drafter_9/annotations/C107_D2_P4.xml @@ -898,6 +898,7 @@ 957 193 994 + 94 diff --git a/drafter_9/annotations/C108_D1_P1.xml b/drafter_9/annotations/C108_D1_P1.xml index f274724e626ddfd009818b1ff61c6c543a2b93e4..0de7629bc115c5a652046a88770a0277b6c90301 100644 --- a/drafter_9/annotations/C108_D1_P1.xml +++ b/drafter_9/annotations/C108_D1_P1.xml @@ -685,7 +685,7 @@ 243 1115 - BATTERY + Battery text @@ -1020,4 +1020,41 @@ 655 + + switch + Unspecified + 0 + 0 + + 418 + 767 + 514 + 891 + + + + inductor + Unspecified + 0 + 0 + + 549 + 796 + 576 + 865 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 519 + 748 + 549 + 934 + + diff --git a/drafter_9/annotations/C108_D1_P2.xml b/drafter_9/annotations/C108_D1_P2.xml index b91b31525c6d8847ea2ac2e97499597b779edf34..e49653e4b5f7ef23d2a1d5f02e2ae7caeb665441 100644 --- a/drafter_9/annotations/C108_D1_P2.xml +++ b/drafter_9/annotations/C108_D1_P2.xml @@ -35,7 +35,7 @@ 399 958 - BATTERY + Battery text @@ -1020,4 +1020,41 @@ 502 + + switch + Unspecified + 0 + 0 + + 553 + 646 + 635 + 756 + + + + inductor + Unspecified + 0 + 0 + + 667 + 675 + 691 + 739 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 640 + 633 + 665 + 801 + + diff --git a/drafter_9/annotations/C108_D1_P3.xml b/drafter_9/annotations/C108_D1_P3.xml index 495346c13c04b71149aa876057d279e26c5a5e9b..ab97d58d46208cbd7f387cd4655686a8bc3a06f6 100644 --- a/drafter_9/annotations/C108_D1_P3.xml +++ b/drafter_9/annotations/C108_D1_P3.xml @@ -1020,4 +1020,41 @@ R4 + + switch + Unspecified + 0 + 0 + + 490 + 711 + 575 + 824 + + + + inductor + Unspecified + 0 + 0 + + 609 + 733 + 634 + 803 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 582 + 695 + 609 + 869 + + diff --git a/drafter_9/annotations/C108_D1_P4.xml b/drafter_9/annotations/C108_D1_P4.xml index e658d021913a2db841e2febf0df63d7bf0a470fd..fe0ca41211ee80a6723800fd97e3a73e1020cc10 100644 --- a/drafter_9/annotations/C108_D1_P4.xml +++ b/drafter_9/annotations/C108_D1_P4.xml @@ -1020,4 +1020,41 @@ 10µ + + switch + Unspecified + 0 + 0 + + 490 + 835 + 569 + 933 + + + + inductor + Unspecified + 0 + 0 + + 595 + 859 + 620 + 914 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 571 + 822 + 596 + 972 + + diff --git a/drafter_9/annotations/C108_D2_P1.xml b/drafter_9/annotations/C108_D2_P1.xml index b68649b157a45e9b6135cb47145490b873b5b4e4..6384ade4cbb065ec90ca2090545fd208e9761145 100644 --- a/drafter_9/annotations/C108_D2_P1.xml +++ b/drafter_9/annotations/C108_D2_P1.xml @@ -165,7 +165,7 @@ 264 1090 - SµF + SMF text @@ -948,4 +948,41 @@ 1273 + + switch + Unspecified + 0 + 0 + + 528 + 846 + 608 + 970 + + + + inductor + Unspecified + 0 + 0 + + 637 + 869 + 675 + 931 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 607 + 816 + 639 + 1005 + + diff --git a/drafter_9/annotations/C108_D2_P2.xml b/drafter_9/annotations/C108_D2_P2.xml index b4c731554ab1fd7f2ec970d55c514b23597ae69c..c54b821d1a78f9a6eb09d80a79f8f064c0e4a603 100644 --- a/drafter_9/annotations/C108_D2_P2.xml +++ b/drafter_9/annotations/C108_D2_P2.xml @@ -243,7 +243,7 @@ 240 1011 - SµF + SMF text @@ -948,4 +948,41 @@ R1 + + switch + Unspecified + 0 + 0 + + 486 + 774 + 558 + 892 + + + + inductor + Unspecified + 0 + 0 + + 589 + 795 + 620 + 853 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 557 + 747 + 592 + 931 + + diff --git a/drafter_9/annotations/C108_D2_P3.xml b/drafter_9/annotations/C108_D2_P3.xml index 60a60d101b3540f3d3ad61e5ad27c038113143c6..79e2d8090bd3e92685808ecea3f21d6a375d2acf 100644 --- a/drafter_9/annotations/C108_D2_P3.xml +++ b/drafter_9/annotations/C108_D2_P3.xml @@ -412,7 +412,7 @@ 205 1048 - SµF + SMF text @@ -948,4 +948,41 @@ 86 + + switch + Unspecified + 0 + 0 + + 486 + 782 + 570 + 922 + + + + inductor + Unspecified + 0 + 0 + + 604 + 806 + 639 + 868 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 569 + 750 + 604 + 955 + + diff --git a/drafter_9/annotations/C108_D2_P4.xml b/drafter_9/annotations/C108_D2_P4.xml index 4c6a567d35b9d1a610156a226a0b674d5eafbe37..49694689a2e7955b44e98275857301217d9e9380 100644 --- a/drafter_9/annotations/C108_D2_P4.xml +++ b/drafter_9/annotations/C108_D2_P4.xml @@ -256,7 +256,7 @@ 237 1076 - SµF + SMF text @@ -948,4 +948,41 @@ 834 + + switch + Unspecified + 0 + 0 + + 514 + 847 + 594 + 967 + + + + inductor + Unspecified + 0 + 0 + + 627 + 870 + 660 + 925 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 592 + 822 + 628 + 1002 + + diff --git a/drafter_9/annotations/C98_D1_P1.xml b/drafter_9/annotations/C98_D1_P1.xml index be346720e964a7daca36b7230f167125c29c0fb0..7f1370428383fb2cf46d7e5a210b3107d8a90aeb 100644 --- a/drafter_9/annotations/C98_D1_P1.xml +++ b/drafter_9/annotations/C98_D1_P1.xml @@ -21,6 +21,7 @@ 1075 679 1118 + 356 @@ -83,6 +84,7 @@ 963 674 1012 + 354 @@ -160,7 +162,7 @@ 728 1119 - ViΩ + Vin text diff --git a/drafter_9/annotations/C98_D1_P2.xml b/drafter_9/annotations/C98_D1_P2.xml index f6125fd8779cb0a86de85c32f33b07e398cd4336..b0a04b40268c00c6b94a6bd66ed6d13fc30fd2bb 100644 --- a/drafter_9/annotations/C98_D1_P2.xml +++ b/drafter_9/annotations/C98_D1_P2.xml @@ -100,7 +100,7 @@ 662 1052 - ViΩ + Vin text @@ -201,6 +201,7 @@ 1013 625 1049 + 358 diff --git a/drafter_9/annotations/C98_D1_P3.xml b/drafter_9/annotations/C98_D1_P3.xml index e4d2c6a34903bcad533b760458741120055fa437..725ebace3c1a7900ec5b7c12a7b075c7924cf27e 100644 --- a/drafter_9/annotations/C98_D1_P3.xml +++ b/drafter_9/annotations/C98_D1_P3.xml @@ -74,7 +74,7 @@ 680 1112 - ViΩ + Vin text @@ -175,6 +175,7 @@ 976 629 1018 + 350 @@ -312,6 +313,7 @@ 1070 641 1109 + 356 diff --git a/drafter_9/annotations/C98_D1_P4.xml b/drafter_9/annotations/C98_D1_P4.xml index 1da962c9b56a11390002354e29eaf1e4a979c1dd..d70a0a68cc6f63fc7b367f7b4887610c6080209d 100644 --- a/drafter_9/annotations/C98_D1_P4.xml +++ b/drafter_9/annotations/C98_D1_P4.xml @@ -34,6 +34,7 @@ 955 636 999 + 347 @@ -86,7 +87,7 @@ 688 1096 - ViΩ + Vin text @@ -324,6 +325,7 @@ 1055 644 1097 + 354 diff --git a/drafter_9/annotations/C98_D2_P1.xml b/drafter_9/annotations/C98_D2_P1.xml index 09802e8ab7c10c8b2716c3d5d9ea7501c46ef046..58ccbeca75a1eeb650e1e2e5249882215b302a91 100644 --- a/drafter_9/annotations/C98_D2_P1.xml +++ b/drafter_9/annotations/C98_D2_P1.xml @@ -87,7 +87,7 @@ 502 862 - R1=83KΩ + R1=84KΩ text @@ -189,6 +189,7 @@ 976 593 1028 + 350 @@ -227,6 +228,7 @@ 877 224 934 + 354 diff --git a/drafter_9/annotations/C98_D2_P2.xml b/drafter_9/annotations/C98_D2_P2.xml index 4b626fe2d0931f1d2538d22adc23a780089e6e46..8e3232b034781f7fe34c89d0be1d66cc2e86edb5 100644 --- a/drafter_9/annotations/C98_D2_P2.xml +++ b/drafter_9/annotations/C98_D2_P2.xml @@ -21,7 +21,7 @@ 1182 604 1223 - 360 + 352 @@ -264,6 +264,7 @@ 1005 271 1054 + 354 @@ -276,6 +277,7 @@ 1092 614 1141 + 354 diff --git a/drafter_9/annotations/C98_D2_P3.xml b/drafter_9/annotations/C98_D2_P3.xml index 437f1b9279d63ed44deb41a9b097dbce237a3673..08630228dec8d223f332856375538a3b3ca1af06 100644 --- a/drafter_9/annotations/C98_D2_P3.xml +++ b/drafter_9/annotations/C98_D2_P3.xml @@ -214,6 +214,7 @@ 818 317 865 + 352 @@ -325,6 +326,7 @@ 902 634 948 + 347 diff --git a/drafter_9/annotations/C98_D2_P4.xml b/drafter_9/annotations/C98_D2_P4.xml index 63863580130e2533eaff061f15b852fcf20ceeab..3e1feb2e7bf6540160850500190d18f0054aa0b4 100644 --- a/drafter_9/annotations/C98_D2_P4.xml +++ b/drafter_9/annotations/C98_D2_P4.xml @@ -150,7 +150,7 @@ 879 545 927 - 3 + 350 diff --git a/drafter_9/annotations/C99_D1_P1.xml b/drafter_9/annotations/C99_D1_P1.xml index 28cf813dc5a23030031fd40a10949f4f321da578..af55077529764181a4f9666a007739a4e2f38169 100644 --- a/drafter_9/annotations/C99_D1_P1.xml +++ b/drafter_9/annotations/C99_D1_P1.xml @@ -21,6 +21,7 @@ 849 880 886 + 79 @@ -147,6 +148,7 @@ 820 358 839 + 356 @@ -159,6 +161,7 @@ 808 494 824 + 345 @@ -171,6 +174,7 @@ 791 682 807 + 352 @@ -183,6 +187,7 @@ 783 830 799 + 352 @@ -502,7 +507,7 @@ 195 1087 - µicrophone + Microphone text diff --git a/drafter_9/annotations/C99_D1_P2.xml b/drafter_9/annotations/C99_D1_P2.xml index 4148a5c38400c3e20cf593c0d1bcfe0c4d216e8e..963114bc33c4c3f79fb668051bd7666394f7cb51 100644 --- a/drafter_9/annotations/C99_D1_P2.xml +++ b/drafter_9/annotations/C99_D1_P2.xml @@ -34,6 +34,7 @@ 813 155 832 + 354 @@ -46,6 +47,7 @@ 823 371 843 + 356 @@ -58,6 +60,7 @@ 820 504 838 + 354 @@ -70,6 +73,7 @@ 813 696 830 + 356 @@ -82,6 +86,7 @@ 810 841 827 + 356 @@ -329,7 +334,7 @@ 182 1085 - µicrophone + Microphone text @@ -575,7 +580,7 @@ 972 479 1022 - 360 + 356 @@ -759,6 +764,7 @@ 880 888 920 + 73 diff --git a/drafter_9/annotations/C99_D1_P3.xml b/drafter_9/annotations/C99_D1_P3.xml index 973dac7abdb47168ad9ad7b4cefcad9b9189fa6c..d31e470b802441147455c7d3d5fb6f889e67c413 100644 --- a/drafter_9/annotations/C99_D1_P3.xml +++ b/drafter_9/annotations/C99_D1_P3.xml @@ -214,7 +214,7 @@ 910 501 958 - 360 + 356 @@ -500,7 +500,7 @@ 239 1012 - µicrophone + Microphone text @@ -538,7 +538,7 @@ 895 813 950 - 360 + 354 @@ -710,6 +710,7 @@ 816 880 855 + 75 @@ -770,6 +771,7 @@ 764 210 781 + 358 @@ -794,6 +796,7 @@ 771 524 786 + 356 @@ -819,6 +822,7 @@ 760 701 775 + 356 @@ -831,6 +835,7 @@ 755 836 770 + 354 diff --git a/drafter_9/annotations/C99_D1_P4.xml b/drafter_9/annotations/C99_D1_P4.xml index 9815865f6cdf019b28663145979b4eb96f69f549..667323b86a24e4cc598bb723983423c3d144e7ab 100644 --- a/drafter_9/annotations/C99_D1_P4.xml +++ b/drafter_9/annotations/C99_D1_P4.xml @@ -98,6 +98,7 @@ 877 411 895 + 354 @@ -110,6 +111,7 @@ 867 547 884 + 348 @@ -122,6 +124,7 @@ 856 741 873 + 358 @@ -134,6 +137,7 @@ 855 893 871 + 354 @@ -419,7 +423,7 @@ 242 1141 - µicrophone + Microphone text @@ -693,6 +697,7 @@ 926 941 967 + 73 diff --git a/drafter_9/annotations/C99_D2_P1.xml b/drafter_9/annotations/C99_D2_P1.xml index 414b976e168127ac9e9fe21ce57e4df7342ad465..46c56018abc621d07a9f3ae286cc26f048afc721 100644 --- a/drafter_9/annotations/C99_D2_P1.xml +++ b/drafter_9/annotations/C99_D2_P1.xml @@ -34,6 +34,7 @@ 817 904 857 + 79 @@ -542,7 +543,7 @@ 151 1029 - µicrophone + Microphone terminal diff --git a/drafter_9/annotations/C99_D2_P2.xml b/drafter_9/annotations/C99_D2_P2.xml index 7414087238f4d570a85f089adb7c5aeb61b39cff..35819654eb3d2823709f4fc32e95555bae20ed38 100644 --- a/drafter_9/annotations/C99_D2_P2.xml +++ b/drafter_9/annotations/C99_D2_P2.xml @@ -139,7 +139,7 @@ 201 1078 - µicrophone + Microphone text @@ -458,6 +458,7 @@ 856 925 894 + 85 diff --git a/drafter_9/annotations/C99_D2_P3.xml b/drafter_9/annotations/C99_D2_P3.xml index cc8cdf7ee37fd2d77895be1ad4fea80afac17685..55f3e495fdd489472a47c8ad862c765dd09c9c20 100644 --- a/drafter_9/annotations/C99_D2_P3.xml +++ b/drafter_9/annotations/C99_D2_P3.xml @@ -191,7 +191,7 @@ 197 991 - µicrophone + Microphone text @@ -397,6 +397,7 @@ 795 829 834 + 90 diff --git a/drafter_9/annotations/C99_D2_P4.xml b/drafter_9/annotations/C99_D2_P4.xml index b0a941261187f7fab40470b4a7fd12b25e100e18..3b58082d3774225d5dee65a10e573f2adf69d014 100644 --- a/drafter_9/annotations/C99_D2_P4.xml +++ b/drafter_9/annotations/C99_D2_P4.xml @@ -256,7 +256,7 @@ 184 985 - µicrophone + Microphone inductor @@ -268,6 +268,7 @@ 786 957 820 + 77 diff --git a/drafter_9/instances/C100_D2_P4.json b/drafter_9/instances/C100_D2_P4.json index b22c00dcbd76b1f54f66496e1b9d1377ae902d7f..2c882d22392e597c0953bbff306f141d46561fe8 100644 --- a/drafter_9/instances/C100_D2_P4.json +++ b/drafter_9/instances/C100_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -67,6 +68,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -119,6 +122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -145,6 +149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -171,6 +176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -197,6 +203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -223,6 +230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -253,6 +261,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -279,6 +288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -305,6 +315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -357,6 +369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -721,6 +747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -903,6 +936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -929,6 +963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -955,6 +990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -981,6 +1017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1007,6 +1044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1033,6 +1071,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1059,6 +1098,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1085,6 +1125,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1111,6 +1152,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1137,6 +1179,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1163,6 +1206,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1189,6 +1233,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1251,6 +1296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1281,6 +1327,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1307,6 +1354,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1333,6 +1381,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1371,6 +1420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1380,12 +1430,16 @@ "label": "optocoupler", "points": [ [ - 170.19230769230768, - 1288.7820512820513 + 201.61538461538464, + 1304.9450549450548 ], [ - 152.8846153846154, - 1307.051282051282 + 162.05494505494508, + 1300.5494505494505 + ], + [ + 159.30769230769232, + 1306.043956043956 ], [ 120.83333333333333, @@ -1400,15 +1454,32 @@ 1337.8205128205127 ], [ - 291.025641025641, - 1335.2564102564102 + 165.90109890109892, + 1334.6153846153845 + ], + [ + 197.21978021978023, + 1344.2307692307693 + ], + [ + 248.5934065934066, + 1327.4725274725274 + ], + [ + 274.14285714285717, + 1334.3406593406594 + ], + [ + 290.0769230769231, + 1327.7472527472528 ], [ - 286.53846153846155, - 1276.923076923077 + 279.91208791208794, + 1277.197802197802 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1443,6 +1514,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1469,6 +1541,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1495,6 +1568,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1521,6 +1595,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1547,6 +1622,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1573,6 +1649,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1599,6 +1676,124 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optical", + "points": [ + [ + 165.68105515587527, + 1309.558752997602 + ], + [ + 197.33573141486806, + 1313.1558752997603 + ], + [ + 193.25899280575535, + 1336.4172661870502 + ], + [ + 163.7625899280575, + 1328.0239808153476 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "diode.light_emitting", + "points": [ + [ + 123.47482014388487, + 1315.3141486810553 + ], + [ + 125.15347721822539, + 1340.2541966426859 + ], + [ + 159.4460431654676, + 1335.2182254196643 + ], + [ + 164.24220623501196, + 1331.3812949640287 + ], + [ + 195.65707434052754, + 1340.4940047961632 + ], + [ + 200.93285371702635, + 1310.9976019184653 + ], + [ + 165.68105515587527, + 1305.9616306954435 + ], + [ + 161.60431654676256, + 1309.3189448441246 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "transistor.photo", + "points": [ + [ + 158.96642685851316, + 1328.5035971223022 + ], + [ + 164.00239808153472, + 1303.8033573141486 + ], + [ + 202.37170263788965, + 1307.6402877697842 + ], + [ + 248.89448441246998, + 1292.5323741007194 + ], + [ + 278.3908872901678, + 1281.021582733813 + ], + [ + 286.78417266187046, + 1325.3860911270983 + ], + [ + 274.31414868105514, + 1331.3812949640287 + ], + [ + 248.89448441246998, + 1323.4676258992806 + ], + [ + 199.73381294964025, + 1340.2541966426859 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_9/instances/C103_D1_P1.json b/drafter_9/instances/C103_D1_P1.json index 03e5598eae28ce5f11bacc477a49b5353c6ea268..36cb0f09f9e3dd1503b1fd3e27496b9a69bfa1ed 100644 --- a/drafter_9/instances/C103_D1_P1.json +++ b/drafter_9/instances/C103_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 351.0, @@ -24,13 +24,15 @@ 668.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 265.0, @@ -49,13 +51,15 @@ 871.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 293.0, @@ -74,13 +78,15 @@ 955.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 138.0, @@ -99,13 +105,15 @@ 893.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 409.0, @@ -124,13 +132,15 @@ 819.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 676.0, @@ -149,13 +159,15 @@ 885.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 548.0, @@ -174,13 +186,15 @@ 955.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 695.0, @@ -199,13 +213,15 @@ 945.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 735.0, @@ -224,13 +240,15 @@ 813.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 837.0, @@ -249,13 +267,15 @@ 864.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 147.0, @@ -274,13 +294,15 @@ 1010.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 155.0, @@ -299,13 +321,15 @@ 876.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 821.0, @@ -324,13 +348,15 @@ 849.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 825.0, @@ -349,13 +375,15 @@ 1021.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 520.0, @@ -374,13 +402,15 @@ 941.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 663.0, @@ -399,13 +429,15 @@ 936.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 266.0, @@ -424,13 +456,15 @@ 949.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 638.0, @@ -453,13 +487,15 @@ 871.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 242.0, @@ -482,13 +518,15 @@ 851.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 268.0, @@ -507,13 +545,15 @@ 1015.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 523.0, @@ -532,13 +572,15 @@ 1019.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 663.0, @@ -557,13 +599,15 @@ 1022.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 670.0, @@ -582,13 +626,15 @@ 849.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 529.0, @@ -607,13 +653,15 @@ 886.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 528.0, @@ -632,13 +680,15 @@ 857.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 399.0, @@ -657,13 +707,15 @@ 847.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 730.0, @@ -682,10 +734,16 @@ 840.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C103_D1_P1.jpg", + "imageData": null, + "imageHeight": 2016, + "imageWidth": 1134, "lineColor": [ 0, 255, @@ -697,9 +755,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C103_D1_P1.jpg", - "imageData": null, - "imageHeight": 2016, - "imageWidth": 1134 + ] } \ No newline at end of file diff --git a/drafter_9/instances/C104_D2_P4.json b/drafter_9/instances/C104_D2_P4.json index eaecf23909e64cfcafee23e2edfa7ef1c9a1e077..65a27c69cfe67b724f463c480ca617c6bb1e2de3 100644 --- a/drafter_9/instances/C104_D2_P4.json +++ b/drafter_9/instances/C104_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -34,23 +35,56 @@ "label": "transformer", "points": [ [ - 499.0, - 832.0 + 572.8047493403693, + 838.2110817941953 ], [ - 499.0, - 895.0 + 559.084432717678, + 838.4749340369393 ], [ - 600.0, - 895.0 + 540.6147757255936, + 837.6833773087071 ], [ - 600.0, - 832.0 + 530.8522427440632, + 833.7255936675461 + ], + [ + 499.45382585751975, + 826.0738786279684 + ], + [ + 493.12137203166225, + 896.5224274406332 + ], + [ + 514.157622739018, + 901.5400516795866 + ], + [ + 529.796833773087, + 901.2717678100264 + ], + [ + 553.4341085271318, + 898.1808785529715 + ], + [ + 569.3746701846965, + 888.0791556728233 + ], + [ + 598.9261213720316, + 891.7730870712401 + ], + [ + 601.2377260981912, + 832.2894056847545 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +138,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +165,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +192,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +219,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +246,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +273,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +300,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +327,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +354,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +381,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +408,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +435,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -595,6 +648,88 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 540.0870712401055, + 840.8496042216359 + ], + [ + 558.820580474934, + 841.377308707124 + ], + [ + 551.1688654353561, + 895.2031662269129 + ], + [ + 531.6437994722954, + 897.5778364116095 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 502.0923482849604, + 828.976253298153 + ], + [ + 529.0052770448549, + 835.8364116094987 + ], + [ + 514.2295514511873, + 898.1055408970976 + ], + [ + 495.75989445910284, + 893.6200527704485 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 570.1662269129287, + 884.3852242744064 + ], + [ + 574.1240105540896, + 840.3218997361478 + ], + [ + 598.9261213720316, + 835.3087071240105 + ], + [ + 596.287598944591, + 888.6068601583113 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_9/instances/C105_D2_P4.json b/drafter_9/instances/C105_D2_P4.json index d43da43d8c3596181a62973017c73572f596aeeb..3f28354bdb5d6d515da739d1ddee942af91333dc 100644 --- a/drafter_9/instances/C105_D2_P4.json +++ b/drafter_9/instances/C105_D2_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 276.0, @@ -24,13 +24,15 @@ 269.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 208.0, @@ -49,13 +51,15 @@ 723.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 43.0, @@ -74,13 +78,15 @@ 720.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 189.0, @@ -99,13 +105,15 @@ 849.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 59.0, @@ -124,13 +132,15 @@ 903.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 500.0, @@ -149,13 +159,15 @@ 1123.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 716.0, @@ -174,13 +186,15 @@ 1095.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 337.0, @@ -199,13 +213,15 @@ 1147.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 932.0, @@ -224,13 +240,15 @@ 973.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 685.0, @@ -249,13 +267,15 @@ 844.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 891.0, @@ -274,13 +294,15 @@ 747.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 565.5367231638418, @@ -299,13 +321,15 @@ 807.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 538.0, @@ -324,13 +348,15 @@ 701.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 75.0, @@ -349,13 +375,15 @@ 534.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 695.0, @@ -374,13 +402,15 @@ 628.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 634.0, @@ -399,13 +429,15 @@ 516.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "integrated_circuit", "line_color": null, "fill_color": null, + "label": "integrated_circuit", "points": [ [ 512.0, @@ -424,13 +456,15 @@ 1388.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 530.0, @@ -449,13 +483,15 @@ 1462.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 621.0, @@ -474,13 +510,15 @@ 1413.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 624.0, @@ -499,13 +537,15 @@ 1478.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 448.0, @@ -524,13 +564,15 @@ 1485.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 707.0, @@ -549,13 +591,15 @@ 1412.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 705.0, @@ -574,13 +618,15 @@ 1472.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "gnd", "line_color": null, "fill_color": null, + "label": "gnd", "points": [ [ 563.0, @@ -599,13 +645,15 @@ 1210.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "gnd", "line_color": null, "fill_color": null, + "label": "gnd", "points": [ [ 664.0, @@ -624,13 +672,15 @@ 1201.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "gnd", "line_color": null, "fill_color": null, + "label": "gnd", "points": [ [ 289.0, @@ -649,13 +699,15 @@ 1251.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 300.0, @@ -674,13 +726,15 @@ 1145.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 678.0, @@ -699,13 +753,15 @@ 1094.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 571.0, @@ -724,13 +780,15 @@ 1113.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 658.0, @@ -749,13 +807,15 @@ 641.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 191.0, @@ -774,13 +834,15 @@ 774.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 114.0, @@ -799,13 +861,15 @@ 725.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 550.0, @@ -824,13 +888,15 @@ 747.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 860.0, @@ -849,13 +915,15 @@ 756.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 890.0, @@ -874,13 +942,15 @@ 986.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 434.0, @@ -899,13 +969,15 @@ 847.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 564.0, @@ -924,13 +996,15 @@ 782.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "capacitor.unpolarized", "line_color": null, "fill_color": null, + "label": "capacitor.unpolarized", "points": [ [ 208.0, @@ -949,13 +1023,15 @@ 819.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 296.0, @@ -974,13 +1050,15 @@ 1062.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 566.0, @@ -999,13 +1077,15 @@ 1024.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 670.0, @@ -1024,13 +1104,15 @@ 1011.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "vss", "line_color": null, "fill_color": null, + "label": "vss", "points": [ [ 106.0, @@ -1049,13 +1131,15 @@ 583.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "vss", "line_color": null, "fill_color": null, + "label": "vss", "points": [ [ 652.0, @@ -1074,13 +1158,15 @@ 560.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 640.0, @@ -1099,13 +1185,15 @@ 839.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 109.45273631840794, @@ -1124,13 +1212,15 @@ 894.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 123.0, @@ -1149,13 +1239,15 @@ 837.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 122.0, @@ -1174,13 +1266,15 @@ 786.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 269.0, @@ -1199,13 +1293,15 @@ 892.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 431.0, @@ -1224,13 +1320,15 @@ 884.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 382.0, @@ -1249,13 +1347,15 @@ 851.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 303.0, @@ -1274,13 +1374,15 @@ 796.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 304.0, @@ -1299,13 +1401,15 @@ 774.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 299.0, @@ -1324,13 +1428,15 @@ 822.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 374.0, @@ -1349,13 +1455,15 @@ 790.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 433.0, @@ -1374,13 +1482,15 @@ 779.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 657.0, @@ -1399,13 +1509,15 @@ 743.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 520.0, @@ -1424,13 +1536,15 @@ 772.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 523.0, @@ -1449,13 +1563,15 @@ 795.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 524.0, @@ -1474,13 +1590,15 @@ 751.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 550.0, @@ -1499,13 +1617,15 @@ 866.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 550.0, @@ -1524,13 +1644,15 @@ 843.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 663.0, @@ -1549,13 +1671,15 @@ 782.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 115.0, @@ -1574,10 +1698,16 @@ 1090.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C105_D2_P4.jpg", + "imageData": null, + "imageHeight": 2016, + "imageWidth": 1134, "lineColor": [ 0, 255, @@ -1589,9 +1719,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C105_D2_P4.jpg", - "imageData": null, - "imageHeight": 2016, - "imageWidth": 1134 + ] } \ No newline at end of file diff --git a/drafter_9/instances/C106_D1_P4.json b/drafter_9/instances/C106_D1_P4.json index 5e73595fe36050f398d9db21d2b855bb0e6fc4c3..b2527d409d82b671d238ba1252e57f5b829c81b9 100644 --- a/drafter_9/instances/C106_D1_P4.json +++ b/drafter_9/instances/C106_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1169,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1195,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1247,6 +1294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1273,6 +1321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1377,6 +1429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1403,6 +1456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1572,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1599,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1626,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1653,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1619,6 +1680,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1645,6 +1707,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1671,6 +1734,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1697,6 +1761,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1723,6 +1788,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1749,6 +1815,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1775,6 +1842,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1801,6 +1869,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1867,6 +1936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1929,6 +1999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1955,6 +2026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1989,6 +2061,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2015,6 +2088,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2041,6 +2115,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2067,6 +2142,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2093,6 +2169,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2119,6 +2196,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2145,6 +2223,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2171,6 +2250,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2197,6 +2277,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2223,6 +2304,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2249,6 +2331,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2275,6 +2358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2284,51 +2368,76 @@ "label": "transformer", "points": [ [ - 1083.1746031746031, - 945.0793650793651 + 1109.1412742382272, + 943.213296398892 ], [ - 1095.4, - 1002.4 + 1095.2908587257618, + 952.3545706371192 ], [ - 1094.4, - 1007.0 + 1093.9365853658537, + 1002.2373983739838 ], [ - 1090.0, - 1016.6 + 1092.9365853658537, + 1006.8373983739838 ], [ - 1081.2339331619537, - 1027.5064267352184 + 1088.5365853658536, + 1016.4373983739838 ], [ - 1079.9485861182518, - 1071.7223650385604 + 1079.7705185278073, + 1027.343825109202 ], [ - 1093.0591259640103, - 1074.5501285347043 + 1078.4851714841054, + 1071.5597634125443 ], [ - 1088.4318766066838, - 1098.714652956298 + 1091.595711329864, + 1074.387526908688 ], [ - 1082.0, - 1147.0 + 1090.8594200115228, + 1094.5224377440627 ], [ - 1173.0, - 1147.0 + 1086.9684619725374, + 1098.5520513302818 ], [ - 1173.0, - 944.0 + 1087.5346260387812, + 1144.0443213296398 + ], + [ + 1116.3434903047091, + 1151.8005540166205 + ], + [ + 1138.2271468144045, + 1134.3490304709142 + ], + [ + 1174.5152354570637, + 1131.3019390581717 + ], + [ + 1175.9002770083102, + 1071.191135734072 + ], + [ + 1173.4072022160665, + 1009.9722991689752 + ], + [ + 1142.9362880886426, + 943.213296398892 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2355,6 +2464,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2381,6 +2491,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2407,6 +2518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2433,6 +2545,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2459,6 +2572,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2485,6 +2599,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2511,6 +2626,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2715,104 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1094.1716279367517, + 1007.3519621022981 + ], + [ + 1089.2682926829268, + 1018.0487804878048 + ], + [ + 1082.7543051021062, + 1026.6433006849754 + ], + [ + 1080.3921003776968, + 1070.5409384802508 + ], + [ + 1095.8448753462603, + 1073.1301939058171 + ], + [ + 1107.8048780487804, + 1072.1951219512196 + ], + [ + 1109.9196594328148, + 1007.1551117085974 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1146.5040650406504, + 1015.6097560975609 + ], + [ + 1169.9186991869917, + 1010.5691056910568 + ], + [ + 1171.7451523545706, + 1070.9141274238227 + ], + [ + 1147.8048780487804, + 1071.8699186991869 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 1113.2963988919669, + 945.4293628808865 + ], + [ + 1136.01108033241, + 945.7063711911358 + ], + [ + 1134.3490304709142, + 1131.3019390581717 + ], + [ + 1116.3434903047091, + 1147.9224376731302 + ], + [ + 1111.3573407202216, + 1142.1052631578948 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_9/instances/C97_D2_P2.json b/drafter_9/instances/C97_D2_P2.json index b9033784007718514b676274f18edf95776a6d41..035d3a02ee80e45992f18ec31b040ae61cfcb869 100644 --- a/drafter_9/instances/C97_D2_P2.json +++ b/drafter_9/instances/C97_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -341,6 +353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -367,6 +380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -393,6 +407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +1001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1069,6 +1109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1163,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1190,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1181,6 +1225,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1215,6 +1260,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1241,6 +1287,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1267,6 +1314,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1293,6 +1341,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1319,6 +1368,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1345,6 +1395,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1371,6 +1422,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1397,6 +1449,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1431,6 +1484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1465,6 +1519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1491,6 +1546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1517,6 +1573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1543,6 +1600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1569,6 +1627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1599,6 +1658,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_9/instances/C98_D2_P4.json b/drafter_9/instances/C98_D2_P4.json index 626e2ede1cea8ad5766be787b725b485688bc334..d0a2b7d1b0ae1bc8b7f3cf04b7df50a0d27d6d98 100644 --- a/drafter_9/instances/C98_D2_P4.json +++ b/drafter_9/instances/C98_D2_P4.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "gnd", "line_color": null, "fill_color": null, + "label": "gnd", "points": [ [ 494.0, @@ -24,13 +24,15 @@ 968.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "gnd", "line_color": null, "fill_color": null, + "label": "gnd", "points": [ [ 256.0, @@ -49,13 +51,15 @@ 971.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "gnd", "line_color": null, "fill_color": null, + "label": "gnd", "points": [ [ 134.0, @@ -74,13 +78,15 @@ 972.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 179.0, @@ -99,13 +105,15 @@ 473.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 704.0, @@ -124,13 +132,15 @@ 692.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 756.0, @@ -149,13 +159,15 @@ 821.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 557.0, @@ -174,13 +186,15 @@ 797.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 543.0, @@ -199,13 +213,15 @@ 779.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 537.639658848614, @@ -224,13 +240,15 @@ 823.0660980810235 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.fet", "line_color": null, "fill_color": null, + "label": "transistor.fet", "points": [ [ 491.0, @@ -249,13 +267,15 @@ 781.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.dc", "line_color": null, "fill_color": null, + "label": "voltage.dc", "points": [ [ 498.0, @@ -274,13 +294,15 @@ 879.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 552.0, @@ -299,13 +321,15 @@ 889.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 309.0, @@ -324,13 +348,15 @@ 869.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 330.0, @@ -349,13 +375,15 @@ 751.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 35.0, @@ -374,13 +402,15 @@ 810.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "voltage.dc", "line_color": null, "fill_color": null, + "label": "voltage.dc", "points": [ [ 140.0, @@ -399,13 +429,15 @@ 799.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 159.0, @@ -424,13 +456,15 @@ 704.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 301.0, @@ -449,13 +483,15 @@ 700.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 294.0, @@ -474,13 +510,15 @@ 807.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 298.0, @@ -499,13 +537,15 @@ 740.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 283.0, @@ -524,13 +564,15 @@ 844.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 383.0, @@ -549,13 +591,15 @@ 654.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 385.0, @@ -574,13 +618,15 @@ 695.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 530.0, @@ -599,13 +645,15 @@ 696.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 705.0, @@ -624,13 +672,15 @@ 962.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 737.0, @@ -649,13 +699,15 @@ 962.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 735.0, @@ -674,10 +726,16 @@ 708.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C98_D2_P4.jpg", + "imageData": null, + "imageHeight": 2016, + "imageWidth": 1134, "lineColor": [ 0, 255, @@ -689,9 +747,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C98_D2_P4.jpg", - "imageData": null, - "imageHeight": 2016, - "imageWidth": 1134 + ] } \ No newline at end of file diff --git a/drafter_9/instances/C99_D2_P1.json b/drafter_9/instances/C99_D2_P1.json index 205938b936b7c561e943c5de25aefe767008554e..bdd6a2bd6d57318125be89fd19216165f076c321 100644 --- a/drafter_9/instances/C99_D2_P1.json +++ b/drafter_9/instances/C99_D2_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -147,6 +150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -173,6 +177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -199,6 +204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -225,6 +231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -251,6 +258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -277,6 +285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -303,6 +312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -329,6 +339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -355,6 +366,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -381,6 +393,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -407,6 +420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -433,6 +447,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -459,6 +474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -485,6 +501,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -511,6 +528,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -537,6 +555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -563,6 +582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -589,6 +609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -615,6 +636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -641,6 +663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -667,6 +690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -693,6 +717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -719,6 +744,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -745,6 +771,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -771,6 +798,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -797,6 +825,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -823,6 +852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -849,6 +879,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -875,6 +906,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -901,6 +933,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -927,6 +960,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -953,6 +987,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -979,6 +1014,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1005,6 +1041,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1031,6 +1068,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1057,6 +1095,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1083,6 +1122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1109,6 +1149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1135,6 +1176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1161,6 +1203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1187,6 +1230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1213,6 +1257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1239,6 +1284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1289,6 +1335,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1315,6 +1362,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1341,6 +1389,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1367,6 +1416,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1393,6 +1443,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1419,6 +1470,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1445,6 +1497,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1471,6 +1524,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1497,6 +1551,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1523,6 +1578,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1549,6 +1605,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1575,6 +1632,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1601,6 +1659,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }