diff --git a/.vs/CEpole/v16/.suo b/.vs/CEpole/v16/.suo new file mode 100644 index 0000000..25abb3d Binary files /dev/null and b/.vs/CEpole/v16/.suo differ diff --git a/.vs/CEpole/v16/Server/sqlite3/db.lock b/.vs/CEpole/v16/Server/sqlite3/db.lock new file mode 100644 index 0000000..e69de29 diff --git a/.vs/CEpole/v16/Server/sqlite3/storage.ide b/.vs/CEpole/v16/Server/sqlite3/storage.ide new file mode 100644 index 0000000..a0e176e Binary files /dev/null and b/.vs/CEpole/v16/Server/sqlite3/storage.ide differ diff --git a/CEpole.suo b/CEpole.suo new file mode 100644 index 0000000..80c5fb1 Binary files /dev/null and b/CEpole.suo differ diff --git a/Project_fp13/CEpole_fp13.vbproj b/Project_fp13/CEpole_fp13.vbproj index 7e92dbd..1fb1037 100644 --- a/Project_fp13/CEpole_fp13.vbproj +++ b/Project_fp13/CEpole_fp13.vbproj @@ -42,7 +42,7 @@ CEpole.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 STYLES=0 - x86 + AnyCPU false diff --git a/Project_fp13/Defalut_PrintForm.vb b/Project_fp13/Defalut_PrintForm.vb index 3dfff4c..d048525 100644 --- a/Project_fp13/Defalut_PrintForm.vb +++ b/Project_fp13/Defalut_PrintForm.vb @@ -1418,7 +1418,7 @@ Public Class Defalut_PrintForm ' Private Sub Build_PrintPage(ByRef Ga As Graphics, ByVal dummycnt As Short, ByVal Print As Boolean, ByVal CNT As Short, ByVal Row As Short) Private Sub Build_PrintPage(ByRef Ga As Graphics, ByVal dummycnt As Short, ByVal Print As Boolean) - Dim Brush As SolidBrush + Dim Brush As SolidBrush = Nothing Dim obj As CEpole.C_label Dim NewX, NewY, NewLeft, NewTop As Integer Dim SrcG As Graphics = Me.v_picturebox1.CreateGraphics @@ -1469,11 +1469,14 @@ Public Class Defalut_PrintForm If Print Then '//실제인쇄라면 인쇄여백을 추가로 설정한다. NewLeft += +SetForm.MyProperty_Paper.출력여백X NewTop += SetForm.MyProperty_Paper.출력여백Y + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(obj.ForeColor2) '//160515 Else If Me.DMode Then + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(Drawing.Color.Gainsboro) '//전경색으로 브러쉬를 만든다. Else + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(obj.ForeColor) '//전경색으로 브러쉬를 만든다. End If End If @@ -1514,11 +1517,16 @@ Public Class Defalut_PrintForm NewLeft = NewLeft + rcnt * obj.RepeatX NewTop = NewTop + rcnt * obj.RepeatY If Me.DMode Then + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(obj.ForeColor) '//전경색으로 브러쉬를 만든다. Else + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(Drawing.Color.LightGreen) '//전경색으로 브러쉬를 만든다. End If - If Print Then Brush = New SolidBrush(obj.ForeColor) + If Print Then + If Not Brush Is Nothing Then Brush.Dispose() + Brush = New SolidBrush(obj.ForeColor) + End If End If @@ -1532,17 +1540,19 @@ Public Class Defalut_PrintForm NewX = obj.GetSize.Width * (obj.WordWidth / 100) * (Ga.DpiX / SrcG.DpiX) NewY = obj.GetSize.Height * (obj.WordHeight / 100) * (Ga.DpiY / SrcG.DpiY) End If - Dim BMP As New Bitmap(NewX, NewY, Ga) - Dim G As Graphics = Graphics.FromImage(BMP) - G.ScaleTransform((obj.WordWidth / 100), (obj.WordHeight / 100)) - G.DrawString(obj.text2, obj.Font, Brush, 0, 0) - G.Dispose() + Using BMP As New Bitmap(NewX, NewY, Ga) + Using G As Graphics = Graphics.FromImage(BMP) + G.ScaleTransform((obj.WordWidth / 100), (obj.WordHeight / 100)) + G.DrawString(obj.text2, obj.Font, Brush, 0, 0) + G.Dispose() - Try - Ga.DrawImage(BMP, NewLeft, NewTop) ', CInt(GetSize.Width * (vwordwidth / 100)), GetSize.Height) - Catch ex As Exception - ' MsgBox("Graphic DrawError", MsgBoxStyle.Information, obj.Desc) - End Try + Try + Ga.DrawImage(BMP, NewLeft, NewTop) ', CInt(GetSize.Width * (vwordwidth / 100)), GetSize.Height) + Catch ex As Exception + ' MsgBox("Graphic DrawError", MsgBoxStyle.Information, obj.Desc) + End Try + End Using + End Using End If Next End If @@ -1555,41 +1565,41 @@ Public Class Defalut_PrintForm Try For Each Rect As S_Line In Me.Draw_Line.Items - Dim Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) + Using Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y - Dim NewSX2 As Single = Rect.X2 - Dim NewSY2 As Single = Rect.Y2 + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y + Dim NewSX2 As Single = Rect.X2 + Dim NewSY2 As Single = Rect.Y2 - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSX2 += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY2 += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - NewSX2 += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY2 += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSX2 += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY2 += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + NewSX2 += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY2 += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - NewSX += RowOffsetX - NewSY += RowOffsetY + NewSX += RowOffsetX + NewSY += RowOffsetY - NewSX2 += RowOffsetX - NewSY2 += RowOffsetY + NewSX2 += RowOffsetX + NewSY2 += RowOffsetY - If Print Then - NewSX += SetForm.MyProperty_Paper.출력여백X - NewSY += SetForm.MyProperty_Paper.출력여백Y + If Print Then + NewSX += SetForm.MyProperty_Paper.출력여백X + NewSY += SetForm.MyProperty_Paper.출력여백Y - NewSX2 += SetForm.MyProperty_Paper.출력여백X - NewSY2 += SetForm.MyProperty_Paper.출력여백Y - End If - - Ga.DrawLine(Pen, NewSX, NewSY, NewSX2, NewSY2) + NewSX2 += SetForm.MyProperty_Paper.출력여백X + NewSY2 += SetForm.MyProperty_Paper.출력여백Y + End If + Ga.DrawLine(Pen, NewSX, NewSY, NewSX2, NewSY2) + End Using Next Catch ex As Exception @@ -1598,35 +1608,36 @@ Public Class Defalut_PrintForm I = 0 Try For Each Rect As S_Box In Me.Draw_Box.Items - Dim Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) + Using Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - NewSX += RowOffsetX - NewSY += RowOffsetY + NewSX += RowOffsetX + NewSY += RowOffsetY - If Print Then - NewSX += +SetForm.MyProperty_Paper.출력여백X - NewSY += +SetForm.MyProperty_Paper.출력여백Y - End If - - If Rect.Radius = 0 Then - Ga.DrawRectangle(Pen, NewSX, NewSY, Rect.Width, Rect.Height) - Else - Dim rRect As Rectangle = New Rectangle(NewSX, NewSY, Rect.Width, Rect.Height) - Dim rpath As System.Drawing.Drawing2D.GraphicsPath = ACC.MYGDI.GetRoundedRectPath(rRect, Rect.Radius) - Ga.DrawPath(Pen, rpath) - End If + If Print Then + NewSX += +SetForm.MyProperty_Paper.출력여백X + NewSY += +SetForm.MyProperty_Paper.출력여백Y + End If + If Rect.Radius = 0 Then + Ga.DrawRectangle(Pen, NewSX, NewSY, Rect.Width, Rect.Height) + Else + Dim rRect As Rectangle = New Rectangle(NewSX, NewSY, Rect.Width, Rect.Height) + Using rpath As System.Drawing.Drawing2D.GraphicsPath = ACC.MYGDI.GetRoundedRectPath(rRect, Rect.Radius) + Ga.DrawPath(Pen, rpath) + End Using + End If + End Using Next Catch ex As Exception @@ -1635,29 +1646,30 @@ Public Class Defalut_PrintForm I = 0 Try For Each Rect As S_Circle In Me.Draw_Circle.Items - Dim Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) + Using Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - NewSX += RowOffsetX - NewSY += RowOffsetY + NewSX += RowOffsetX + NewSY += RowOffsetY - If Print Then - NewSX += +SetForm.MyProperty_Paper.출력여백X - NewSY += +SetForm.MyProperty_Paper.출력여백Y - End If + If Print Then + NewSX += +SetForm.MyProperty_Paper.출력여백X + NewSY += +SetForm.MyProperty_Paper.출력여백Y + End If - Ga.DrawEllipse(Pen, NewSX, NewSY, Rect.Width, Rect.Height) + Ga.DrawEllipse(Pen, NewSX, NewSY, Rect.Width, Rect.Height) + End Using Next Catch ex As Exception @@ -1672,34 +1684,34 @@ Public Class Defalut_PrintForm ' MsgBox(F) If System.IO.File.Exists(F) Then - Dim Image As Image = Image.FromFile(F) '//파일로부터 이미지를 가져옴 + Using Image As Image = Image.FromFile(F) '//파일로부터 이미지를 가져옴 - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - NewSX += RowOffsetX - NewSY += RowOffsetY + NewSX += RowOffsetX + NewSY += RowOffsetY - If Print Then - NewSX += +SetForm.MyProperty_Paper.출력여백X - NewSY += +SetForm.MyProperty_Paper.출력여백Y - End If - - If Rect.Width = 0 OrElse Rect.Height = 0 Then - Ga.DrawImage(Image, NewSX, NewSY) - Else - Ga.DrawImage(Image, NewSX, NewSY, Rect.Width, Rect.Height) - End If + If Print Then + NewSX += +SetForm.MyProperty_Paper.출력여백X + NewSY += +SetForm.MyProperty_Paper.출력여백Y + End If + If Rect.Width = 0 OrElse Rect.Height = 0 Then + Ga.DrawImage(Image, NewSX, NewSY) + Else + Ga.DrawImage(Image, NewSX, NewSY, Rect.Width, Rect.Height) + End If + End Using End If End If @@ -1714,7 +1726,7 @@ Public Class Defalut_PrintForm For Each Rect As S_QRCode In Me.Draw_QRcode.Items 'Dim scale As Int16 ' Dim version As Int16 - Dim image As Image + Dim image As Image = Nothing Dim data As String = "" ' Dim errorCorrect As String Dim qrCodeEncoder1 As New ThoughtWorks.QRCode.Codec.QRCodeEncoder() @@ -1798,6 +1810,7 @@ Public Class Defalut_PrintForm End If End If + If Not image Is Nothing Then image.Dispose() Next Catch ex As Exception @@ -1815,9 +1828,9 @@ Public Class Defalut_PrintForm Private Sub pDoc_PrintPage(ByVal sender As Object, ByVal e As System.Drawing.Printing.PrintPageEventArgs) Handles pDoc.PrintPage RaiseEvent StatusMessage("<< [P] pDoc_PrintPage : Build Print Pages", e_EventMessage.Normal) - Dim fmt As New StringFormat(StringFormatFlags.LineLimit) - Dim NewFontSize As Int16 = 10 - Dim dummy As Boolean = False '//이값이 true 이면 출력시 변위를 지정해서 출력한다. + 'Dim fmt As New StringFormat(StringFormatFlags.LineLimit) + 'Dim NewFontSize As Int16 = 10 + 'Dim dummy As Boolean = False '//이값이 true 이면 출력시 변위를 지정해서 출력한다. If Me.printindex <> -1 And SetForm.rad_repeat.Checked = False Then Me.GeTviewData(Me.PrintArray(Me.printindex), False) '//페이지를 갱신하고 출력을 시작한다. e.Graphics.ScaleTransform(SetForm.MyProperty_Paper.가로확대비율, SetForm.MyProperty_Paper.세로확대비율) '//확대,축소비율적용 diff --git a/Project_fp13/My Project/licenses.licx b/Project_fp13/My Project/licenses.licx index 0bbe94e..15613e2 100644 --- a/Project_fp13/My Project/licenses.licx +++ b/Project_fp13/My Project/licenses.licx @@ -1,2 +1 @@ -FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=5.0.3505.2008, Culture=neutral, PublicKeyToken=327c3516b1b18457 FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=13.45.20191.0, Culture=neutral, PublicKeyToken=327c3516b1b18457 diff --git a/Project_fp5/CEpole_fp5.vbproj b/Project_fp5/CEpole_fp5.vbproj index eeeb82c..e4fd830 100644 --- a/Project_fp5/CEpole_fp5.vbproj +++ b/Project_fp5/CEpole_fp5.vbproj @@ -42,7 +42,7 @@ CEpole.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355 STYLES=0 - x86 + AnyCPU pdbonly diff --git a/Project_fp5/Defalut_PrintForm.vb b/Project_fp5/Defalut_PrintForm.vb index 209a55a..c921156 100644 --- a/Project_fp5/Defalut_PrintForm.vb +++ b/Project_fp5/Defalut_PrintForm.vb @@ -265,7 +265,7 @@ Public Class Defalut_PrintForm ''' 초기화합니다. ''' ''' - Public Sub Initialize(ByVal V_Srctable As DataTable, ByVal styleTag As String, _ + Public Sub Initialize(ByVal V_Srctable As DataTable, ByVal styleTag As String, ByVal v_SettingFile As String, ByVal v_DefStyleIndex As Short, Optional ByVal ADT As DataTable = Nothing, Optional ByVal OT As Boolean = False) RaiseEvent StatusMessage("폼을 초기화합니다", e_EventMessage.Normal) @@ -1402,7 +1402,12 @@ Public Class Defalut_PrintForm If MsgBox("인쇄를 하시겠습니까?", MsgBoxStyle.Information + MsgBoxStyle.OkCancel, "확인") = MsgBoxResult.Ok Then RaiseEvent StatusMessage("<< [P] Print", e_EventMessage.Normal) If Me.Prepare_Print() Then + ' Try pDoc.Print() + ' Catch ex As Exception + ' MsgBox("인쇄 실패\n" + ex.Message) + ' End Try + Else MsgBox("인쇄가능한 목록이 없거나 인쇄범위(=페이지수)에 문제가 있습니다", MsgBoxStyle.Critical, "확인") End If @@ -1414,7 +1419,7 @@ Public Class Defalut_PrintForm ' Private Sub Build_PrintPage(ByRef Ga As Graphics, ByVal dummycnt As Short, ByVal Print As Boolean, ByVal CNT As Short, ByVal Row As Short) Private Sub Build_PrintPage(ByRef Ga As Graphics, ByVal dummycnt As Short, ByVal Print As Boolean) - Dim Brush As SolidBrush + Dim Brush As SolidBrush = Nothing Dim obj As CEpole.C_label Dim NewX, NewY, NewLeft, NewTop As Integer Dim SrcG As Graphics = Me.v_picturebox1.CreateGraphics @@ -1468,8 +1473,10 @@ Public Class Defalut_PrintForm Brush = New SolidBrush(obj.ForeColor2) '//160515 Else If Me.DMode Then + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(Drawing.Color.Gainsboro) '//전경색으로 브러쉬를 만든다. Else + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(obj.ForeColor) '//전경색으로 브러쉬를 만든다. End If End If @@ -1510,11 +1517,16 @@ Public Class Defalut_PrintForm NewLeft = NewLeft + rcnt * obj.RepeatX NewTop = NewTop + rcnt * obj.RepeatY If Me.DMode Then + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(obj.ForeColor) '//전경색으로 브러쉬를 만든다. Else + If Not Brush Is Nothing Then Brush.Dispose() Brush = New SolidBrush(Drawing.Color.LightGreen) '//전경색으로 브러쉬를 만든다. End If - If Print Then Brush = New SolidBrush(obj.ForeColor) + If Print Then + If Not Brush Is Nothing Then Brush.Dispose() + Brush = New SolidBrush(obj.ForeColor) + End If End If @@ -1542,20 +1554,20 @@ Public Class Defalut_PrintForm ' NewY = obj.GetSize().Height * (obj.WordHeight / 100.0) * (Ga.DpiY / SrcG.DpiY) 'End If + Using BMP As New Bitmap(NewX, NewY, Ga) + Using G As Graphics = Graphics.FromImage(BMP) + G.ScaleTransform((obj.WordWidth / 100.0), (obj.WordHeight / 100.0)) + Using sf As New StringFormat() + G.DrawString(obj.text2, obj.Font, Brush, 0.0F, 0.0F) + End Using + End Using + Try + Ga.DrawImage(BMP, NewLeft, NewTop) ', CInt(GetSize.Width * (vwordwidth / 100)), GetSize.Height) + Catch ex As Exception + ' MsgBox("Graphic DrawError", MsgBoxStyle.Information, obj.Desc) + End Try + End Using - Dim BMP As New Bitmap(NewX, NewY, Ga) - Dim G As Graphics = Graphics.FromImage(BMP) - G.ScaleTransform((obj.WordWidth / 100.0), (obj.WordHeight / 100.0)) - - Dim sf As New StringFormat() - G.DrawString(obj.text2, obj.Font, Brush, 0.0F, 0.0F) - G.Dispose() - - Try - Ga.DrawImage(BMP, NewLeft, NewTop) ', CInt(GetSize.Width * (vwordwidth / 100)), GetSize.Height) - Catch ex As Exception - ' MsgBox("Graphic DrawError", MsgBoxStyle.Information, obj.Desc) - End Try End If Next End If @@ -1614,34 +1626,36 @@ Public Class Defalut_PrintForm Try If Not Me.Draw_Box Is Nothing AndAlso Not Me.Draw_Box.Items Is Nothing Then For Each Rect As S_Box In Me.Draw_Box.Items - Dim Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) + Using Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - NewSX += RowOffsetX - NewSY += RowOffsetY + NewSX += RowOffsetX + NewSY += RowOffsetY - If Print Then - NewSX += +SetForm.MyProperty_Paper.출력여백X - NewSY += +SetForm.MyProperty_Paper.출력여백Y - End If + If Print Then + NewSX += +SetForm.MyProperty_Paper.출력여백X + NewSY += +SetForm.MyProperty_Paper.출력여백Y + End If - If Rect.Radius = 0 Then - Ga.DrawRectangle(Pen, NewSX, NewSY, Rect.Width, Rect.Height) - Else - Dim rRect As Rectangle = New Rectangle(NewSX, NewSY, Rect.Width, Rect.Height) - Dim rpath As System.Drawing.Drawing2D.GraphicsPath = ACC.MYGDI.GetRoundedRectPath(rRect, Rect.Radius) - Ga.DrawPath(Pen, rpath) - End If + If Rect.Radius = 0 Then + Ga.DrawRectangle(Pen, NewSX, NewSY, Rect.Width, Rect.Height) + Else + Dim rRect As Rectangle = New Rectangle(NewSX, NewSY, Rect.Width, Rect.Height) + Using rpath As System.Drawing.Drawing2D.GraphicsPath = ACC.MYGDI.GetRoundedRectPath(rRect, Rect.Radius) + Ga.DrawPath(Pen, rpath) + End Using + End If + End Using Next End If @@ -1654,29 +1668,30 @@ Public Class Defalut_PrintForm Try If Not Draw_Circle Is Nothing AndAlso Not Me.Draw_Circle.Items Is Nothing Then For Each Rect As S_Circle In Me.Draw_Circle.Items - Dim Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) + Using Pen As New Drawing.Pen(Rect.PenColor, Rect.PenWidth) - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - NewSX += RowOffsetX - NewSY += RowOffsetY + NewSX += RowOffsetX + NewSY += RowOffsetY - If Print Then - NewSX += +SetForm.MyProperty_Paper.출력여백X - NewSY += +SetForm.MyProperty_Paper.출력여백Y - End If + If Print Then + NewSX += +SetForm.MyProperty_Paper.출력여백X + NewSY += +SetForm.MyProperty_Paper.출력여백Y + End If - Ga.DrawEllipse(Pen, NewSX, NewSY, Rect.Width, Rect.Height) + Ga.DrawEllipse(Pen, NewSX, NewSY, Rect.Width, Rect.Height) + End Using Next End If @@ -1694,34 +1709,33 @@ Public Class Defalut_PrintForm ' MsgBox(F) If System.IO.File.Exists(F) Then - Dim Image As Image = Image.FromFile(F) '//파일로부터 이미지를 가져옴 + Using Image As Image = Image.FromFile(F) '//파일로부터 이미지를 가져옴 + Dim NewSX As Single = Rect.X + Dim NewSY As Single = Rect.Y - Dim NewSX As Single = Rect.X - Dim NewSY As Single = Rect.Y + If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. + NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) + Else + NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt + NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt + End If - If RowIndex > 0 Then '//연속출력일때에는 줄구분 값을 사용한다. - NewSX += SetForm.MyProperty_Paper.연속여백x * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - NewSY += SetForm.MyProperty_Paper.연속여백y * (dummycnt - RowIndex * SetForm.MyProperty_Paper.분리갯수) - Else - NewSX += SetForm.MyProperty_Paper.연속여백x * dummycnt - NewSY += SetForm.MyProperty_Paper.연속여백y * dummycnt - End If + NewSX += RowOffsetX + NewSY += RowOffsetY - NewSX += RowOffsetX - NewSY += RowOffsetY - - If Print Then - NewSX += +SetForm.MyProperty_Paper.출력여백X - NewSY += +SetForm.MyProperty_Paper.출력여백Y - End If - - If Rect.Width = 0 OrElse Rect.Height = 0 Then - Ga.DrawImage(Image, NewSX, NewSY) - Else - Ga.DrawImage(Image, NewSX, NewSY, Rect.Width, Rect.Height) - End If + If Print Then + NewSX += +SetForm.MyProperty_Paper.출력여백X + NewSY += +SetForm.MyProperty_Paper.출력여백Y + End If + If Rect.Width = 0 OrElse Rect.Height = 0 Then + Ga.DrawImage(Image, NewSX, NewSY) + Else + Ga.DrawImage(Image, NewSX, NewSY, Rect.Width, Rect.Height) + End If + End Using End If End If @@ -1739,7 +1753,7 @@ Public Class Defalut_PrintForm For Each Rect As S_QRCode In Me.Draw_QRcode.Items 'Dim scale As Int16 ' Dim version As Int16 - Dim image As Image + Dim image As Image = Nothing Dim data As String = "" ' Dim errorCorrect As String Dim qrCodeEncoder1 As New ThoughtWorks.QRCode.Codec.QRCodeEncoder() @@ -1823,6 +1837,7 @@ Public Class Defalut_PrintForm End If End If + If Not image Is Nothing Then image.Dispose() Next End If @@ -1842,9 +1857,9 @@ Public Class Defalut_PrintForm Private Sub pDoc_PrintPage(ByVal sender As Object, ByVal e As System.Drawing.Printing.PrintPageEventArgs) Handles pDoc.PrintPage RaiseEvent StatusMessage("<< [P] pDoc_PrintPage : Build Print Pages", e_EventMessage.Normal) - Dim fmt As New StringFormat(StringFormatFlags.LineLimit) - Dim NewFontSize As Int16 = 10 - Dim dummy As Boolean = False '//이값이 true 이면 출력시 변위를 지정해서 출력한다. + 'Dim fmt As New StringFormat(StringFormatFlags.LineLimit) + 'Dim NewFontSize As Int16 = 10 + 'Dim dummy As Boolean = False '//이값이 true 이면 출력시 변위를 지정해서 출력한다. If Me.printindex <> -1 And SetForm.rad_repeat.Checked = False Then Me.GeTviewData(Me.PrintArray(Me.printindex), False) '//페이지를 갱신하고 출력을 시작한다. e.Graphics.ScaleTransform(SetForm.MyProperty_Paper.가로확대비율, SetForm.MyProperty_Paper.세로확대비율) '//확대,축소비율적용 diff --git a/Project_fp5/FileToDataTable.vb b/Project_fp5/FileToDataTable.vb index 7263e03..835d418 100644 --- a/Project_fp5/FileToDataTable.vb +++ b/Project_fp5/FileToDataTable.vb @@ -58,36 +58,36 @@ Seppos = Line.IndexOf("=") If Findkey.ToUpper = "STYLE" Then Select Case Line.Substring(0, Seppos).ToUpper.Trim - Case "VISIBLE" : stylelist(CurIdx).visible = Line.Substring(Seppos + 1).ToUpper - Case "DESC" : stylelist(CurIdx).Desc = Line.Substring(Seppos + 1).ToUpper + Case "VISIBLE" : stylelist(CurIdx).visible = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "DESC" : stylelist(CurIdx).Desc = Line.Substring(Seppos + 1).ToUpper().Trim() Case "FILE" '이부분은 바로 대체되었다.stylelist(CurIdx).File = Line.Substring(Seppos + 1).ToUpper - Case "BACKIMG" : stylelist(CurIdx).Backimg = Line.Substring(Seppos + 1).ToUpper - Case "CANVASX" : stylelist(CurIdx).CanvasX = Line.Substring(Seppos + 1).ToUpper - Case "CANVASY" : stylelist(CurIdx).CanvasY = Line.Substring(Seppos + 1).ToUpper + Case "BACKIMG" : stylelist(CurIdx).Backimg = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "CANVASX" : stylelist(CurIdx).CanvasX = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "CANVASY" : stylelist(CurIdx).CanvasY = Line.Substring(Seppos + 1).ToUpper().Trim() - Case "DUMMYCNT" : stylelist(CurIdx).DummyCnt = Line.Substring(Seppos + 1).ToUpper - Case "DUMMY" : stylelist(CurIdx).Dummy = Line.Substring(Seppos + 1).ToUpper - Case "DUMMMYX" : stylelist(CurIdx).dummmyx = Line.Substring(Seppos + 1).ToUpper - Case "DUMMMYY" : stylelist(CurIdx).dummmyy = Line.Substring(Seppos + 1).ToUpper + Case "DUMMYCNT" : stylelist(CurIdx).DummyCnt = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "DUMMY" : stylelist(CurIdx).Dummy = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "DUMMMYX" : stylelist(CurIdx).dummmyx = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "DUMMMYY" : stylelist(CurIdx).dummmyy = Line.Substring(Seppos + 1).ToUpper().Trim() - Case "DRAWITEMREPEAT" : stylelist(CurIdx).DrawItemRepeat = Line.Substring(Seppos + 1).ToUpper + Case "DRAWITEMREPEAT" : stylelist(CurIdx).DrawItemRepeat = Line.Substring(Seppos + 1).ToUpper().Trim() - Case "ROWDIVCNT" : stylelist(CurIdx).RowDivCnt = Line.Substring(Seppos + 1).ToUpper - Case "ROWDIVX" : stylelist(CurIdx).rowdivx = Line.Substring(Seppos + 1).ToUpper - Case "ROWDIVY" : stylelist(CurIdx).rowdivy = Line.Substring(Seppos + 1).ToUpper + Case "ROWDIVCNT" : stylelist(CurIdx).RowDivCnt = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "ROWDIVX" : stylelist(CurIdx).rowdivx = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "ROWDIVY" : stylelist(CurIdx).rowdivy = Line.Substring(Seppos + 1).ToUpper().Trim() - Case "DUMMYTYPE" : stylelist(CurIdx).Dummytype = Line.Substring(Seppos + 1).ToUpper - Case "LANDSCAPE" : stylelist(CurIdx).LandScape = Line.Substring(Seppos + 1).ToUpper - Case "PICSTYLE" : stylelist(CurIdx).picstyle = Line.Substring(Seppos + 1).ToUpper - Case "VIEWIMAGE" : stylelist(CurIdx).Viewimage = Line.Substring(Seppos + 1).ToUpper - Case "FILTER" : stylelist(CurIdx).Filter = Line.Substring(Seppos + 1).ToUpper - Case "FIXEDSTYLE" : stylelist(CurIdx).FixedStyle = Line.Substring(Seppos + 1).ToUpper - Case "PRINTRANGE" : stylelist(CurIdx).PrintRange = Line.Substring(Seppos + 1).ToUpper - Case "MARGINX" : stylelist(CurIdx).MarginX = Line.Substring(Seppos + 1).ToUpper - Case "MARGINY" : stylelist(CurIdx).MarginY = Line.Substring(Seppos + 1).ToUpper - Case "PRINTFONTOFFSET" : stylelist(CurIdx).PrintFontOffset = Line.Substring(Seppos + 1).ToUpper - Case "SCALEX" : stylelist(CurIdx).ScaleX = Line.Substring(Seppos + 1).ToUpper - Case "SCALEY" : stylelist(CurIdx).ScaleY = Line.Substring(Seppos + 1).ToUpper + Case "DUMMYTYPE" : stylelist(CurIdx).Dummytype = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "LANDSCAPE" : stylelist(CurIdx).LandScape = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "PICSTYLE" : stylelist(CurIdx).picstyle = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "VIEWIMAGE" : stylelist(CurIdx).Viewimage = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "FILTER" : stylelist(CurIdx).Filter = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "FIXEDSTYLE" : stylelist(CurIdx).FixedStyle = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "PRINTRANGE" : stylelist(CurIdx).PrintRange = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "MARGINX" : stylelist(CurIdx).MarginX = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "MARGINY" : stylelist(CurIdx).MarginY = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "PRINTFONTOFFSET" : stylelist(CurIdx).PrintFontOffset = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "SCALEX" : stylelist(CurIdx).ScaleX = Line.Substring(Seppos + 1).ToUpper().Trim() + Case "SCALEY" : stylelist(CurIdx).ScaleY = Line.Substring(Seppos + 1).ToUpper().Trim() End Select End If Else '//다음키가 발견되었다. @@ -196,13 +196,13 @@ Select Case Line.Substring(0, Seppos).ToUpper Case "DESC" If Findkey.ToUpper = "STYLE" Then - stylelist(CurIdx).Desc = Line.Substring(Seppos + 1).ToUpper + stylelist(CurIdx).Desc = Line.Substring(Seppos + 1).ToUpper.Trim() Add_StyleRow(stylelist(CurIdx).PATTERNTABLE, CStr(Findkey & Line.Substring(0, Seppos)).ToUpper, Line.Substring(Seppos + 1).ToUpper, "STYLE", "DESC") Else - TxtBuf = Line.Substring(0, Seppos).ToUpper.Trim + TxtBuf = Line.Substring(0, Seppos).ToUpper.Trim() dr = stylelist(CurIdx).PATTERNTABLE.NewRow dr(0) = CStr(Findkey & Line.Substring(0, Seppos)).ToUpper - dr(1) = Line.Substring(Seppos + 1).ToUpper.Trim + dr(1) = Line.Substring(Seppos + 1).ToUpper.Trim() dr(2) = Findkey '//섹션 dr(3) = "DESC" '//개체 dr(4) = "" '//키 diff --git a/Project_fp5/Frm_Prnset.Designer.vb b/Project_fp5/Frm_Prnset.Designer.vb index 7457b2f..1cb65f0 100644 --- a/Project_fp5/Frm_Prnset.Designer.vb +++ b/Project_fp5/Frm_Prnset.Designer.vb @@ -36,6 +36,8 @@ Partial Class Frm_Prnset Me.CbtstyleeditToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripSeparator() Me.cbt_del = New System.Windows.Forms.ToolStripMenuItem() + Me.btStyleinvisible = New System.Windows.Forms.ToolStripMenuItem() + Me.btStyleVisible = New System.Windows.Forms.ToolStripMenuItem() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.pg1 = New System.Windows.Forms.PropertyGrid() Me.TabPage2 = New System.Windows.Forms.TabPage() @@ -131,8 +133,6 @@ Partial Class Frm_Prnset Me.bt_print = New System.Windows.Forms.ToolStripButton() Me.bt_dmode = New System.Windows.Forms.ToolStripButton() Me.btSaveImage = New System.Windows.Forms.ToolStripButton() - Me.btStyleinvisible = New System.Windows.Forms.ToolStripMenuItem() - Me.btStyleVisible = New System.Windows.Forms.ToolStripMenuItem() Me.TabPage3.SuspendLayout() Me.cm_style.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -159,9 +159,9 @@ Partial Class Frm_Prnset 'TabPage3 ' Me.TabPage3.Controls.Add(Me.cmb_style) - Me.TabPage3.Location = New System.Drawing.Point(4, 22) + Me.TabPage3.Location = New System.Drawing.Point(4, 26) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(333, 324) + Me.TabPage3.Size = New System.Drawing.Size(368, 346) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "스타일" Me.TabPage3.UseVisualStyleBackColor = True @@ -172,20 +172,21 @@ Partial Class Frm_Prnset Me.cmb_style.Dock = System.Windows.Forms.DockStyle.Fill Me.cmb_style.DropDownHeight = 200 Me.cmb_style.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple + Me.cmb_style.Font = New System.Drawing.Font("맑은 고딕", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.cmb_style.FormattingEnabled = True Me.cmb_style.ImeMode = System.Windows.Forms.ImeMode.Hangul Me.cmb_style.IntegralHeight = False Me.cmb_style.Items.AddRange(New Object() {"df", "sfds", "fds", "123"}) Me.cmb_style.Location = New System.Drawing.Point(0, 0) Me.cmb_style.Name = "cmb_style" - Me.cmb_style.Size = New System.Drawing.Size(333, 324) + Me.cmb_style.Size = New System.Drawing.Size(368, 346) Me.cmb_style.TabIndex = 19 ' 'cm_style ' Me.cm_style.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cbt_makenewstyle, Me.cbt_copystyle, Me.cmb_editname, Me.bt_chang_font, Me.CbtstyleeditToolStripMenuItem, Me.ToolStripMenuItem2, Me.cbt_del, Me.btStyleinvisible, Me.btStyleVisible}) Me.cm_style.Name = "cm_style" - Me.cm_style.Size = New System.Drawing.Size(179, 208) + Me.cm_style.Size = New System.Drawing.Size(179, 186) ' 'cbt_makenewstyle ' @@ -231,13 +232,25 @@ Partial Class Frm_Prnset Me.cbt_del.Size = New System.Drawing.Size(178, 22) Me.cbt_del.Text = "스타일 삭제" ' + 'btStyleinvisible + ' + Me.btStyleinvisible.Name = "btStyleinvisible" + Me.btStyleinvisible.Size = New System.Drawing.Size(178, 22) + Me.btStyleinvisible.Text = "스타일 숨김" + ' + 'btStyleVisible + ' + Me.btStyleVisible.Name = "btStyleVisible" + Me.btStyleVisible.Size = New System.Drawing.Size(178, 22) + Me.btStyleVisible.Text = "스타일 표시" + ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.pg1) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Location = New System.Drawing.Point(4, 26) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(333, 324) + Me.TabPage1.Size = New System.Drawing.Size(368, 346) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "페이지" Me.TabPage1.UseVisualStyleBackColor = True @@ -248,7 +261,7 @@ Partial Class Frm_Prnset Me.pg1.ImeMode = System.Windows.Forms.ImeMode.Hangul Me.pg1.Location = New System.Drawing.Point(3, 3) Me.pg1.Name = "pg1" - Me.pg1.Size = New System.Drawing.Size(327, 318) + Me.pg1.Size = New System.Drawing.Size(362, 340) Me.pg1.TabIndex = 100 Me.pg1.ToolbarVisible = False ' @@ -297,10 +310,10 @@ Partial Class Frm_Prnset Me.TabPage7.Controls.Add(Me.TB_FONTNAME) Me.TabPage7.Controls.Add(Me.tb_y) Me.TabPage7.Controls.Add(Me.tb_x) - Me.TabPage7.Location = New System.Drawing.Point(4, 22) + Me.TabPage7.Location = New System.Drawing.Point(4, 26) Me.TabPage7.Name = "TabPage7" Me.TabPage7.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage7.Size = New System.Drawing.Size(279, 205) + Me.TabPage7.Size = New System.Drawing.Size(279, 201) Me.TabPage7.TabIndex = 0 Me.TabPage7.Text = "I" Me.TabPage7.UseVisualStyleBackColor = True @@ -334,7 +347,7 @@ Partial Class Frm_Prnset ' Me.tb_rep.Location = New System.Drawing.Point(63, 20) Me.tb_rep.Name = "tb_rep" - Me.tb_rep.Size = New System.Drawing.Size(34, 21) + Me.tb_rep.Size = New System.Drawing.Size(34, 25) Me.tb_rep.TabIndex = 9 ' 'Label12 @@ -342,7 +355,7 @@ Partial Class Frm_Prnset Me.Label12.AutoSize = True Me.Label12.Location = New System.Drawing.Point(6, 23) Me.Label12.Name = "Label12" - Me.Label12.Size = New System.Drawing.Size(53, 12) + Me.Label12.Size = New System.Drawing.Size(65, 19) Me.Label12.TabIndex = 8 Me.Label12.Text = "반복횟수" ' @@ -350,7 +363,7 @@ Partial Class Frm_Prnset ' Me.tb_rx.Location = New System.Drawing.Point(122, 20) Me.tb_rx.Name = "tb_rx" - Me.tb_rx.Size = New System.Drawing.Size(34, 21) + Me.tb_rx.Size = New System.Drawing.Size(34, 25) Me.tb_rx.TabIndex = 91 ' 'Label13 @@ -358,7 +371,7 @@ Partial Class Frm_Prnset Me.Label13.AutoSize = True Me.Label13.Location = New System.Drawing.Point(162, 24) Me.Label13.Name = "Label13" - Me.Label13.Size = New System.Drawing.Size(13, 12) + Me.Label13.Size = New System.Drawing.Size(17, 19) Me.Label13.TabIndex = 13 Me.Label13.Text = "Y" ' @@ -366,7 +379,7 @@ Partial Class Frm_Prnset ' Me.tb_ry.Location = New System.Drawing.Point(181, 20) Me.tb_ry.Name = "tb_ry" - Me.tb_ry.Size = New System.Drawing.Size(34, 21) + Me.tb_ry.Size = New System.Drawing.Size(34, 25) Me.tb_ry.TabIndex = 92 ' 'Label14 @@ -374,7 +387,7 @@ Partial Class Frm_Prnset Me.Label14.AutoSize = True Me.Label14.Location = New System.Drawing.Point(103, 24) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(13, 12) + Me.Label14.Size = New System.Drawing.Size(17, 19) Me.Label14.TabIndex = 11 Me.Label14.Text = "X" ' @@ -383,7 +396,7 @@ Partial Class Frm_Prnset Me.Label8.AutoSize = True Me.Label8.Location = New System.Drawing.Point(18, 47) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(13, 12) + Me.Label8.Size = New System.Drawing.Size(17, 19) Me.Label8.TabIndex = 3 Me.Label8.Text = "Y" ' @@ -392,7 +405,7 @@ Partial Class Frm_Prnset Me.Label9.AutoSize = True Me.Label9.Location = New System.Drawing.Point(18, 24) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(13, 12) + Me.Label9.Size = New System.Drawing.Size(17, 19) Me.Label9.TabIndex = 0 Me.Label9.Text = "X" ' @@ -401,7 +414,7 @@ Partial Class Frm_Prnset Me.Label5.AutoSize = True Me.Label5.Location = New System.Drawing.Point(159, 47) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(29, 12) + Me.Label5.Size = New System.Drawing.Size(37, 19) Me.Label5.TabIndex = 5 Me.Label5.Text = "공백" ' @@ -410,7 +423,7 @@ Partial Class Frm_Prnset Me.Label7.AutoSize = True Me.Label7.Location = New System.Drawing.Point(159, 24) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(29, 12) + Me.Label7.Size = New System.Drawing.Size(37, 19) Me.Label7.TabIndex = 2 Me.Label7.Text = "크기" ' @@ -419,7 +432,7 @@ Partial Class Frm_Prnset Me.Label3.AutoSize = True Me.Label3.Location = New System.Drawing.Point(81, 47) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(29, 12) + Me.Label3.Size = New System.Drawing.Size(37, 19) Me.Label3.TabIndex = 4 Me.Label3.Text = "높이" ' @@ -428,7 +441,7 @@ Partial Class Frm_Prnset Me.Label2.AutoSize = True Me.Label2.Location = New System.Drawing.Point(81, 24) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(29, 12) + Me.Label2.Size = New System.Drawing.Size(37, 19) Me.Label2.TabIndex = 1 Me.Label2.Text = "너비" ' @@ -446,28 +459,28 @@ Partial Class Frm_Prnset ' Me.tb_space.Location = New System.Drawing.Point(194, 43) Me.tb_space.Name = "tb_space" - Me.tb_space.Size = New System.Drawing.Size(34, 21) + Me.tb_space.Size = New System.Drawing.Size(34, 25) Me.tb_space.TabIndex = 82 ' 'tb_size ' Me.tb_size.Location = New System.Drawing.Point(194, 20) Me.tb_size.Name = "tb_size" - Me.tb_size.Size = New System.Drawing.Size(34, 21) + Me.tb_size.Size = New System.Drawing.Size(34, 25) Me.tb_size.TabIndex = 81 ' 'tb_h ' Me.tb_h.Location = New System.Drawing.Point(116, 43) Me.tb_h.Name = "tb_h" - Me.tb_h.Size = New System.Drawing.Size(34, 21) + Me.tb_h.Size = New System.Drawing.Size(34, 25) Me.tb_h.TabIndex = 80 ' 'tb_w ' Me.tb_w.Location = New System.Drawing.Point(116, 20) Me.tb_w.Name = "tb_w" - Me.tb_w.Size = New System.Drawing.Size(34, 21) + Me.tb_w.Size = New System.Drawing.Size(34, 25) Me.tb_w.TabIndex = 79 ' 'TB_FONTNAME @@ -477,7 +490,7 @@ Partial Class Frm_Prnset Me.TB_FONTNAME.Location = New System.Drawing.Point(89, 72) Me.TB_FONTNAME.Name = "TB_FONTNAME" Me.TB_FONTNAME.ReadOnly = True - Me.TB_FONTNAME.Size = New System.Drawing.Size(127, 21) + Me.TB_FONTNAME.Size = New System.Drawing.Size(127, 25) Me.TB_FONTNAME.TabIndex = 7 Me.TB_FONTNAME.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.ToolTip1.SetToolTip(Me.TB_FONTNAME, "글꼴이름을 나타냅니다") @@ -486,14 +499,14 @@ Partial Class Frm_Prnset ' Me.tb_y.Location = New System.Drawing.Point(40, 43) Me.tb_y.Name = "tb_y" - Me.tb_y.Size = New System.Drawing.Size(34, 21) + Me.tb_y.Size = New System.Drawing.Size(34, 25) Me.tb_y.TabIndex = 78 ' 'tb_x ' Me.tb_x.Location = New System.Drawing.Point(40, 20) Me.tb_x.Name = "tb_x" - Me.tb_x.Size = New System.Drawing.Size(34, 21) + Me.tb_x.Size = New System.Drawing.Size(34, 25) Me.tb_x.TabIndex = 77 ' 'TabPage8 @@ -522,7 +535,7 @@ Partial Class Frm_Prnset Me.Label10.AutoSize = True Me.Label10.Location = New System.Drawing.Point(13, 37) Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(53, 12) + Me.Label10.Size = New System.Drawing.Size(65, 19) Me.Label10.TabIndex = 99 Me.Label10.Tag = "" Me.Label10.Text = "개체선택" @@ -533,7 +546,7 @@ Partial Class Frm_Prnset Me.lb_numtype.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lb_numtype.Location = New System.Drawing.Point(202, 60) Me.lb_numtype.Name = "lb_numtype" - Me.lb_numtype.Size = New System.Drawing.Size(91, 21) + Me.lb_numtype.Size = New System.Drawing.Size(91, 25) Me.lb_numtype.TabIndex = 91 Me.lb_numtype.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' @@ -542,7 +555,7 @@ Partial Class Frm_Prnset Me.Label6.AutoSize = True Me.Label6.Location = New System.Drawing.Point(12, 64) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(53, 12) + Me.Label6.Size = New System.Drawing.Size(65, 19) Me.Label6.TabIndex = 85 Me.Label6.Tag = "" Me.Label6.Text = "표시유형" @@ -554,7 +567,7 @@ Partial Class Frm_Prnset Me.cmb_sep.Items.AddRange(New Object() {"혼합", "분리", "통합", "*****"}) Me.cmb_sep.Location = New System.Drawing.Point(72, 60) Me.cmb_sep.Name = "cmb_sep" - Me.cmb_sep.Size = New System.Drawing.Size(124, 20) + Me.cmb_sep.Size = New System.Drawing.Size(124, 25) Me.cmb_sep.TabIndex = 84 Me.ToolTip1.SetToolTip(Me.cmb_sep, "전주번호 표시형태를 선택하세요") ' @@ -563,7 +576,7 @@ Partial Class Frm_Prnset Me.cmb_controls.FormattingEnabled = True Me.cmb_controls.Location = New System.Drawing.Point(73, 34) Me.cmb_controls.Name = "cmb_controls" - Me.cmb_controls.Size = New System.Drawing.Size(219, 20) + Me.cmb_controls.Size = New System.Drawing.Size(219, 25) Me.cmb_controls.TabIndex = 45 Me.ToolTip1.SetToolTip(Me.cmb_controls, "선택가능한 개체목록을 볼 수 잇습니다. 화면에 보이지 않는 개체도 선택이 가능합니다") ' @@ -687,10 +700,11 @@ Partial Class Frm_Prnset Me.TabControl1.Controls.Add(Me.TabPage6) Me.TabControl1.Controls.Add(Me.TabPage5) Me.TabControl1.Controls.Add(Me.TabPage4) - Me.TabControl1.Location = New System.Drawing.Point(7, 32) + Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabControl1.Location = New System.Drawing.Point(5, 30) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(341, 350) + Me.TabControl1.Size = New System.Drawing.Size(376, 376) Me.TabControl1.TabIndex = 57 ' 'TabPage6 @@ -708,10 +722,10 @@ Partial Class Frm_Prnset 'lst_shape ' Me.lst_shape.FormattingEnabled = True - Me.lst_shape.ItemHeight = 12 + Me.lst_shape.ItemHeight = 17 Me.lst_shape.Location = New System.Drawing.Point(4, 28) Me.lst_shape.Name = "lst_shape" - Me.lst_shape.Size = New System.Drawing.Size(324, 88) + Me.lst_shape.Size = New System.Drawing.Size(324, 72) Me.lst_shape.TabIndex = 102 ' 'pgs @@ -839,7 +853,7 @@ Partial Class Frm_Prnset Me.LinkLabel2.LinkColor = System.Drawing.Color.Firebrick Me.LinkLabel2.Location = New System.Drawing.Point(238, 13) Me.LinkLabel2.Name = "LinkLabel2" - Me.LinkLabel2.Size = New System.Drawing.Size(53, 12) + Me.LinkLabel2.Size = New System.Drawing.Size(65, 19) Me.LinkLabel2.TabIndex = 14 Me.LinkLabel2.TabStop = True Me.LinkLabel2.Text = "배경삭제" @@ -850,7 +864,7 @@ Partial Class Frm_Prnset Me.LinkLabel1.AutoSize = True Me.LinkLabel1.Location = New System.Drawing.Point(179, 13) Me.LinkLabel1.Name = "LinkLabel1" - Me.LinkLabel1.Size = New System.Drawing.Size(53, 12) + Me.LinkLabel1.Size = New System.Drawing.Size(65, 19) Me.LinkLabel1.TabIndex = 13 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "배경선택" @@ -861,7 +875,7 @@ Partial Class Frm_Prnset Me.Label11.AutoSize = True Me.Label11.Location = New System.Drawing.Point(14, 36) Me.Label11.Name = "Label11" - Me.Label11.Size = New System.Drawing.Size(101, 12) + Me.Label11.Size = New System.Drawing.Size(121, 19) Me.Label11.TabIndex = 12 Me.Label11.Text = "배경화면표시형식" ' @@ -907,7 +921,7 @@ Partial Class Frm_Prnset Me.chk_prnimg.AutoSize = True Me.chk_prnimg.Location = New System.Drawing.Point(9, 19) Me.chk_prnimg.Name = "chk_prnimg" - Me.chk_prnimg.Size = New System.Drawing.Size(112, 16) + Me.chk_prnimg.Size = New System.Drawing.Size(131, 23) Me.chk_prnimg.TabIndex = 5 Me.chk_prnimg.Text = "인쇄시 배경포함" Me.chk_prnimg.UseVisualStyleBackColor = True @@ -916,7 +930,7 @@ Partial Class Frm_Prnset ' Me.tb_bakh.Location = New System.Drawing.Point(89, 66) Me.tb_bakh.Name = "tb_bakh" - Me.tb_bakh.Size = New System.Drawing.Size(32, 21) + Me.tb_bakh.Size = New System.Drawing.Size(32, 25) Me.tb_bakh.TabIndex = 11 ' 'Label1 @@ -924,7 +938,7 @@ Partial Class Frm_Prnset Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(8, 45) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(39, 12) + Me.Label1.Size = New System.Drawing.Size(45, 19) Me.Label1.TabIndex = 6 Me.Label1.Text = "(위치)" ' @@ -932,7 +946,7 @@ Partial Class Frm_Prnset ' Me.tb_bakw.Location = New System.Drawing.Point(52, 66) Me.tb_bakw.Name = "tb_bakw" - Me.tb_bakw.Size = New System.Drawing.Size(32, 21) + Me.tb_bakw.Size = New System.Drawing.Size(32, 25) Me.tb_bakw.TabIndex = 10 ' 'Label4 @@ -940,7 +954,7 @@ Partial Class Frm_Prnset Me.Label4.AutoSize = True Me.Label4.Location = New System.Drawing.Point(8, 70) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(39, 12) + Me.Label4.Size = New System.Drawing.Size(45, 19) Me.Label4.TabIndex = 7 Me.Label4.Text = "(크기)" ' @@ -948,14 +962,14 @@ Partial Class Frm_Prnset ' Me.tb_baky.Location = New System.Drawing.Point(89, 41) Me.tb_baky.Name = "tb_baky" - Me.tb_baky.Size = New System.Drawing.Size(32, 21) + Me.tb_baky.Size = New System.Drawing.Size(32, 25) Me.tb_baky.TabIndex = 9 ' 'tb_bakx ' Me.tb_bakx.Location = New System.Drawing.Point(52, 41) Me.tb_bakx.Name = "tb_bakx" - Me.tb_bakx.Size = New System.Drawing.Size(32, 21) + Me.tb_bakx.Size = New System.Drawing.Size(32, 25) Me.tb_bakx.TabIndex = 8 ' 'tb_picfile @@ -975,7 +989,7 @@ Partial Class Frm_Prnset Me.cmb_imgtype.Items.AddRange(New Object() {"None", "Tile", "Center", "Stetch", "Zoom", "화면에 직접출력"}) Me.cmb_imgtype.Location = New System.Drawing.Point(125, 32) Me.cmb_imgtype.Name = "cmb_imgtype" - Me.cmb_imgtype.Size = New System.Drawing.Size(166, 20) + Me.cmb_imgtype.Size = New System.Drawing.Size(166, 25) Me.cmb_imgtype.TabIndex = 3 ' 'Chk_BgImage @@ -983,7 +997,7 @@ Partial Class Frm_Prnset Me.Chk_BgImage.AutoSize = True Me.Chk_BgImage.Location = New System.Drawing.Point(19, 11) Me.Chk_BgImage.Name = "Chk_BgImage" - Me.Chk_BgImage.Size = New System.Drawing.Size(96, 16) + Me.Chk_BgImage.Size = New System.Drawing.Size(112, 23) Me.Chk_BgImage.TabIndex = 0 Me.Chk_BgImage.Text = "배경화면사용" Me.Chk_BgImage.UseVisualStyleBackColor = True @@ -1000,6 +1014,7 @@ Partial Class Frm_Prnset ' 'NewFp1 ' + Me.NewFp1.AccessibleDescription = "" Me.NewFp1.Dock = System.Windows.Forms.DockStyle.Fill Me.NewFp1.HorizontalScrollBarPolicy = FarPoint.Win.Spread.ScrollBarPolicy.AsNeeded Me.NewFp1.Location = New System.Drawing.Point(0, 0) @@ -1029,18 +1044,18 @@ Partial Class Frm_Prnset 'tb_printrange ' Me.tb_printrange.BackColor = System.Drawing.Color.LightGoldenrodYellow - Me.tb_printrange.Location = New System.Drawing.Point(207, 13) + Me.tb_printrange.Location = New System.Drawing.Point(256, 16) Me.tb_printrange.Name = "tb_printrange" - Me.tb_printrange.Size = New System.Drawing.Size(87, 21) + Me.tb_printrange.Size = New System.Drawing.Size(87, 25) Me.tb_printrange.TabIndex = 5 Me.tb_printrange.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' 'rad_rangecustom ' Me.rad_rangecustom.AutoSize = True - Me.rad_rangecustom.Location = New System.Drawing.Point(105, 17) + Me.rad_rangecustom.Location = New System.Drawing.Point(131, 17) Me.rad_rangecustom.Name = "rad_rangecustom" - Me.rad_rangecustom.Size = New System.Drawing.Size(47, 16) + Me.rad_rangecustom.Size = New System.Drawing.Size(55, 23) Me.rad_rangecustom.TabIndex = 4 Me.rad_rangecustom.TabStop = True Me.rad_rangecustom.Text = "지정" @@ -1050,9 +1065,9 @@ Partial Class Frm_Prnset ' Me.rad_Rangecurr.AutoSize = True Me.rad_Rangecurr.Checked = True - Me.rad_Rangecurr.Location = New System.Drawing.Point(55, 17) + Me.rad_Rangecurr.Location = New System.Drawing.Point(69, 17) Me.rad_Rangecurr.Name = "rad_Rangecurr" - Me.rad_Rangecurr.Size = New System.Drawing.Size(47, 16) + Me.rad_Rangecurr.Size = New System.Drawing.Size(55, 23) Me.rad_Rangecurr.TabIndex = 3 Me.rad_Rangecurr.TabStop = True Me.rad_Rangecurr.Text = "현재" @@ -1060,11 +1075,12 @@ Partial Class Frm_Prnset ' 'cmb_prnlist ' + Me.cmb_prnlist.Dock = System.Windows.Forms.DockStyle.Top Me.cmb_prnlist.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cmb_prnlist.FormattingEnabled = True - Me.cmb_prnlist.Location = New System.Drawing.Point(8, 6) + Me.cmb_prnlist.Location = New System.Drawing.Point(5, 5) Me.cmb_prnlist.Name = "cmb_prnlist" - Me.cmb_prnlist.Size = New System.Drawing.Size(336, 20) + Me.cmb_prnlist.Size = New System.Drawing.Size(376, 25) Me.cmb_prnlist.TabIndex = 53 ' 'rad_rangeall @@ -1072,7 +1088,7 @@ Partial Class Frm_Prnset Me.rad_rangeall.AutoSize = True Me.rad_rangeall.Location = New System.Drawing.Point(7, 17) Me.rad_rangeall.Name = "rad_rangeall" - Me.rad_rangeall.Size = New System.Drawing.Size(47, 16) + Me.rad_rangeall.Size = New System.Drawing.Size(55, 23) Me.rad_rangeall.TabIndex = 2 Me.rad_rangeall.TabStop = True Me.rad_rangeall.Text = "전체" @@ -1086,9 +1102,10 @@ Partial Class Frm_Prnset Me.GroupBox3.Controls.Add(Me.rad_Rangecurr) Me.GroupBox3.Controls.Add(Me.rad_rangecustom) Me.GroupBox3.Controls.Add(Me.tb_printrange) - Me.GroupBox3.Location = New System.Drawing.Point(8, 388) + Me.GroupBox3.Dock = System.Windows.Forms.DockStyle.Bottom + Me.GroupBox3.Location = New System.Drawing.Point(5, 406) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(340, 39) + Me.GroupBox3.Size = New System.Drawing.Size(376, 46) Me.GroupBox3.TabIndex = 56 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "인쇄범위" @@ -1096,9 +1113,9 @@ Partial Class Frm_Prnset 'rad_repeat ' Me.rad_repeat.AutoSize = True - Me.rad_repeat.Location = New System.Drawing.Point(154, 17) + Me.rad_repeat.Location = New System.Drawing.Point(193, 17) Me.rad_repeat.Name = "rad_repeat" - Me.rad_repeat.Size = New System.Drawing.Size(47, 16) + Me.rad_repeat.Size = New System.Drawing.Size(55, 23) Me.rad_repeat.TabIndex = 6 Me.rad_repeat.TabStop = True Me.rad_repeat.Text = "반복" @@ -1111,9 +1128,9 @@ Partial Class Frm_Prnset Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(30, 30) Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.bt_preview, Me.bt_print, Me.bt_dmode, Me.btSaveImage}) - Me.ToolStrip1.Location = New System.Drawing.Point(0, 433) + Me.ToolStrip1.Location = New System.Drawing.Point(5, 452) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(350, 39) + Me.ToolStrip1.Size = New System.Drawing.Size(376, 39) Me.ToolStrip1.TabIndex = 58 Me.ToolStrip1.Text = "ToolStrip1" ' @@ -1155,33 +1172,23 @@ Partial Class Frm_Prnset Me.btSaveImage.Text = "저장" Me.btSaveImage.Visible = False ' - 'btStyleinvisible - ' - Me.btStyleinvisible.Name = "btStyleinvisible" - Me.btStyleinvisible.Size = New System.Drawing.Size(178, 22) - Me.btStyleinvisible.Text = "스타일 숨김" - ' - 'btStyleVisible - ' - Me.btStyleVisible.Name = "btStyleVisible" - Me.btStyleVisible.Size = New System.Drawing.Size(178, 22) - Me.btStyleVisible.Text = "스타일 표시" - ' 'Frm_Prnset ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.AutoScroll = True Me.BackColor = System.Drawing.SystemColors.Control - Me.ClientSize = New System.Drawing.Size(350, 472) - Me.Controls.Add(Me.ToolStrip1) + Me.ClientSize = New System.Drawing.Size(386, 496) Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.cmb_prnlist) Me.Controls.Add(Me.GroupBox3) + Me.Controls.Add(Me.ToolStrip1) + Me.Font = New System.Drawing.Font("맑은 고딕", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.KeyPreview = True Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "Frm_Prnset" + Me.Padding = New System.Windows.Forms.Padding(5) Me.Text = "속성창" Me.TabPage3.ResumeLayout(False) Me.cm_style.ResumeLayout(False) diff --git a/Project_fp5/Frm_Prnset.resx b/Project_fp5/Frm_Prnset.resx index bd8dce4..a57361b 100644 --- a/Project_fp5/Frm_Prnset.resx +++ b/Project_fp5/Frm_Prnset.resx @@ -399,73 +399,73 @@ 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 TkSuQmCC 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 \ No newline at end of file diff --git a/Project_fp5/Frm_Prnset.vb b/Project_fp5/Frm_Prnset.vb index 278fec5..ebbc2d4 100644 --- a/Project_fp5/Frm_Prnset.vb +++ b/Project_fp5/Frm_Prnset.vb @@ -100,7 +100,7 @@ Public Class Frm_Prnset '//190223 Function getStyleIndex() As Integer - If cmb_style.Text.Trim = "" Then Return -1 + If cmb_style.Text.Trim() = "" Then Return -1 Dim nostr As String = cmb_style.Text.Substring(1, cmb_style.Text.IndexOf("]") - 1) Return Integer.Parse(nostr) End Function