diff --git a/ArinLog/bin/Debug/ArinLog.Net4.dll b/ArinLog/bin/Debug/ArinLog.Net4.dll index 62bd167..9b3d202 100644 Binary files a/ArinLog/bin/Debug/ArinLog.Net4.dll and b/ArinLog/bin/Debug/ArinLog.Net4.dll differ diff --git a/ArinLog/bin/Debug/ArinLog.Net4.pdb b/ArinLog/bin/Debug/ArinLog.Net4.pdb index 2d8c1b0..befb018 100644 Binary files a/ArinLog/bin/Debug/ArinLog.Net4.pdb and b/ArinLog/bin/Debug/ArinLog.Net4.pdb differ diff --git a/ArinLog/obj/Debug/ArinLog.Net4.pdb b/ArinLog/obj/Debug/ArinLog.Net4.pdb index 2d8c1b0..befb018 100644 Binary files a/ArinLog/obj/Debug/ArinLog.Net4.pdb and b/ArinLog/obj/Debug/ArinLog.Net4.pdb differ diff --git a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb index cb00609..26c7ca4 100644 --- a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb +++ b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb @@ -26,43 +26,22 @@ Partial Class fSelectWeatherGroup Dim ListViewItem1 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("1561564") Dim ListViewItem2 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("dfsdfsdf") Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(fSelectWeatherGroup)) - Me.Label1 = New System.Windows.Forms.Label() - Me.btOK = New System.Windows.Forms.Button() Me.bsArea2 = New System.Windows.Forms.BindingSource(Me.components) Me.DS = New Eco2Ar.DS() Me.bsArea1 = New System.Windows.Forms.BindingSource(Me.components) Me.lv1 = New System.Windows.Forms.ListView() - Me.lv2 = New System.Windows.Forms.ListView() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.Panel2 = New System.Windows.Forms.Panel() Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + Me.Panel2 = New System.Windows.Forms.Panel() + Me.lv2 = New System.Windows.Forms.ListView() Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + Me.btOK = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() CType(Me.bsArea2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DS, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.bsArea1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Label1 - ' - Me.Label1.Dock = System.Windows.Forms.DockStyle.Top - Me.Label1.Font = New System.Drawing.Font("맑은 고딕", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.Label1.Location = New System.Drawing.Point(10, 10) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(632, 41) - Me.Label1.TabIndex = 0 - Me.Label1.Text = "지역을 선택하세요" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) - ' - 'btOK - ' - Me.btOK.Dock = System.Windows.Forms.DockStyle.Bottom - Me.btOK.Font = New System.Drawing.Font("맑은 고딕", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.btOK.Location = New System.Drawing.Point(10, 492) - Me.btOK.Name = "btOK" - Me.btOK.Size = New System.Drawing.Size(632, 50) - Me.btOK.TabIndex = 2 - Me.btOK.Text = "확 인" - Me.btOK.UseVisualStyleBackColor = True - ' 'bsArea2 ' Me.bsArea2.DataMember = "weather_group" @@ -81,71 +60,86 @@ Partial Class fSelectWeatherGroup 'lv1 ' Me.lv1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1}) - Me.lv1.Dock = System.Windows.Forms.DockStyle.Fill - Me.lv1.Font = New System.Drawing.Font("맑은 고딕", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.lv1.Font = New System.Drawing.Font("맑은 고딕", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.lv1.FullRowSelect = True - Me.lv1.GridLines = True Me.lv1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None Me.lv1.HideSelection = False Me.lv1.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem1}) - Me.lv1.Location = New System.Drawing.Point(10, 51) + Me.lv1.Location = New System.Drawing.Point(13, 37) Me.lv1.Name = "lv1" - Me.lv1.Size = New System.Drawing.Size(311, 431) + Me.lv1.Size = New System.Drawing.Size(161, 382) Me.lv1.TabIndex = 5 Me.lv1.UseCompatibleStateImageBehavior = False Me.lv1.View = System.Windows.Forms.View.Details ' + 'ColumnHeader1 + ' + Me.ColumnHeader1.Width = 156 + ' + 'Panel2 + ' + Me.Panel2.Location = New System.Drawing.Point(180, 37) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(10, 382) + Me.Panel2.TabIndex = 7 + ' 'lv2 ' Me.lv2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader2}) - Me.lv2.Dock = System.Windows.Forms.DockStyle.Right - Me.lv2.Font = New System.Drawing.Font("맑은 고딕", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.lv2.Font = New System.Drawing.Font("맑은 고딕", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.lv2.FullRowSelect = True - Me.lv2.GridLines = True Me.lv2.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None Me.lv2.HideSelection = False Me.lv2.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem2}) - Me.lv2.Location = New System.Drawing.Point(331, 51) + Me.lv2.Location = New System.Drawing.Point(196, 37) Me.lv2.Name = "lv2" - Me.lv2.Size = New System.Drawing.Size(311, 431) + Me.lv2.Size = New System.Drawing.Size(161, 382) Me.lv2.TabIndex = 5 Me.lv2.UseCompatibleStateImageBehavior = False Me.lv2.View = System.Windows.Forms.View.Details ' - 'Panel1 - ' - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel1.Location = New System.Drawing.Point(10, 482) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(632, 10) - Me.Panel1.TabIndex = 6 - ' - 'Panel2 - ' - Me.Panel2.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel2.Location = New System.Drawing.Point(321, 51) - Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(10, 431) - Me.Panel2.TabIndex = 7 - ' - 'ColumnHeader1 - ' - Me.ColumnHeader1.Width = 300 - ' 'ColumnHeader2 ' - Me.ColumnHeader2.Width = 300 + Me.ColumnHeader2.Width = 130 + ' + 'btOK + ' + Me.btOK.Font = New System.Drawing.Font("맑은 고딕", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.btOK.Location = New System.Drawing.Point(129, 425) + Me.btOK.Name = "btOK" + Me.btOK.Size = New System.Drawing.Size(119, 33) + Me.btOK.TabIndex = 2 + Me.btOK.Text = "확 인" + Me.btOK.UseVisualStyleBackColor = True + ' + 'Label1 + ' + Me.Label1.Font = New System.Drawing.Font("맑은 고딕", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.Label1.Location = New System.Drawing.Point(10, 10) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(153, 24) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "대분류" + ' + 'Label2 + ' + Me.Label2.Font = New System.Drawing.Font("맑은 고딕", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.Label2.Location = New System.Drawing.Point(192, 10) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(153, 24) + Me.Label2.TabIndex = 0 + Me.Label2.Text = "중분류" ' 'fSelectWeatherGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(652, 552) + Me.ClientSize = New System.Drawing.Size(370, 462) Me.Controls.Add(Me.lv1) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.lv2) - Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.btOK) + Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Font = New System.Drawing.Font("맑은 고딕", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -169,8 +163,8 @@ Partial Class fSelectWeatherGroup Public WithEvents DS As DS Friend WithEvents lv1 As ListView Friend WithEvents lv2 As ListView - Friend WithEvents Panel1 As Panel Friend WithEvents Panel2 As Panel Friend WithEvents ColumnHeader1 As ColumnHeader Friend WithEvents ColumnHeader2 As ColumnHeader + Friend WithEvents Label2 As System.Windows.Forms.Label End Class diff --git a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb index a1ce510..567fc12 100644 --- a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb +++ b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb @@ -99,7 +99,7 @@ Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btOK.Click If lv2.SelectedItems.Count < 1 Then - MessageBox.Show("2차 지역을 선택하세요", "확인") + MessageBox.Show("중분류를 선택하세요", "확인") Return End If diff --git a/ArinWarev1/Forms_Input/Frm_v20091231_Weather.vb b/ArinWarev1/Forms_Input/Frm_v20091231_Weather.vb index 744b7ad..8478a06 100644 --- a/ArinWarev1/Forms_Input/Frm_v20091231_Weather.vb +++ b/ArinWarev1/Forms_Input/Frm_v20091231_Weather.vb @@ -1,4 +1,6 @@ -Public Class Frm_V20091231_Weather +Imports System.Runtime.Serialization + +Public Class Frm_V20091231_Weather #Region "data Base 변경여부및 적용방법" '''변경된내용을적용한다. @@ -615,8 +617,8 @@ Private Sub dv_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles dv.MouseUp If e.Button = Windows.Forms.MouseButtons.Right Then Dim Frm_FilterA As New Frm_Filter - Frm_FilterA.ColumTitle = getColCaption(Me.Dt) - Frm_FilterA.ColumList = getColName(Me.Dt) + Frm_FilterA.ColumTitle = getColCaption(Me.DT) + Frm_FilterA.ColumList = getColName(Me.DT) Frm_FilterA.Colorlist = "" If Frm_FilterA.ShowDialog <> Windows.Forms.DialogResult.OK Then Return '//창떳을떄 확인아ㅣ고 취소눌르면 다음을 수행하지않는다는거에요. Dim Filter As String = Frm_FilterA.tb_filter.Text '//값은 아까 그 텍박에 잇구요. @@ -1159,31 +1161,74 @@ Private Sub ToolStripButton8_Click(sender As Object, e As EventArgs) Handles ToolStripButton8.Click - Dim sd As New FolderBrowserDialog() - If sd.ShowDialog() = DialogResult.OK Then - 'Eco2는 바로 내보내기하면 된다 - 'DSET1.weather_cha.Clear() - 'DSET1.weather_ilsa.Clear() - 'DSET1.weather_supdo.Clear() - 'DSET1.weather_temp.Clear() + ' Dim sd As New FolderBrowserDialog() + ' If sd.ShowDialog() = DialogResult.OK Then + 'Eco2는 바로 내보내기하면 된다 + 'DSET1.weather_cha.Clear() + 'DSET1.weather_ilsa.Clear() + 'DSET1.weather_supdo.Clear() + 'DSET1.weather_temp.Clear() - 'DSET1.weather_cha.Merge(DSET1.weather_cha_od) - 'DSET1.weather_ilsa.Merge(DSET1.weather_ilsa) - 'DSET1.weather_supdo.Merge(DSET1.weather_supdo) - 'DSET1.weather_temp.Merge(DSET1.weather_temp) + 'DSET1.weather_cha.Merge(DSET1.weather_cha_od) + 'DSET1.weather_ilsa.Merge(DSET1.weather_ilsa) + 'DSET1.weather_supdo.Merge(DSET1.weather_supdo) + 'DSET1.weather_temp.Merge(DSET1.weather_temp) - '모든파일을 저장한다. - DSET1.weather_cha.WriteXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_cha.TableName + ".xml")) - DSET1.weather_ilsa.WriteXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_ilsa.TableName + ".xml")) - DSET1.weather_supdo.WriteXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_supdo.TableName + ".xml")) - DSET1.weather_temp.WriteXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_temp.TableName + ".xml")) - DSET1.tbl_weather.WriteXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.tbl_weather.TableName + ".xml")) + '모든파일을 저장한다. + Dim SelectedPath As String = AppDomain.CurrentDomain.BaseDirectory + "Data" + Dim file1 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_cha.TableName + ".xml") + Dim file2 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_ilsa.TableName + ".xml") + Dim file3 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_supdo.TableName + ".xml") + Dim file4 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_temp.TableName + ".xml") + Dim file5 As String = System.IO.Path.Combine(SelectedPath, DSET1.tbl_weather.TableName + ".xml") + Dim file6 As String = System.IO.Path.Combine(SelectedPath, DSET1.weather_group.TableName + ".xml") - DSET1.weather_group.WriteXml(System.IO.Path.Combine(sd.SelectedPath, DSET1.weather_cha.TableName + ".xml")) + DSET1.weather_cha.WriteXml(file1) + DSET1.weather_ilsa.WriteXml(file2) + DSET1.weather_supdo.WriteXml(file3) + DSET1.weather_temp.WriteXml(file4) + DSET1.tbl_weather.WriteXml(file5) + DSET1.weather_group.WriteXml(file6) - End If + + file1 = System.IO.Path.Combine(SelectedPath, DSET1.weather_cha.TableName + ".dat") + file2 = System.IO.Path.Combine(SelectedPath, DSET1.weather_ilsa.TableName + ".dat") + file3 = System.IO.Path.Combine(SelectedPath, DSET1.weather_supdo.TableName + ".dat") + file4 = System.IO.Path.Combine(SelectedPath, DSET1.weather_temp.TableName + ".dat") + file5 = System.IO.Path.Combine(SelectedPath, DSET1.tbl_weather.TableName + ".dat") + file6 = System.IO.Path.Combine(SelectedPath, DSET1.weather_group.TableName + ".dat") + + + '//암호화 + Serialize(file1, DSET1.weather_cha) + Serialize(file2, DSET1.weather_ilsa) + Serialize(file3, DSET1.weather_supdo) + Serialize(file4, DSET1.weather_temp) + Serialize(file5, DSET1.tbl_weather) + + Using stm As System.IO.Stream = System.IO.File.Open(file6, System.IO.FileMode.Create, System.IO.FileAccess.Write) + Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '역직렬화 후 객체 클래스로 형변환... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close() + bf.Serialize(stm, DSET1.weather_group) + End Using + + + 'Serialize(file6, DSET1.weather_group) + + ' End If End Sub + Sub Serialize(filename As String, data As Object) + + Using stm As System.IO.Stream = System.IO.File.Open(filename, System.IO.FileMode.Create, System.IO.FileAccess.Write) + Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter '역직렬화 후 객체 클래스로 형변환... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close() + bf.Serialize(stm, data) + End Using + + + + End Sub + + Private Sub ToolStripButton13_Click(sender As Object, e As EventArgs) Handles ToolStripButton13.Click Dim sd As New FolderBrowserDialog() If sd.ShowDialog() = DialogResult.OK Then diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index 2971c0e..9ca360c 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -255,7 +255,7 @@ Public Class MdiMain End Sub - Public Sub Open_File(ByVal FileName As String, Optional ByVal SyncServer As Boolean = False, Optional checkVersion As Boolean = True, Optional silent As Boolean = False) + Public Sub Open_File(ByVal FileName As String, Optional ByVal SyncServer As Boolean = False, Optional checkVersion As Boolean = True, Optional silent As Boolean = False, Optional isNew As Boolean = False) If Prj.Opened Then @@ -327,7 +327,7 @@ Public Class MdiMain Return End If End If - + End If @@ -638,9 +638,16 @@ Public Class MdiMain MsgBox("ǹ䵥Ͱ Ƿ ʱڷḦ մϴ", MsgBoxStyle.Critical, "Ȯ") Dim newdescdr As DS.tbl_DescRow = DSET1.tbl_Desc.NewRow newdescdr.name = "" - newdescdr.buildarea = "0001" + newdescdr.buildarea = "010100" DSET1.tbl_Desc.Addtbl_DescRow(newdescdr) DSET1.tbl_Desc.AcceptChanges() + Else + If isNew Then '//űۼ + Dim drDesc1 As DS.tbl_DescRow = DSET1.tbl_Desc.Rows(0) + drDesc1.buildarea = "010100" '// + drDesc1.EndEdit() + End If + End If @@ -766,6 +773,9 @@ Public Class MdiMain Frm_Work.Close() + '//weather + Read_WeatherFile() + Calc = New Calculator(Prj.LGVersino, DSET1, DSETR1, Result1, False) '//Ŭ ʱȭ Me.bt_filesave.Enabled = True 'Me.bt_newsave.Enabled = True @@ -809,7 +819,7 @@ Public Class MdiMain End If - Menu_ǹ() + '// ϸ ش. Me.Save_FilHistory(Prj.FileName) @@ -858,7 +868,7 @@ Public Class MdiMain MsgBox("ڵ " & ex.Message.ToString) End Try End If - + '/ǥϹȮ '//2010.12.06 ߰ Try @@ -894,9 +904,11 @@ Public Class MdiMain End Try End If + + Read_WeatherFile() - + Menu_ǹ() '/͹Ȯ 'Try @@ -979,6 +991,18 @@ Public Class MdiMain Private GroupList_Bunbae As ArrayList + + + Sub DeSerialize(filename As String, ByRef data As DataTable) + + Using stm As System.IO.Stream = System.IO.File.Open(filename, System.IO.FileMode.Open, System.IO.FileAccess.Read) + Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter 'ȭ ü Ŭ ȯ... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close() + Dim dt As DataTable = bf.Deserialize(stm) + data.Clear() + data.Merge(dt) + End Using + + End Sub Sub Read_WeatherFile() '// ܺϿ Ѵ DSET1.weather_cha.Clear() @@ -989,46 +1013,72 @@ Public Class MdiMain DSET1.tbl_weather.Clear() Dim DataPath As String = AppDomain.CurrentDomain.BaseDirectory + "Data" - Dim fi1 As String = System.IO.Path.Combine(DataPath, DSET1.weather_cha.TableName + ".xml") - Dim fi2 As String = System.IO.Path.Combine(DataPath, DSET1.weather_ilsa.TableName + ".xml") - Dim fi3 As String = System.IO.Path.Combine(DataPath, DSET1.weather_supdo.TableName + ".xml") - Dim fi4 As String = System.IO.Path.Combine(DataPath, DSET1.weather_temp.TableName + ".xml") - Dim fi5 As String = System.IO.Path.Combine(DataPath, DSET1.tbl_weather.TableName + ".xml") - Dim fi6 As String = System.IO.Path.Combine(DataPath, DSET1.weather_group.TableName + ".xml") + Dim fi1d As String = System.IO.Path.Combine(DataPath, DSET1.weather_cha.TableName + ".dat") + Dim fi2d As String = System.IO.Path.Combine(DataPath, DSET1.weather_ilsa.TableName + ".dat") + Dim fi3d As String = System.IO.Path.Combine(DataPath, DSET1.weather_supdo.TableName + ".dat") + Dim fi4d As String = System.IO.Path.Combine(DataPath, DSET1.weather_temp.TableName + ".dat") + Dim fi5d As String = System.IO.Path.Combine(DataPath, DSET1.tbl_weather.TableName + ".dat") + Dim fi6d As String = System.IO.Path.Combine(DataPath, DSET1.weather_group.TableName + ".dat") + If System.IO.File.Exists(fi1d) Then + DeSerialize(fi1d, CType(DSET1.weather_cha, DS.weather_chaDataTable)) + DeSerialize(fi2d, CType(DSET1.weather_ilsa, DS.weather_ilsaDataTable)) + DeSerialize(fi3d, CType(DSET1.weather_supdo, DS.weather_supdoDataTable)) + DeSerialize(fi4d, CType(DSET1.weather_temp, DS.weather_tempDataTable)) + DeSerialize(fi5d, CType(DSET1.tbl_weather, DS.tbl_weatherDataTable)) + + 'Using stm As System.IO.Stream = System.IO.File.Open(fi6d, System.IO.FileMode.Open, System.IO.FileAccess.Read) + ' Dim bf As System.Runtime.Serialization.Formatters.Binary.BinaryFormatter = New System.Runtime.Serialization.Formatters.Binary.BinaryFormatter 'ȭ ü Ŭ ȯ... Dim a As clsTEST = CType(bf.Deserialize(stm), clsTEST) stm.Close() + ' DSET1.weather_group = CType(bf.Deserialize(stm), DS.weather_groupDataTable)) + 'End Using + + DeSerialize(fi6d, CType(DSET1.weather_group, DS.weather_groupDataTable)) + + Else + '//ȣȭ̸ ҷ + Dim fi1 As String = System.IO.Path.Combine(DataPath, DSET1.weather_cha.TableName + ".xml") + Dim fi2 As String = System.IO.Path.Combine(DataPath, DSET1.weather_ilsa.TableName + ".xml") + Dim fi3 As String = System.IO.Path.Combine(DataPath, DSET1.weather_supdo.TableName + ".xml") + Dim fi4 As String = System.IO.Path.Combine(DataPath, DSET1.weather_temp.TableName + ".xml") + Dim fi5 As String = System.IO.Path.Combine(DataPath, DSET1.tbl_weather.TableName + ".xml") + Dim fi6 As String = System.IO.Path.Combine(DataPath, DSET1.weather_group.TableName + ".xml") - If System.IO.File.Exists(fi1) Then - DSET1.weather_cha.ReadXml(fi1) - Else - MsgBox("#1 ϴ\r\nα׷ ٽ ġϼ") - End If - If System.IO.File.Exists(fi2) Then - DSET1.weather_ilsa.ReadXml(fi2) - Else - MsgBox("#2 ϴ\r\nα׷ ٽ ġϼ") - End If - If System.IO.File.Exists(fi3) Then - DSET1.weather_supdo.ReadXml(fi3) - Else - MsgBox("#3 ϴ\r\nα׷ ٽ ġϼ") - End If - If System.IO.File.Exists(fi4) Then - DSET1.weather_temp.ReadXml(fi4) - Else - MsgBox("#4 ϴ\r\nα׷ ٽ ġϼ") - End If - If System.IO.File.Exists(fi5) Then - DSET1.tbl_weather.ReadXml(fi5) - Else - MsgBox("#5 ϴ\r\nα׷ ٽ ġϼ") - End If - If System.IO.File.Exists(fi6) Then - DSET1.weather_group.ReadXml(fi6) - Else - MsgBox("#6 ϴ\r\nα׷ ٽ ġϼ") + If System.IO.File.Exists(fi1) Then + DSET1.weather_cha.ReadXml(fi1) + Else + MsgBox("#1 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi2) Then + DSET1.weather_ilsa.ReadXml(fi2) + Else + MsgBox("#2 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi3) Then + DSET1.weather_supdo.ReadXml(fi3) + Else + MsgBox("#3 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi4) Then + DSET1.weather_temp.ReadXml(fi4) + Else + MsgBox("#4 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi5) Then + DSET1.tbl_weather.ReadXml(fi5) + Else + MsgBox("#5 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi6) Then + DSET1.weather_group.ReadXml(fi6) + Else + MsgBox("#6 ϴ\r\nα׷ ٽ ġϼ") + End If + End If + + DSET1.weather_cha.AcceptChanges() DSET1.weather_ilsa.AcceptChanges() DSET1.weather_supdo.AcceptChanges() @@ -1491,7 +1541,7 @@ ENDSTAT: '// ' My.Computer.FileSystem.WriteAllBytes(SD.FileName, Desbuf, False) 'End If '///////////////////////////////////////////////////////////////////////////////////////////////////////////// 2011.03.16߰ - Me.Open_File(SD.FileName, True, False) + Me.Open_File(SD.FileName, True, False, False, True) Prj.UIVersion = CurrentUIVersion() '//׻ 160327 Refresh_info() Me.Save_File(Prj.FileName, False)