From c0526f74fd51231ab2ec04c8c4091391a252e546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Mon, 23 Sep 2024 11:32:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ComponentProgramming/Forms/Form.Designer.cs | 34 +++++++++++--------- ComponentProgramming/Forms/Form.cs | 6 ++-- ComponentProgramming/Forms/Form.resx | 3 ++ ComponentProgramming/Forms/diagram.pdf | Bin 52779 -> 52779 bytes ComponentProgramming/Forms/table.pdf | Bin 46872 -> 46872 bytes ComponentProgramming/Forms/text.pdf | Bin 56146 -> 56146 bytes 6 files changed, 25 insertions(+), 18 deletions(-) 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 f294598565d60203afbede48f0a0211f24b7f30b..b86bdcfd5b79a7760ef3dbbd07da1186ec866a31 100644 GIT binary patch delta 302 zcmZ2Ihk5lJ<_U)E#)gK*hNh+)Eq-vaIr~L;y1H#PfZoSc%XYhsyXs%x2Kk*b@LVv=TVX=IU7TnsE6U7YP~2&tI7`)mOKIEGg( delta 302 zcmajVu}Z^G6o6rpLPb%ed4@V(xjEa1JrAB4Yd-$xHU@1pDe_=q;o5nKRf$Qj^aj7h99ZC_T|UwO2C9Q&zgCt?(7 zB1PDwiW}`!?Go=mvqPxcw>6C$FjFKUh0y%mu0h3^u<}6YsWwJ@-QlJT^U^RD)@lp6 Z2vfnSNNI3lZK+Km#qrU9N4tEz`3CNiR;mC1 diff --git a/ComponentProgramming/Forms/table.pdf b/ComponentProgramming/Forms/table.pdf index 03305b5cc0e29f83f6a7947334a20b0e7f281403..b57b302c54694b8e982880b8d46568a4dee3c75d 100644 GIT binary patch delta 278 zcmaiqzfJ-%7{J2~ke~|;yns$7HQ(3o>$Sb8F{P5QnaBWRuXoH&&h9QIUG52pt0^%) zfHUvG!ZWxyFqkm@{&a_;I~4CYAVfl?KFz-0e_B4yS1yf)lYBea6@Q#Z!?)g1OW$X& zN0=AqKbtWv5G%q;scS&8Y$#pj>OcLGHNBbpQYW delta 278 zcmbR7j%mg_rU{1ZMn=ZQ7Dh%JEnc#*1v|REjG{Ca*ol-$l2V;#KP6dz|FwT(8a{m(#hDx)X~7j!qCvk$;8am&W4bR J$t$)M006biOo{*i diff --git a/ComponentProgramming/Forms/text.pdf b/ComponentProgramming/Forms/text.pdf index 0368d118a40f1465c04a79da30301fe4dfd80b3d..df4327668d5598cc96b2637581c645839d82a1e8 100644 GIT binary patch delta 313 zcmcb#jrr0x<_U)E#)gK*hNdPPEnHaHT)cupU7RNGW0&4MmsOex!QX*kN>857afr>s z%Q4c|eRDkLEhZS-o~M!#%AOq0DK_~EZzxPkpYQSsA>$B3Ln~uLD^n9aa}!fzGh_3~ zBG;|32`5}%reb20XlRz0Y^ZCLmXxGxl4_8wn`C5`rfX?zZklM6YMGp9WHwprhKY)$ zc~YXWVY0EVsZm;@u1TU1P@%Djsjg*Gnz3neilKR$Y4YZ#8*)reCT0fa7N!=i&Th_* g7N#bKmd-9_j)sOnF+*23GZ#}k8$v23Ke|-_0M=Pqt^fc4 delta 313 zcmcb#jrr0x<_U)EhDL_Qh9+hkEnHaH0>YgmBK;@tW0&4MmsOex!QX*kN>857afmI{ z!{5_4U~@d@EhZS-o~M!#%AOq0DK_~EZzxPkpYQSsA;Si zBG;|32`5}%redCEo?@PCoUChRZkVWRVq%c0Yhh$)qMMjzm}qQbl$>IjnmSqQhKY)i zfvIV-Ns6Jag{8T%u8Fa+nQoGCT8gfjsd;LWrBSMBnq}hVrWv?rmhxFmWF0V iMlLQU299Rt=7x@jE(Ru+#%6|2#&$M@R7`$!s{jB(30XA&