diff --git a/chaudronnerie/CHO04.FCStd b/chaudronnerie/CHO04.FCStd index 8ab2622..a5edf6d 100644 Binary files a/chaudronnerie/CHO04.FCStd and b/chaudronnerie/CHO04.FCStd differ diff --git a/chaudronnerie/CHO05.FCStd b/chaudronnerie/CHO05.FCStd new file mode 100644 index 0000000..01b9cd8 Binary files /dev/null and b/chaudronnerie/CHO05.FCStd differ diff --git a/chaudronnerie/CHO08.FCStd b/chaudronnerie/CHO08.FCStd index c5fdf47..10d00f0 100644 Binary files a/chaudronnerie/CHO08.FCStd and b/chaudronnerie/CHO08.FCStd differ diff --git a/chaudronnerie/CHO09.FCStd b/chaudronnerie/CHO09.FCStd index 57115cc..5a92d88 100644 Binary files a/chaudronnerie/CHO09.FCStd and b/chaudronnerie/CHO09.FCStd differ diff --git a/chaudronnerie/CHO51.FCStd b/chaudronnerie/CHO51.FCStd deleted file mode 100644 index e3cda3f..0000000 Binary files a/chaudronnerie/CHO51.FCStd and /dev/null differ diff --git a/chaudronnerie/CHO59.FCStd b/chaudronnerie/CHO59.FCStd index bca3c88..a6b8a0a 100644 Binary files a/chaudronnerie/CHO59.FCStd and b/chaudronnerie/CHO59.FCStd differ diff --git a/chaudronnerie/CHO5x.FCStd b/chaudronnerie/CHO5x.FCStd deleted file mode 100644 index f6f6faa..0000000 Binary files a/chaudronnerie/CHO5x.FCStd and /dev/null differ diff --git a/cycle/TSM16.FCStd b/cycle/TSM16.FCStd index 87ca9de..693c297 100644 Binary files a/cycle/TSM16.FCStd and b/cycle/TSM16.FCStd differ diff --git a/dessins/assemblage/dessins_assemblage_tubes.FCStd b/dessins/assemblage/dessins_assemblage_tubes.FCStd index d230d36..fe7fa55 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/View003.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View003.png index f0e8adf..bd8266c 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/View022.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View022.png index 58131c2..1213d90 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 ac012b6..7316aea 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/View026.png b/dessins/assemblage/dessins_assemblage_tubes_raster/View026.png index 9438c68..01348ea 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/quincaillerie/QIN59.FCStd b/quincaillerie/QIN59.FCStd new file mode 100644 index 0000000..29c5527 Binary files /dev/null and b/quincaillerie/QIN59.FCStd differ diff --git a/quincaillerie/QIN93.FCStd b/quincaillerie/QIN93.FCStd deleted file mode 100644 index 3626d50..0000000 Binary files a/quincaillerie/QIN93.FCStd and /dev/null differ diff --git a/quincaillerie/visserie/QIN15.FCStd b/quincaillerie/visserie/QIN15.FCStd new file mode 100644 index 0000000..304babe Binary files /dev/null and b/quincaillerie/visserie/QIN15.FCStd differ diff --git a/quincaillerie/visserie/QIN16.FCStd b/quincaillerie/visserie/QIN16.FCStd new file mode 100644 index 0000000..dbd923b Binary files /dev/null and b/quincaillerie/visserie/QIN16.FCStd differ diff --git a/quincaillerie/visserie/QIN57.FCStd b/quincaillerie/visserie/QIN57.FCStd new file mode 100644 index 0000000..cc4da27 Binary files /dev/null and b/quincaillerie/visserie/QIN57.FCStd differ diff --git a/quincaillerie/visserie/QIN58.FCStd b/quincaillerie/visserie/QIN58.FCStd new file mode 100644 index 0000000..2ee6ded Binary files /dev/null and b/quincaillerie/visserie/QIN58.FCStd differ diff --git a/quincaillerie/visserie/QIN91.FCStd b/quincaillerie/visserie/QIN91.FCStd deleted file mode 100644 index b95661b..0000000 Binary files a/quincaillerie/visserie/QIN91.FCStd and /dev/null differ diff --git a/quincaillerie/visserie/QIN92.FCStd b/quincaillerie/visserie/QIN92.FCStd deleted file mode 100644 index ec991fc..0000000 Binary files a/quincaillerie/visserie/QIN92.FCStd and /dev/null differ diff --git a/sous-assemblages/MoteurM400.FCStd b/sous-assemblages/MoteurM400.FCStd index 8ddf78c..fe37a98 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 index ac1b5ca..52f59b5 100644 Binary files a/sous-assemblages/SiegeAdulteLowCost.FCStd and b/sous-assemblages/SiegeAdulteLowCost.FCStd differ diff --git a/sous-assemblages/StructureSiege.FCStd b/sous-assemblages/StructureSiege.FCStd index 98c3e04..8987577 100644 Binary files a/sous-assemblages/StructureSiege.FCStd and b/sous-assemblages/StructureSiege.FCStd differ diff --git a/tools/export-all-parts.py b/tools/export-all-parts.py index c819107..1b25d8e 100644 --- a/tools/export-all-parts.py +++ b/tools/export-all-parts.py @@ -24,7 +24,7 @@ def convert_file(file_name, output_format): if len(obj.Parents) == 0: #print(obj.Label) root_objects.append(obj) - if obj.Label == doc.Name: + if obj.Label == doc.Name or obj.Label == doc.Name + ' (experimental)': main_object = obj if main_object is None and len(root_objects) == 1: @@ -33,6 +33,11 @@ def convert_file(file_name, output_format): if main_object is None: raise Exception("Can't find main object in file " + file_name + " (found " + str(len(root_objects)) + " root object(s), none named like the document " + doc.Name + ")") + if 'experimental' in main_object.Label or 'expérimental' in main_object.Label: + print('Document ' + doc.Name + ' is marked as experimental and will be ignored') + close_all_docs() + return + secondary_objects = [] code_obj = doc.getObjectsByLabel('Code_Tube_Draft') if len(code_obj) == 1: @@ -67,11 +72,7 @@ def convert_file(file_name, output_format): close_all_docs() -def convert_assembly(file_name, output_format): - print("Exporting assembly " + file_name + "...") - - doc = App.open(project_folder + '/' + file_name) - +def export_assembly(doc, file_name, output_format): root_objects = [] main_object = None @@ -110,17 +111,27 @@ def convert_assembly(file_name, output_format): else: ImportGui.export([main_object], output_path) +def convert_assembly(file_name, output_format): + print("Exporting assembly " + file_name + "...") + doc = App.open(project_folder + '/' + file_name) + export_assembly(doc, file_name, output_format) close_all_docs() -def export_configuration(doc, config_name, output_filename): +def export_configuration(file_name, config_name, output_filename, output_format): print('Generating assembly for configuration '+config_name+'...') + doc = App.open(project_folder + '/' + file_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') + export_assembly(doc, output_filename, output_format) + + #doc.saveAs(assemblies_output_folder + '/' + output_filename + '.FCStd') + + close_all_docs() try: folders = [ @@ -136,14 +147,12 @@ try: print(source_path) convert_file(source_path, 'step') - convert_assembly('vheliotech.FCStd', 'step') + #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()''' + export_configuration('vheliotech.FCStd', 'Config_Integrale', 'vheliotech-integral', 'step') + export_configuration('vheliotech.FCStd', 'Config_Solaire', 'vheliotech-solaire', 'step') + export_configuration('vheliotech.FCStd', 'Config_Motorisee', 'vheliotech-motorise', 'step') + export_configuration('vheliotech.FCStd', 'Config_Basique', 'vheliotech-basique', 'step') except Exception as e: print(e) diff --git a/tubes/L02.FCStd b/tubes/L02.FCStd index 596a967..3c56723 100644 Binary files a/tubes/L02.FCStd and b/tubes/L02.FCStd differ diff --git a/tubes/M04.FCStd b/tubes/M04.FCStd index 716b10b..80d6646 100644 Binary files a/tubes/M04.FCStd and b/tubes/M04.FCStd differ diff --git a/vheliotech.FCStd b/vheliotech.FCStd index bc82eeb..b3c17fc 100644 Binary files a/vheliotech.FCStd and b/vheliotech.FCStd differ