Commit 6087f7ed authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

Merge branch 'master' of https://github.com/Elphel/freecad_x3d

parents f4ad1ccb 9fef9baf
...@@ -521,7 +521,11 @@ def colorMatchCandidate(assy_object, candidates, info_dict, precision = PRECISIO ...@@ -521,7 +521,11 @@ def colorMatchCandidate(assy_object, candidates, info_dict, precision = PRECISIO
""" """
colored_candidates={} colored_candidates={}
if candidates: if candidates:
try:
assy_color_center_area = assy_object["colorCenters"] assy_color_center_area = assy_object["colorCenters"]
except:
print ("colorMatchCandidate(), assy_object = ",assy_object)
assy_color_center_area = {}
cand_matches=[] cand_matches=[]
for candidate in candidates: for candidate in candidates:
matched_colors=[] matched_colors=[]
...@@ -1316,7 +1320,7 @@ class X3dStepAssyDialog(QtGui.QWidget): ...@@ -1316,7 +1320,7 @@ class X3dStepAssyDialog(QtGui.QWidget):
if mode == "assy": if mode == "assy":
return "Active FreeCAD document" return "Active FreeCAD document"
elif mode == "log": elif mode == "log":
return "none" # stdout" return "stdout"
else: else:
return "not set" return "not set"
...@@ -1836,4 +1840,7 @@ reload (x3d_step_assy) ...@@ -1836,4 +1840,7 @@ reload (x3d_step_assy)
form = x3d_step_assy.X3dStepAssyDialog() form = x3d_step_assy.X3dStepAssyDialog()
form.show() form.show()
or just run conversion from the command line in Python console
x3d_step_assy.generateAssemblyX3d("") #or with path
x3d_step_assy.showFailedComponents()
""" """
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment