diff --git a/ComponentProgramming/Forms/Form.Designer.cs b/ComponentProgramming/Forms/Form.Designer.cs index 6b1b2e0..c5ab029 100644 --- a/ComponentProgramming/Forms/Form.Designer.cs +++ b/ComponentProgramming/Forms/Form.Designer.cs @@ -36,32 +36,34 @@ controlListBox = new ComponentProgramming.ControlListBox(); tableComponent = new ComponentProgramming.Components.TableComponent(components); diagramComponent = new ComponentProgramming.DiagramComponent(components); + largeTextComponent = new ComponentProgramming.Components.LargeTextComponent(components); SuspendLayout(); // // controlComboBox // - controlComboBox.Location = new Point(12, 3); - controlComboBox.Margin = new Padding(3, 4, 3, 4); + controlComboBox.Location = new Point(14, 4); + controlComboBox.Margin = new Padding(3, 5, 3, 5); controlComboBox.Name = "controlComboBox"; controlComboBox.SelectedItem = ""; - controlComboBox.Size = new Size(177, 31); + controlComboBox.Size = new Size(202, 41); controlComboBox.TabIndex = 0; controlComboBox.ComboBoxChanged += controlComboBox_ComboBoxChanged; // // controlTextBox // - controlTextBox.Location = new Point(226, 3); - controlTextBox.Margin = new Padding(3, 4, 3, 4); + controlTextBox.Location = new Point(258, 4); + controlTextBox.Margin = new Padding(3, 5, 3, 5); controlTextBox.Name = "controlTextBox"; controlTextBox.NumPattern = null; - controlTextBox.Size = new Size(150, 29); + controlTextBox.Size = new Size(171, 39); controlTextBox.TabIndex = 1; // // buttonGetObj // - buttonGetObj.Location = new Point(12, 415); + buttonGetObj.Location = new Point(14, 553); + buttonGetObj.Margin = new Padding(3, 4, 3, 4); buttonGetObj.Name = "buttonGetObj"; - buttonGetObj.Size = new Size(126, 23); + buttonGetObj.Size = new Size(144, 31); buttonGetObj.TabIndex = 3; buttonGetObj.Text = "Получить объект"; buttonGetObj.UseVisualStyleBackColor = true; @@ -69,10 +71,9 @@ // // buttonEnter // - buttonEnter.Location = new Point(272, 36); - buttonEnter.Margin = new Padding(3, 2, 3, 2); + buttonEnter.Location = new Point(311, 48); buttonEnter.Name = "buttonEnter"; - buttonEnter.Size = new Size(74, 24); + buttonEnter.Size = new Size(85, 32); buttonEnter.TabIndex = 5; buttonEnter.Text = "Ввод"; buttonEnter.UseVisualStyleBackColor = true; @@ -81,21 +82,23 @@ // controlListBox // controlListBox.GetIndex = -1; - controlListBox.Location = new Point(12, 65); + controlListBox.Location = new Point(14, 87); + controlListBox.Margin = new Padding(3, 5, 3, 5); controlListBox.Name = "controlListBox"; - controlListBox.Size = new Size(334, 344); + controlListBox.Size = new Size(382, 459); controlListBox.TabIndex = 7; // // Form // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(759, 450); + ClientSize = new Size(410, 600); Controls.Add(controlListBox); Controls.Add(buttonEnter); Controls.Add(buttonGetObj); Controls.Add(controlTextBox); Controls.Add(controlComboBox); + Margin = new Padding(3, 4, 3, 4); Name = "Form"; Text = "Form"; ResumeLayout(false); @@ -111,5 +114,6 @@ private ComponentProgramming.ControlListBox controlListBox; private ComponentProgramming.Components.TableComponent tableComponent; private ComponentProgramming.DiagramComponent diagramComponent; + private ComponentProgramming.Components.LargeTextComponent largeTextComponent; } } diff --git a/ComponentProgramming/Forms/Form.cs b/ComponentProgramming/Forms/Form.cs index 8be1fa6..1c218ca 100644 --- a/ComponentProgramming/Forms/Form.cs +++ b/ComponentProgramming/Forms/Form.cs @@ -11,7 +11,7 @@ namespace Forms FillTextBox(); FillList(); string[] strings = new string[] { "Ó êîìïîíåíòà äîëæåí áûòü ïóáëè÷íûé ìåòîä, êîòîðûé äîëæåí ïðèíèìàòü íà âõîä èìÿ ôàéëà (âêëþ÷àÿ ïóòü äî ôàéëà)", "íàçâàíèå äîêóìåíòà (çàãîëîâîê â äîêóìåíòå) è ìàññèâ ñòðîê (êàæäàÿ ñòðîêà – àáçàö òåêñòà â âûõîäíîì äîêóìåíòå èëè òåêñò â ÿ÷åéêå äëÿ òàáëè÷íîãî äîêóìåíòà)" }; - //largeTextComponent.CreateDocument("C:\\Users\\shotb\\source\\repos\\KOP\\ComponentProgramming\\Forms\\text.pdf", "Çàãîëîâîê", strings); + largeTextComponent.CreateDocument("C:\\Users\\Ìàêñèì\\source\\repos\\PIbd-31_Yakovlev.M.G._COP_16\\ComponentProgramming\\Forms\\text.pdf", "Çàãîëîâîê", strings); List colInfos = new List() { new ColumnInfo("Name","Èìÿ",50), @@ -31,14 +31,14 @@ namespace Forms new Worker("Âîâêà", "Êóçüìèí", "+88005553535", "mail@gmail.ru", "pass123"), new Worker("Ãëåáóøêà", "Ìèîí÷èíñêèé", "+88005553535", "mail@gmail.ru", "pass123"), }; - tableComponent.CreateTable("C:\\Users\\shotb\\source\\repos\\KOP\\ComponentProgramming\\Forms\\table.pdf", "Çàãîëîâîê", mergeCells, colInfos, workers); + tableComponent.CreateTable("C:\\Users\\Ìàêñèì\\source\\repos\\PIbd-31_Yakovlev.M.G._COP_16\\ComponentProgramming\\Forms\\table.pdf", "Çàãîëîâîê", mergeCells, colInfos, workers); Dictionary> data = new Dictionary>(); data.Add("Çíà÷1", new List { 0.5, 1, 2, 5, 2 }); data.Add("Çíà÷2", new List { 3, 2, 1, 3, 6 }); data.Add("Çíà÷3", new List { 7, 3, 1, 2, 5 }); - diagramComponent.CreateLineDiagram("C:\\Users\\shotb\\source\\repos\\KOP\\ComponentProgramming\\Forms\\diagram.pdf", "Çàãîëîâîê", "Ëèíåéíàÿ äèàãðàììà", data, LegendAlign.bottom); + diagramComponent.CreateLineDiagram("C:\\Users\\Ìàêñèì\\source\\repos\\PIbd-31_Yakovlev.M.G._COP_16\\ComponentProgramming\\Forms\\diagram.pdf", "Çàãîëîâîê", "Ëèíåéíàÿ äèàãðàììà", data, LegendAlign.bottom); } private void FillBox() diff --git a/ComponentProgramming/Forms/Form.resx b/ComponentProgramming/Forms/Form.resx index d3d135a..458d54c 100644 --- a/ComponentProgramming/Forms/Form.resx +++ b/ComponentProgramming/Forms/Form.resx @@ -123,4 +123,7 @@ 161, 17 + + 351, 17 + \ No newline at end of file diff --git a/ComponentProgramming/Forms/diagram.pdf b/ComponentProgramming/Forms/diagram.pdf index f294598..b86bdcf 100644 Binary files a/ComponentProgramming/Forms/diagram.pdf and b/ComponentProgramming/Forms/diagram.pdf differ diff --git a/ComponentProgramming/Forms/table.pdf b/ComponentProgramming/Forms/table.pdf index 03305b5..b57b302 100644 Binary files a/ComponentProgramming/Forms/table.pdf and b/ComponentProgramming/Forms/table.pdf differ diff --git a/ComponentProgramming/Forms/text.pdf b/ComponentProgramming/Forms/text.pdf index 0368d11..df43276 100644 Binary files a/ComponentProgramming/Forms/text.pdf and b/ComponentProgramming/Forms/text.pdf differ