diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo
index 47ee59c..fa7741c 100644
Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index fce72a5..76cbf4b 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index 29679e7..e03a906 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index a2675ed..1dd3487 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 7ce5107..cca7e0f 100644
Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache
index 83b6e0f..b7fdc11 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index a8e4fe4..f86692b 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index fce72a5..76cbf4b 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index 29679e7..e03a906 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index a2675ed..1dd3487 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
index 4d5f64c..03a1c74 100644
--- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
@@ -28,13 +28,13 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc_Plan));
this.panel1 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
@@ -85,6 +85,7 @@
this.panel5 = new System.Windows.Forms.Panel();
this.panel6 = new System.Windows.Forms.Panel();
this.tb_Left = new System.Windows.Forms.TextBox();
+ this.btn_Bring = new System.Windows.Forms.Button();
this.btn_PrintView = new System.Windows.Forms.Button();
this.chk_GuideLine = new System.Windows.Forms.CheckBox();
this.cb_TextFont = new System.Windows.Forms.ComboBox();
@@ -122,7 +123,6 @@
this.panel7 = new System.Windows.Forms.Panel();
this.printDocument1 = new System.Drawing.Printing.PrintDocument();
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
- this.btn_Bring = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel4.SuspendLayout();
this.panel3.SuspendLayout();
@@ -151,7 +151,7 @@
this.panel4.Controls.Add(this.btn_Excel);
this.panel4.Controls.Add(this.cb_EncodingType);
this.panel4.Controls.Add(this.btn_Output);
- this.panel4.Location = new System.Drawing.Point(402, 2);
+ this.panel4.Location = new System.Drawing.Point(402, 3);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(457, 29);
this.panel4.TabIndex = 9;
@@ -197,7 +197,7 @@
//
// btn_Close
//
- this.btn_Close.Location = new System.Drawing.Point(903, 5);
+ this.btn_Close.Location = new System.Drawing.Point(903, 6);
this.btn_Close.Name = "btn_Close";
this.btn_Close.Size = new System.Drawing.Size(86, 23);
this.btn_Close.TabIndex = 5;
@@ -208,7 +208,7 @@
// btn_Select_List
//
this.btn_Select_List.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.btn_Select_List.Location = new System.Drawing.Point(9, 2);
+ this.btn_Select_List.Location = new System.Drawing.Point(9, 3);
this.btn_Select_List.Name = "btn_Select_List";
this.btn_Select_List.Size = new System.Drawing.Size(354, 29);
this.btn_Select_List.TabIndex = 0;
@@ -226,7 +226,7 @@
this.panel3.Controls.Add(this.cb_FirstAuthor);
this.panel3.Controls.Add(this.label3);
this.panel3.Controls.Add(this.label4);
- this.panel3.Location = new System.Drawing.Point(10, 6);
+ this.panel3.Location = new System.Drawing.Point(10, 5);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(566, 29);
this.panel3.TabIndex = 7;
@@ -351,14 +351,14 @@
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.AppWorkspace;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.AppWorkspace;
+ dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridView1.ColumnHeadersHeight = 25;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -417,8 +417,8 @@
//
// reg_num
//
- dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.reg_num.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.reg_num.DefaultCellStyle = dataGridViewCellStyle16;
this.reg_num.FillWeight = 130.9363F;
this.reg_num.HeaderText = "등록번호";
this.reg_num.Name = "reg_num";
@@ -426,8 +426,8 @@
//
// class_code
//
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.class_code.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.class_code.DefaultCellStyle = dataGridViewCellStyle17;
this.class_code.FillWeight = 76.41504F;
this.class_code.HeaderText = "분류";
this.class_code.Name = "class_code";
@@ -435,8 +435,8 @@
//
// author_code
//
- dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.author_code.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.author_code.DefaultCellStyle = dataGridViewCellStyle18;
this.author_code.FillWeight = 77.02635F;
this.author_code.HeaderText = "저자기호";
this.author_code.Name = "author_code";
@@ -444,8 +444,8 @@
//
// volume
//
- dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.volume.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.volume.DefaultCellStyle = dataGridViewCellStyle19;
this.volume.FillWeight = 38.80909F;
this.volume.HeaderText = "V";
this.volume.Name = "volume";
@@ -454,8 +454,8 @@
//
// copy
//
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.copy.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.copy.DefaultCellStyle = dataGridViewCellStyle20;
this.copy.FillWeight = 40.14827F;
this.copy.HeaderText = "C";
this.copy.Name = "copy";
@@ -464,8 +464,8 @@
//
// prefix
//
- dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.prefix.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.prefix.DefaultCellStyle = dataGridViewCellStyle21;
this.prefix.FillWeight = 41.51828F;
this.prefix.HeaderText = "F";
this.prefix.Name = "prefix";
@@ -581,7 +581,7 @@
this.checkBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkBox1.Location = new System.Drawing.Point(1431, 92);
+ this.checkBox1.Location = new System.Drawing.Point(1420, 6);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(15, 14);
this.checkBox1.TabIndex = 2;
@@ -597,7 +597,7 @@
this.panel2.Controls.Add(this.tb_ISBN);
this.panel2.Controls.Add(this.btn_ChangeTag);
this.panel2.Controls.Add(this.tb_SearchTag);
- this.panel2.Location = new System.Drawing.Point(596, 6);
+ this.panel2.Location = new System.Drawing.Point(596, 5);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(412, 29);
this.panel2.TabIndex = 8;
@@ -666,6 +666,16 @@
this.tb_Left.Text = "20";
this.tb_Left.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
+ // btn_Bring
+ //
+ this.btn_Bring.Location = new System.Drawing.Point(1023, 5);
+ this.btn_Bring.Name = "btn_Bring";
+ this.btn_Bring.Size = new System.Drawing.Size(75, 49);
+ this.btn_Bring.TabIndex = 80;
+ this.btn_Bring.Text = "불러오기";
+ this.btn_Bring.UseVisualStyleBackColor = true;
+ this.btn_Bring.Click += new System.EventHandler(this.btn_Bring_Click);
+ //
// btn_PrintView
//
this.btn_PrintView.Location = new System.Drawing.Point(942, 5);
@@ -768,7 +778,7 @@
//
this.chk_C.AutoSize = true;
this.chk_C.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.chk_C.Location = new System.Drawing.Point(627, 35);
+ this.chk_C.Location = new System.Drawing.Point(623, 35);
this.chk_C.Name = "chk_C";
this.chk_C.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.chk_C.Size = new System.Drawing.Size(37, 16);
@@ -790,7 +800,7 @@
//
this.chk_V.AutoSize = true;
this.chk_V.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.chk_V.Location = new System.Drawing.Point(570, 35);
+ this.chk_V.Location = new System.Drawing.Point(563, 35);
this.chk_V.Name = "chk_V";
this.chk_V.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.chk_V.Size = new System.Drawing.Size(36, 16);
@@ -995,6 +1005,7 @@
//
// panel7
//
+ this.panel7.Controls.Add(this.checkBox1);
this.panel7.Controls.Add(this.dataGridView1);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Location = new System.Drawing.Point(0, 75);
@@ -1016,16 +1027,6 @@
this.printPreviewDialog1.Name = "printPreviewDialog1";
this.printPreviewDialog1.Visible = false;
//
- // btn_Bring
- //
- this.btn_Bring.Location = new System.Drawing.Point(1023, 5);
- this.btn_Bring.Name = "btn_Bring";
- this.btn_Bring.Size = new System.Drawing.Size(75, 49);
- this.btn_Bring.TabIndex = 80;
- this.btn_Bring.Text = "불러오기";
- this.btn_Bring.UseVisualStyleBackColor = true;
- this.btn_Bring.Click += new System.EventHandler(this.btn_Bring_Click);
- //
// Marc_Plan
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1034,7 +1035,6 @@
this.Controls.Add(this.panel7);
this.Controls.Add(this.panel6);
this.Controls.Add(this.panel5);
- this.Controls.Add(this.checkBox1);
this.Controls.Add(this.panel1);
this.Name = "Marc_Plan";
this.Text = "마크 정리";
@@ -1050,8 +1050,8 @@
this.panel6.ResumeLayout(false);
this.panel6.PerformLayout();
this.panel7.ResumeLayout(false);
+ this.panel7.PerformLayout();
this.ResumeLayout(false);
- this.PerformLayout();
}
diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs
index a99ba10..a99adcb 100644
--- a/unimarc/unimarc/마크/Marc_Plan.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.cs
@@ -61,6 +61,7 @@ namespace WindowsFormsApp1.Mac
{
throw new NotImplementedException();
}
+
#region SelectList_Sub
public void mk_Grid(string ListName, string date)
{
@@ -575,11 +576,22 @@ namespace WindowsFormsApp1.Mac
MessageBox.Show("글자체를 선택해주세요!");
return;
}
-
+ Cnt = 0;
+ isMorePage = false;
printPreviewDialog1.Document = printDocument1;
printPreviewDialog1.ShowDialog();
}
+ ///
+ /// 행의 갯수
+ ///
+ int Cnt;
+
+ ///
+ /// 여러장 인쇄인지
+ ///
+ bool isMorePage;
+
private void printDocument1_PrintPage(object sender, System.Drawing.Printing.PrintPageEventArgs e)
{
// A4 Size( 1169 x 827 in) ( 210 x 297 mm )
@@ -590,6 +602,7 @@ namespace WindowsFormsApp1.Mac
int Garo = Convert.ToInt32(tb_Garo.Text);
int Sero = Convert.ToInt32(tb_Sero.Text);
+ int Total = Garo * Sero;
int FontSize = Convert.ToInt32(tb_TextSize.Text);
float GaroGap = mmToInch(Convert.ToDouble(tb_GaroGap.Text));
@@ -601,8 +614,13 @@ namespace WindowsFormsApp1.Mac
Font F = new Font(cb_TextFont.Text, FontSize);
Font NumFont = new Font(cb_TextFont.Text, 5);
+ StringFormat format = new StringFormat();
+ //format.Alignment = StringAlignment.Center;
+
int startCount = Convert.ToInt32(tb_StartPosition.Text);
- int Count = 0;
+ if (isMorePage)
+ startCount = 0;
+
int GridCount = 0;
for (int SeroCount = 0; SeroCount < Sero; SeroCount++)
{
@@ -612,23 +630,32 @@ namespace WindowsFormsApp1.Mac
if (!chk_GuideLine.Checked)
e.Graphics.DrawRectangle(ps, UxPos, yPos, Width, Height);
+ if (Cnt >= dataGridView1.Rows.Count)
+ return;
+
if (GridCount >= startCount - 1)
{
- e.Graphics.DrawString(GridData[Count], F, Brushes.Black, UxPos + mmToInch(6), yPos + mmToInch(2));
+ e.Graphics.DrawString(GridData[Cnt], F, Brushes.Black, UxPos + mmToInch(6), yPos + mmToInch(2), format);
if (!chk_Num.Checked)
e.Graphics.DrawString(
- dataGridView1.Rows[Count].Cells["reg_num"].Value.ToString(),
+ dataGridView1.Rows[Cnt].Cells["reg_num"].Value.ToString(),
NumFont,
Brushes.Black,
UxPos + mmToInch(6),
- yPos + Width + mmToInch(4));
+ yPos + Width + mmToInch(4), format);
- Count++;
+ Cnt++;
}
UxPos += Width + GaroGap;
GridCount++;
}
+ if (GridCount % Total == 0)
+ {
+ e.HasMorePages = true;
+ isMorePage = true;
+ return;
+ }
yPos += Height + SeroGap;
}
}
@@ -641,7 +668,7 @@ namespace WindowsFormsApp1.Mac
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
string classSymbol = dataGridView1.Rows[a].Cells["class_code"].Value.ToString();
- string authorSymbol = dataGridView1.Rows[a].Cells["AuthorSymbol"].Value.ToString();
+ string authorSymbol = dataGridView1.Rows[a].Cells["author_code"].Value.ToString();
string count = dataGridView1.Rows[a].Cells["copy"].Value.ToString();
string vol = dataGridView1.Rows[a].Cells["volume"].Value.ToString();
string fix = dataGridView1.Rows[a].Cells["prefix"].Value.ToString();