From 2bf95ec25879292459c5db457817a396b628c7e9 Mon Sep 17 00:00:00 2001 From: ykh Date: Sun, 28 Sep 2025 22:13:37 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=EB=B3=B8=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArinWarev1/Calculator-OD/Cooling/CCooling.vb | 177 ++++++++++--- ArinWarev1/Calculator-OD/Heating/CHeating.vb | 56 +++-- ArinWarev1/DataSet/DS.Designer.vb | 90 ++++++- ArinWarev1/DataSet/DS.xsd | 118 ++++----- ArinWarev1/DataSet/DS.xss | 30 +-- ArinWarev1/FORM-BASIC/Frm_Intro.Designer.vb | 7 +- ArinWarev1/FORM-OD/Frm_3_Mach.Designer.vb | 110 ++++---- ArinWarev1/FORM-OD/Frm_3_Mach.resx | 7 +- ArinWarev1/FORM-OD/Frm_3_Mach.vb | 34 +++ ArinWarev1/My Project/AssemblyInfo.vb | 6 +- Eco2Mixed_vs2010.sln | 110 -------- Setup/Setup.vdproj | 248 ++++++++----------- 12 files changed, 556 insertions(+), 437 deletions(-) delete mode 100644 Eco2Mixed_vs2010.sln diff --git a/ArinWarev1/Calculator-OD/Cooling/CCooling.vb b/ArinWarev1/Calculator-OD/Cooling/CCooling.vb index 0416a5a..4a63136 100644 --- a/ArinWarev1/Calculator-OD/Cooling/CCooling.vb +++ b/ArinWarev1/Calculator-OD/Cooling/CCooling.vb @@ -432,38 +432,157 @@ Q_dot_z = Q_dot_c_outg * (1 + 1 / EER) '(3.2.8-30) P_d_hydr = 1 - If dr냉방.냉동기종류 = "히트펌프" Then '//170627 2355 - P_Pump = (TOSG(T, dr냉방.냉수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + If Program = EProgram.친환경평가 Then + If dr냉방.냉동기종류 = "히트펌프" Then '//170627 2355 + P_Pump = (TOSG(T, dr냉방.냉수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + Else + P_Pump = (TOSG(T, dr냉방.냉수펌프동력) + TOSG(T, dr냉방.냉각수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + End If + + + + f_e = P_Pump / P_d_hydr '원래는 P_hydr '(3.2.8-37) + c_p1 = 0.75 + c_p2 = 0.25 + If Q_z_outg_l <> 0 Then + If (Q_dot_z * t_h_max) = 0 Then + beta_d_l = 0 '//170515 + Else + beta_d_l = Q_z_outg_l / (Q_dot_z * t_h_max) '(3.2.8-34) t_d_l 을 t_h_max으로 사용 + End If + + If beta_d_l = 0 Then + e_d_l = 0 + Else + e_d_l = f_e * (c_p1 + c_p2 / beta_d_l) '(3.2.8-36) + End If + + + W_d_hydr_l = P_d_hydr / 1000 * t_h_max * beta_d_l * f_Abgl '(3.2.8-27) t_d_l 을 t_h_max으로 사용 + + Q_z_aux_d_l = W_d_hydr_l * e_d_l '(3.2.8-26) + 'Q_z_aux_d_a = sigma(Q_z_zux_d_l) '(3.2.8-25) + + Q_c_aux = Q_c_aux + Q_z_aux_d_l + End If Else - P_Pump = (TOSG(T, dr냉방.냉수펌프동력) + TOSG(T, dr냉방.냉각수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + If dr냉방.냉동기종류 = "히트펌프" Then '//170627 2355 + P_Pump = (TOSG(T, dr냉방.냉수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + + c_p1 = 0.75 + c_p2 = 0.25 + + f_e = P_Pump / P_d_hydr '원래는 P_hydr '(3.2.8-37) + + If Q_z_outg_l <> 0 Then + If (Q_dot_z * t_h_max) = 0 Then + beta_d_l = 0 '//170515 + Else + beta_d_l = Q_z_outg_l / (Q_dot_z * t_h_max) '(3.2.8-34) t_d_l 을 t_h_max으로 사용 + End If + + If beta_d_l = 0 Then + e_d_l = 0 + Else + e_d_l = f_e * (c_p1 + c_p2 / beta_d_l) '(3.2.8-36) + End If + + + W_d_hydr_l = P_d_hydr / 1000 * t_h_max * beta_d_l * f_Abgl '(3.2.8-27) t_d_l 을 t_h_max으로 사용 + + Q_z_aux_d_l = W_d_hydr_l * e_d_l '(3.2.8-26) + 'Q_z_aux_d_a = sigma(Q_z_zux_d_l) '(3.2.8-25) + + Q_c_aux = Q_c_aux + Q_z_aux_d_l + End If + + + + Else + + P_Pump = (TOSG(T, dr냉방.냉수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + + If dr냉방.냉수펌프제어 = "제어" Then ' Worksheets("냉방분배시스템").Range("급수온도1").Offset(-1, i_count_c_d - 1) = "제어" Then + c_p1 = 0.85 + c_p2 = 0.15 + ElseIf dr냉방.냉수펌프제어 = "대수제어" Then + c_p1 = 0.75 + c_p2 = 0.25 + Else + c_p1 = 0.25 + c_p2 = 0.75 + End If + + + f_e = P_Pump / P_d_hydr '원래는 P_hydr '(3.2.8-37) + + If Q_z_outg_l <> 0 Then + If (Q_dot_z * t_h_max) = 0 Then + beta_d_l = 0 '//170515 + Else + beta_d_l = Q_z_outg_l / (Q_dot_z * t_h_max) '(3.2.8-34) t_d_l 을 t_h_max으로 사용 + End If + + If beta_d_l = 0 Then + e_d_l = 0 + Else + e_d_l = f_e * (c_p1 + c_p2 / beta_d_l) '(3.2.8-36) + End If + + + W_d_hydr_l = P_d_hydr / 1000 * t_h_max * beta_d_l * f_Abgl '(3.2.8-27) t_d_l 을 t_h_max으로 사용 + + Q_z_aux_d_l = W_d_hydr_l * e_d_l '(3.2.8-26) + 'Q_z_aux_d_a = sigma(Q_z_zux_d_l) '(3.2.8-25) + + Q_c_aux = Q_c_aux + Q_z_aux_d_l + End If + + + '----------------- second + + P_Pump = (TOSG(T, dr냉방.냉각수펌프동력)) * 1000 'Worksheets("냉방분배시스템").Range("급수온도1").Offset(9, i_count_c_d - 1) + + If dr냉방.냉각수펌프제어 = "제어" Then ' Worksheets("냉방분배시스템").Range("급수온도1").Offset(-1, i_count_c_d - 1) = "제어" Then + c_p1 = 0.85 + c_p2 = 0.15 + ElseIf dr냉방.냉각수펌프제어 = "대수제어" Then + c_p1 = 0.75 + c_p2 = 0.25 + Else + c_p1 = 0.25 + c_p2 = 0.75 + End If + + f_e = P_Pump / P_d_hydr '원래는 P_hydr '(3.2.8-37) + + If Q_z_outg_l <> 0 Then + If (Q_dot_z * t_h_max) = 0 Then + beta_d_l = 0 '//170515 + Else + beta_d_l = Q_z_outg_l / (Q_dot_z * t_h_max) '(3.2.8-34) t_d_l 을 t_h_max으로 사용 + End If + + If beta_d_l = 0 Then + e_d_l = 0 + Else + e_d_l = f_e * (c_p1 + c_p2 / beta_d_l) '(3.2.8-36) + End If + + + W_d_hydr_l = P_d_hydr / 1000 * t_h_max * beta_d_l * f_Abgl '(3.2.8-27) t_d_l 을 t_h_max으로 사용 + + Q_z_aux_d_l = W_d_hydr_l * e_d_l '(3.2.8-26) + 'Q_z_aux_d_a = sigma(Q_z_zux_d_l) '(3.2.8-25) + + Q_c_aux = Q_c_aux + Q_z_aux_d_l + End If + + + End If End If - - - f_e = P_Pump / P_d_hydr '원래는 P_hydr '(3.2.8-37) - c_p1 = 0.75 - c_p2 = 0.25 - If Q_z_outg_l <> 0 Then - If (Q_dot_z * t_h_max) = 0 Then - beta_d_l = 0 '//170515 - Else - beta_d_l = Q_z_outg_l / (Q_dot_z * t_h_max) '(3.2.8-34) t_d_l 을 t_h_max으로 사용 - End If - - If beta_d_l = 0 Then - e_d_l = 0 - Else - e_d_l = f_e * (c_p1 + c_p2 / beta_d_l) '(3.2.8-36) - End If - - - W_d_hydr_l = P_d_hydr / 1000 * t_h_max * beta_d_l * f_Abgl '(3.2.8-27) t_d_l 을 t_h_max으로 사용 - - Q_z_aux_d_l = W_d_hydr_l * e_d_l '(3.2.8-26) - 'Q_z_aux_d_a = sigma(Q_z_zux_d_l) '(3.2.8-25) - - Q_c_aux = Q_c_aux + Q_z_aux_d_l - End If + diff --git a/ArinWarev1/Calculator-OD/Heating/CHeating.vb b/ArinWarev1/Calculator-OD/Heating/CHeating.vb index eff141b..37a1188 100644 --- a/ArinWarev1/Calculator-OD/Heating/CHeating.vb +++ b/ArinWarev1/Calculator-OD/Heating/CHeating.vb @@ -378,6 +378,7 @@ Case "전기보일러" '전기보일러" use_Elec = use_Elec + Q_w_outg_i + Q_w_g_i + (Q_w_outg_i * 0.09) + Q_w_outg = Q_w_outg + (Q_w_outg_i * 0.09) '========2023.11.12 수정 '====================================================================================2010.03.14 추가 Case "히트펌프" @@ -1825,17 +1826,43 @@ ' 전기보조에너지 Q_h_d_aux 산출 관련 P_Pump = TOSG(dr난방.펌프동력) ' Worksheets("난방기기").Range("난방펌프제어유형1").Offset(1, i_count_boiler - 1) - 'Select Case dr난방.펌프제어유형.Trim ' Worksheets("난방기기").Range("난방펌프제어유형1").Offset(0, i_count_boiler - 1) - ' Case "비제어" '비제어" - c_p1 = 0.25 - c_p2 = 0.75 - ' Case "정압" '정압" - ' c_p1 = 0.75 - ' c_p2 = 0.25 - ' Case "변압" '변압" - ' c_p1 = 0.9 - ' c_p2 = 0.1 - 'End Select + + + + If Program = EProgram.친환경평가 Then + + 'Select Case dr난방.펌프제어유형.Trim ' Worksheets("난방기기").Range("난방펌프제어유형1").Offset(0, i_count_boiler - 1) + ' Case "비제어" '비제어" + c_p1 = 0.25 + c_p2 = 0.75 + ' Case "정압" '정압" + ' c_p1 = 0.75 + ' c_p2 = 0.25 + ' Case "변압" '변압" + ' c_p1 = 0.9 + ' c_p2 = 0.1 + 'End Select + + + f_P_A = 1 + + Else + + Select Case dr난방.펌프제어유형.Trim() ' Worksheets("난방기기").Range("난방펌프제어유형1").Offset(0, i_count_boiler - 1) + Case "정압" '정압" + c_p1 = 0.75 + c_p2 = 0.25 + Case "변압" '변압" + c_p1 = 0.9 + c_p2 = 0.1 + Case Else + c_p1 = 0.25 + c_p2 = 0.75 + End Select + + f_P_A = 0.6 + + End If If beta_h_d = 0 Then Q_h_d_aux_i = 0 @@ -1843,13 +1870,6 @@ Q_h_d_aux_i = P_Pump * beta_h_d * t_h * (c_p1 + c_p2 / beta_h_d) '(3.2.7-39) End If - If Program = EProgram.친환경평가 Then - f_P_A = 1 - - Else - f_P_A = 0.6 - - End If 'Select Case dr난방.펌프교정계수.Trim ' Worksheets("난방기기").Range("난방펌프교정계수1").Offset(0, i_count_boiler - 1) diff --git a/ArinWarev1/DataSet/DS.Designer.vb b/ArinWarev1/DataSet/DS.Designer.vb index 2f98e78..5180e9b 100644 --- a/ArinWarev1/DataSet/DS.Designer.vb +++ b/ArinWarev1/DataSet/DS.Designer.vb @@ -7298,7 +7298,7 @@ Partial Public Class DS Me.column펌프정격전력.DefaultValue = CType("0",String) Me.column배관망유형.DefaultValue = CType("0",String) Me.column펌프교정계수.DefaultValue = CType("0",String) - Me.column펌프제어유형.DefaultValue = CType("0",String) + Me.column펌프제어유형.DefaultValue = CType("(없음)",String) Me.column펌프제어유형.MaxLength = 50 Me.column펌프동력.DefaultValue = CType("0",String) Me.column펌프동력.MaxLength = 50 @@ -7517,6 +7517,10 @@ Partial Public Class DS Private column대수 As Global.System.Data.DataColumn + Private column냉수펌프제어 As Global.System.Data.DataColumn + + Private column냉각수펌프제어 As Global.System.Data.DataColumn + _ Public Sub New() @@ -7736,6 +7740,22 @@ Partial Public Class DS End Get End Property + _ + Public ReadOnly Property 냉수펌프제어Column() As Global.System.Data.DataColumn + Get + Return Me.column냉수펌프제어 + End Get + End Property + + _ + Public ReadOnly Property 냉각수펌프제어Column() As Global.System.Data.DataColumn + Get + Return Me.column냉각수펌프제어 + End Get + End Property + _ @@ -7796,9 +7816,11 @@ Partial Public Class DS ByVal 냉수펌프동력 As String, _ ByVal 냉각수펌프동력 As String, _ ByVal 사용연료 As String, _ - ByVal 대수 As String) As tbl_nangbangkikiRow + ByVal 대수 As String, _ + ByVal 냉수펌프제어 As String, _ + ByVal 냉각수펌프제어 As String) As tbl_nangbangkikiRow Dim rowtbl_nangbangkikiRow As tbl_nangbangkikiRow = CType(Me.NewRow,tbl_nangbangkikiRow) - Dim columnValuesArray() As Object = New Object() {code, 설명, 냉동기방식, 냉동기용량, 열성능비, 냉동기종류, 냉동기압축방식, 압축기제어방식, 냉동기설비시스템, 제어방식, 온수열생산기기, 증발식건식냉각기, 증발식냉각기, 보조방음기유무, 냉각탑입구온도, 연결된시스템, 열생산연결방식, 개별기기적용, 헤더적용, 냉수펌프동력, 냉각수펌프동력, 사용연료, 대수} + Dim columnValuesArray() As Object = New Object() {code, 설명, 냉동기방식, 냉동기용량, 열성능비, 냉동기종류, 냉동기압축방식, 압축기제어방식, 냉동기설비시스템, 제어방식, 온수열생산기기, 증발식건식냉각기, 증발식냉각기, 보조방음기유무, 냉각탑입구온도, 연결된시스템, 열생산연결방식, 개별기기적용, 헤더적용, 냉수펌프동력, 냉각수펌프동력, 사용연료, 대수, 냉수펌프제어, 냉각수펌프제어} rowtbl_nangbangkikiRow.ItemArray = columnValuesArray Me.Rows.Add(rowtbl_nangbangkikiRow) Return rowtbl_nangbangkikiRow @@ -7850,6 +7872,8 @@ Partial Public Class DS Me.column냉각수펌프동력 = MyBase.Columns("냉각수펌프동력") Me.column사용연료 = MyBase.Columns("사용연료") Me.column대수 = MyBase.Columns("대수") + Me.column냉수펌프제어 = MyBase.Columns("냉수펌프제어") + Me.column냉각수펌프제어 = MyBase.Columns("냉각수펌프제어") End Sub _ + Public Property 냉수펌프제어() As String + Get + If Me.Is냉수펌프제어Null Then + Return String.Empty + Else + Return CType(Me(Me.tabletbl_nangbangkiki.냉수펌프제어Column),String) + End If + End Get + Set + Me(Me.tabletbl_nangbangkiki.냉수펌프제어Column) = value + End Set + End Property + + _ + Public Property 냉각수펌프제어() As String + Get + If Me.Is냉각수펌프제어Null Then + Return String.Empty + Else + Return CType(Me(Me.tabletbl_nangbangkiki.냉각수펌프제어Column),String) + End If + End Get + Set + Me(Me.tabletbl_nangbangkiki.냉각수펌프제어Column) = value + End Set + End Property + _ Public Function Is설명Null() As Boolean @@ -30719,6 +30777,30 @@ Partial Public Class DS Public Sub Set대수Null() Me(Me.tabletbl_nangbangkiki.대수Column) = Global.System.Convert.DBNull End Sub + + _ + Public Function Is냉수펌프제어Null() As Boolean + Return Me.IsNull(Me.tabletbl_nangbangkiki.냉수펌프제어Column) + End Function + + _ + Public Sub Set냉수펌프제어Null() + Me(Me.tabletbl_nangbangkiki.냉수펌프제어Column) = Global.System.Convert.DBNull + End Sub + + _ + Public Function Is냉각수펌프제어Null() As Boolean + Return Me.IsNull(Me.tabletbl_nangbangkiki.냉각수펌프제어Column) + End Function + + _ + Public Sub Set냉각수펌프제어Null() + Me(Me.tabletbl_nangbangkiki.냉각수펌프제어Column) = Global.System.Convert.DBNull + End Sub End Class ''' diff --git a/ArinWarev1/DataSet/DS.xsd b/ArinWarev1/DataSet/DS.xsd index 2dcad93..c68ef87 100644 --- a/ArinWarev1/DataSet/DS.xsd +++ b/ArinWarev1/DataSet/DS.xsd @@ -1532,7 +1532,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -1875,7 +1875,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -1898,7 +1898,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2016,7 +2016,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2127,7 +2127,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2322,7 +2322,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2350,7 +2350,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2405,7 +2405,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2467,10 +2467,12 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 + + - + @@ -2515,7 +2517,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2523,7 +2525,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2552,7 +2554,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2670,7 +2672,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2865,7 +2867,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2910,7 +2912,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2928,7 +2930,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2948,7 +2950,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -2973,7 +2975,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3031,7 +3033,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3095,7 +3097,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3107,7 +3109,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3116,7 +3118,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3150,7 +3152,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3318,7 +3320,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3389,7 +3391,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3426,7 +3428,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3460,7 +3462,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3487,7 +3489,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3514,7 +3516,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3526,7 +3528,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3538,7 +3540,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3551,7 +3553,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3576,7 +3578,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3612,7 +3614,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3641,7 +3643,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -3984,7 +3986,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4102,7 +4104,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4213,7 +4215,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4331,7 +4333,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4526,7 +4528,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4721,7 +4723,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4832,7 +4834,7 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + @@ -4943,108 +4945,108 @@ SELECT pcode, code, 설명, 최대부하, m01, m02, m03, m04, m05, m06, m07, m08 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/ArinWarev1/DataSet/DS.xss b/ArinWarev1/DataSet/DS.xss index beb4f7f..b027060 100644 --- a/ArinWarev1/DataSet/DS.xss +++ b/ArinWarev1/DataSet/DS.xss @@ -4,10 +4,10 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + @@ -15,39 +15,39 @@ - - - - - + + + + + - + - + - + - + - - - + + + \ No newline at end of file diff --git a/ArinWarev1/FORM-BASIC/Frm_Intro.Designer.vb b/ArinWarev1/FORM-BASIC/Frm_Intro.Designer.vb index ba52fd3..9788eed 100644 --- a/ArinWarev1/FORM-BASIC/Frm_Intro.Designer.vb +++ b/ArinWarev1/FORM-BASIC/Frm_Intro.Designer.vb @@ -53,7 +53,6 @@ Partial Class Frm_Intro 'RadioButton2 ' Me.RadioButton2.AutoSize = True - Me.RadioButton2.Checked = True Me.RadioButton2.Font = New System.Drawing.Font("맑은 고딕", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.RadioButton2.ForeColor = System.Drawing.Color.RoyalBlue Me.RadioButton2.Location = New System.Drawing.Point(22, 19) @@ -61,21 +60,21 @@ Partial Class Frm_Intro Me.RadioButton2.Name = "RadioButton2" Me.RadioButton2.Size = New System.Drawing.Size(216, 25) Me.RadioButton2.TabIndex = 18 - Me.RadioButton2.TabStop = True Me.RadioButton2.Text = "에너지 절약형 친환경주택" Me.RadioButton2.UseVisualStyleBackColor = True ' 'RadioButton1 ' Me.RadioButton1.AutoSize = True - Me.RadioButton1.Enabled = False - Me.RadioButton1.Font = New System.Drawing.Font("맑은 고딕", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.RadioButton1.Checked = True + Me.RadioButton1.Font = New System.Drawing.Font("맑은 고딕", 12.0!, System.Drawing.FontStyle.Bold) Me.RadioButton1.ForeColor = System.Drawing.Color.RoyalBlue Me.RadioButton1.Location = New System.Drawing.Point(22, 56) Me.RadioButton1.Margin = New System.Windows.Forms.Padding(3, 6, 3, 6) Me.RadioButton1.Name = "RadioButton1" Me.RadioButton1.Size = New System.Drawing.Size(222, 25) Me.RadioButton1.TabIndex = 17 + Me.RadioButton1.TabStop = True Me.RadioButton1.Text = "건축물 에너지 소비 총량제" Me.RadioButton1.UseVisualStyleBackColor = True ' diff --git a/ArinWarev1/FORM-OD/Frm_3_Mach.Designer.vb b/ArinWarev1/FORM-OD/Frm_3_Mach.Designer.vb index 073a53c..391b3c7 100644 --- a/ArinWarev1/FORM-OD/Frm_3_Mach.Designer.vb +++ b/ArinWarev1/FORM-OD/Frm_3_Mach.Designer.vb @@ -32,44 +32,44 @@ Partial Class Frm_3_Mach Me.C1DockingTab1 = New C1.Win.C1Command.C1DockingTab() Me.C1DockingTabPage1 = New C1.Win.C1Command.C1DockingTabPage() Me.fxNanBang = New C1.Win.C1FlexGrid.C1FlexGrid() - Me.bs_난방기기 = New System.Windows.Forms.BindingSource(Me.components) - Me.DataSet1 = New Eco2OD.DS() Me.C1DockingTabPage2 = New C1.Win.C1Command.C1DockingTabPage() Me.fxNaengBang = New C1.Win.C1FlexGrid.C1FlexGrid() - Me.bs_냉방기기 = New System.Windows.Forms.BindingSource(Me.components) Me.C1DockingTabPage3 = New C1.Win.C1Command.C1DockingTabPage() Me.fxKogjo = New C1.Win.C1FlexGrid.C1FlexGrid() - Me.bs_공조기기 = New System.Windows.Forms.BindingSource(Me.components) Me.C1DockingTabPage4 = New C1.Win.C1Command.C1DockingTabPage() Me.fxLight = New C1.Win.C1FlexGrid.C1FlexGrid() - Me.bs_조명기기 = New System.Windows.Forms.BindingSource(Me.components) Me.C1DockingTabPage5 = New C1.Win.C1Command.C1DockingTabPage() Me.fxDanMal = New C1.Win.C1FlexGrid.C1FlexGrid() - Me.bS_실내단말기 = New System.Windows.Forms.BindingSource(Me.components) Me.C1StatusBar1 = New C1.Win.C1Ribbon.C1StatusBar() Me.btAdd = New C1.Win.C1Ribbon.RibbonButton() Me.btDel = New C1.Win.C1Ribbon.RibbonButton() Me.RibbonButton1 = New C1.Win.C1Ribbon.RibbonButton() + Me.bs_난방기기 = New System.Windows.Forms.BindingSource(Me.components) + Me.DataSet1 = New Eco2OD.DS() + Me.bs_냉방기기 = New System.Windows.Forms.BindingSource(Me.components) + Me.bs_공조기기 = New System.Windows.Forms.BindingSource(Me.components) + Me.bs_조명기기 = New System.Windows.Forms.BindingSource(Me.components) + Me.bS_실내단말기 = New System.Windows.Forms.BindingSource(Me.components) Me.cmGrid.SuspendLayout() CType(Me.C1DockingTab1, System.ComponentModel.ISupportInitialize).BeginInit() Me.C1DockingTab1.SuspendLayout() Me.C1DockingTabPage1.SuspendLayout() CType(Me.fxNanBang, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).BeginInit() Me.C1DockingTabPage2.SuspendLayout() CType(Me.fxNaengBang, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).BeginInit() Me.C1DockingTabPage3.SuspendLayout() CType(Me.fxKogjo, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).BeginInit() Me.C1DockingTabPage4.SuspendLayout() CType(Me.fxLight, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).BeginInit() Me.C1DockingTabPage5.SuspendLayout() CType(Me.fxDanMal, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.C1StatusBar1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'cmGrid @@ -148,17 +148,6 @@ Partial Class Frm_3_Mach Me.fxNanBang.Tag = "nanbang" Me.fxNanBang.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver ' - 'bs_난방기기 - ' - Me.bs_난방기기.DataMember = "tbl_nanbangkiki" - Me.bs_난방기기.DataSource = Me.DataSet1 - Me.bs_난방기기.Filter = "code <> '0'" - ' - 'DataSet1 - ' - Me.DataSet1.DataSetName = "DS" - Me.DataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'C1DockingTabPage2 ' Me.C1DockingTabPage2.Controls.Add(Me.fxNaengBang) @@ -189,12 +178,6 @@ Partial Class Frm_3_Mach Me.fxNaengBang.Tag = "naengbang" Me.fxNaengBang.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver ' - 'bs_냉방기기 - ' - Me.bs_냉방기기.DataMember = "tbl_nangbangkiki" - Me.bs_냉방기기.DataSource = Me.DataSet1 - Me.bs_냉방기기.Filter = "code <> '0'" - ' 'C1DockingTabPage3 ' Me.C1DockingTabPage3.Controls.Add(Me.fxKogjo) @@ -225,12 +208,6 @@ Partial Class Frm_3_Mach Me.fxKogjo.Tag = "kongjo" Me.fxKogjo.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver ' - 'bs_공조기기 - ' - Me.bs_공조기기.DataMember = "tbl_kongjo" - Me.bs_공조기기.DataSource = Me.DataSet1 - Me.bs_공조기기.Filter = "code <> '0'" - ' 'C1DockingTabPage4 ' Me.C1DockingTabPage4.Controls.Add(Me.fxLight) @@ -261,13 +238,6 @@ Partial Class Frm_3_Mach Me.fxLight.Tag = "light" Me.fxLight.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver ' - 'bs_조명기기 - ' - Me.bs_조명기기.AllowNew = True - Me.bs_조명기기.DataMember = "tbl_light" - Me.bs_조명기기.DataSource = Me.DataSet1 - Me.bs_조명기기.Filter = "code <> '0'" - ' 'C1DockingTabPage5 ' Me.C1DockingTabPage5.Controls.Add(Me.fxDanMal) @@ -298,13 +268,6 @@ Partial Class Frm_3_Mach Me.fxDanMal.Tag = "danmal" Me.fxDanMal.VisualStyle = C1.Win.C1FlexGrid.VisualStyle.Office2007Silver ' - 'bS_실내단말기 - ' - Me.bS_실내단말기.AllowNew = True - Me.bS_실내단말기.DataMember = "tbl_danmal" - Me.bS_실내단말기.DataSource = Me.DataSet1 - Me.bS_실내단말기.Filter = "code <> '0'" - ' 'C1StatusBar1 ' Me.C1StatusBar1.AutoSizeElement = C1.Framework.AutoSizeElement.Width @@ -334,6 +297,43 @@ Partial Class Frm_3_Mach Me.RibbonButton1.SmallImage = CType(resources.GetObject("RibbonButton1.SmallImage"), System.Drawing.Image) Me.RibbonButton1.Text = "적용(&S)" ' + 'bs_난방기기 + ' + Me.bs_난방기기.DataMember = "tbl_nanbangkiki" + Me.bs_난방기기.DataSource = Me.DataSet1 + Me.bs_난방기기.Filter = "code <> '0'" + ' + 'DataSet1 + ' + Me.DataSet1.DataSetName = "DS" + Me.DataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' + 'bs_냉방기기 + ' + Me.bs_냉방기기.DataMember = "tbl_nangbangkiki" + Me.bs_냉방기기.DataSource = Me.DataSet1 + Me.bs_냉방기기.Filter = "code <> '0'" + ' + 'bs_공조기기 + ' + Me.bs_공조기기.DataMember = "tbl_kongjo" + Me.bs_공조기기.DataSource = Me.DataSet1 + Me.bs_공조기기.Filter = "code <> '0'" + ' + 'bs_조명기기 + ' + Me.bs_조명기기.AllowNew = True + Me.bs_조명기기.DataMember = "tbl_light" + Me.bs_조명기기.DataSource = Me.DataSet1 + Me.bs_조명기기.Filter = "code <> '0'" + ' + 'bS_실내단말기 + ' + Me.bS_실내단말기.AllowNew = True + Me.bS_실내단말기.DataMember = "tbl_danmal" + Me.bS_실내단말기.DataSource = Me.DataSet1 + Me.bS_실내단말기.Filter = "code <> '0'" + ' 'Frm_3_Mach ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -353,21 +353,21 @@ Partial Class Frm_3_Mach Me.C1DockingTab1.ResumeLayout(False) Me.C1DockingTabPage1.ResumeLayout(False) CType(Me.fxNanBang, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).EndInit() Me.C1DockingTabPage2.ResumeLayout(False) CType(Me.fxNaengBang, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).EndInit() Me.C1DockingTabPage3.ResumeLayout(False) CType(Me.fxKogjo, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).EndInit() Me.C1DockingTabPage4.ResumeLayout(False) CType(Me.fxLight, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).EndInit() Me.C1DockingTabPage5.ResumeLayout(False) CType(Me.fxDanMal, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.C1StatusBar1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.bs_난방기기, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DataSet1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.bs_냉방기기, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.bs_공조기기, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.bs_조명기기, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.bS_실내단말기, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/ArinWarev1/FORM-OD/Frm_3_Mach.resx b/ArinWarev1/FORM-OD/Frm_3_Mach.resx index 25290c7..286b745 100644 --- a/ArinWarev1/FORM-OD/Frm_3_Mach.resx +++ b/ArinWarev1/FORM-OD/Frm_3_Mach.resx @@ -121,7 +121,7 @@ 728, 17 - 43,1,0,0,0,120,Columns:1{Width:40;Name:"code";Caption:"CD";Visible:False;AllowEditing:False;Style:"DataType:System.String;BackColor:WhiteSmoke;TextAlign:CenterCenter;";} 2{Width:38;Name:"설명";Caption:"설명";Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Width:38;Name:"난방급탕구분";Caption:"구분";Style:"DataType:System.String;TextAlign:CenterCenter;";} 4{Width:62;Name:"열생산기기방식";Caption:"난방방식";Style:"DataType:System.String;TextAlign:CenterCenter;";} 5{Width:81;Name:"배관길이";Caption:"배관길이(m)";Visible:False;Style:"DataType:System.String;TextAlign:CenterCenter;";} 6{Name:"연결된시스템";Caption:"연결된신재생";Style:"DataType:System.String;TextAlign:CenterCenter;";} 7{Width:62;Name:"사용연료";Caption:"사용연료";Style:"DataType:System.String;TextAlign:CenterCenter;";} 8{Width:82;Name:"보일러정격출력";Caption:"기기용량(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 9{Width:82;Name:"열교환기정격출력";Caption:"열교환기정격출력";Visible:False;Style:"DataType:System.String;TextAlign:CenterCenter;";} 10{Width:38;Name:"보일러대수";Caption:"기기대수";Style:"DataType:System.String;TextAlign:CenterCenter;";} 11{Width:60;Name:"정격보일러효율";Caption:"기기효율(%)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 12{Width:100;Name:"정격보일러COP";Caption:"성적계수(COP)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 13{Width:129;Name:"펌프동력";Caption:"펌프동력합계(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 14{Name:"축열탱크방식";Caption:"축열탱크방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 15{Name:"축열제척";Caption:"축열제척";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 16{Name:"펌프정격전력";Caption:"펌프정격전력";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 17{Name:"배관망유형";Caption:"배관망유형";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 18{Name:"펌프교정계수";Caption:"펌프교정계수";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 19{Name:"펌프제어유형";Caption:"펌프제어유형";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 20{Name:"분배시스템방식";Caption:"분배시스템방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 21{Name:"순환유무";Caption:"순환유무";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 22{Name:"펌프동력급탕";Caption:"펌프동력급탕";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 23{Name:"건물길이";Caption:"건물길이";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 24{Name:"건물넓이";Caption:"건물넓이";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 25{Name:"열공급층수";Caption:"열공급층수";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 26{Name:"층고";Caption:"층고";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 27{Name:"신재생연결여부";Caption:"신재생연결여부";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 28{Name:"펌프제어";Caption:"펌프제어";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 29{Name:"급수온도";Caption:"급수온도";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 30{Name:"환수온도";Caption:"환수온도";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 31{Name:"운전방식";Caption:"운전방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 32{Name:"보일러방식";Caption:"보일러방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 33{Name:"지역난방방식";Caption:"지역난방방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 34{Name:"히트연료";Caption:"히트연료";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 35{Name:"히트난방용량";Caption:"히트난방용량";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 36{Name:"히트난방정격7";Caption:"히트난방정격7";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 37{Name:"히트난방정격10";Caption:"히트난방정격10";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 38{Name:"히트배관길이";Caption:"히트배관길이";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 39{Name:"단열등급";Caption:"단열등급";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 40{Name:"히트펌프시스템종류";Caption:"히트펌프시스템종류";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 41{Name:"개별기기적용";Caption:"개별기기적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} 42{Name:"헤더적용";Caption:"헤더적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} + 44,1,0,0,0,120,Columns:1{Width:40;Name:"code";Caption:"CD";Visible:False;AllowEditing:False;Style:"DataType:System.String;BackColor:WhiteSmoke;TextAlign:CenterCenter;";} 2{Width:38;Name:"설명";Caption:"설명";Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Width:38;Name:"난방급탕구분";Caption:"구분";Style:"DataType:System.String;TextAlign:CenterCenter;";} 4{Width:62;Name:"열생산기기방식";Caption:"난방방식";Style:"DataType:System.String;TextAlign:CenterCenter;";} 5{Width:81;Name:"배관길이";Caption:"배관길이(m)";Visible:False;Style:"DataType:System.String;TextAlign:CenterCenter;";} 6{Name:"연결된시스템";Caption:"연결된신재생";Style:"DataType:System.String;TextAlign:CenterCenter;";} 7{Width:62;Name:"사용연료";Caption:"사용연료";Style:"DataType:System.String;TextAlign:CenterCenter;";} 8{Width:82;Name:"보일러정격출력";Caption:"기기용량(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 9{Width:82;Name:"열교환기정격출력";Caption:"열교환기정격출력";Visible:False;Style:"DataType:System.String;TextAlign:CenterCenter;";} 10{Width:38;Name:"보일러대수";Caption:"기기대수";Style:"DataType:System.String;TextAlign:CenterCenter;";} 11{Width:60;Name:"정격보일러효율";Caption:"기기효율(%)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 12{Width:100;Name:"정격보일러COP";Caption:"성적계수(COP)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 13{Width:129;Name:"펌프동력";Caption:"펌프동력합계(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 14{Name:"펌프제어유형";Caption:"펌프제어유형";Style:"DataType:System.String;TextAlign:LeftCenter;";} 15{Name:"축열탱크방식";Caption:"축열탱크방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 16{Name:"축열제척";Caption:"축열제척";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 17{Name:"펌프정격전력";Caption:"펌프정격전력";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 18{Name:"배관망유형";Caption:"배관망유형";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 19{Name:"펌프교정계수";Caption:"펌프교정계수";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 20{Name:"펌프제어유형";Caption:"펌프제어유형";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 21{Name:"분배시스템방식";Caption:"분배시스템방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 22{Name:"순환유무";Caption:"순환유무";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 23{Name:"펌프동력급탕";Caption:"펌프동력급탕";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 24{Name:"건물길이";Caption:"건물길이";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 25{Name:"건물넓이";Caption:"건물넓이";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 26{Name:"열공급층수";Caption:"열공급층수";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 27{Name:"층고";Caption:"층고";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 28{Name:"신재생연결여부";Caption:"신재생연결여부";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 29{Name:"펌프제어";Caption:"펌프제어";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 30{Name:"급수온도";Caption:"급수온도";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 31{Name:"환수온도";Caption:"환수온도";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 32{Name:"운전방식";Caption:"운전방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 33{Name:"보일러방식";Caption:"보일러방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 34{Name:"지역난방방식";Caption:"지역난방방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 35{Name:"히트연료";Caption:"히트연료";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 36{Name:"히트난방용량";Caption:"히트난방용량";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 37{Name:"히트난방정격7";Caption:"히트난방정격7";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 38{Name:"히트난방정격10";Caption:"히트난방정격10";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 39{Name:"히트배관길이";Caption:"히트배관길이";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 40{Name:"단열등급";Caption:"단열등급";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 41{Name:"히트펌프시스템종류";Caption:"히트펌프시스템종류";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 42{Name:"개별기기적용";Caption:"개별기기적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} 43{Name:"헤더적용";Caption:"헤더적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} 238, 17 @@ -133,7 +133,7 @@ Normal{BackColor:Window;} Alternate{} Fixed{BackColor:Control;ForeColor:ControlText;Border:Flat,1,ControlDark,Both;BackgroundImageLayout:Hide;} Highlight{BackColor:Highlight;ForeColor:HighlightText;SearchBackColor:Orange;} Focus{Border:Flat,2,Fuchsia,Both;} Editor{} Search{BackColor:Highlight;ForeColor:HighlightText;} Frozen{BackColor:Beige;} FrozenAlternate{} NewRow{ForeColor:GrayText;} EmptyArea{BackColor:AppWorkspace;Border:Flat,1,ControlDarkDark,Both;} SelectedColumnHeader{} SelectedRowHeader{} GrandTotal{BackColor:Black;ForeColor:White;} Subtotal0{BackColor:ControlDarkDark;ForeColor:White;} Subtotal1{BackColor:ControlDarkDark;ForeColor:White;} Subtotal2{BackColor:ControlDarkDark;ForeColor:White;} Subtotal3{BackColor:ControlDarkDark;ForeColor:White;} Subtotal4{BackColor:ControlDarkDark;ForeColor:White;} Subtotal5{BackColor:ControlDarkDark;ForeColor:White;} FilterEditor{} FirstCustomStyle{} - 26,1,0,0,0,120,Columns:1{Width:40;Name:"code";Caption:"CD";Visible:False;AllowEditing:False;Style:"DataType:System.String;BackColor:WhiteSmoke;TextAlign:CenterCenter;";} 2{Width:38;Name:"설명";Caption:"설명";Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Width:62;Name:"냉동기방식";Caption:"냉방방식";Style:"DataType:System.String;TextAlign:CenterCenter;";} 4{Width:63;Name:"냉동기용량";Caption:"용량(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 5{Width:68;Name:"대수";Caption:"기기대수";Style:"DataType:System.String;TextAlign:CenterCenter;";} 6{Width:94;Name:"열성능비";Caption:"열성능비(COP)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 7{Width:74;Name:"냉동기종류";Caption:"냉동기종류";Style:"DataType:System.String;TextAlign:CenterCenter;";} 8{Width:86;Name:"연결된시스템";Caption:"연결된신재생";Style:"DataType:System.String;TextAlign:CenterCenter;";} 9{Width:62;Name:"사용연료";Caption:"사용연료";Style:"DataType:System.String;TextAlign:CenterCenter;";} 10{Name:"냉수펌프동력";Caption:"냉수펌프동력(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 11{Name:"증발식건식냉각기";Caption:"냉각탑종류";Style:"DataType:System.String;TextAlign:CenterCenter;";} 12{Name:"냉각수펌프동력";Caption:"냉각수펌프동력(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 13{Name:"냉동기압축방식";Caption:"냉동기압축방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 14{Name:"압축기제어방식";Caption:"압축기제어방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 15{Name:"냉동기설비시스템";Caption:"냉동기설비시스템";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 16{Name:"제어방식";Caption:"제어방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 17{Name:"온수열생산기기";Caption:"온수열생산기기";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 18{Name:"증발식건식냉각기";Caption:"증발식건식냉각기";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 19{Name:"증발식냉각기";Caption:"증발식냉각기";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 20{Name:"보조방음기유무";Caption:"보조방음기유무";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 21{Name:"냉각탑입구온도";Caption:"냉각탑입구온도";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 22{Name:"신재생연결여부";Caption:"신재생연결여부";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 23{Name:"열생산연결방식";Caption:"열생산연결방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 24{Name:"개별기기적용";Caption:"개별기기적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} 25{Name:"헤더적용";Caption:"헤더적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} + 28,1,0,0,0,120,Columns:1{Width:40;Name:"code";Caption:"CD";Visible:False;AllowEditing:False;Style:"DataType:System.String;BackColor:WhiteSmoke;TextAlign:CenterCenter;";} 2{Width:38;Name:"설명";Caption:"설명";Style:"DataType:System.String;TextAlign:LeftCenter;";} 3{Width:62;Name:"냉동기방식";Caption:"냉방방식";Style:"DataType:System.String;TextAlign:CenterCenter;";} 4{Width:63;Name:"냉동기용량";Caption:"용량(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 5{Width:68;Name:"대수";Caption:"기기대수";Style:"DataType:System.String;TextAlign:CenterCenter;";} 6{Width:94;Name:"열성능비";Caption:"열성능비(COP)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 7{Width:74;Name:"냉동기종류";Caption:"냉동기종류";Style:"DataType:System.String;TextAlign:CenterCenter;";} 8{Width:86;Name:"연결된시스템";Caption:"연결된신재생";Style:"DataType:System.String;TextAlign:CenterCenter;";} 9{Width:62;Name:"사용연료";Caption:"사용연료";Style:"DataType:System.String;TextAlign:CenterCenter;";} 10{Name:"냉수펌프동력";Caption:"냉수펌프동력(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 11{Name:"증발식건식냉각기";Caption:"냉각탑종류";Style:"DataType:System.String;TextAlign:CenterCenter;";} 12{Name:"냉각수펌프동력";Caption:"냉각수펌프동력(㎾)";Style:"DataType:System.String;TextAlign:CenterCenter;";} 13{Name:"냉수펌프제어";Caption:"냉수펌프제어";Style:"DataType:System.String;TextAlign:LeftCenter;";} 14{Name:"냉각수펌프제어";Caption:"냉각수펌프제어";Style:"DataType:System.String;TextAlign:LeftCenter;";} 15{Name:"냉동기압축방식";Caption:"냉동기압축방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 16{Name:"압축기제어방식";Caption:"압축기제어방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 17{Name:"냉동기설비시스템";Caption:"냉동기설비시스템";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 18{Name:"제어방식";Caption:"제어방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 19{Name:"온수열생산기기";Caption:"온수열생산기기";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 20{Name:"증발식건식냉각기";Caption:"증발식건식냉각기";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 21{Name:"증발식냉각기";Caption:"증발식냉각기";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 22{Name:"보조방음기유무";Caption:"보조방음기유무";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 23{Name:"냉각탑입구온도";Caption:"냉각탑입구온도";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 24{Name:"신재생연결여부";Caption:"신재생연결여부";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 25{Name:"열생산연결방식";Caption:"열생산연결방식";Visible:False;Style:"DataType:System.String;TextAlign:LeftCenter;";} 26{Name:"개별기기적용";Caption:"개별기기적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} 27{Name:"헤더적용";Caption:"헤더적용";Visible:False;Style:"DataType:System.Boolean;TextAlign:LeftCenter;ImageAlign:CenterCenter;";} 357, 17 @@ -238,6 +238,9 @@ RseFWwAAAABJRU5ErkJggg== + + 17, 17 + 134 diff --git a/ArinWarev1/FORM-OD/Frm_3_Mach.vb b/ArinWarev1/FORM-OD/Frm_3_Mach.vb index c683892..8766211 100644 --- a/ArinWarev1/FORM-OD/Frm_3_Mach.vb +++ b/ArinWarev1/FORM-OD/Frm_3_Mach.vb @@ -542,6 +542,16 @@ Public Class Frm_3_Mach 'ShowSubTotal_Light() ' ShowSubTotal_Danmal() + If Program = EProgram.친환경평가 Then + fxNanBang.Cols("펌프제어유형").Visible = False + fxNaengBang.Cols("냉수펌프제어").Visible = False + fxNaengBang.Cols("냉각수펌프제어").Visible = False + Else + fxNanBang.Cols("펌프제어유형").Visible = True + fxNaengBang.Cols("냉수펌프제어").Visible = True + fxNaengBang.Cols("냉각수펌프제어").Visible = True + End If + Me.Show() Application.DoEvents() @@ -779,6 +789,17 @@ Public Class Frm_3_Mach End With fxNanBang.Cols("열생산기기방식").Editor = cmd난방방식 + '//230715 + Dim cmd펌프제어유형 As New ComboBox() + With cmd펌프제어유형.Items + .Add("(없음)") + .Add("비제어") + .Add("정압") + .Add("변압") + End With + fxNanBang.Cols("펌프제어유형").Editor = cmd펌프제어유형 + + '//난방기기(신재생) Make_난방기기신재생_List(fxNanBang.Cols("연결된시스템").Index) 'Dim filter As String = "code like '1%' or (code like '2%' and 지열냉난방구분 = '난방급탕용')" @@ -810,6 +831,19 @@ Public Class Frm_3_Mach cmd냉방방식.DropDownStyle = ComboBoxStyle.DropDownList fxNaengBang.Cols("냉동기방식").Editor = cmd냉방방식 + Dim cmd냉수펌프제어 As New ComboBox() + With cmd냉수펌프제어.Items + .Add("(없음)") + .Add("제어") + .Add("대수제어") + .Add("비제어") + End With + cmd냉수펌프제어.DropDownStyle = ComboBoxStyle.DropDownList + fxNaengBang.Cols("냉수펌프제어").Editor = cmd냉수펌프제어 + fxNaengBang.Cols("냉각수펌프제어").Editor = cmd냉수펌프제어 + + + Dim cmd냉동기종류 As New ComboBox() With cmd냉동기종류.Items .Add("(없음)") diff --git a/ArinWarev1/My Project/AssemblyInfo.vb b/ArinWarev1/My Project/AssemblyInfo.vb index 4210fdd..a4d3c03 100644 --- a/ArinWarev1/My Project/AssemblyInfo.vb +++ b/ArinWarev1/My Project/AssemblyInfo.vb @@ -18,7 +18,7 @@ Imports System.Runtime.InteropServices '이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. - + ' 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. ' @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' 지정되도록 할 수 있습니다. ' - - + + diff --git a/Eco2Mixed_vs2010.sln b/Eco2Mixed_vs2010.sln deleted file mode 100644 index a866b60..0000000 --- a/Eco2Mixed_vs2010.sln +++ /dev/null @@ -1,110 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SubProject", "SubProject", "{4D184935-DE50-4DBA-9EBF-8C66C579B7DC}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ECO2OD", "ArinWarev1\ECO2OD.vbproj", "{D5C51BDE-68E5-42BC-B648-DB9CCF044703}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ArinNet", "ArinNet\ArinNet.vbproj", "{F0FB4304-F995-446A-99B7-0896A5E07A72}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CEnergy", "CEnergy\ArinClassV2\CEnergy.vbproj", "{2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ArinLogin", "ArinLogin\ArinLogin.vbproj", "{8B6E4D7F-B484-471A-A419-2FE3451D26A3}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Uninstall", "Uninstall\Uninstall\Uninstall.vbproj", "{453B4F28-21A4-4DEE-ABFD-636E1570D6BA}" -EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mn", "mn\mn\mn.vbproj", "{C47BFE30-BD8C-468B-87E4-E07214A882B6}" -EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Release|Any CPU.Build.0 = Release|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D5C51BDE-68E5-42BC-B648-DB9CCF044703}.Release|x86.ActiveCfg = Release|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Debug|x86.ActiveCfg = Debug|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Release|Any CPU.Build.0 = Release|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F0FB4304-F995-446A-99B7-0896A5E07A72}.Release|x86.ActiveCfg = Release|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Debug|x86.ActiveCfg = Debug|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Release|Any CPU.Build.0 = Release|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14}.Release|x86.ActiveCfg = Release|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Release|Any CPU.Build.0 = Release|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8B6E4D7F-B484-471A-A419-2FE3451D26A3}.Release|x86.ActiveCfg = Release|Any CPU - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Debug|Any CPU.ActiveCfg = Debug|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Debug|x86.ActiveCfg = Debug|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Debug|x86.Build.0 = Debug|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Release|Any CPU.ActiveCfg = Release|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Release|Mixed Platforms.Build.0 = Release|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Release|x86.ActiveCfg = Release|x86 - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA}.Release|x86.Build.0 = Release|x86 - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Debug|x86.ActiveCfg = Debug|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Release|Any CPU.Build.0 = Release|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C47BFE30-BD8C-468B-87E4-E07214A882B6}.Release|x86.ActiveCfg = Release|Any CPU - {1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}.Debug|Any CPU.ActiveCfg = Debug - {1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}.Debug|Mixed Platforms.ActiveCfg = Debug - {1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}.Debug|x86.ActiveCfg = Debug - {1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}.Release|Any CPU.ActiveCfg = Release - {1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}.Release|Mixed Platforms.ActiveCfg = Release - {1B94F9E1-B61C-4AF3-ADB6-20BE6F3DF0DE}.Release|x86.ActiveCfg = Release - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {F0FB4304-F995-446A-99B7-0896A5E07A72} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC} - {2AF28E8C-84F1-4D56-9592-3B0EBDE8DF14} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC} - {8B6E4D7F-B484-471A-A419-2FE3451D26A3} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC} - {453B4F28-21A4-4DEE-ABFD-636E1570D6BA} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC} - {C47BFE30-BD8C-468B-87E4-E07214A882B6} = {4D184935-DE50-4DBA-9EBF-8C66C579B7DC} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - VisualSVNWorkingCopyRoot = . - EndGlobalSection -EndGlobal diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj index 804db77..fd85722 100644 --- a/Setup/Setup.vdproj +++ b/Setup/Setup.vdproj @@ -28,13 +28,13 @@ "Entry" { "MsmKey" = "8:_0607C8779841A74B037EF1D0DFA4156F" - "OwnerKey" = "8:_8D3FA753E2574529B5284B603B3AD3DF" + "OwnerKey" = "8:_808E81A74CBB493F9C6CDAC35D8ADC41" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_0607C8779841A74B037EF1D0DFA4156F" - "OwnerKey" = "8:_808E81A74CBB493F9C6CDAC35D8ADC41" + "OwnerKey" = "8:_8D3FA753E2574529B5284B603B3AD3DF" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -274,109 +274,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F680131EFFBE4408B6AF4D3D60303159" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3C54360ECA2D917C917C5457315CD0AE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ECA020B6D724A4C2FDDF4795EBA72FEC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E1ECB12976894E3FADEA35AE01BDDB5A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CE1CDBA71D55A58C9E8C434429263651" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_C13B6CBDE2EB4A0BB5C958D0E7BC948F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9F72EF8C6F8F4BE79DAE4F8E50CCAF59" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9008565094D744E2AE00EEC5CB70FCA8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8D3FA753E2574529B5284B603B3AD3DF" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_60637DEA5C4CEECB31E2B5F25358C674" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_8C6810F81A354E8C9488D35488F58A8E" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_808E81A74CBB493F9C6CDAC35D8ADC41" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_94CA0FDA969A00D55D11475CF05BBCF7" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D1D8385A708F4CC36F9B3A4AE780D28F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_123BA2FFEEA9E2FE234DB92367A069EB" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_6CC8CD1E9189E07A7A96D9F615DACB24" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_67FBB57779D149B6BD4F5DDAA22DAC80" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_640C4B450006D92E645D60B4E6D01F81" + "OwnerKey" = "8:_0607C8779841A74B037EF1D0DFA4156F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -388,7 +286,109 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0607C8779841A74B037EF1D0DFA4156F" + "OwnerKey" = "8:_640C4B450006D92E645D60B4E6D01F81" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_67FBB57779D149B6BD4F5DDAA22DAC80" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_6CC8CD1E9189E07A7A96D9F615DACB24" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_123BA2FFEEA9E2FE234DB92367A069EB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_D1D8385A708F4CC36F9B3A4AE780D28F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_94CA0FDA969A00D55D11475CF05BBCF7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_808E81A74CBB493F9C6CDAC35D8ADC41" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8C6810F81A354E8C9488D35488F58A8E" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_60637DEA5C4CEECB31E2B5F25358C674" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_8D3FA753E2574529B5284B603B3AD3DF" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_9008565094D744E2AE00EEC5CB70FCA8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_9F72EF8C6F8F4BE79DAE4F8E50CCAF59" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C13B6CBDE2EB4A0BB5C958D0E7BC948F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CE1CDBA71D55A58C9E8C434429263651" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_E1ECB12976894E3FADEA35AE01BDDB5A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_ECA020B6D724A4C2FDDF4795EBA72FEC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_3C54360ECA2D917C917C5457315CD0AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_F680131EFFBE4408B6AF4D3D60303159" "MsmSig" = "8:_UNDEFINED" } } @@ -523,11 +523,6 @@ "AssemblyAsmDisplayName" = "8:C1.Win.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=944ae1ea0e47ca04, processorArchitecture=MSIL" "ScatterAssemblies" { - "_0607C8779841A74B037EF1D0DFA4156F" - { - "Name" = "8:C1.Win.4.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:C1.Win.4.DLL" "TargetName" = "8:" @@ -585,11 +580,6 @@ "AssemblyAsmDisplayName" = "8:ArinLogin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_123BA2FFEEA9E2FE234DB92367A069EB" - { - "Name" = "8:ArinLogin.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:ArinLogin.DLL" "TargetName" = "8:" @@ -676,11 +666,6 @@ "AssemblyAsmDisplayName" = "8:Interop.VBIDE, Version=5.3.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_3C54360ECA2D917C917C5457315CD0AE" - { - "Name" = "8:Interop.VBIDE.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:Interop.VBIDE.DLL" "TargetName" = "8:" @@ -767,11 +752,6 @@ "AssemblyAsmDisplayName" = "8:C1.Win.C1Command.4, Version=4.0.20171.248, Culture=neutral, PublicKeyToken=e808566f358766d8, processorArchitecture=MSIL" "ScatterAssemblies" { - "_60637DEA5C4CEECB31E2B5F25358C674" - { - "Name" = "8:C1.Win.C1Command.4.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:C1.Win.C1Command.4.DLL" "TargetName" = "8:" @@ -1095,11 +1075,6 @@ "AssemblyAsmDisplayName" = "8:CEnergy, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_94CA0FDA969A00D55D11475CF05BBCF7" - { - "Name" = "8:CEnergy.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:CEnergy.DLL" "TargetName" = "8:" @@ -1296,7 +1271,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:mn, Version=1.0.9339.40092, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:mn, Version=1.0.9402.38441, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { "_D0A1428AD3AC48F3B2E7EA77C0E43B59" @@ -1330,11 +1305,6 @@ "AssemblyAsmDisplayName" = "8:ArinNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_D1D8385A708F4CC36F9B3A4AE780D28F" - { - "Name" = "8:ArinNet.DLL" - "Attributes" = "3:512" - } } "SourcePath" = "8:ArinNet.DLL" "TargetName" = "8:" @@ -1651,9 +1621,9 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:에너지평가프로그램" - "ProductCode" = "8:{F6BB0814-287B-428A-8BDF-E1B81C4AB411}" + "ProductCode" = "8:{F6BB0814-2222-3333-8BDF-E1B81C4AB411}" "PackageCode" = "8:{110AF908-A283-48F9-B540-18E7DF1AC397}" - "UpgradeCode" = "8:{90A3D151-BEEB-4C35-9E76-B1E0B7F91C88}" + "UpgradeCode" = "8:{90A3D151-CCCC-1212-9E76-B1E0B7F91C88}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE"