diff --git a/Database/Databas.xlsx b/Database/Databas.xlsx index a0afeb9..1a5c47f 100644 Binary files a/Database/Databas.xlsx and b/Database/Databas.xlsx differ diff --git a/Database/Load.csv b/Database/Load.csv index 621a008..915702e 100644 --- a/Database/Load.csv +++ b/Database/Load.csv @@ -1,5 +1,18 @@ NAME [str],LB-HEIGHT [int],LB-THICKNESS [int],300 [dbl],400 [dbl],500 [dbl],600 [dbl],700 [dbl],800 [dbl],900 [dbl],1000 [dbl],1100 [dbl],1200 [dbl],1300 [dbl],1400 [dbl],1500 [dbl],1600 [dbl],1800 [dbl],2000 [dbl],2200 [dbl],2400 [dbl] -H,20,2,62,37,22,15,9.5,6.4,4.5,3.3,2.4,1.9,1.5,1.2,1.0,0.8,0.6,0.4,0.3,0.2 +A22x22,20,2,93,52,33,23,14,9.5,6.7,4.9,3.7,2.8,2.2,1.8,1.4,,,,, +A22x22,25,2,145,81,52,36,27,19,13,9.5,7.2,5.5,4.3,3.5,2.8,,,,, +A22x22,30,2,209,117,75,52,38,29,23,16,12,9.5,7.5,6,4.9,,,,, +A22x22,40,2,371,209,134,93,68,52,41,33,28,23,18,14,12,,,,, +A33x11,20,2,62,35,22,15,9.5,6.4,4.5,3.3,2.4,1.9,1.5,1.2,1,,,,, +A33x11,25,2,97,54,35,24,18,12,8.7,6.4,4.8,3.7,2.9,2.3,1.9,,,,, +A33x11,30,2,139,78,50,35,26,20,15,11,8.3,6.4,5,4,3.3,,,,, +A33x11,40,2,247,139,89,62,45,35,27,22,18,15,12,9.5,7.7,,,,, +B,20,3,255,143,92,62,39,26,18,13,10,7.8,6.1,4.9,4,3.3,2.3,1.7,1.3,1 +B,25,3,398,224,143,100,73,51,36,26,20,15,12,9.6,7.8,6.4,4.5,3.3,2.5,1.9 +B,30,3,574,323,207,143,105,81,62,45,34,26,21,16,13,11,7.8,5.7,4.3,3.3 +B,35,3,781,439,281,195,143,110,87,70,54,42,33,26,21,18,12,9,6.8,5.2 +B,40,3,1020,574,367,255,187,143,113,92,76,62,49,39,32,26,18,13,10,7.8 +H,20,2,62,35,22,15,9.5,6.4,4.5,3.3,2.4,1.9,1.5,1.2,1.0,0.8,0.6,0.4,0.3,0.2 H,20,3,93,52,39,23,14,9.5,6.7,4.9,3.7,2.8,2.2,1.8,1.4,1.2,1.0,0.6,0.5,0.4 H,25,2,97,54,35,24,18,12,9,6.4,4.8,3.7,2.9,2.3,1.9,1.6,1.1,0.8,0.6,0.5 H,25,3,145,81,52,36,26,19,13,9.5,7.2,5.5,4.3,3.5,2.8,2.3,1.6,1.2,0.9,0.7 @@ -19,3 +32,45 @@ H,70,4,2288,1287,824,572,420,322,254,206,170,143,122,102,83,68,48,35,26,20 H,70,5,2860,1609,1030,715,525,402,318,257,213,179,152,127,103,85,60,44,33,25 H,80,4,2989,1681,1076,747,549,420,332,269,222,187,159,137,120,102,71,52,39,30 H,80,5,3736,2102,1345,934,686,525,415,336,278,233,199,172,149,127,89,65,49,38 +J,20,3,75,42,27,18,11,7.7,5.4,3.9,3,2.3,,,,,,,, +J,25,3,117,66,42,29,21,15,10,7.7,5.8,4.4,3.5,2.8,2.3,,,,, +J,25,5,294,165,102,59,37,25,18,13,9.6,7.4,5.8,4.7,3.8,3.1,2.2,1.6,1.2,0.9 +J,30,3,168,94,60,42,31,24,18,13,10,7.7,6,4.8,3.9,3.2,2.3,1.7,1.2,1 +J,30,5,423,238,152,102,64,43,30,22,17,13,10,8.1,6.6,5.4,3.8,2.8,2.1,1.6 +J,35,3,229,129,82,57,42,32,25,21,16,12,9.6,7.7,6.2,5.1,3.6,2.6,2,1.5 +J,35,5,576,324,207,144,102,69,48,35,26,20,16,13,10,8.6,6,4.4,3.3,2.5 +J,40,3,299,168,108,75,55,72,33,27,22,18,14,11,9.3,7.7,5.4,3.9,3,2.3 +J,40,5,752,423,271,188,138,102,72,52,39,30,24,19,15,13,9,6.6,4.9,3.8 +J,45,3,378,213,136,94,69,53,42,34,28,24,20,16,13,11,7.7,5.6,4.2,3.2 +J,50,3,467,262,168,117,86,66,52,42,35,29,25,21,18,15,10,7.7,5.7,4.4 +J,50,5,1175,661,423,294,216,165,130,102,77,59,47,37,30,25,18,13,9.6,7.4 +N,20,2,120,97,43,29,18,12,8.7,6.3,4.8,3.7,2.9,2.3,1.9,1.5,1.1,0.8,0.6,0.5 +N,20,3,180,101,65,44,28,18,13,9.5,7.1,5.5,4.3,3.5,2.8,2.3,1.6,1.2,0.9,0.7 +N,25,2,187,105,67,47,34,24,17,12,9.3,7.1,5.6,4.5,3.7,3.0,2.1,1.5,1.2,0.9 +N,25,3,281,158,101,70,52,36,25,18,14,11,8.4,6.8,5.5,4.5,3.2,2.3,1.7,1.3 +N,30,2,270,152,97,67,50,38,29,21,16,12,9.7,7.8,6.3,5.2,3.7,2.7,2.0,1.5 +N,30,3,405,228,146,101,74,57,44,32,24,18,15,12,9.5,7.8,5.5,4.0,3.0,2.3 +N,35,3,586,329,211,146,108,82,65,53,41,31,25,20,16,13,9.3,6.8,5.1,3.9 +N,40,3,765,430,275,191,140,108,85,69,57,47,37,29,24,20,14,10,7.6,5.8 +N,45,3,968,545,349,242,178,136,108,87,72,60,52,42,34,28,20,14,11,8.3 +N,50,3,1196,672,430,299,220,168,133,108,89,75,64,55,47,38,27,20,15,11 +H-T,25,2,71,40,26,18,12,7.9,5.6,4,3,2.3,,,,,,,, +H-T,25,3,107,60,39,27,18,12,8.3,6.1,4.6,3.5,2.8,2.2,,,,,, +H-T,30,3,163,92,59,41,30,22,16,11,8.5,6.6,5.2,4.1,3.4,2.8,1.9,,, +H-T,35,3,230,129,83,57,42,32,26,19,14,11,8.7,7,5.7,4.7,3.3,2.4,1.8, +H-T,40,3,309,174,111,77,57,43,34,28,22,17,13,11,8.8,7.3,5.1,3.7,2.8,2.1 +N-T,25,3,221,124,80,55,36,24,17,12,9.4,7.2,5.7,4.6,3.7,3.1,2.1,1.6,1.2,0.9 +N-T,30,3,336,189,121,84,62,46,32,23,18,14,11,8.5,6.9,5.7,4,2.9,2.2,1.7 +N-T,35,3,474,267,171,119,87,67,53,39,30,23,18,14,12,9.6,6.8,4.9,3.7,2.8 +N-T,40,3,637,358,229,159,117,90,71,57,46,35,28,22,18,15,10,7.7,5.8,4.4 +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, +,,,,,,,,,,,,,,,,,,,, diff --git a/Database/Meshes.csv b/Database/Meshes.csv index 52070a9..023ed8f 100644 --- a/Database/Meshes.csv +++ b/Database/Meshes.csv @@ -219,50 +219,6 @@ J9-T,41,100,40,5,6.5,,,Pressure Welded,Untreated,1,J 41 J9-T,41,100,45,5,6.5,,,Pressure Welded,Untreated,1,J 41 J9-T,41,100,50,5,6.5,,,Pressure Welded,Untreated,1,J 41 J9-T,41,100,60,5,6.5,,,Pressure Welded,Untreated,1,J 41 -HN9-T,35,100,25,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,30,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,35,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,40,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,45,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,50,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,25,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,30,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,35,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,40,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,45,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,50,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,HN 35 -HN9-T,35,100,25,3,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,30,3,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,35,3,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,40,3,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,45,3,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,50,3,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,25,5,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,30,5,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,35,5,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,40,5,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,45,5,6.5,,,Pressure Welded,Untreated,1,HN 35 -HN9-T,35,100,50,5,6.5,,,Pressure Welded,Untreated,1,HN 35 -JN9-T,41,100,25,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,30,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,35,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,40,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,25,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,30,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,35,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,45,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,50,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,60,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,JN 41 -JN9-T,41,100,25,3,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,30,3,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,35,3,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,40,3,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,25,5,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,30,5,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,35,5,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,45,5,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,50,5,6.5,,,Pressure Welded,Untreated,1,JN 41 -JN9-T,41,100,60,5,6.5,,,Pressure Welded,Untreated,1,JN 41 N6,17,75,25,2,5,,,Pressure Welded,Hot dip galvanized steel,0,N 17 N6,17,75,30,2,5,,,Pressure Welded,Hot dip galvanized steel,0,N 17 N6,17,75,25,2,5,,,Pressure Welded,Untreated,0,N 17 diff --git a/Database/Whole Meshes.csv b/Database/Whole Meshes.csv index 3f3929b..a0b01fe 100644 --- a/Database/Whole Meshes.csv +++ b/Database/Whole Meshes.csv @@ -1,61 +1,61 @@ -H 33 [int],H 34 [int],F 25 [int],D 22 [int],N 16 [int],N 17 [int],B 12 [int],I 100 [int],J 41 [int],JN 41 [int],HN 35 [int],A 22 [int],A 33 [int] -1000,1000,1000,1000,1000,1000,700,1000,1000,1000,1000,1000,1000 -966,962,973,972,982,983,685,900,957,955,961,968,957 -933,927,949,950,966,965,672,800,914,915,926,946,924 -900,893,923,928,949,949,659,700,872,874,890,924,891 -867,858,898,906,933,931,646,600,830,832,855,902,858 -834,825,873,884,916,914,633,500,788,791,820,880,825 -801,790,849,862,900,897,620,400,745,750,785,858,792 -768,756,825,840,883,880,608,300,700,709,750,836,759 -734,722,799,818,867,862,596,200,662,668,714,814,726 -700,687,774,797,850,845,584,100,621,626,679,792,693 -668,653,750,775,834,827,571,,580,585,644,770,660 -635,618,725,753,817,811,559,,540,544,608,748,627 -602,584,700,731,801,793,547,,500,503,573,726,594 -568,551,674,709,784,776,535,,456,462,538,704,561 -534,516,650,687,768,759,522,,416,421,503,682,528 -500,485,625,665,751,742,511,,375,380,467,660,495 -469,451,600,643,734,724,500,,334,338,432,638,462 -436,417,575,621,718,707,485,,293,297,397,616,429 -403,383,550,599,700,690,473,,254,256,362,594,396 -370,348,526,577,683,673,460,,211,215,326,572,363 -337,314,500,555,665,656,448,,171,174,291,550,330 -304,280,475,533,649,639,436,,130,132,256,528,297 -271,246,451,511,632,622,424,,89,91,221,506,264 -238,211,426,490,616,605,411,,48,50,185,484,231 -205,178,401,468,600,587,399,,,,150,462,198 -171,144,377,446,583,570,387,,,,115,440,165 -139,109,352,424,568,553,374,,,,80,418,132 -106,75,327,402,550,536,362,,,,44,396,99 -73,40,302,380,534,519,350,,,,,374,66 -40,,278,358,518,502,338,,,,,352, -,,253,336,500,486,326,,,,,330, -,,228,314,483,469,313,,,,,308, -,,204,292,465,452,301,,,,,286, -,,179,270,449,435,289,,,,,264, -,,154,248,433,418,276,,,,,242, -,,130,226,416,400,264,,,,,220, -,,105,204,400,383,252,,,,,198, -,,81,182,383,366,240,,,,,176, -,,56,160,367,349,228,,,,,154, -,,32,139,351,332,215,,,,,132, -,,,117,334,315,203,,,,,110, -,,,95,318,298,191,,,,,88, -,,,73,302,280,178,,,,,66, -,,,51,285,262,166,,,,,44, -,,,29,269,246,154,,,,,, -,,,,252,229,142,,,,,, -,,,,236,212,130,,,,,, -,,,,220,195,117,,,,,, -,,,,203,178,105,,,,,, -,,,,187,160,93,,,,,, -,,,,171,143,80,,,,,, -,,,,154,126,68,,,,,, -,,,,137,109,56,,,,,, -,,,,122,92,44,,,,,, -,,,,105,74,31,,,,,, -,,,,89,57,19,,,,,, -,,,,72,40,,,,,,, -,,,,56,23,,,,,,, -,,,,40,,,,,,,, -,,,,24,,,,,,,, +H 33 [int],H 34 [int],F 25 [int],D 22 [int],N 16 [int],N 17 [int],B 12 [int],I 100 [int],J 41 [int],A 22 [int],A 33 [int] +1000,1000,1000,1000,1000,1000,700,1000,1000,1000,1000 +966,962,973,972,982,983,685,900,957,968,957 +933,927,949,950,966,965,672,800,914,946,924 +900,893,923,928,949,949,659,700,872,924,891 +867,858,898,906,933,931,646,600,830,902,858 +834,825,873,884,916,914,633,500,788,880,825 +801,790,849,862,900,897,620,400,745,858,792 +768,756,825,840,883,880,608,300,700,836,759 +734,722,799,818,867,862,596,200,662,814,726 +700,687,774,797,850,845,584,100,621,792,693 +668,653,750,775,834,827,571,,580,770,660 +635,618,725,753,817,811,559,,540,748,627 +602,584,700,731,801,793,547,,500,726,594 +568,551,674,709,784,776,535,,456,704,561 +534,516,650,687,768,759,522,,416,682,528 +500,485,625,665,751,742,511,,375,660,495 +469,451,600,643,734,724,500,,334,638,462 +436,417,575,621,718,707,485,,293,616,429 +403,383,550,599,700,690,473,,254,594,396 +370,348,526,577,683,673,460,,211,572,363 +337,314,500,555,665,656,448,,171,550,330 +304,280,475,533,649,639,436,,130,528,297 +271,246,451,511,632,622,424,,89,506,264 +238,211,426,490,616,605,411,,48,484,231 +205,178,401,468,600,587,399,,,462,198 +171,144,377,446,583,570,387,,,440,165 +139,109,352,424,568,553,374,,,418,132 +106,75,327,402,550,536,362,,,396,99 +73,40,302,380,534,519,350,,,374,66 +40,,278,358,518,502,338,,,352, +,,253,336,500,486,326,,,330, +,,228,314,483,469,313,,,308, +,,204,292,465,452,301,,,286, +,,179,270,449,435,289,,,264, +,,154,248,433,418,276,,,242, +,,130,226,416,400,264,,,220, +,,105,204,400,383,252,,,198, +,,81,182,383,366,240,,,176, +,,56,160,367,349,228,,,154, +,,32,139,351,332,215,,,132, +,,,117,334,315,203,,,110, +,,,95,318,298,191,,,88, +,,,73,302,280,178,,,66, +,,,51,285,262,166,,,44, +,,,29,269,246,154,,,, +,,,,252,229,142,,,, +,,,,236,212,130,,,, +,,,,220,195,117,,,, +,,,,203,178,105,,,, +,,,,187,160,93,,,, +,,,,171,143,80,,,, +,,,,154,126,68,,,, +,,,,137,109,56,,,, +,,,,122,92,44,,,, +,,,,105,74,31,,,, +,,,,89,57,19,,,, +,,,,72,40,,,,, +,,,,56,23,,,,, +,,,,40,,,,,, +,,,,24,,,,,, diff --git a/Wardrobe/Gratings Data/Grating_Fill.vb b/Wardrobe/Gratings Data/Grating_Fill.vb index 4df661c..3faec73 100644 --- a/Wardrobe/Gratings Data/Grating_Fill.vb +++ b/Wardrobe/Gratings Data/Grating_Fill.vb @@ -98,8 +98,18 @@ Public Class Grating_Fill Dim LBHeightInDT As Integer = loadDT.Rows(0)("LB-HEIGHT") Dim LBThicknessInDT As Integer = loadDT.Rows(0)("LB-THICKNESS") + Dim loadName As String = User_Input.gratingName.Substring(0, 1) + If User_Input.gratingName.Substring(User_Input.gratingName.Length - 1, 1) = "T" Then + loadName += "-T" + If loadName = "F-T" Then + loadName = "H-T" ' Fixa: Tillfällig då det inte finns load data för F-T + End If + ElseIf loadName = "A" Then + loadName += User_Input.gratingMesh.Split(" ")(0) + End If + For i = 0 To loadDT.Rows.Count - 1 - If User_Input.gratingName.Substring(0, 1) = nameInDT AndAlso User_Input.gratingHeight = LBHeightInDT _ + If loadName = nameInDT AndAlso User_Input.gratingHeight = LBHeightInDT _ AndAlso User_Input.loadBarThickness = LBThicknessInDT Then For j = loadDT.Columns.Count - 1 To 0 Step -1