Skip to content
Snippets Groups Projects
Commit 14cafb60 authored by Brendon Murphy's avatar Brendon Murphy
Browse files

remove local presets folder & replace with internal operator presets

parent 6fccd8c5
No related branches found
No related tags found
No related merge requests found
Showing
with 209 additions and 234 deletions
...@@ -21,9 +21,6 @@ import bpy ...@@ -21,9 +21,6 @@ import bpy
import mathutils import mathutils
from bpy.props import * from bpy.props import *
from add_mesh_BoltFactory.createMesh import * from add_mesh_BoltFactory.createMesh import *
from add_mesh_BoltFactory.preset_utils import *
##------------------------------------------------------------ ##------------------------------------------------------------
# calculates the matrix for the new object # calculates the matrix for the new object
...@@ -203,24 +200,12 @@ class add_mesh_bolt(bpy.types.Operator): ...@@ -203,24 +200,12 @@ class add_mesh_bolt(bpy.types.Operator):
min = 0, soft_min = 0, max = MAX_INPUT_NUMBER, min = 0, soft_min = 0, max = MAX_INPUT_NUMBER,
description='Flat distance of the Hex Nut') description='Flat distance of the Hex Nut')
presets, presetsPath = getPresets()
bf_presets = EnumProperty(attr='bf_presets',
name='Preset',
description="Use Preset from File",
default='M3.py',
items=presets)
last_preset = None
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
col = layout.column() col = layout.column()
#ENUMS #ENUMS
col.prop(self, 'bf_Model_Type') col.prop(self, 'bf_Model_Type')
col.prop(self, 'bf_presets')
col.separator() col.separator()
#Bit #Bit
...@@ -284,21 +269,8 @@ class add_mesh_bolt(bpy.types.Operator): ...@@ -284,21 +269,8 @@ class add_mesh_bolt(bpy.types.Operator):
def execute(self, context): def execute(self, context):
#print('EXECUTING...') #print('EXECUTING...')
self.bf_Phillips_Bit_Depth = float(Get_Phillips_Bit_Height(self.bf_Philips_Bit_Dia))
if not self.last_preset or self.bf_presets != self.last_preset:
#print('setting Preset', self.bf_presets)
setProps(self, self.bf_presets, self.presetsPath)
self.bf_Phillips_Bit_Depth = float(Get_Phillips_Bit_Height(self.bf_Philips_Bit_Dia))
self.last_preset = self.bf_presets
#self.bf_Phillips_Bit_Depth = float(Get_Phillips_Bit_Height(self.bf_Philips_Bit_Dia))
#self.bf_Philips_Bit_Dia = self.bf_Pan_Head_Dia*(1.82/5.6)
#self.bf_Minor_Dia = self.bf_Major_Dia - (1.082532 * self.bf_Pitch)
Create_New_Mesh(self, context, self.align_matrix) Create_New_Mesh(self, context, self.align_matrix)
return {'FINISHED'} return {'FINISHED'}
##### INVOKE ##### ##### INVOKE #####
......
# ##### BEGIN GPL LICENSE BLOCK #####
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ##### END GPL LICENSE BLOCK #####
import os
def getPresets():
scriptPath = os.path.dirname(__file__)
presetPath = os.path.join(scriptPath, "presets")
presetFiles = os.listdir(presetPath)
#presetFiles.sort()
presets = [(presetFile, presetFile.rpartition(".")[0], presetFile)
for i, presetFile in enumerate(presetFiles) if presetFile.endswith(".py")]
#print(presets)
return presets, presetPath
#presets = getPresets()
def setProps(props, preset, presetsPath):
#bpy.ops.script.python_file_run(filepath=presetsPath + '\\' + preset)
file = open(os.path.join(presetsPath, preset))
for line in file:
exec(line)
file.close()
return
props.bf_Shank_Dia = 10.0
#props.bf_Pitch = 1.5 # Coarse
props.bf_Pitch = 1.25 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 10.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 17.0
props.bf_Hex_Head_Height = 6.4
props.bf_Cap_Head_Dia = 16.0
props.bf_Cap_Head_Height = 10.0
props.bf_CounterSink_Head_Dia = 20.0
props.bf_Allen_Bit_Flat_Distance = 8.0
props.bf_Allen_Bit_Depth = 5.0
props.bf_Pan_Head_Dia = 20.0
props.bf_Dome_Head_Dia = 20.0
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 8.0
props.bf_Hex_Nut_Flat_Distance = 17.0
props.bf_Thread_Length = 20
props.bf_Shank_Length = 0.0
#props.bf_Pitch = 1.75 # Coarse
props.bf_Pitch = 1.50 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 12.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 19.0
props.bf_Hex_Head_Height = 7.5
props.bf_Cap_Head_Dia = 18.5
props.bf_Cap_Head_Height = 12.0
props.bf_CounterSink_Head_Dia = 22.0
props.bf_Allen_Bit_Flat_Distance = 10.0
props.bf_Allen_Bit_Depth = 6.0
props.bf_Pan_Head_Dia = 24.0
props.bf_Dome_Head_Dia = 24.0
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 10.0
props.bf_Hex_Nut_Flat_Distance = 19.0
props.bf_Shank_Dia = 12.0
props.bf_Shank_Length = 33.0
props.bf_Thread_Length = 32.0
props.bf_Shank_Dia = 3.0
#props.bf_Pitch = 0.5 # Coarse
props.bf_Pitch = 0.35 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 3.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 5.5
props.bf_Hex_Head_Height = 2.0
props.bf_Cap_Head_Dia = 5.5
props.bf_Cap_Head_Height = 3.0
props.bf_CounterSink_Head_Dia = 6.3
props.bf_Allen_Bit_Flat_Distance = 2.5
props.bf_Allen_Bit_Depth = 1.5
props.bf_Pan_Head_Dia = 5.6
props.bf_Dome_Head_Dia = 5.6
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 2.4
props.bf_Hex_Nut_Flat_Distance = 5.5
props.bf_Thread_Length = 6
props.bf_Shank_Length = 0.0
props.bf_Shank_Dia = 4.0
#props.bf_Pitch = 0.7 # Coarse
props.bf_Pitch = 0.5 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 4.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 7.0
props.bf_Hex_Head_Height = 2.8
props.bf_Cap_Head_Dia = 7.0
props.bf_Cap_Head_Height = 4.0
props.bf_CounterSink_Head_Dia = 9.4
props.bf_Allen_Bit_Flat_Distance = 3.0
props.bf_Allen_Bit_Depth = 2.0
props.bf_Pan_Head_Dia = 8.0
props.bf_Dome_Head_Dia = 8.0
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 3.2
props.bf_Hex_Nut_Flat_Distance = 7.0
props.bf_Thread_Length = 8
props.bf_Shank_Length = 0.0
props.bf_Shank_Dia = 5.0
#props.bf_Pitch = 0.8 # Coarse
props.bf_Pitch = 0.5 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 5.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 8.0
props.bf_Hex_Head_Height = 3.5
props.bf_Cap_Head_Dia = 8.5
props.bf_Cap_Head_Height = 5.0
props.bf_CounterSink_Head_Dia = 10.4
props.bf_Allen_Bit_Flat_Distance = 4.0
props.bf_Allen_Bit_Depth = 2.5
props.bf_Pan_Head_Dia = 9.5
props.bf_Dome_Head_Dia = 9.5
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 4.0
props.bf_Hex_Nut_Flat_Distance = 8.0
props.bf_Thread_Length = 10
props.bf_Shank_Length = 0.0
props.bf_Shank_Dia = 6.0
#bf_Pitch = 1.0 # Coarse
props.bf_Pitch = 0.75 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 6.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 10.0
props.bf_Hex_Head_Height = 4.0
props.bf_Cap_Head_Dia = 10.0
props.bf_Cap_Head_Height = 6.0
props.bf_CounterSink_Head_Dia = 12.6
props.bf_Allen_Bit_Flat_Distance = 5.0
props.bf_Allen_Bit_Depth = 3.0
props.bf_Pan_Head_Dia = 12.0
props.bf_Dome_Head_Dia = 12.0
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 5.0
props.bf_Hex_Nut_Flat_Distance = 10.0
props.bf_Thread_Length = 12
props.bf_Shank_Length = 0.0
props.bf_Shank_Dia = 8.0
#props.bf_Pitch = 1.25 # Coarse
props.bf_Pitch = 1.00 # Fine
props.bf_Crest_Percent = 10
props.bf_Root_Percent = 10
props.bf_Major_Dia = 8.0
props.bf_Minor_Dia = props.bf_Major_Dia - (1.082532 * props.bf_Pitch)
props.bf_Hex_Head_Flat_Distance = 13.0
props.bf_Hex_Head_Height = 5.3
props.bf_Cap_Head_Dia = 13.5
props.bf_Cap_Head_Height = 8.0
props.bf_CounterSink_Head_Dia = 17.3
props.bf_Allen_Bit_Flat_Distance = 6.0
props.bf_Allen_Bit_Depth = 4.0
props.bf_Pan_Head_Dia = 16.0
props.bf_Dome_Head_Dia = 16.0
props.bf_Philips_Bit_Dia = props.bf_Pan_Head_Dia * (1.82 / 5.6)
#props.bf_Phillips_Bit_Depth = Get_Phillips_Bit_Height(props.bf_Philips_Bit_Dia)
props.bf_Hex_Nut_Height = 6.5
props.bf_Hex_Nut_Flat_Distance = 13.0
props.bf_Thread_Length = 16
props.bf_Shank_Length = 0.0
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 3.0
op.bf_Allen_Bit_Depth = 1.5
op.bf_Allen_Bit_Flat_Distance = 2.5
op.bf_Hex_Head_Height = 2.0
op.bf_Hex_Head_Flat_Distance = 5.5
op.bf_CounterSink_Head_Dia = 6.300000190734863
op.bf_Cap_Head_Height = 3.0
op.bf_Cap_Head_Dia = 5.5
op.bf_Dome_Head_Dia = 5.599999904632568
op.bf_Pan_Head_Dia = 5.599999904632568
op.bf_Thread_Length = 6.0
op.bf_Major_Dia = 3.0
op.bf_Pitch = 0.3499999940395355
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 2.4000000953674316
op.bf_Hex_Nut_Flat_Distance = 5.5
op.bf_presets = 'M3.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 10.0
op.bf_Allen_Bit_Depth = 5.0
op.bf_Allen_Bit_Flat_Distance = 8.0
op.bf_Hex_Head_Height = 6.400000095367432
op.bf_Hex_Head_Flat_Distance = 17.0
op.bf_CounterSink_Head_Dia = 20.0
op.bf_Cap_Head_Height = 10.0
op.bf_Cap_Head_Dia = 16.0
op.bf_Dome_Head_Dia = 20.0
op.bf_Pan_Head_Dia = 20.0
op.bf_Thread_Length = 20.0
op.bf_Major_Dia = 10.0
op.bf_Pitch = 1.25
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 8.0
op.bf_Hex_Nut_Flat_Distance = 17.0
op.bf_presets = 'M10.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 33.0
op.bf_Shank_Dia = 12.0
op.bf_Allen_Bit_Depth = 6.0
op.bf_Allen_Bit_Flat_Distance = 10.0
op.bf_Hex_Head_Height = 7.5
op.bf_Hex_Head_Flat_Distance = 19.0
op.bf_CounterSink_Head_Dia = 22.0
op.bf_Cap_Head_Height = 12.0
op.bf_Cap_Head_Dia = 18.5
op.bf_Dome_Head_Dia = 24.0
op.bf_Pan_Head_Dia = 24.0
op.bf_Thread_Length = 32.0
op.bf_Major_Dia = 12.0
op.bf_Pitch = 1.5
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 10.0
op.bf_Hex_Nut_Flat_Distance = 19.0
op.bf_presets = 'M12.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 3.0
op.bf_Allen_Bit_Depth = 1.5
op.bf_Allen_Bit_Flat_Distance = 2.5
op.bf_Hex_Head_Height = 2.0
op.bf_Hex_Head_Flat_Distance = 5.5
op.bf_CounterSink_Head_Dia = 6.300000190734863
op.bf_Cap_Head_Height = 3.0
op.bf_Cap_Head_Dia = 5.5
op.bf_Dome_Head_Dia = 5.599999904632568
op.bf_Pan_Head_Dia = 5.599999904632568
op.bf_Thread_Length = 6.0
op.bf_Major_Dia = 3.0
op.bf_Pitch = 0.3499999940395355
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 2.4000000953674316
op.bf_Hex_Nut_Flat_Distance = 5.5
op.bf_presets = 'M3.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 4.0
op.bf_Allen_Bit_Depth = 2.0
op.bf_Allen_Bit_Flat_Distance = 3.0
op.bf_Hex_Head_Height = 2.799999952316284
op.bf_Hex_Head_Flat_Distance = 7.0
op.bf_CounterSink_Head_Dia = 9.399999618530273
op.bf_Cap_Head_Height = 4.0
op.bf_Cap_Head_Dia = 7.0
op.bf_Dome_Head_Dia = 8.0
op.bf_Pan_Head_Dia = 8.0
op.bf_Thread_Length = 8.0
op.bf_Major_Dia = 4.0
op.bf_Pitch = 0.5
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 3.200000047683716
op.bf_Hex_Nut_Flat_Distance = 7.0
op.bf_presets = 'M4.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 5.0
op.bf_Allen_Bit_Depth = 2.5
op.bf_Allen_Bit_Flat_Distance = 4.0
op.bf_Hex_Head_Height = 3.5
op.bf_Hex_Head_Flat_Distance = 8.0
op.bf_CounterSink_Head_Dia = 10.399999618530273
op.bf_Cap_Head_Height = 5.0
op.bf_Cap_Head_Dia = 8.5
op.bf_Dome_Head_Dia = 9.5
op.bf_Pan_Head_Dia = 9.5
op.bf_Thread_Length = 10.0
op.bf_Major_Dia = 5.0
op.bf_Pitch = 0.5
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 4.0
op.bf_Hex_Nut_Flat_Distance = 8.0
op.bf_presets = 'M5.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 6.0
op.bf_Allen_Bit_Depth = 3.0
op.bf_Allen_Bit_Flat_Distance = 5.0
op.bf_Hex_Head_Height = 4.0
op.bf_Hex_Head_Flat_Distance = 10.0
op.bf_CounterSink_Head_Dia = 12.600000381469727
op.bf_Cap_Head_Height = 6.0
op.bf_Cap_Head_Dia = 10.0
op.bf_Dome_Head_Dia = 12.0
op.bf_Pan_Head_Dia = 12.0
op.bf_Thread_Length = 12.0
op.bf_Major_Dia = 6.0
op.bf_Pitch = 0.75
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 5.0
op.bf_Hex_Nut_Flat_Distance = 10.0
op.bf_presets = 'M6.py'
import bpy
op = bpy.context.active_operator
op.bf_Model_Type = 'bf_Model_Bolt'
op.bf_Head_Type = 'bf_Head_Hex'
op.bf_Bit_Type = 'bf_Bit_None'
op.bf_Nut_Type = 'bf_Nut_Hex'
op.bf_Shank_Length = 0.0
op.bf_Shank_Dia = 8.0
op.bf_Allen_Bit_Depth = 4.0
op.bf_Allen_Bit_Flat_Distance = 6.0
op.bf_Hex_Head_Height = 5.300000190734863
op.bf_Hex_Head_Flat_Distance = 13.0
op.bf_CounterSink_Head_Dia = 17.299999237060547
op.bf_Cap_Head_Height = 8.0
op.bf_Cap_Head_Dia = 13.5
op.bf_Dome_Head_Dia = 16.0
op.bf_Pan_Head_Dia = 16.0
op.bf_Thread_Length = 16.0
op.bf_Major_Dia = 8.0
op.bf_Pitch = 1.0
op.bf_Crest_Percent = 10
op.bf_Root_Percent = 10
op.bf_Hex_Nut_Height = 6.5
op.bf_Hex_Nut_Flat_Distance = 13.0
op.bf_presets = 'M8.py'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment