diff --git a/HLCt/pressure_welded.SLDPRT b/HLCt/pressure_welded.SLDPRT index 5bffaff..602576f 100644 Binary files a/HLCt/pressure_welded.SLDPRT and b/HLCt/pressure_welded.SLDPRT differ diff --git a/HLCt/recess_side_square.SLDPRT b/HLCt/recess_side_square.SLDPRT index f65337c..3f5f632 100644 Binary files a/HLCt/recess_side_square.SLDPRT and b/HLCt/recess_side_square.SLDPRT differ diff --git a/Wardrobe/Recess Functions/Side_Rectangle.vb b/Wardrobe/Recess Functions/Side_Rectangle.vb index 8199fce..0819669 100644 --- a/Wardrobe/Recess Functions/Side_Rectangle.vb +++ b/Wardrobe/Recess Functions/Side_Rectangle.vb @@ -258,6 +258,8 @@ Dim mesNum As Integer = Data.pointsMeasurements.Count - 1 + Data.recessData.Rows.Add() + Dim pointRow1 As DataRow = Data.gratingPoints.NewRow Dim pointRow2 As DataRow = Data.gratingPoints.NewRow Dim pointRow3 As DataRow = Data.gratingPoints.NewRow @@ -330,6 +332,13 @@ Data.grossAreaPoints.Rows(0)("GUI Y") + CInt(GUI.Controls("Y_TextBox").Text) / (2 * Data.scaleDiff) - 4, 1}) + ' Recess Data + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("RECESS TYPE") = "SIDE SQUARE" + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("SIDE") = 1 + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("WIDTH") = CInt(GUI.Controls("Y_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("LENGTH") = CInt(GUI.Controls("X_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("OFFSET") = CInt(GUI.Controls("Off_TextBox").Text) + ElseIf sidePressed = 2 Then ' Add the new points pointRow1("X") = Data.grossAreaPoints.Rows(1)("X") @@ -382,6 +391,13 @@ Data.grossAreaPoints.Rows(1)("GUI Y") + sideSquareValues(2) / Data.scaleDiff - 15 - 3, 2}) + ' Recess Data + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("RECESS TYPE") = "SIDE SQUARE" + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("SIDE") = 2 + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("WIDTH") = CInt(GUI.Controls("Y_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("LENGTH") = CInt(GUI.Controls("X_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("OFFSET") = CInt(GUI.Controls("Off_TextBox").Text) + ElseIf sidePressed = 3 Then ' Add the new points pointRow1("X") = Data.grossAreaPoints.Rows(2)("X") - sideSquareValues(2) / 1000 @@ -429,6 +445,13 @@ Data.grossAreaPoints.Rows(2)("GUI Y") - CInt(GUI.Controls("Y_TextBox").Text) / (2 * Data.scaleDiff) - 4, 3}) + ' Recess Data + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("RECESS TYPE") = "SIDE SQUARE" + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("SIDE") = 3 + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("WIDTH") = CInt(GUI.Controls("Y_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("LENGTH") = CInt(GUI.Controls("X_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("OFFSET") = CInt(GUI.Controls("Off_TextBox").Text) + Else ' Add the new points pointRow1("X") = Data.grossAreaPoints.Rows(3)("X") @@ -477,6 +500,13 @@ Data.grossAreaPoints.Rows(3)("GUI X") + sideSquareValues(0) / (2 * Data.scaleDiff) - 8, Data.grossAreaPoints.Rows(3)("GUI Y") - sideSquareValues(2) / Data.scaleDiff + 3, 4}) + + ' Recess Data + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("RECESS TYPE") = "SIDE SQUARE" + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("SIDE") = 4 + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("WIDTH") = CInt(GUI.Controls("Y_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("LENGTH") = CInt(GUI.Controls("X_TextBox").Text) + Data.recessData.Rows(Data.recessData.Rows.Count - 1)("OFFSET") = CInt(GUI.Controls("Off_TextBox").Text) End If Data.gratingPoints.Rows.InsertAt(pointRow1, index + 1) diff --git a/Wardrobe/SolidWorks/Model_3D.vb b/Wardrobe/SolidWorks/Model_3D.vb index 226b9c0..b8173c4 100644 --- a/Wardrobe/SolidWorks/Model_3D.vb +++ b/Wardrobe/SolidWorks/Model_3D.vb @@ -129,6 +129,42 @@ Public Class Model_3D ExternalClass.modify_parameter_value("DP_ROTATION", inst_, 0) End If + + ElseIf recessDR("RECESS TYPE") = "SIDE SQUARE" Then + inst_ = ExternalClass.instantiate_parts(parentID, "recess_side_square", "") + + ExternalClass.modify_parameter_value("DP_EDGEBAR_HEIGHT", inst_, gratingParameters("LOADBAR_HEIGHT")) + ExternalClass.modify_parameter_value("DP_EDGEBAR_THICKNESS", inst_, gratingParameters("LOADBAR_THICKNESS")) + + If recessDR("SIDE") = 1 Then + ExternalClass.modify_parameter_value("DP_LENGTH", inst_, recessDR("WIDTH")) + ExternalClass.modify_parameter_value("DP_WIDTH", inst_, recessDR("LENGTH")) + ExternalClass.modify_parameter_value("DP_OFFSET_W", inst_, gratingParameters("WIDTH")) + ExternalClass.modify_parameter_value("DP_OFFSET_L", inst_, recessDR("OFFSET")) + ExternalClass.modify_parameter_value("DP_ROTATION", inst_, 90) + + ElseIf recessDR("SIDE") = 2 Then + ExternalClass.modify_parameter_value("DP_LENGTH", inst_, recessDR("LENGTH")) + ExternalClass.modify_parameter_value("DP_WIDTH", inst_, recessDR("WIDTH")) + ExternalClass.modify_parameter_value("DP_OFFSET_W", inst_, gratingParameters("WIDTH") - recessDR("OFFSET")) + ExternalClass.modify_parameter_value("DP_OFFSET_L", inst_, gratingParameters("LENGTH")) + ExternalClass.modify_parameter_value("DP_ROTATION", inst_, 180) + + ElseIf recessDR("SIDE") = 3 Then + ExternalClass.modify_parameter_value("DP_LENGTH", inst_, recessDR("WIDTH")) + ExternalClass.modify_parameter_value("DP_WIDTH", inst_, recessDR("LENGTH")) + ExternalClass.modify_parameter_value("DP_OFFSET_W", inst_, 0) + ExternalClass.modify_parameter_value("DP_OFFSET_L", inst_, gratingParameters("LENGTH") - recessDR("OFFSET")) + ExternalClass.modify_parameter_value("DP_ROTATION", inst_, 270) + + Else + ExternalClass.modify_parameter_value("DP_LENGTH", inst_, recessDR("LENGTH")) + ExternalClass.modify_parameter_value("DP_WIDTH", inst_, recessDR("WIDTH")) + ExternalClass.modify_parameter_value("DP_OFFSET_W", inst_, recessDR("OFFSET")) + ExternalClass.modify_parameter_value("DP_OFFSET_L", inst_, 0) + ExternalClass.modify_parameter_value("DP_ROTATION", inst_, 0) + + End If End If