가로등 통합 anycpu 로 변경
This commit is contained in:
Arin(asus)
@@ -42,7 +42,7 @@
|
||||
<DocumentationFile>CEpole.xml</DocumentationFile>
|
||||
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
|
||||
<DefineConstants>STYLES=0</DefineConstants>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
|
||||
@@ -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.세로확대비율) '//확대,축소비율적용
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user