diff --git a/.gitignore b/.gitignore index 6f80546..9705b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.FCStd1 _local - +__pycache__/ +/dist/ diff --git a/README.md b/README.md index d2a1249..b819b14 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,6 @@ Ceci est un projet porté par l'association [Vélo solaire pour tous](https://vhelio.org/) visant à modéliser le [vhéliotech](https://vhelio.org/vheliotech/) en 3D avec FreeCAD. -Les fichiers présentés ici sont une version de travail. La [version "stable" la plus récente](https://communaute.vhelio.org/d/4-documentation-du-vheliotech-indice-001-mars-2022) est téléchargeable avec le reste de la documentation sur le site de la communauté du vhéliotech. +Les fichiers présentés ici sont une version **en cours de travail**. La [version "stable" la plus récente](https://communaute.vhelio.org/d/4-documentation-du-vheliotech-indice-001-mars-2022) est téléchargeable avec le reste de la documentation sur le site de la communauté du vhéliotech. Nous partageons cette version en cours de travail par soucis de transparence et pour faciliter les intéractions avec les personnes intéressées, mais tout ce qui est présenté dans ce dépôt est sujet à changement. L'utilisation des outils et les méthodes de travail sont décrites dans le [wiki](https://git.vhelio.org/vhelio/vheliotech-freecad/wiki). diff --git a/chaudronnerie/CHO02.FCStd b/chaudronnerie/CHO02.FCStd index f8b0e96..7038510 100644 Binary files a/chaudronnerie/CHO02.FCStd and b/chaudronnerie/CHO02.FCStd differ diff --git a/chaudronnerie/CHO03.FCStd b/chaudronnerie/CHO03.FCStd index c012b54..1e5f317 100644 Binary files a/chaudronnerie/CHO03.FCStd and b/chaudronnerie/CHO03.FCStd differ diff --git a/chaudronnerie/CHO04.FCStd b/chaudronnerie/CHO04.FCStd index 54e60d2..8ab2622 100644 Binary files a/chaudronnerie/CHO04.FCStd and b/chaudronnerie/CHO04.FCStd differ diff --git a/chaudronnerie/CHO06.FCStd b/chaudronnerie/CHO06.FCStd index ee659cd..5c88375 100644 Binary files a/chaudronnerie/CHO06.FCStd and b/chaudronnerie/CHO06.FCStd differ diff --git a/chaudronnerie/CHO08.FCStd b/chaudronnerie/CHO08.FCStd index 5932396..c5fdf47 100644 Binary files a/chaudronnerie/CHO08.FCStd and b/chaudronnerie/CHO08.FCStd differ diff --git a/chaudronnerie/CHO09.FCStd b/chaudronnerie/CHO09.FCStd index 93d18de..57115cc 100644 Binary files a/chaudronnerie/CHO09.FCStd and b/chaudronnerie/CHO09.FCStd differ diff --git a/chaudronnerie/CHO10.FCStd b/chaudronnerie/CHO10.FCStd index f091ab4..b3ab07f 100644 Binary files a/chaudronnerie/CHO10.FCStd and b/chaudronnerie/CHO10.FCStd differ diff --git a/chaudronnerie/CHO11.FCStd b/chaudronnerie/CHO11.FCStd index f0f0c75..489cb63 100644 Binary files a/chaudronnerie/CHO11.FCStd and b/chaudronnerie/CHO11.FCStd differ diff --git a/chaudronnerie/CHO13.FCStd b/chaudronnerie/CHO13.FCStd index 26e6d28..9e567aa 100644 Binary files a/chaudronnerie/CHO13.FCStd and b/chaudronnerie/CHO13.FCStd differ diff --git a/chaudronnerie/CHO14.FCStd b/chaudronnerie/CHO14.FCStd index 2535573..f683a76 100644 Binary files a/chaudronnerie/CHO14.FCStd and b/chaudronnerie/CHO14.FCStd differ diff --git a/chaudronnerie/CHO15.FCStd b/chaudronnerie/CHO15.FCStd index 569342d..11c77cc 100644 Binary files a/chaudronnerie/CHO15.FCStd and b/chaudronnerie/CHO15.FCStd differ diff --git a/chaudronnerie/CHO16.FCStd b/chaudronnerie/CHO16.FCStd index 5314b41..b878240 100644 Binary files a/chaudronnerie/CHO16.FCStd and b/chaudronnerie/CHO16.FCStd differ diff --git a/chaudronnerie/CHO17.FCStd b/chaudronnerie/CHO17.FCStd index c928225..b317364 100644 Binary files a/chaudronnerie/CHO17.FCStd and b/chaudronnerie/CHO17.FCStd differ diff --git a/chaudronnerie/CHO18.FCStd b/chaudronnerie/CHO18.FCStd index b23e464..dd5e37b 100644 Binary files a/chaudronnerie/CHO18.FCStd and b/chaudronnerie/CHO18.FCStd differ diff --git a/chaudronnerie/CHO19.FCStd b/chaudronnerie/CHO19.FCStd index 8b9fc0f..fc6c163 100644 Binary files a/chaudronnerie/CHO19.FCStd and b/chaudronnerie/CHO19.FCStd differ diff --git a/chaudronnerie/CHO20.FCStd b/chaudronnerie/CHO20.FCStd index c23f237..c4a5eda 100644 Binary files a/chaudronnerie/CHO20.FCStd and b/chaudronnerie/CHO20.FCStd differ diff --git a/chaudronnerie/CHO21.FCStd b/chaudronnerie/CHO21.FCStd index 2972c53..069a6e9 100644 Binary files a/chaudronnerie/CHO21.FCStd and b/chaudronnerie/CHO21.FCStd differ diff --git a/chaudronnerie/CHO22.FCStd b/chaudronnerie/CHO22.FCStd deleted file mode 100644 index d2cc692..0000000 Binary files a/chaudronnerie/CHO22.FCStd and /dev/null differ diff --git a/chaudronnerie/CHO23.FCStd b/chaudronnerie/CHO23.FCStd index 7e2c93b..b265bec 100644 Binary files a/chaudronnerie/CHO23.FCStd and b/chaudronnerie/CHO23.FCStd differ diff --git a/chaudronnerie/CHO24.FCStd b/chaudronnerie/CHO24.FCStd index 5890c25..c63e399 100644 Binary files a/chaudronnerie/CHO24.FCStd and b/chaudronnerie/CHO24.FCStd differ diff --git a/chaudronnerie/CHO25.FCStd b/chaudronnerie/CHO25.FCStd index 8828d27..14ef3c5 100644 Binary files a/chaudronnerie/CHO25.FCStd and b/chaudronnerie/CHO25.FCStd differ diff --git a/chaudronnerie/CHO26.FCStd b/chaudronnerie/CHO26.FCStd index 96e72ab..bec262b 100644 Binary files a/chaudronnerie/CHO26.FCStd and b/chaudronnerie/CHO26.FCStd differ diff --git a/chaudronnerie/CHO30.FCStd b/chaudronnerie/CHO30.FCStd index 2068c82..0b5bef6 100644 Binary files a/chaudronnerie/CHO30.FCStd and b/chaudronnerie/CHO30.FCStd differ diff --git a/chaudronnerie/CHO32.FCStd b/chaudronnerie/CHO32.FCStd index 34058d0..590170f 100644 Binary files a/chaudronnerie/CHO32.FCStd and b/chaudronnerie/CHO32.FCStd differ diff --git a/chaudronnerie/CHO34.FCStd b/chaudronnerie/CHO34.FCStd index 88ec5cd..c877885 100644 Binary files a/chaudronnerie/CHO34.FCStd and b/chaudronnerie/CHO34.FCStd differ diff --git a/chaudronnerie/CHO35.FCStd b/chaudronnerie/CHO35.FCStd index 8f6081d..7cf7bab 100644 Binary files a/chaudronnerie/CHO35.FCStd and b/chaudronnerie/CHO35.FCStd differ diff --git a/chaudronnerie/CHO38.FCStd b/chaudronnerie/CHO38.FCStd index 0876f7b..9a8deb1 100644 Binary files a/chaudronnerie/CHO38.FCStd and b/chaudronnerie/CHO38.FCStd differ diff --git a/chaudronnerie/CHO39.FCStd b/chaudronnerie/CHO39.FCStd index d25b779..d610f74 100644 Binary files a/chaudronnerie/CHO39.FCStd and b/chaudronnerie/CHO39.FCStd differ diff --git a/chaudronnerie/CHO40.FCStd b/chaudronnerie/CHO40.FCStd index 208ebfd..4df7450 100644 Binary files a/chaudronnerie/CHO40.FCStd and b/chaudronnerie/CHO40.FCStd differ diff --git a/chaudronnerie/CHO41.FCStd b/chaudronnerie/CHO41.FCStd index 82b4739..f3617e1 100644 Binary files a/chaudronnerie/CHO41.FCStd and b/chaudronnerie/CHO41.FCStd differ diff --git a/chaudronnerie/CHO42.FCStd b/chaudronnerie/CHO42.FCStd index f074807..16fbf7f 100644 Binary files a/chaudronnerie/CHO42.FCStd and b/chaudronnerie/CHO42.FCStd differ diff --git a/chaudronnerie/CHO43.FCStd b/chaudronnerie/CHO43.FCStd index 2917501..5694e3f 100644 Binary files a/chaudronnerie/CHO43.FCStd and b/chaudronnerie/CHO43.FCStd differ diff --git a/chaudronnerie/CHO44.FCStd b/chaudronnerie/CHO44.FCStd index c2d2ae6..98a4937 100644 Binary files a/chaudronnerie/CHO44.FCStd and b/chaudronnerie/CHO44.FCStd differ diff --git a/chaudronnerie/CHO45.FCStd b/chaudronnerie/CHO45.FCStd index 4e99a17..9824b31 100644 Binary files a/chaudronnerie/CHO45.FCStd and b/chaudronnerie/CHO45.FCStd differ diff --git a/chaudronnerie/CHO46.FCStd b/chaudronnerie/CHO46.FCStd index c4e730b..372223a 100644 Binary files a/chaudronnerie/CHO46.FCStd and b/chaudronnerie/CHO46.FCStd differ diff --git a/chaudronnerie/CHO47.FCStd b/chaudronnerie/CHO47.FCStd index fcf4702..5684529 100644 Binary files a/chaudronnerie/CHO47.FCStd and b/chaudronnerie/CHO47.FCStd differ diff --git a/chaudronnerie/CHO49.FCStd b/chaudronnerie/CHO49.FCStd index 7db1112..51b89a0 100644 Binary files a/chaudronnerie/CHO49.FCStd and b/chaudronnerie/CHO49.FCStd differ diff --git a/chaudronnerie/CHO50.FCStd b/chaudronnerie/CHO50.FCStd index 3279504..6325261 100644 Binary files a/chaudronnerie/CHO50.FCStd and b/chaudronnerie/CHO50.FCStd differ diff --git a/chaudronnerie/CHO51.FCStd b/chaudronnerie/CHO51.FCStd index 37266a5..e3cda3f 100644 Binary files a/chaudronnerie/CHO51.FCStd and b/chaudronnerie/CHO51.FCStd differ diff --git a/chaudronnerie/CHO52.FCStd b/chaudronnerie/CHO52.FCStd index a54a8b9..3f6cedc 100644 Binary files a/chaudronnerie/CHO52.FCStd and b/chaudronnerie/CHO52.FCStd differ diff --git a/chaudronnerie/CHO53.FCStd b/chaudronnerie/CHO53.FCStd index 3e92d33..b062e75 100644 Binary files a/chaudronnerie/CHO53.FCStd and b/chaudronnerie/CHO53.FCStd differ diff --git a/chaudronnerie/CHO54.FCStd b/chaudronnerie/CHO54.FCStd index 03aaac6..0c38778 100644 Binary files a/chaudronnerie/CHO54.FCStd and b/chaudronnerie/CHO54.FCStd differ diff --git a/chaudronnerie/CHO55.FCStd b/chaudronnerie/CHO55.FCStd index e4e4b06..aea7c2f 100644 Binary files a/chaudronnerie/CHO55.FCStd and b/chaudronnerie/CHO55.FCStd differ diff --git a/chaudronnerie/CHO56.FCStd b/chaudronnerie/CHO56.FCStd index 8ee5c56..af57c25 100644 Binary files a/chaudronnerie/CHO56.FCStd and b/chaudronnerie/CHO56.FCStd differ diff --git a/chaudronnerie/CHO57.FCStd b/chaudronnerie/CHO57.FCStd index ee1e1b9..fd6e323 100644 Binary files a/chaudronnerie/CHO57.FCStd and b/chaudronnerie/CHO57.FCStd differ diff --git a/chaudronnerie/CHO58.FCStd b/chaudronnerie/CHO58.FCStd index 3fefa3c..e327b48 100644 Binary files a/chaudronnerie/CHO58.FCStd and b/chaudronnerie/CHO58.FCStd differ diff --git a/chaudronnerie/CHO59.FCStd b/chaudronnerie/CHO59.FCStd new file mode 100644 index 0000000..bca3c88 Binary files /dev/null and b/chaudronnerie/CHO59.FCStd differ diff --git a/chaudronnerie/CHO5x.FCStd b/chaudronnerie/CHO5x.FCStd index 66c5306..f6f6faa 100644 Binary files a/chaudronnerie/CHO5x.FCStd and b/chaudronnerie/CHO5x.FCStd differ diff --git a/cycle/TSM15.FCStd b/cycle/TSM15.FCStd new file mode 100644 index 0000000..ec23260 Binary files /dev/null and b/cycle/TSM15.FCStd differ diff --git a/cycle/TSM16.FCStd b/cycle/TSM16.FCStd new file mode 100644 index 0000000..87ca9de Binary files /dev/null and b/cycle/TSM16.FCStd differ diff --git a/dessins/assemblage/dessin_assemblage_direction.FCStd b/dessins/assemblage/dessin_assemblage_direction.FCStd index c32524c..c17b4ad 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction.FCStd and b/dessins/assemblage/dessin_assemblage_direction.FCStd differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View001.png b/dessins/assemblage/dessin_assemblage_direction_raster/View001.png index 9966be7..3fa6d6c 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View001.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View001.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View002.png b/dessins/assemblage/dessin_assemblage_direction_raster/View002.png index e56ce61..191625c 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View002.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View002.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View003.png b/dessins/assemblage/dessin_assemblage_direction_raster/View003.png index 567d22e..75cd48b 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View003.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View003.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View004.png b/dessins/assemblage/dessin_assemblage_direction_raster/View004.png index e8380d3..6692677 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View004.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View004.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View005.png b/dessins/assemblage/dessin_assemblage_direction_raster/View005.png index 116fadd..cd1e549 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View005.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View005.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View006.png b/dessins/assemblage/dessin_assemblage_direction_raster/View006.png index 2a339dc..b8a8ed5 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View006.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View006.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View007.png b/dessins/assemblage/dessin_assemblage_direction_raster/View007.png index b6cccc9..291bae9 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View007.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View007.png differ diff --git a/dessins/assemblage/dessin_assemblage_direction_raster/View008.png b/dessins/assemblage/dessin_assemblage_direction_raster/View008.png index c2583b9..a1c7fc9 100644 Binary files a/dessins/assemblage/dessin_assemblage_direction_raster/View008.png and b/dessins/assemblage/dessin_assemblage_direction_raster/View008.png differ diff --git a/dessins/assemblage/dessins_assemblage_tendeur.FCStd b/dessins/assemblage/dessins_assemblage_tendeur.FCStd index a17fea9..415f79c 100644 Binary files a/dessins/assemblage/dessins_assemblage_tendeur.FCStd and b/dessins/assemblage/dessins_assemblage_tendeur.FCStd differ diff --git a/dessins/assemblage/dessins_assemblage_tendeur_raster/View.png b/dessins/assemblage/dessins_assemblage_tendeur_raster/View.png index 455753d..9dcff01 100644 Binary files a/dessins/assemblage/dessins_assemblage_tendeur_raster/View.png and b/dessins/assemblage/dessins_assemblage_tendeur_raster/View.png differ diff --git a/dessins/assemblage/dessins_assemblage_tendeur_raster/View002.png b/dessins/assemblage/dessins_assemblage_tendeur_raster/View002.png index 47b4d5c..80149ba 100644 Binary files a/dessins/assemblage/dessins_assemblage_tendeur_raster/View002.png and b/dessins/assemblage/dessins_assemblage_tendeur_raster/View002.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes.FCStd b/dessins/assemblage/dessins_assemblage_tubes.FCStd index 840072b..5e37e0a 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes.FCStd and b/dessins/assemblage/dessins_assemblage_tubes.FCStd differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View.png index 69f9c72..41fe4ed 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View001.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View001.png index 068c760..16125d8 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View001.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View001.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View002.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View002.png index b4feecd..8e94fad 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View002.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View002.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View003.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View003.png index 0046cba..f0e8adf 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View003.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View003.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View004.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View004.png index e82df3a..78c2932 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View004.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View004.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View005.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View005.png index 1b68ae9..32b6991 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View005.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View005.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View006.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View006.png index 92513bd..47e3da1 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View006.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View006.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View007.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View007.png index 79c524d..505e6bb 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View007.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View007.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View008.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View008.png index 9496e3e..85938e7 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View008.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View008.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View009.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View009.png index a7037a1..4d73d54 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View009.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View009.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View010.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View010.png index a6d8e9d..50e6f09 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View010.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View010.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View011.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View011.png index 6cc9bb9..0329b88 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View011.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View011.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View012.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View012.png index 832a3ee..e1c82bb 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View012.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View012.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View013.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View013.png index 3dbfa19..037906b 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View013.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View013.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View014.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View014.png index a94241c..a9f26fc 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View014.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View014.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View015.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View015.png index 85b34d3..9f40054 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View015.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View015.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View016.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View016.png index bfbd580..d673464 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View016.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View016.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View017.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View017.png index c7f6837..caeb31b 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View017.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View017.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View018.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View018.png index dac374f..e0b9e73 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View018.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View018.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View019.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View019.png index 80a9669..696cc4d 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View019.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View019.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View020.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View020.png index 68c1533..f1a4ced 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View020.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View020.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View021.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View021.png index c6bc662..37fadee 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View021.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View021.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View022.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View022.png index 4a42b79..58131c2 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View022.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View022.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View024.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View024.png index e9d2c60..ac012b6 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View024.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View024.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View025.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View025.png index c019ae9..67d512f 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View025.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View025.png differ diff --git a/dessins/assemblage/dessins_assemblage_tubes_raster/View026.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View026.png index b9a4c14..9438c68 100644 Binary files a/dessins/assemblage/dessins_assemblage_tubes_raster/View026.png and b/dessins/assemblage/dessins_assemblage_tubes_raster/View026.png differ diff --git a/dessins/general/dessins_general_ensemble.FCStd b/dessins/general/dessins_general_ensemble.FCStd index 3649b9e..cb6dd89 100644 Binary files a/dessins/general/dessins_general_ensemble.FCStd and b/dessins/general/dessins_general_ensemble.FCStd differ diff --git a/dessins/general/dessins_general_ensemble_raster/View.png b/dessins/general/dessins_general_ensemble_raster/View.png index ce3b658..0449c38 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View.png and b/dessins/general/dessins_general_ensemble_raster/View.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View001.png b/dessins/general/dessins_general_ensemble_raster/View001.png index 5a55a52..350df79 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View001.png and b/dessins/general/dessins_general_ensemble_raster/View001.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View002.png b/dessins/general/dessins_general_ensemble_raster/View002.png index 54aeba3..8494fea 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View002.png and b/dessins/general/dessins_general_ensemble_raster/View002.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View003.png b/dessins/general/dessins_general_ensemble_raster/View003.png index 93966ff..fb7281f 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View003.png and b/dessins/general/dessins_general_ensemble_raster/View003.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View004.png b/dessins/general/dessins_general_ensemble_raster/View004.png index a4c89d3..9b79ea4 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View004.png and b/dessins/general/dessins_general_ensemble_raster/View004.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View005.png b/dessins/general/dessins_general_ensemble_raster/View005.png index 36fb212..ec4ead2 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View005.png and b/dessins/general/dessins_general_ensemble_raster/View005.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View006.png b/dessins/general/dessins_general_ensemble_raster/View006.png index d7afac4..1138843 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View006.png and b/dessins/general/dessins_general_ensemble_raster/View006.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View007.png b/dessins/general/dessins_general_ensemble_raster/View007.png index 34688a3..8fd3e42 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View007.png and b/dessins/general/dessins_general_ensemble_raster/View007.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View008.png b/dessins/general/dessins_general_ensemble_raster/View008.png index 0eb6091..38e7194 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View008.png and b/dessins/general/dessins_general_ensemble_raster/View008.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View009.png b/dessins/general/dessins_general_ensemble_raster/View009.png index 45ff534..b923226 100644 Binary files a/dessins/general/dessins_general_ensemble_raster/View009.png and b/dessins/general/dessins_general_ensemble_raster/View009.png differ diff --git a/dessins/general/dessins_general_ensemble_raster/View010.png b/dessins/general/dessins_general_ensemble_raster/View010.png new file mode 100644 index 0000000..5198a45 Binary files /dev/null and b/dessins/general/dessins_general_ensemble_raster/View010.png differ diff --git a/electricite/ELE99.FCStd b/electricite/ELE99.FCStd index f352df6..8ff6e02 100644 Binary files a/electricite/ELE99.FCStd and b/electricite/ELE99.FCStd differ diff --git a/lib/humain.FCStd b/lib/humain.FCStd new file mode 100644 index 0000000..c37fe6d Binary files /dev/null and b/lib/humain.FCStd differ diff --git a/lib/humain_pilote.FCStd b/lib/humain_pilote.FCStd new file mode 100644 index 0000000..c37fe6d Binary files /dev/null and b/lib/humain_pilote.FCStd differ diff --git a/quincaillerie/QIN02.FCStd b/quincaillerie/QIN02.FCStd index 475d0ab..7bf45d4 100644 Binary files a/quincaillerie/QIN02.FCStd and b/quincaillerie/QIN02.FCStd differ diff --git a/quincaillerie/QIN03.FCStd b/quincaillerie/QIN03.FCStd index 90ebdfa..10c3e98 100644 Binary files a/quincaillerie/QIN03.FCStd and b/quincaillerie/QIN03.FCStd differ diff --git a/quincaillerie/QIN07.FCStd b/quincaillerie/QIN07.FCStd index 1c2e9eb..a8f0c40 100644 Binary files a/quincaillerie/QIN07.FCStd and b/quincaillerie/QIN07.FCStd differ diff --git a/quincaillerie/QIN17.FCStd b/quincaillerie/QIN17.FCStd index 56fbb73..5f7da62 100644 Binary files a/quincaillerie/QIN17.FCStd and b/quincaillerie/QIN17.FCStd differ diff --git a/quincaillerie/QIN18.FCStd b/quincaillerie/QIN18.FCStd index 1acfd77..aafec76 100644 Binary files a/quincaillerie/QIN18.FCStd and b/quincaillerie/QIN18.FCStd differ diff --git a/quincaillerie/QIN24.FCStd b/quincaillerie/QIN24.FCStd index ebf6019..8b7c85b 100644 Binary files a/quincaillerie/QIN24.FCStd and b/quincaillerie/QIN24.FCStd differ diff --git a/quincaillerie/QIN25.FCStd b/quincaillerie/QIN25.FCStd index 42d534f..d0ebf42 100644 Binary files a/quincaillerie/QIN25.FCStd and b/quincaillerie/QIN25.FCStd differ diff --git a/quincaillerie/QIN26.FCStd b/quincaillerie/QIN26.FCStd index f6b2528..a34435b 100644 Binary files a/quincaillerie/QIN26.FCStd and b/quincaillerie/QIN26.FCStd differ diff --git a/quincaillerie/QIN49.FCStd b/quincaillerie/QIN49.FCStd index 1550dca..2ca8ebb 100644 Binary files a/quincaillerie/QIN49.FCStd and b/quincaillerie/QIN49.FCStd differ diff --git a/quincaillerie/QIN51.FCStd b/quincaillerie/QIN51.FCStd index b306edd..99961f6 100644 Binary files a/quincaillerie/QIN51.FCStd and b/quincaillerie/QIN51.FCStd differ diff --git a/quincaillerie/QIN52.FCStd b/quincaillerie/QIN52.FCStd index 7bf8ad9..3ba5921 100644 Binary files a/quincaillerie/QIN52.FCStd and b/quincaillerie/QIN52.FCStd differ diff --git a/quincaillerie/QIN93.FCStd b/quincaillerie/QIN93.FCStd new file mode 100644 index 0000000..3626d50 Binary files /dev/null and b/quincaillerie/QIN93.FCStd differ diff --git a/quincaillerie/visserie/QIN04.FCStd b/quincaillerie/visserie/QIN04.FCStd index a3a0844..10d21b8 100644 Binary files a/quincaillerie/visserie/QIN04.FCStd and b/quincaillerie/visserie/QIN04.FCStd differ diff --git a/quincaillerie/visserie/QIN06.FCStd b/quincaillerie/visserie/QIN06.FCStd index 1afac8f..4501071 100644 Binary files a/quincaillerie/visserie/QIN06.FCStd and b/quincaillerie/visserie/QIN06.FCStd differ diff --git a/quincaillerie/visserie/QIN12.FCStd b/quincaillerie/visserie/QIN12.FCStd index 3583d5c..937cfb0 100644 Binary files a/quincaillerie/visserie/QIN12.FCStd and b/quincaillerie/visserie/QIN12.FCStd differ diff --git a/quincaillerie/visserie/QIN13.FCStd b/quincaillerie/visserie/QIN13.FCStd index 9a4c015..be72f2d 100644 Binary files a/quincaillerie/visserie/QIN13.FCStd and b/quincaillerie/visserie/QIN13.FCStd differ diff --git a/quincaillerie/visserie/QIN14.FCStd b/quincaillerie/visserie/QIN14.FCStd index 36922b1..a861b6d 100644 Binary files a/quincaillerie/visserie/QIN14.FCStd and b/quincaillerie/visserie/QIN14.FCStd differ diff --git a/quincaillerie/visserie/QIN20.FCStd b/quincaillerie/visserie/QIN20.FCStd index 3afd86d..6a60b66 100644 Binary files a/quincaillerie/visserie/QIN20.FCStd and b/quincaillerie/visserie/QIN20.FCStd differ diff --git a/quincaillerie/visserie/QIN23.FCStd b/quincaillerie/visserie/QIN23.FCStd index 1085383..a20365d 100644 Binary files a/quincaillerie/visserie/QIN23.FCStd and b/quincaillerie/visserie/QIN23.FCStd differ diff --git a/quincaillerie/visserie/QIN28.FCStd b/quincaillerie/visserie/QIN28.FCStd index 6d12106..b427f2a 100644 Binary files a/quincaillerie/visserie/QIN28.FCStd and b/quincaillerie/visserie/QIN28.FCStd differ diff --git a/quincaillerie/visserie/QIN29.FCStd b/quincaillerie/visserie/QIN29.FCStd index 8d456ad..7b30558 100644 Binary files a/quincaillerie/visserie/QIN29.FCStd and b/quincaillerie/visserie/QIN29.FCStd differ diff --git a/quincaillerie/visserie/QIN32.FCStd b/quincaillerie/visserie/QIN32.FCStd index c2e08b1..0d56746 100644 Binary files a/quincaillerie/visserie/QIN32.FCStd and b/quincaillerie/visserie/QIN32.FCStd differ diff --git a/quincaillerie/visserie/QIN33.FCStd b/quincaillerie/visserie/QIN33.FCStd index 5679716..a2438e5 100644 Binary files a/quincaillerie/visserie/QIN33.FCStd and b/quincaillerie/visserie/QIN33.FCStd differ diff --git a/quincaillerie/visserie/QIN34.FCStd b/quincaillerie/visserie/QIN34.FCStd index 5052388..07f7da8 100644 Binary files a/quincaillerie/visserie/QIN34.FCStd and b/quincaillerie/visserie/QIN34.FCStd differ diff --git a/quincaillerie/visserie/QIN35.FCStd b/quincaillerie/visserie/QIN35.FCStd index 2187d6c..ede8f45 100644 Binary files a/quincaillerie/visserie/QIN35.FCStd and b/quincaillerie/visserie/QIN35.FCStd differ diff --git a/quincaillerie/visserie/QIN36.FCStd b/quincaillerie/visserie/QIN36.FCStd index 7f36ba3..811ac5f 100644 Binary files a/quincaillerie/visserie/QIN36.FCStd and b/quincaillerie/visserie/QIN36.FCStd differ diff --git a/quincaillerie/visserie/QIN39.FCStd b/quincaillerie/visserie/QIN39.FCStd index af12bba..7c5201b 100644 Binary files a/quincaillerie/visserie/QIN39.FCStd and b/quincaillerie/visserie/QIN39.FCStd differ diff --git a/quincaillerie/visserie/QIN40.FCStd b/quincaillerie/visserie/QIN40.FCStd index 9ee037a..627f068 100644 Binary files a/quincaillerie/visserie/QIN40.FCStd and b/quincaillerie/visserie/QIN40.FCStd differ diff --git a/quincaillerie/visserie/QIN41.FCStd b/quincaillerie/visserie/QIN41.FCStd index 4774683..f907c80 100644 Binary files a/quincaillerie/visserie/QIN41.FCStd and b/quincaillerie/visserie/QIN41.FCStd differ diff --git a/quincaillerie/visserie/QIN43.FCStd b/quincaillerie/visserie/QIN43.FCStd index a0a703d..3508d16 100644 Binary files a/quincaillerie/visserie/QIN43.FCStd and b/quincaillerie/visserie/QIN43.FCStd differ diff --git a/quincaillerie/visserie/QIN44.FCStd b/quincaillerie/visserie/QIN44.FCStd index a330951..52a7ce8 100644 Binary files a/quincaillerie/visserie/QIN44.FCStd and b/quincaillerie/visserie/QIN44.FCStd differ diff --git a/quincaillerie/visserie/QIN45.FCStd b/quincaillerie/visserie/QIN45.FCStd index db90e3e..1c7e8b9 100644 Binary files a/quincaillerie/visserie/QIN45.FCStd and b/quincaillerie/visserie/QIN45.FCStd differ diff --git a/quincaillerie/visserie/QIN46.FCStd b/quincaillerie/visserie/QIN46.FCStd index 830f6c2..42c60ca 100644 Binary files a/quincaillerie/visserie/QIN46.FCStd and b/quincaillerie/visserie/QIN46.FCStd differ diff --git a/quincaillerie/visserie/QIN50.FCStd b/quincaillerie/visserie/QIN50.FCStd index 18e41f6..dd05c0b 100644 Binary files a/quincaillerie/visserie/QIN50.FCStd and b/quincaillerie/visserie/QIN50.FCStd differ diff --git a/quincaillerie/visserie/QIN56.FCStd b/quincaillerie/visserie/QIN56.FCStd index def1129..d7430dd 100644 Binary files a/quincaillerie/visserie/QIN56.FCStd and b/quincaillerie/visserie/QIN56.FCStd differ diff --git a/quincaillerie/visserie/QIN60.FCStd b/quincaillerie/visserie/QIN60.FCStd index 20d77ef..fd8bf6b 100644 Binary files a/quincaillerie/visserie/QIN60.FCStd and b/quincaillerie/visserie/QIN60.FCStd differ diff --git a/quincaillerie/visserie/QIN65.FCStd b/quincaillerie/visserie/QIN65.FCStd index a8b797c..704aba4 100644 Binary files a/quincaillerie/visserie/QIN65.FCStd and b/quincaillerie/visserie/QIN65.FCStd differ diff --git a/quincaillerie/visserie/QIN90.FCStd b/quincaillerie/visserie/QIN90.FCStd index 284945f..62f4c06 100644 Binary files a/quincaillerie/visserie/QIN90.FCStd and b/quincaillerie/visserie/QIN90.FCStd differ diff --git a/quincaillerie/visserie/QIN91.FCStd b/quincaillerie/visserie/QIN91.FCStd new file mode 100644 index 0000000..b95661b Binary files /dev/null and b/quincaillerie/visserie/QIN91.FCStd differ diff --git a/quincaillerie/visserie/QIN92.FCStd b/quincaillerie/visserie/QIN92.FCStd new file mode 100644 index 0000000..ec991fc Binary files /dev/null and b/quincaillerie/visserie/QIN92.FCStd differ diff --git a/roues/ROU99.FCStd b/roues/ROU99.FCStd index fa1c296..fd379ca 100644 Binary files a/roues/ROU99.FCStd and b/roues/ROU99.FCStd differ diff --git a/sous-assemblages/MoteurM400.FCStd b/sous-assemblages/MoteurM400.FCStd index 3c46c31..8ddf78c 100644 Binary files a/sous-assemblages/MoteurM400.FCStd and b/sous-assemblages/MoteurM400.FCStd differ diff --git a/sous-assemblages/SiegeAdulteLowCost.FCStd b/sous-assemblages/SiegeAdulteLowCost.FCStd new file mode 100644 index 0000000..ac1b5ca Binary files /dev/null and b/sous-assemblages/SiegeAdulteLowCost.FCStd differ diff --git a/sous-assemblages/SiegeAdulteSansFixation.FCStd b/sous-assemblages/SiegeAdulteSansFixation.FCStd new file mode 100644 index 0000000..17c2005 Binary files /dev/null and b/sous-assemblages/SiegeAdulteSansFixation.FCStd differ diff --git a/textiles/TXT02.FCStd b/textiles/TXT02.FCStd index 06e7fb7..fd45587 100644 Binary files a/textiles/TXT02.FCStd and b/textiles/TXT02.FCStd differ diff --git a/textiles/TXT03.FCStd b/textiles/TXT03.FCStd index 8ddc65a..9b74802 100644 Binary files a/textiles/TXT03.FCStd and b/textiles/TXT03.FCStd differ diff --git a/tools/export-all-parts.py b/tools/export-all-parts.py index 436b2fb..c819107 100644 --- a/tools/export-all-parts.py +++ b/tools/export-all-parts.py @@ -1,16 +1,17 @@ -freecad_install_path = '/home/youen/dev/FreeCAD-asm3-Daily-Conda-Py3.10-20221128-glibc2.12-x86_64' - -import sys -sys.path.insert(0,freecad_install_path + '/usr/lib') - from pathlib import Path +import os import FreeCAD as App import Import +import ImportGui + +project_folder = os.getcwd() +output_folder = project_folder + '/dist/STEP' +assemblies_output_folder = project_folder + '/dist/FCStd' -script_folder = os.path.dirname(__file__) -project_folder = os.path.realpath(script_folder + '/..') -output_folder = project_folder + '-STEP' +def close_all_docs(): + while len(FreeCAD.listDocuments().values()) > 0: + FreeCAD.closeDocument(list(FreeCAD.listDocuments().values())[0].Name) def convert_file(file_name, output_format): doc = App.open(project_folder + '/' + file_name) @@ -58,22 +59,96 @@ def convert_file(file_name, output_format): if not os.path.exists(output_dir): os.makedirs(output_dir) - Import.export([main_object], output_path) + if output_format.lower() == 'stpz': + import stepZ + stepZ.export([main_object], output_path) + else: + Import.export([main_object], output_path) - # close all documents - while len(FreeCAD.listDocuments().values()) > 0: - FreeCAD.closeDocument(list(FreeCAD.listDocuments().values())[0].Name) + close_all_docs() + +def convert_assembly(file_name, output_format): + print("Exporting assembly " + file_name + "...") + + doc = App.open(project_folder + '/' + file_name) + + root_objects = [] + main_object = None + + # remove all objects that are not visible, or not in the TypeId whitelist, because we don't want to export those + need_check_objects = True + while need_check_objects: + need_check_objects = False + for obj in doc.Objects: + if not obj.Visibility or obj.TypeId not in ['Part::Feature', 'Part::FeaturePython', 'PartDesign::Body', 'Part::Mirroring', 'Part::Cut', 'Part::Part2DObjectPython', 'Part::MultiFuse', 'Part::Loft', 'Part::Torus', 'Part::Cylinder', 'App::DocumentObjectGroup', 'App::Part', 'App::Link']: + #print('removing ' + obj.Name + ' ('+obj.Label+')') + doc.removeObject(obj.Name) + need_check_objects = True + break + + for obj in doc.Objects: + if len(obj.Parents) == 0: + #print(obj.Label) + root_objects.append(obj) + if obj.Label == doc.Name: + main_object = obj + + if main_object is None and len(root_objects) == 1: + main_object = root_objects[0] + + if main_object is None: + raise Exception("Can't find main assembly in file " + file_name + " (found " + str(len(root_objects)) + " root object(s), none named like the document " + doc.Name + ")") + + output_path = output_folder + '/' + os.path.dirname(file_name) + '/' + Path(file_name).stem + '.' + output_format + output_dir = os.path.dirname(output_path) + if not os.path.exists(output_dir): + os.makedirs(output_dir) + + if output_format.lower() == 'stpz': + import stepZ + stepZ.export([main_object], output_path) + else: + ImportGui.export([main_object], output_path) + + close_all_docs() + +def export_configuration(doc, config_name, output_filename): + print('Generating assembly for configuration '+config_name+'...') + + Gui.Selection.clearSelection() + Gui.Selection.addSelection('vheliotech','Model','Configurations.'+doc.getObjectsByLabel(config_name)[0].Name+'.') + Gui.runCommand('Asm4_applyConfiguration') + Gui.Selection.clearSelection() + + doc.saveAs(assemblies_output_folder + '/' + output_filename + '.FCStd') + +try: + folders = [ + 'chaudronnerie', + 'tubes' + ] + + for folder in folders: + files = os.listdir(project_folder + '/' + folder) + for source_file in files: + if not source_file.endswith('.FCStd'): continue + source_path = folder + '/' + source_file + print(source_path) + convert_file(source_path, 'step') -folders = [ - 'chaudronnerie', - 'tubes' -] + convert_assembly('vheliotech.FCStd', 'step') + + '''doc = App.open(project_folder + '/vheliotech.FCStd') + export_configuration(doc, 'Config_Integrale', 'vheliotech-config-integrale') + export_configuration(doc, 'Config_Solaire', 'vheliotech-config-solaire') + export_configuration(doc, 'Config_Motorisee', 'vheliotech-config-motorisee') + export_configuration(doc, 'Config_Basique', 'vheliotech-config-basique') + close_all_docs()''' + +except Exception as e: + print(e) -for folder in folders: - files = os.listdir(project_folder + '/' + folder) - for source_file in files: - if not source_file.endswith('.FCStd'): continue - source_path = folder + '/' + source_file - print(source_path) - convert_file(source_path, 'step') +# exit FreeCAD +close_all_docs() +FreeCADGui.getMainWindow().close() diff --git a/tools/export-all-parts.sh b/tools/export-all-parts.sh new file mode 100755 index 0000000..cc116e8 --- /dev/null +++ b/tools/export-all-parts.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +# Set the path to your FreeCAD executable here +FREECAD=~/dev/FreeCAD-asm3-Daily-Conda-Py3.10-20221128-glibc2.12-x86_64.AppImage + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +cd $SCRIPT_DIR/.. + +rm -rf ./dist + +# Check script syntax before starting freecad +python3 -m py_compile tools/export-all-parts.py + +# Export all versioned files +mkdir -p dist/FCStd +git archive HEAD . | tar -x -C dist/FCStd + +# Start freecad to run the script. We must start freecad with GUI (otherwise we can't export colors). We start it hidden in a virtual framebuffer (xvfb) so that it can run cleanly in the background. +xvfb-run $FREECAD tools/export-all-parts.py diff --git a/tubes/E16.FCStd b/tubes/E16.FCStd index 95ecef3..f8ca159 100644 Binary files a/tubes/E16.FCStd and b/tubes/E16.FCStd differ diff --git a/tubes/E20.FCStd b/tubes/E20.FCStd index eaacf35..6f83adc 100644 Binary files a/tubes/E20.FCStd and b/tubes/E20.FCStd differ diff --git a/tubes/E21.FCStd b/tubes/E21.FCStd index 6622e6f..18dfa13 100644 Binary files a/tubes/E21.FCStd and b/tubes/E21.FCStd differ diff --git a/tubes/E36.FCStd b/tubes/E36.FCStd index ff622c1..42f2d99 100644 Binary files a/tubes/E36.FCStd and b/tubes/E36.FCStd differ diff --git a/tubes/L00.FCStd b/tubes/L00.FCStd index 875eb08..f2f7424 100644 Binary files a/tubes/L00.FCStd and b/tubes/L00.FCStd differ diff --git a/tubes/L01.FCStd b/tubes/L01.FCStd index 4049cde..fb7b757 100644 Binary files a/tubes/L01.FCStd and b/tubes/L01.FCStd differ diff --git a/tubes/L02.FCStd b/tubes/L02.FCStd index f726f31..596a967 100644 Binary files a/tubes/L02.FCStd and b/tubes/L02.FCStd differ diff --git a/tubes/L03.FCStd b/tubes/L03.FCStd index 7f8e78c..e3bc809 100644 Binary files a/tubes/L03.FCStd and b/tubes/L03.FCStd differ diff --git a/tubes/L04.FCStd b/tubes/L04.FCStd index f3ab7b1..67bf70d 100644 Binary files a/tubes/L04.FCStd and b/tubes/L04.FCStd differ diff --git a/tubes/L05.FCStd b/tubes/L05.FCStd index a2111de..b08073b 100644 Binary files a/tubes/L05.FCStd and b/tubes/L05.FCStd differ diff --git a/tubes/L06.FCStd b/tubes/L06.FCStd index 3b946bd..5527e7f 100644 Binary files a/tubes/L06.FCStd and b/tubes/L06.FCStd differ diff --git a/tubes/L07.FCStd b/tubes/L07.FCStd index d537033..a9977a7 100644 Binary files a/tubes/L07.FCStd and b/tubes/L07.FCStd differ diff --git a/tubes/L08.FCStd b/tubes/L08.FCStd index 185396c..f997f75 100644 Binary files a/tubes/L08.FCStd and b/tubes/L08.FCStd differ diff --git a/tubes/L09.FCStd b/tubes/L09.FCStd index 1e9dd2e..2b9a1b7 100644 Binary files a/tubes/L09.FCStd and b/tubes/L09.FCStd differ diff --git a/tubes/L10.FCStd b/tubes/L10.FCStd index dcdb368..f3807fa 100644 Binary files a/tubes/L10.FCStd and b/tubes/L10.FCStd differ diff --git a/tubes/L11.FCStd b/tubes/L11.FCStd index 44cfb44..a1e4f3b 100644 Binary files a/tubes/L11.FCStd and b/tubes/L11.FCStd differ diff --git a/tubes/L12.FCStd b/tubes/L12.FCStd index ea65fc4..48df26f 100644 Binary files a/tubes/L12.FCStd and b/tubes/L12.FCStd differ diff --git a/tubes/M00.FCStd b/tubes/M00.FCStd index 4c0fb4a..39dcb20 100644 Binary files a/tubes/M00.FCStd and b/tubes/M00.FCStd differ diff --git a/tubes/M01.FCStd b/tubes/M01.FCStd index cf60acc..879711f 100644 Binary files a/tubes/M01.FCStd and b/tubes/M01.FCStd differ diff --git a/tubes/M02.FCStd b/tubes/M02.FCStd index 24ebef5..62ab8bf 100644 Binary files a/tubes/M02.FCStd and b/tubes/M02.FCStd differ diff --git a/tubes/M03.FCStd b/tubes/M03.FCStd index 38f4b74..a5bf622 100644 Binary files a/tubes/M03.FCStd and b/tubes/M03.FCStd differ diff --git a/tubes/M04.FCStd b/tubes/M04.FCStd index d94fe6f..716b10b 100644 Binary files a/tubes/M04.FCStd and b/tubes/M04.FCStd differ diff --git a/tubes/M05.FCStd b/tubes/M05.FCStd index 434d5e5..8639e89 100644 Binary files a/tubes/M05.FCStd and b/tubes/M05.FCStd differ diff --git a/tubes/M06.FCStd b/tubes/M06.FCStd index 7782cb2..6b92978 100644 Binary files a/tubes/M06.FCStd and b/tubes/M06.FCStd differ diff --git a/tubes/M07.FCStd b/tubes/M07.FCStd index 89381a3..ed66188 100644 Binary files a/tubes/M07.FCStd and b/tubes/M07.FCStd differ diff --git a/tubes/R00.FCStd b/tubes/R00.FCStd index 79674ed..10a2a45 100644 Binary files a/tubes/R00.FCStd and b/tubes/R00.FCStd differ diff --git a/tubes/R01.FCStd b/tubes/R01.FCStd index 1b352ca..7d112ad 100644 Binary files a/tubes/R01.FCStd and b/tubes/R01.FCStd differ diff --git a/tubes/R02.FCStd b/tubes/R02.FCStd index 6740fd2..8a61c3e 100644 Binary files a/tubes/R02.FCStd and b/tubes/R02.FCStd differ diff --git a/tubes/R03.FCStd b/tubes/R03.FCStd index 10c0259..48d41c4 100644 Binary files a/tubes/R03.FCStd and b/tubes/R03.FCStd differ diff --git a/tubes/R04.FCStd b/tubes/R04.FCStd new file mode 100644 index 0000000..9409b0b Binary files /dev/null and b/tubes/R04.FCStd differ diff --git a/tubes/T00.FCStd b/tubes/T00.FCStd index 7c542d5..b6ece76 100644 Binary files a/tubes/T00.FCStd and b/tubes/T00.FCStd differ diff --git a/tubes/T01.FCStd b/tubes/T01.FCStd index 5eb3dee..a9d287b 100644 Binary files a/tubes/T01.FCStd and b/tubes/T01.FCStd differ diff --git a/tubes/T02.FCStd b/tubes/T02.FCStd index 701d8f1..65ef2d3 100644 Binary files a/tubes/T02.FCStd and b/tubes/T02.FCStd differ diff --git a/tubes/T03.FCStd b/tubes/T03.FCStd index 215ff79..10447d3 100644 Binary files a/tubes/T03.FCStd and b/tubes/T03.FCStd differ diff --git a/tubes/T04.FCStd b/tubes/T04.FCStd index f00331f..85f5044 100644 Binary files a/tubes/T04.FCStd and b/tubes/T04.FCStd differ diff --git a/tubes/T05.FCStd b/tubes/T05.FCStd index 34c202d..4ec4fcf 100644 Binary files a/tubes/T05.FCStd and b/tubes/T05.FCStd differ diff --git a/tubes/T06.FCStd b/tubes/T06.FCStd index ec42312..4379405 100644 Binary files a/tubes/T06.FCStd and b/tubes/T06.FCStd differ diff --git a/tubes/T07.FCStd b/tubes/T07.FCStd index ca51e48..32e0c35 100644 Binary files a/tubes/T07.FCStd and b/tubes/T07.FCStd differ diff --git a/tubes/T08.FCStd b/tubes/T08.FCStd index c0825c9..a5c4da0 100644 Binary files a/tubes/T08.FCStd and b/tubes/T08.FCStd differ diff --git a/tubes/T09.FCStd b/tubes/T09.FCStd index 516f0c4..e7aad82 100644 Binary files a/tubes/T09.FCStd and b/tubes/T09.FCStd differ diff --git a/tubes/T10.FCStd b/tubes/T10.FCStd index 4b8877f..385a799 100644 Binary files a/tubes/T10.FCStd and b/tubes/T10.FCStd differ diff --git a/tubes/T11.FCStd b/tubes/T11.FCStd index b45836c..f65ef61 100644 Binary files a/tubes/T11.FCStd and b/tubes/T11.FCStd differ diff --git a/tubes/T12.FCStd b/tubes/T12.FCStd index 69962c6..defb230 100644 Binary files a/tubes/T12.FCStd and b/tubes/T12.FCStd differ diff --git a/tubes/T13.FCStd b/tubes/T13.FCStd index d7e847a..00b8d9b 100644 Binary files a/tubes/T13.FCStd and b/tubes/T13.FCStd differ diff --git a/tubes/T14.FCStd b/tubes/T14.FCStd index 7445148..241cc0d 100644 Binary files a/tubes/T14.FCStd and b/tubes/T14.FCStd differ diff --git a/tubes/T15.FCStd b/tubes/T15.FCStd index 873ac28..6873488 100644 Binary files a/tubes/T15.FCStd and b/tubes/T15.FCStd differ diff --git a/tubes/T16.FCStd b/tubes/T16.FCStd index d876838..496225f 100644 Binary files a/tubes/T16.FCStd and b/tubes/T16.FCStd differ diff --git a/tubes/T17.FCStd b/tubes/T17.FCStd index 6d438cc..7f22661 100644 Binary files a/tubes/T17.FCStd and b/tubes/T17.FCStd differ diff --git a/tubes/T18.FCStd b/tubes/T18.FCStd index ee71e1e..0bc98c5 100644 Binary files a/tubes/T18.FCStd and b/tubes/T18.FCStd differ diff --git a/tubes/T19.FCStd b/tubes/T19.FCStd index 6558627..8406c5a 100644 Binary files a/tubes/T19.FCStd and b/tubes/T19.FCStd differ diff --git a/tubes/T20.FCStd b/tubes/T20.FCStd index e55af7e..f51032a 100644 Binary files a/tubes/T20.FCStd and b/tubes/T20.FCStd differ diff --git a/tubes/T21.FCStd b/tubes/T21.FCStd index e4f9698..8c12ca7 100644 Binary files a/tubes/T21.FCStd and b/tubes/T21.FCStd differ diff --git a/tubes/T22.FCStd b/tubes/T22.FCStd index 252c560..c935994 100644 Binary files a/tubes/T22.FCStd and b/tubes/T22.FCStd differ diff --git a/tubes/T23.FCStd b/tubes/T23.FCStd index 177cf4c..dbf6d06 100644 Binary files a/tubes/T23.FCStd and b/tubes/T23.FCStd differ diff --git a/tubes/T24.FCStd b/tubes/T24.FCStd new file mode 100644 index 0000000..59c94b4 Binary files /dev/null and b/tubes/T24.FCStd differ diff --git a/tubes/T25.FCStd b/tubes/T25.FCStd new file mode 100644 index 0000000..ce4cd39 Binary files /dev/null and b/tubes/T25.FCStd differ diff --git a/vheliotech-basique.FCStd b/vheliotech-basique.FCStd deleted file mode 100644 index a883d92..0000000 Binary files a/vheliotech-basique.FCStd and /dev/null differ diff --git a/vheliotech-basique_list.csv b/vheliotech-basique_list.csv deleted file mode 100644 index 6e772ca..0000000 --- a/vheliotech-basique_list.csv +++ /dev/null @@ -1,88 +0,0 @@ -Document, Reference, Count -QIN53, QIN53, 6 -CHO47, CHO47, 2 -CHO44, CHO44, 1 -CHO46, CHO46, 2 -T18, T18, 2 -L04, L04, 2 -M04, M04, 1 -T05, T05, 2 -M05, M05, 2 -L05, L05, 1 -L02, L02, 2 -M02, M02, 2 -M03, M03, 1 -L00, L00, 1 -T13, T13, 2 -M06, M06, 2 -CHO45, CHO45, 1 -M01, M01, 2 -L07, L07, 2 -T11, T11, 1 -L01, L01, 1 -T12, T12, 1 -L06, L06, 1 -T16, T16, 1 -CHO17, CHO17, 12 -CHO13, CHO13, 1 -CHO14, CHO14, 1 -ROU99, ROU99, 1 -T04, T04, 1 -ROU98, ROU98, 2 -CHO34, CHO34, 3 -FRN04, FRN04, 3 -CHO48, CHO48, 1 -CHO04, CHO04, 1 -CHO51, CHO51, 12 -CHO10, CHO10, 1 -CHO55, CHO55, 1 -CHO5x, CHO5x, 2 -CHO56, CHO56, 1 -QIN35, QIN35, 63 -QIN06, QIN06, 208 -QIN23, QIN23, 4 -TXT04, TXT04, 1 -TXT05, TXT05, 1 -CHO26, CHO26, 1 -CHO11, CHO11, 1 -R00, R00, 2 -R01, R01, 2 -R03, R03, 1 -T14, T14, 1 -CHO16, CHO16, 2 -CHO25, CHO25, 1 -CHO15, CHO15, 2 -CHO21, CHO21, 1 -CHO23, CHO23, 1 -QIN45, QIN45, 2 -QIN12, QIN12, 272 -QIN60, QIN60, 74 -QIN90, QIN90, 13 -CHO49, CHO49, 3 -CHO50, CHO50, 4 -QIN14, QIN14, 14 -QIN40, QIN40, 30 -QIN65, QIN65, 7 -QIN33, QIN33, 2 -QIN36, QIN36, 4 -QIN34, QIN34, 6 -E21, E21, 6 -QIN32, QIN32, 1 -E16, E16, 1 -QIN50, QIN50, 4 -QIN39, QIN39, 2 -QIN41, QIN41, 8 -QIN29, QIN29, 4 -QIN44, QIN44, 4 -QIN43, QIN43, 2 -FRN03, FRN03, 2 -TXT03, TXT03, 1 -TXT02, TXT02, 1 -CHO53, CHO53, 2 -QIN49, QIN49, 4 -TSM02, TSM02, 1 -QIN20, QIN20, 3 -TSM01, TSM01, 1 -QIN18, QIN18, 1 -varTmpDoc_9, QIN24, 1 -CHO57, CHO57, 1 diff --git a/vheliotech-motorise.FCStd b/vheliotech-motorise.FCStd deleted file mode 100644 index 2b55ea7..0000000 Binary files a/vheliotech-motorise.FCStd and /dev/null differ diff --git a/vheliotech-motorise_list.csv b/vheliotech-motorise_list.csv deleted file mode 100644 index b4e194d..0000000 --- a/vheliotech-motorise_list.csv +++ /dev/null @@ -1,102 +0,0 @@ -Document, Reference, Count -QIN53, QIN53, 6 -CHO47, CHO47, 2 -CHO44, CHO44, 1 -CHO46, CHO46, 2 -T18, T18, 2 -L04, L04, 2 -M04, M04, 1 -T05, T05, 2 -M05, M05, 2 -L05, L05, 1 -L02, L02, 2 -M02, M02, 2 -M03, M03, 1 -L00, L00, 1 -T13, T13, 2 -M06, M06, 2 -CHO45, CHO45, 1 -M01, M01, 2 -L07, L07, 2 -T11, T11, 1 -L01, L01, 1 -T12, T12, 1 -L06, L06, 1 -T16, T16, 1 -CHO17, CHO17, 12 -CHO13, CHO13, 1 -CHO14, CHO14, 1 -ROU99, ROU99, 1 -T04, T04, 1 -ROU98, ROU98, 2 -CHO34, CHO34, 3 -FRN04, FRN04, 3 -CHO48, CHO48, 1 -CHO04, CHO04, 1 -CHO51, CHO51, 12 -CHO30, CHO30, 1 -CHO31, CHO31, 1 -CHO32, CHO32, 1 -CHO33, CHO33, 1 -CHO10, CHO10, 1 -CHO55, CHO55, 2 -CHO5x, CHO5x, 4 -CHO56, CHO56, 2 -QIN35, QIN35, 73 -QIN06, QIN06, 224 -QIN23, QIN23, 8 -TXT04, TXT04, 2 -TXT05, TXT05, 2 -CHO24, CHO24, 1 -CHO26, CHO26, 1 -ELE04, ELE04, 1 -CHO11, CHO11, 1 -R00, R00, 2 -R01, R01, 2 -R03, R03, 1 -T14, T14, 1 -CHO16, CHO16, 2 -CHO25, CHO25, 1 -CHO15, CHO15, 2 -CHO21, CHO21, 1 -CHO23, CHO23, 1 -QIN45, QIN45, 2 -QIN12, QIN12, 276 -QIN60, QIN60, 74 -QIN90, QIN90, 13 -CHO49, CHO49, 3 -CHO50, CHO50, 4 -QIN14, QIN14, 22 -QIN40, QIN40, 32 -QIN65, QIN65, 7 -CHO08, CHO08, 1 -CHO09, CHO09, 1 -TSM99, TSM99, 1 -E20, E20, 8 -E36, E36, 4 -E21, E21, 14 -QIN28, QIN28, 4 -QIN13, QIN13, 8 -QIN29, QIN29, 8 -ELE37, ELE37, 1 -QIN33, QIN33, 2 -QIN36, QIN36, 4 -QIN34, QIN34, 6 -QIN32, QIN32, 1 -E16, E16, 1 -QIN50, QIN50, 4 -QIN39, QIN39, 2 -QIN41, QIN41, 8 -QIN44, QIN44, 4 -QIN43, QIN43, 2 -FRN03, FRN03, 2 -TXT03, TXT03, 1 -TXT02, TXT02, 1 -CHO53, CHO53, 2 -QIN49, QIN49, 4 -TSM02, TSM02, 1 -QIN20, QIN20, 3 -TSM01, TSM01, 1 -QIN18, QIN18, 1 -varTmpDoc_9, QIN24, 1 -CHO57, CHO57, 1 diff --git a/vheliotech-solaire.FCStd b/vheliotech-solaire.FCStd deleted file mode 100644 index 7cd3440..0000000 Binary files a/vheliotech-solaire.FCStd and /dev/null differ diff --git a/vheliotech-solaire_list.csv b/vheliotech-solaire_list.csv deleted file mode 100644 index 365c71d..0000000 --- a/vheliotech-solaire_list.csv +++ /dev/null @@ -1,144 +0,0 @@ -Document, Reference, Count -QIN53, QIN53, 6 -CHO47, CHO47, 2 -CHO44, CHO44, 1 -CHO46, CHO46, 2 -T18, T18, 2 -L04, L04, 2 -M04, M04, 1 -T05, T05, 2 -M05, M05, 2 -L05, L05, 1 -L02, L02, 2 -M02, M02, 2 -M03, M03, 1 -L00, L00, 1 -T13, T13, 2 -M06, M06, 2 -CHO45, CHO45, 1 -M01, M01, 2 -L07, L07, 2 -T11, T11, 1 -L01, L01, 1 -T12, T12, 1 -L06, L06, 1 -T16, T16, 1 -CHO17, CHO17, 26 -CHO13, CHO13, 1 -CHO14, CHO14, 1 -ROU99, ROU99, 1 -T04, T04, 1 -ROU98, ROU98, 2 -CHO34, CHO34, 3 -FRN04, FRN04, 3 -CHO06, CHO06, 4 -ELE07, ELE07, 4 -QIN35, QIN35, 159 -QIN12, QIN12, 412 -QIN06, QIN06, 372 -QIN46, QIN46, 12 -QIN04, QIN04, 12 -ELE15, ELE15, 2 -CHO48, CHO48, 1 -CHO04, CHO04, 1 -CHO51, CHO51, 12 -CHO30, CHO30, 1 -CHO31, CHO31, 1 -CHO32, CHO32, 1 -CHO33, CHO33, 1 -CHO10, CHO10, 1 -CHO55, CHO55, 2 -CHO5x, CHO5x, 8 -CHO56, CHO56, 2 -QIN23, QIN23, 8 -TXT04, TXT04, 2 -TXT05, TXT05, 2 -CHO24, CHO24, 1 -CHO26, CHO26, 1 -ELE08, ELE08, 2 -ELE03, ELE03, 1 -ELE04, ELE04, 1 -CHO11, CHO11, 1 -ELE12, ELE12, 1 -ELE19, ELE19, 1 -R00, R00, 2 -R01, R01, 2 -R03, R03, 1 -T14, T14, 1 -CHO16, CHO16, 2 -CHO25, CHO25, 1 -CHO15, CHO15, 2 -CHO21, CHO21, 1 -CHO23, CHO23, 1 -QIN45, QIN45, 2 -QIN60, QIN60, 94 -QIN90, QIN90, 23 -CHO49, CHO49, 3 -CHO50, CHO50, 4 -QIN14, QIN14, 22 -QIN40, QIN40, 64 -QIN65, QIN65, 7 -CHO08, CHO08, 1 -CHO09, CHO09, 1 -TSM99, TSM99, 1 -E20, E20, 8 -E36, E36, 4 -E21, E21, 14 -QIN28, QIN28, 4 -QIN13, QIN13, 16 -QIN29, QIN29, 10 -ELE37, ELE37, 1 -QIN33, QIN33, 2 -QIN36, QIN36, 4 -QIN34, QIN34, 6 -QIN32, QIN32, 1 -E16, E16, 1 -QIN50, QIN50, 4 -QIN39, QIN39, 2 -QIN41, QIN41, 8 -QIN44, QIN44, 4 -QIN43, QIN43, 2 -FRN03, FRN03, 2 -TXT03, TXT03, 1 -TXT02, TXT02, 1 -CHO52, CHO52, 2 -TXT01, TXT01, 2 -CHO53, CHO53, 2 -QIN49, QIN49, 4 -TSM02, TSM02, 1 -QIN20, QIN20, 3 -TSM01, TSM01, 1 -QIN18, QIN18, 1 -varTmpDoc_9, QIN24, 1 -CHO57, CHO57, 1 -T06, T06, 1 -T01, T01, 1 -T00, T00, 1 -T02, T02, 1 -L03, L03, 2 -T07, T07, 1 -T03, T03, 2 -R02, R02, 2 -T15, T15, 4 -T19, T19, 4 -L11, L11, 4 -L10, L10, 4 -CHO41, CHO41, 1 -CHO40, CHO40, 1 -CHO20, CHO20, 4 -CHO43, CHO43, 1 -CHO42, CHO42, 1 -M00, M00, 2 -M07, M07, 2 -L08, L08, 2 -CHO35, CHO35, 2 -L09, L09, 2 -T09, T09, 2 -T10, T10, 1 -T08, T08, 1 -T22, T22, 1 -CHO03, CHO03, 6 -CHO19, CHO19, 1 -CHO18, CHO18, 1 -QIN25, QIN25, 2 -ROU05, ROU05, 2 diff --git a/vheliotech.FCStd b/vheliotech.FCStd index b307ae1..9af5bb3 100644 Binary files a/vheliotech.FCStd and b/vheliotech.FCStd differ diff --git a/vheliotech_list.csv b/vheliotech_list.csv deleted file mode 100644 index bb84904..0000000 --- a/vheliotech_list.csv +++ /dev/null @@ -1,158 +0,0 @@ -Document, Reference, Count -QIN53, QIN53, 6 -CHO47, CHO47, 2 -CHO44, CHO44, 1 -CHO46, CHO46, 2 -T18, T18, 2 -L04, L04, 2 -M04, M04, 1 -T05, T05, 2 -M05, M05, 2 -L05, L05, 1 -L02, L02, 2 -M02, M02, 2 -M03, M03, 1 -L00, L00, 1 -T13, T13, 2 -M06, M06, 2 -CHO45, CHO45, 1 -M01, M01, 2 -L07, L07, 2 -T11, T11, 1 -L01, L01, 1 -T12, T12, 1 -L06, L06, 1 -T16, T16, 1 -CHO17, CHO17, 26 -CHO13, CHO13, 1 -CHO14, CHO14, 1 -ROU99, ROU99, 1 -T04, T04, 1 -ROU98, ROU98, 2 -CHO34, CHO34, 3 -FRN04, FRN04, 3 -CHO06, CHO06, 4 -ELE07, ELE07, 4 -QIN35, QIN35, 163 -QIN12, QIN12, 455 -QIN06, QIN06, 401 -QIN46, QIN46, 12 -QIN04, QIN04, 12 -ELE15, ELE15, 2 -CHO48, CHO48, 1 -CHO04, CHO04, 1 -CHO51, CHO51, 14 -CHO30, CHO30, 1 -CHO31, CHO31, 1 -CHO32, CHO32, 1 -CHO33, CHO33, 1 -CHO10, CHO10, 1 -CHO54, CHO54, 3 -QIN54, QIN54, 18 -T23, T23, 3 -QIN40, QIN40, 67 -T20, T20, 2 -ACC03, ACC03, 2 -CHO02, CHO02, 4 -CHO55, CHO55, 2 -CHO5x, CHO5x, 8 -CHO56, CHO56, 2 -QIN23, QIN23, 12 -TXT04, TXT04, 2 -TXT05, TXT05, 2 -QIN51, QIN51, 4 -QIN52, QIN52, 4 -CHO24, CHO24, 1 -CHO26, CHO26, 1 -ELE08, ELE08, 2 -ELE03, ELE03, 1 -ELE04, ELE04, 2 -ELE99, ELE99, 1 -T21, T21, 2 -L12, L12, 2 -ACC05, ACC05, 1 -QIN60, QIN60, 102 -QIN65, QIN65, 9 -CHO11, CHO11, 1 -ELE12, ELE12, 1 -ELE19, ELE19, 1 -R00, R00, 2 -R01, R01, 2 -R03, R03, 1 -T14, T14, 1 -CHO16, CHO16, 2 -CHO25, CHO25, 1 -CHO15, CHO15, 2 -CHO21, CHO21, 1 -CHO23, CHO23, 1 -QIN45, QIN45, 2 -QIN90, QIN90, 23 -CHO49, CHO49, 3 -CHO50, CHO50, 4 -QIN14, QIN14, 22 -CHO08, CHO08, 1 -CHO09, CHO09, 1 -TSM99, TSM99, 1 -E20, E20, 8 -E36, E36, 4 -E21, E21, 14 -QIN28, QIN28, 4 -QIN13, QIN13, 16 -QIN29, QIN29, 14 -ELE37, ELE37, 1 -QIN26, QIN26, 2 -QIN33, QIN33, 2 -QIN36, QIN36, 4 -QIN34, QIN34, 6 -QIN32, QIN32, 1 -E16, E16, 1 -QIN50, QIN50, 4 -QIN39, QIN39, 2 -QIN41, QIN41, 8 -QIN44, QIN44, 4 -QIN43, QIN43, 2 -FRN03, FRN03, 2 -TXT03, TXT03, 1 -TXT02, TXT02, 1 -CHO52, CHO52, 2 -TXT01, TXT01, 2 -CHO53, CHO53, 2 -QIN49, QIN49, 4 -TSM02, TSM02, 1 -QIN20, QIN20, 3 -TSM01, TSM01, 1 -QIN18, QIN18, 1 -varTmpDoc_9, QIN24, 1 -CHO39, CHO39, 2 -CHO57, CHO57, 1 -T06, T06, 1 -T01, T01, 1 -T00, T00, 1 -T02, T02, 1 -L03, L03, 2 -T07, T07, 1 -T03, T03, 2 -R02, R02, 2 -T15, T15, 4 -T19, T19, 4 -L11, L11, 4 -L10, L10, 4 -CHO41, CHO41, 1 -CHO40, CHO40, 1 -CHO20, CHO20, 4 -CHO43, CHO43, 1 -CHO42, CHO42, 1 -M00, M00, 2 -M07, M07, 2 -L08, L08, 2 -CHO35, CHO35, 2 -L09, L09, 2 -T09, T09, 2 -T10, T10, 1 -T08, T08, 1 -T22, T22, 1 -CHO03, CHO03, 6 -CHO19, CHO19, 1 -CHO18, CHO18, 1 -QIN25, QIN25, 2 -ROU05, ROU05, 2