Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
freecad_x3d
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
freecad_x3d
Commits
6087f7ed
Commit
6087f7ed
authored
Dec 17, 2015
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Elphel/freecad_x3d
parents
f4ad1ccb
9fef9baf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
x3d_step_assy.py
x3d_step_assy.py
+9
-2
No files found.
x3d_step_assy.py
View file @
6087f7ed
...
...
@@ -521,7 +521,11 @@ def colorMatchCandidate(assy_object, candidates, info_dict, precision = PRECISIO
"""
colored_candidates
=
{}
if
candidates
:
assy_color_center_area
=
assy_object
[
"colorCenters"
]
try
:
assy_color_center_area
=
assy_object
[
"colorCenters"
]
except
:
print
(
"colorMatchCandidate(), assy_object = "
,
assy_object
)
assy_color_center_area
=
{}
cand_matches
=
[]
for
candidate
in
candidates
:
matched_colors
=
[]
...
...
@@ -1316,7 +1320,7 @@ class X3dStepAssyDialog(QtGui.QWidget):
if
mode
==
"assy"
:
return
"Active FreeCAD document"
elif
mode
==
"log"
:
return
"
none"
#
stdout"
return
"stdout"
else
:
return
"not set"
...
...
@@ -1836,4 +1840,7 @@ reload (x3d_step_assy)
form = x3d_step_assy.X3dStepAssyDialog()
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment