diff --git a/ArinWarev1/ECO2OD.vbproj b/ArinWarev1/ECO2OD.vbproj
index 654e5f9..f91b48b 100644
--- a/ArinWarev1/ECO2OD.vbproj
+++ b/ArinWarev1/ECO2OD.vbproj
@@ -152,12 +152,6 @@
DS.xsd
-
- Frm_Buha.vb
-
-
- Form
-
Frm_ExtReport.vb
@@ -399,9 +393,6 @@
-
- Frm_Buha.vb
-
Frm_DisplayGubun.vb
diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb
index 24c1663..317c95e 100644
--- a/ArinWarev1/MdiMain.vb
+++ b/ArinWarev1/MdiMain.vb
@@ -4259,8 +4259,8 @@ ENDSTAT: '//
Work_msg_timer(CLang.Ͼ)
Return
End If
- Frm_Buha.ControlBox = True
- Frm_Buha.Show()
+ Frm_V20091231_buha.ControlBox = True
+ Frm_V20091231_buha.Show()
End Sub
Private Sub ExportCSV()
diff --git a/ArinWarev1/Module/OD.vb b/ArinWarev1/Module/OD.vb
index b127b55..3096e8a 100644
--- a/ArinWarev1/Module/OD.vb
+++ b/ArinWarev1/Module/OD.vb
@@ -64,7 +64,7 @@
Drz.냉난방공조 = "환기"
Drz.외기부하처리여부 = "예"
Else
- Drz.냉난방공조 = " 기능없음"
+ Drz.냉난방공조 = "기능없음" '//쓰폐이쓰 21102
Drz.외기부하처리여부 = "아니오"
End If
Else
@@ -74,21 +74,17 @@
Drz.외기부하처리여부 = "아니오"
Else
Drz.냉난방방식 = "냉난방"
- Drz.냉난방공조 = " 기능없음"
+ Drz.냉난방공조 = "기능없음" '//쓰폐이쓰 211023
Drz.외기부하처리여부 = "아니오"
End If
End If
-
-
-
Drz.조명부하산출방법 = "입력치"
Drz.조명방식 = "없음"
Drz.인공광원 = "없음"
Drz.프로필 = "0002"
-
'' 면적이 가장 큰 대표 용도가 공동주택, 숙박시설, 의료시설은 야간 및 주말운전방식은 정상가동, 기타 시설은 가동정지
Drz.야간운전방식 = "가동정지"
Drz.주말운전방식 = "가동정지"
diff --git a/ArinWarev1/My Project/AssemblyInfo.vb b/ArinWarev1/My Project/AssemblyInfo.vb
index c9a2aa7..3466638 100644
--- a/ArinWarev1/My Project/AssemblyInfo.vb
+++ b/ArinWarev1/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' 지정되도록 할 수 있습니다.
'
-
-
+
+
diff --git a/ArinWarev1/REPORT-OD/Frm_v20091231_Report.Designer.vb b/ArinWarev1/REPORT-OD/Frm_v20091231_Report.Designer.vb
index f904d13..d6dfcfb 100644
--- a/ArinWarev1/REPORT-OD/Frm_v20091231_Report.Designer.vb
+++ b/ArinWarev1/REPORT-OD/Frm_v20091231_Report.Designer.vb
@@ -56,9 +56,9 @@ Partial Class Frm_v20091231_Report
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lb_msg})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 919)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 946)
Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(784, 22)
+ Me.StatusStrip1.Size = New System.Drawing.Size(779, 22)
Me.StatusStrip1.TabIndex = 15
Me.StatusStrip1.Text = "StatusStrip1"
'
@@ -80,20 +80,20 @@ Partial Class Frm_v20091231_Report
Me.ReportViewer1.LocalReport.ReportEmbeddedResource = "Eco2OD.Report_result.rdlc"
Me.ReportViewer1.Location = New System.Drawing.Point(0, 0)
Me.ReportViewer1.Name = "ReportViewer1"
- Me.ReportViewer1.Size = New System.Drawing.Size(784, 919)
+ Me.ReportViewer1.Size = New System.Drawing.Size(779, 946)
Me.ReportViewer1.TabIndex = 16
'
'Frm_v20091231_Report
'
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
- Me.ClientSize = New System.Drawing.Size(784, 941)
+ Me.ClientSize = New System.Drawing.Size(779, 968)
Me.Controls.Add(Me.ReportViewer1)
Me.Controls.Add(Me.StatusStrip1)
Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.999999!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte))
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "Frm_v20091231_Report"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
- Me.Text = "dk"
+ Me.Text = "결과그래프"
CType(Me.Graph_ReqBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DSR, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.Graph_ReqUseBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
diff --git a/ArinWarev1/REPORT-OD/Frm_v20091231_Report.vb b/ArinWarev1/REPORT-OD/Frm_v20091231_Report.vb
index 15c87ba..c18ed0f 100644
--- a/ArinWarev1/REPORT-OD/Frm_v20091231_Report.vb
+++ b/ArinWarev1/REPORT-OD/Frm_v20091231_Report.vb
@@ -82,7 +82,7 @@
Dim Dr2 As DSR.Graph_ReqUseRow
- For Gubun As Short = 0 To 2
+ For Gubun As Short = 0 To 3
Select Case Gubun
Case 0 '//1차에너지소요량
@@ -337,7 +337,56 @@
Dr2.type = "합계"
Dr2.Req = (난방에너지 + 냉방에너지 + 급탕에너지 + 조명에너지 + 환기에너지) * addmulti
Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+ Case 3 '//co2발생량
+ 신재생에너지 = 0
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "신재생에너지"
+ Dr2.Req = 신재생에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+
+ 난방에너지 = Math.Round(Result1o.Co2발생량(0).난방면적, 1)
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "난방에너지"
+ Dr2.Req = 난방에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+
+ 냉방에너지 = Math.Round(Result1o.Co2발생량(0).냉방면적, 1)
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "냉방에너지"
+ Dr2.Req = 냉방에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+
+ 급탕에너지 = Math.Round(Result1o.Co2발생량(0).급탕면적, 1)
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "급탕에너지"
+ Dr2.Req = 급탕에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+
+ 조명에너지 = Math.Round(Result1o.Co2발생량(0).조명면적, 1)
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "조명에너지"
+ Dr2.Req = 조명에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+
+ '계산결과!H92*3/계산결과!H27
+ 환기에너지 = Math.Round(Result1o.Co2발생량(0).환기면적, 1)
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "환기에너지"
+ Dr2.Req = 환기에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
+
+ Dr2 = Me.DSR.Graph_ReqUse.NewGraph_ReqUseRow
+ Dr2.Gubun = "CO2발생량"
+ Dr2.type = "합계"
+ Dr2.Req = 난방에너지 + 냉방에너지 + 급탕에너지 + 조명에너지 + 환기에너지
+ Me.DSR.Graph_ReqUse.Rows.Add(Dr2)
End Select
Next
@@ -345,4 +394,7 @@
End Sub
+ Private Sub Frm_v20091231_Report_SizeChanged(sender As System.Object, e As System.EventArgs) Handles MyBase.SizeChanged
+ 'Me.Text = Me.Size.ToString()
+ End Sub
End Class
\ No newline at end of file
diff --git a/ArinWarev1/REPORT-OD/Report_result.rdlc b/ArinWarev1/REPORT-OD/Report_result.rdlc
index 1aabc73..cd2fb96 100644
--- a/ArinWarev1/REPORT-OD/Report_result.rdlc
+++ b/ArinWarev1/REPORT-OD/Report_result.rdlc
@@ -798,7 +798,6 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))
2pt
- true
Output
@@ -864,8 +863,7 @@ iif(Fields!type.Value="조명에너지","#765e00","#475e76")))))
- =Fields!Gubun.Value
- Descending
+ =iif(Fields!Gubun.Value="요구량",1,iif(Fields!Gubun.Value="소요량",2,iif(Fields!Gubun.Value="1차소요량",3,4)))