diff options
author | Brendon Murphy <meta.androcto1@gmail.com> | 2015-05-24 13:29:42 +0300 |
---|---|---|
committer | Brendon Murphy <meta.androcto1@gmail.com> | 2015-05-24 13:29:42 +0300 |
commit | 14cafb606c88b79c9901be7f7abbb44f147ee5f3 (patch) | |
tree | ea588067228a4892ff9cbaad9a0beff95eebe979 /add_mesh_BoltFactory | |
parent | 6fccd8c57cca34ab2a78f5e86f963b7569993515 (diff) |
remove local presets folder & replace with internal operator presets
Diffstat (limited to 'add_mesh_BoltFactory')
-rw-r--r-- | add_mesh_BoltFactory/Boltfactory.py | 30 | ||||
-rw-r--r-- | add_mesh_BoltFactory/preset_utils.py | 51 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M10.py | 22 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M12.py | 22 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M3.py | 22 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M4.py | 22 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M5.py | 22 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M6.py | 22 | ||||
-rw-r--r-- | add_mesh_BoltFactory/presets/M8.py | 22 |
9 files changed, 1 insertions, 234 deletions
diff --git a/add_mesh_BoltFactory/Boltfactory.py b/add_mesh_BoltFactory/Boltfactory.py index cd123b02..dd215a35 100644 --- a/add_mesh_BoltFactory/Boltfactory.py +++ b/add_mesh_BoltFactory/Boltfactory.py @@ -21,9 +21,6 @@ import bpy import mathutils from bpy.props import * from add_mesh_BoltFactory.createMesh import * -from add_mesh_BoltFactory.preset_utils import * - - ##------------------------------------------------------------ # calculates the matrix for the new object @@ -203,24 +200,12 @@ class add_mesh_bolt(bpy.types.Operator): min = 0, soft_min = 0, max = MAX_INPUT_NUMBER, 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): layout = self.layout col = layout.column() #ENUMS col.prop(self, 'bf_Model_Type') - col.prop(self, 'bf_presets') col.separator() #Bit @@ -284,21 +269,8 @@ class add_mesh_bolt(bpy.types.Operator): def execute(self, context): #print('EXECUTING...') - - 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) - + self.bf_Phillips_Bit_Depth = float(Get_Phillips_Bit_Height(self.bf_Philips_Bit_Dia)) Create_New_Mesh(self, context, self.align_matrix) - return {'FINISHED'} ##### INVOKE ##### diff --git a/add_mesh_BoltFactory/preset_utils.py b/add_mesh_BoltFactory/preset_utils.py deleted file mode 100644 index 093d9f82..00000000 --- a/add_mesh_BoltFactory/preset_utils.py +++ /dev/null @@ -1,51 +0,0 @@ -# ##### 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 diff --git a/add_mesh_BoltFactory/presets/M10.py b/add_mesh_BoltFactory/presets/M10.py deleted file mode 100644 index 03adab07..00000000 --- a/add_mesh_BoltFactory/presets/M10.py +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/add_mesh_BoltFactory/presets/M12.py b/add_mesh_BoltFactory/presets/M12.py deleted file mode 100644 index 58674852..00000000 --- a/add_mesh_BoltFactory/presets/M12.py +++ /dev/null @@ -1,22 +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 diff --git a/add_mesh_BoltFactory/presets/M3.py b/add_mesh_BoltFactory/presets/M3.py deleted file mode 100644 index 584bcd35..00000000 --- a/add_mesh_BoltFactory/presets/M3.py +++ /dev/null @@ -1,22 +0,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 diff --git a/add_mesh_BoltFactory/presets/M4.py b/add_mesh_BoltFactory/presets/M4.py deleted file mode 100644 index 686fbf56..00000000 --- a/add_mesh_BoltFactory/presets/M4.py +++ /dev/null @@ -1,22 +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 diff --git a/add_mesh_BoltFactory/presets/M5.py b/add_mesh_BoltFactory/presets/M5.py deleted file mode 100644 index 6249cf49..00000000 --- a/add_mesh_BoltFactory/presets/M5.py +++ /dev/null @@ -1,22 +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 diff --git a/add_mesh_BoltFactory/presets/M6.py b/add_mesh_BoltFactory/presets/M6.py deleted file mode 100644 index 20c09851..00000000 --- a/add_mesh_BoltFactory/presets/M6.py +++ /dev/null @@ -1,22 +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 diff --git a/add_mesh_BoltFactory/presets/M8.py b/add_mesh_BoltFactory/presets/M8.py deleted file mode 100644 index 7dcffb62..00000000 --- a/add_mesh_BoltFactory/presets/M8.py +++ /dev/null @@ -1,22 +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 |