diff --git a/Project/CEpole.vbproj.user b/Project/CEpole.vbproj.user
new file mode 100644
index 0000000..856def9
--- /dev/null
+++ b/Project/CEpole.vbproj.user
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ko-KR
+ false
+
+
\ No newline at end of file
diff --git a/Project/desktop.ini b/Project/desktop.ini
deleted file mode 100644
index ba588e2..0000000
--- a/Project/desktop.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[.ShellClassInfo]
-IconResource=C:\Windows\system32\SHELL32.dll,17
diff --git a/Project_fp13/CEpole_fp13.vbproj.user b/Project_fp13/CEpole_fp13.vbproj.user
new file mode 100644
index 0000000..856def9
--- /dev/null
+++ b/Project_fp13/CEpole_fp13.vbproj.user
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ko-KR
+ false
+
+
\ No newline at end of file
diff --git a/Project_fp5/CEpole_fp5.vbproj b/Project_fp5/CEpole_fp5.vbproj
index 6509c56..eeeb82c 100644
--- a/Project_fp5/CEpole_fp5.vbproj
+++ b/Project_fp5/CEpole_fp5.vbproj
@@ -5,7 +5,7 @@
AnyCPU
9.0.21022
2.0
- {78345183-B834-4478-BD7A-775BFCCE2168}
+ {A8FF605F-231E-4DC1-9CD8-FD1466FDE5CD}
Library
CEpole
CEpole
diff --git a/Project_fp5/CEpole_fp5.vbproj.user b/Project_fp5/CEpole_fp5.vbproj.user
new file mode 100644
index 0000000..856def9
--- /dev/null
+++ b/Project_fp5/CEpole_fp5.vbproj.user
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ko-KR
+ false
+
+
\ No newline at end of file
diff --git a/Project_fp5/C_label.vb b/Project_fp5/C_label.vb
index e823889..3af9cc9 100644
--- a/Project_fp5/C_label.vb
+++ b/Project_fp5/C_label.vb
@@ -62,8 +62,16 @@ Public Class C_label
'''
'''
'''
+ Public Function GetSize(g As Graphics) As SizeF
+ ' Return System.Windows.Forms.TextRenderer.MeasureText(text2, Font)
+ Return g.MeasureString(text2, Font)
+
+ End Function
+
Public Function GetSize() As SizeF
Return System.Windows.Forms.TextRenderer.MeasureText(text2, Font)
+ 'Return g.MeasureString(text2, Font)
+
End Function
Private Sub RotateAt(ByVal gr As Graphics, ByVal cx As Integer, ByVal cy As Integer, ByVal angle As Single)
diff --git a/Project_fp5/Defalut_PrintForm.vb b/Project_fp5/Defalut_PrintForm.vb
index d7a2afb..209a55a 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)
@@ -1520,18 +1520,35 @@ Public Class Defalut_PrintForm
If obj.WordWidth = 100 AndAlso obj.WordHeight = 100 Then '//이미지확대축소 디지않았을경우
Ga.DrawString(obj.text2, obj.Font, Brush, NewLeft, NewTop)
- Else '//이미지확대축소 됬을경우
+ Else '//이미지확대축소 됬을경우
+
+ 'Dim aNewX = obj.GetSize().Width * (obj.WordWidth / 100.0) '* (Ga.DpiX / SrcG.DpiX)
+ 'Dim aNewY = obj.GetSize().Height * (obj.WordHeight / 100.0) ' * (Ga.DpiY / SrcG.DpiY)
+
+
If Not Print Then
- NewX = obj.GetSize.Width * (obj.WordWidth / 100) '* (Ga.DpiX / SrcG.DpiX)
- NewY = obj.GetSize.Height * (obj.WordHeight / 100) ' * (Ga.DpiY / SrcG.DpiY)
+ NewX = obj.GetSize(Ga).Width * (obj.WordWidth / 100.0) '* (Ga.DpiX / SrcG.DpiX)
+ NewY = obj.GetSize(Ga).Height * (obj.WordHeight / 100.0) ' * (Ga.DpiY / SrcG.DpiY)
Else
- NewX = obj.GetSize.Width * (obj.WordWidth / 100) * (Ga.DpiX / SrcG.DpiX)
- NewY = obj.GetSize.Height * (obj.WordHeight / 100) * (Ga.DpiY / SrcG.DpiY)
+ NewX = obj.GetSize(Ga).Width * (obj.WordWidth / 100.0) * (Ga.DpiX / SrcG.DpiX)
+ NewY = obj.GetSize(Ga).Height * (obj.WordHeight / 100.0) * (Ga.DpiY / SrcG.DpiY)
End If
+
+ 'If Not Print Then
+ ' NewX = obj.GetSize().Width * (obj.WordWidth / 100.0) '* (Ga.DpiX / SrcG.DpiX)
+ ' NewY = obj.GetSize().Height * (obj.WordHeight / 100.0) ' * (Ga.DpiY / SrcG.DpiY)
+ 'Else
+ ' NewX = obj.GetSize().Width * (obj.WordWidth / 100.0) * (Ga.DpiX / SrcG.DpiX)
+ ' NewY = obj.GetSize().Height * (obj.WordHeight / 100.0) * (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.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
@@ -3109,11 +3126,12 @@ Public Class Defalut_PrintForm
Dim selitem As New ArrayList '//마우스클릭했을때 여러개가 겹친경우 해당 아이템들을 넣는곳
+ Dim g As Graphics = CreateGraphics()
Tobj = Nothing
For i As Integer = 0 To Me.AllLabels.GetUpperBound(0)
If Me.AllLabels(i).visible AndAlso Me.AllLabels(i).Text <> "" AndAlso
- ((e.X >= Me.AllLabels(i).Left) And e.X <= (Me.AllLabels(i).Left + Me.AllLabels(i).GetSize.Width)) _
- AndAlso ((e.Y >= Me.AllLabels(i).Top) AndAlso (e.Y <= (Me.AllLabels(i).Top + Me.AllLabels(i).GetSize.Height))) Then
+ ((e.X >= Me.AllLabels(i).Left) And e.X <= (Me.AllLabels(i).Left + Me.AllLabels(i).GetSize(g).Width)) _
+ AndAlso ((e.Y >= Me.AllLabels(i).Top) AndAlso (e.Y <= (Me.AllLabels(i).Top + Me.AllLabels(i).GetSize(g).Height))) Then
Tobj = Me.AllLabels(i)
selitem.Add(Me.AllLabels(i))
'Exit For
@@ -3205,10 +3223,11 @@ Public Class Defalut_PrintForm
'//더블클릭하면 번호표시형태를 변경할수 있게한다.
If Me.DMode = E_DesignMode.Text Then
Dim Tobj As CEpole.C_label = Nothing
+ Dim g As Graphics = CreateGraphics()
For i As Integer = 0 To Me.AllLabels.GetUpperBound(0)
If Me.AllLabels(i).visible AndAlso Me.AllLabels(i).Text <> "" AndAlso
- ((e.X >= Me.AllLabels(i).Left) And e.X <= (Me.AllLabels(i).Left + Me.AllLabels(i).GetSize.Width)) _
- AndAlso ((e.Y >= Me.AllLabels(i).Top) AndAlso (e.Y <= (Me.AllLabels(i).Top + Me.AllLabels(i).GetSize.Height))) Then
+ ((e.X >= Me.AllLabels(i).Left) And e.X <= (Me.AllLabels(i).Left + Me.AllLabels(i).GetSize(g).Width)) _
+ AndAlso ((e.Y >= Me.AllLabels(i).Top) AndAlso (e.Y <= (Me.AllLabels(i).Top + Me.AllLabels(i).GetSize(g).Height))) Then
Tobj = Me.AllLabels(i)
Exit For
End If