diff --git a/InvestWinApp/AddApplicant.h b/InvestWinApp/AddApplicant.h
index 0b116fb..c460188 100644
--- a/InvestWinApp/AddApplicant.h
+++ b/InvestWinApp/AddApplicant.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
namespace InvestWinApp {
@@ -10,7 +10,7 @@ namespace InvestWinApp {
using namespace System::Drawing;
///
- /// AddApplicant
+ /// Сводка для AddApplicant
///
public ref class AddApplicant : public System::Windows::Forms::Form
{
@@ -19,13 +19,13 @@ namespace InvestWinApp {
{
InitializeComponent();
//
- //TODO:
+ //TODO: добавьте код конструктора
//
}
protected:
///
- /// .
+ /// Освободить все используемые ресурсы.
///
~AddApplicant()
{
@@ -82,14 +82,14 @@ namespace InvestWinApp {
private:
///
- /// .
+ /// Обязательная переменная конструктора.
///
System::ComponentModel::Container ^components;
#pragma region Windows Form Designer generated code
///
- ///
- /// .
+ /// Требуемый метод для поддержки конструктора — не изменяйте
+ /// содержимое этого метода с помощью редактора кода.
///
void InitializeComponent(void)
{
@@ -171,7 +171,7 @@ namespace InvestWinApp {
this->label2->Name = L"label2";
this->label2->Size = System::Drawing::Size(161, 16);
this->label2->TabIndex = 1;
- this->label2->Text = L" ";
+ this->label2->Text = L"Фамилия Имя Отчество";
//
// label3
//
@@ -182,7 +182,7 @@ namespace InvestWinApp {
this->label3->Name = L"label3";
this->label3->Size = System::Drawing::Size(47, 16);
this->label3->TabIndex = 2;
- this->label3->Text = L"";
+ this->label3->Text = L"Адрес";
//
// label4
//
@@ -193,7 +193,7 @@ namespace InvestWinApp {
this->label4->Name = L"label4";
this->label4->Size = System::Drawing::Size(52, 16);
this->label4->TabIndex = 3;
- this->label4->Text = L"";
+ this->label4->Text = L"Льгота";
//
// label5
//
@@ -204,7 +204,7 @@ namespace InvestWinApp {
this->label5->Name = L"label5";
this->label5->Size = System::Drawing::Size(99, 16);
this->label5->TabIndex = 4;
- this->label5->Text = L" ";
+ this->label5->Text = L"Баллы по ЕГЭ";
//
// label9
//
@@ -215,7 +215,7 @@ namespace InvestWinApp {
this->label9->Name = L"label9";
this->label9->Size = System::Drawing::Size(140, 16);
this->label9->TabIndex = 8;
- this->label9->Text = L" ";
+ this->label9->Text = L"Номер направления";
//
// scoreBox
//
@@ -297,7 +297,7 @@ namespace InvestWinApp {
this->benefitNo->Size = System::Drawing::Size(53, 20);
this->benefitNo->TabIndex = 0;
this->benefitNo->TabStop = true;
- this->benefitNo->Text = L"";
+ this->benefitNo->Text = L"Нет";
this->benefitNo->UseVisualStyleBackColor = true;
this->benefitNo->Click += gcnew System::EventHandler(this, &AddApplicant::benefitNo_Click);
//
@@ -321,7 +321,7 @@ namespace InvestWinApp {
this->btn_add->Name = L"btn_add";
this->btn_add->Size = System::Drawing::Size(492, 65);
this->btn_add->TabIndex = 6;
- this->btn_add->Text = L"";
+ this->btn_add->Text = L"Добавить";
this->btn_add->UseVisualStyleBackColor = false;
this->btn_add->Click += gcnew System::EventHandler(this, &AddApplicant::btn_add_Click);
//
@@ -348,10 +348,10 @@ namespace InvestWinApp {
}
#pragma endregion
private: System::Void btn_add_Click(System::Object^ sender, System::EventArgs^ e) {
- // id
+ // вычисление id абонента
List^ data = ReadWrite::Load^>("applis.dat");
- //
+ // получение данных
List^ abit = gcnew List;
abit->Add(gcnew Applicant);
@@ -363,18 +363,18 @@ private: System::Void btn_add_Click(System::Object^ sender, System::EventArgs^ e
abit[0]->address = addressBox->Text;
- if (benefitNo->Checked) abit[0]->benefit = "";
+ if (benefitNo->Checked) abit[0]->benefit = "Нет";
else abit[0]->benefit = benefitYes->Text;
abit[0]->score_UGE = Convert::ToInt32(scoreBox->Text);
abit[0]->trend = trendBox->Text;
- //
+ // запись в файл
writeInFile(abit);
}
- catch (...) { MessageBox::Show(" !"); flag = false; }
+ catch (...) { MessageBox::Show("Некорректный ввод!"); flag = false; }
- //
+ // очистка формы
if (flag) {
sernameBox->Clear();
nameBox->Clear();
diff --git a/InvestWinApp/MyForm.h b/InvestWinApp/MyForm.h
index a5e03f7..eb845af 100644
--- a/InvestWinApp/MyForm.h
+++ b/InvestWinApp/MyForm.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
#include
#include
#include
@@ -37,7 +37,7 @@ namespace InvestWinApp {
private: System::Windows::Forms::ToolStripMenuItem^ toolTable;
- private: System::Windows::Forms::ToolStripMenuItem^ ToolStripMenuItem;
+ private: System::Windows::Forms::ToolStripMenuItem^ обновитьТаблицуToolStripMenuItem;
@@ -62,7 +62,7 @@ namespace InvestWinApp {
private: System::Windows::Forms::Button^ top_btn;
private: System::Windows::Forms::Button^ after_btn;
private: System::Windows::Forms::ComboBox^ comboBox;
- private: System::Windows::Forms::ToolStripMenuItem^ ToolStripMenuItem;
+ private: System::Windows::Forms::ToolStripMenuItem^ добавитьАбитуриентаToolStripMenuItem;
private: System::Windows::Forms::DataGridViewTextBoxColumn^ surname;
private: System::Windows::Forms::DataGridViewTextBoxColumn^ name;
private: System::Windows::Forms::DataGridViewTextBoxColumn^ patro;
@@ -70,7 +70,7 @@ namespace InvestWinApp {
private: System::Windows::Forms::DataGridViewTextBoxColumn^ benefits;
private: System::Windows::Forms::DataGridViewTextBoxColumn^ scores;
private: System::Windows::Forms::DataGridViewTextBoxColumn^ trend;
- private: System::Windows::Forms::ToolStripMenuItem^ ToolStripMenuItem;
+ private: System::Windows::Forms::ToolStripMenuItem^ наОбщежитиеToolStripMenuItem;
@@ -240,13 +240,13 @@ namespace InvestWinApp {
InitializeComponent();
//
- //TODO:
+ //TODO: добавьте код конструктора
//
}
protected:
///
- /// .
+ /// Освободить все используемые ресурсы.
///
~MyForm()
{
@@ -257,14 +257,14 @@ namespace InvestWinApp {
}
private:
///
- /// .
+ /// Обязательная переменная конструктора.
///
System::ComponentModel::Container ^components;
#pragma region Windows Form Designer generated code
///
- ///
- /// .
+ /// Требуемый метод для поддержки конструктора — не изменяйте
+ /// содержимое этого метода с помощью редактора кода.
///
void InitializeComponent(void)
{
@@ -286,9 +286,9 @@ namespace InvestWinApp {
this->main_ico = (gcnew System::Windows::Forms::PictureBox());
this->menu = (gcnew System::Windows::Forms::MenuStrip());
this->toolTable = (gcnew System::Windows::Forms::ToolStripMenuItem());
- this->ToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
- this->ToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
- this->ToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+ this->обновитьТаблицуToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+ this->добавитьАбитуриентаToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
+ this->наОбщежитиеToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem());
this->tableLayoutPanel1 = (gcnew System::Windows::Forms::TableLayoutPanel());
this->gridTable = (gcnew System::Windows::Forms::DataGridView());
this->surname = (gcnew System::Windows::Forms::DataGridViewTextBoxColumn());
@@ -455,34 +455,34 @@ namespace InvestWinApp {
// toolTable
//
this->toolTable->DropDownItems->AddRange(gcnew cli::array< System::Windows::Forms::ToolStripItem^ >(3) {
- this->ToolStripMenuItem,
- this->ToolStripMenuItem, this->ToolStripMenuItem
+ this->обновитьТаблицуToolStripMenuItem,
+ this->добавитьАбитуриентаToolStripMenuItem, this->наОбщежитиеToolStripMenuItem
});
this->toolTable->ForeColor = System::Drawing::Color::White;
this->toolTable->Name = L"toolTable";
this->toolTable->Size = System::Drawing::Size(82, 24);
- this->toolTable->Text = L"";
+ this->toolTable->Text = L"Таблица";
//
- // ToolStripMenuItem
+ // обновитьТаблицуToolStripMenuItem
//
- this->ToolStripMenuItem->Name = L"ToolStripMenuItem";
- this->ToolStripMenuItem->Size = System::Drawing::Size(251, 26);
- this->ToolStripMenuItem->Text = L" ";
- this->ToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::ToolStripMenuItem_Click);
+ this->обновитьТаблицуToolStripMenuItem->Name = L"обновитьТаблицуToolStripMenuItem";
+ this->обновитьТаблицуToolStripMenuItem->Size = System::Drawing::Size(251, 26);
+ this->обновитьТаблицуToolStripMenuItem->Text = L"Обновить таблицу";
+ this->обновитьТаблицуToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::обновитьТаблицуToolStripMenuItem_Click);
//
- // ToolStripMenuItem
+ // добавитьАбитуриентаToolStripMenuItem
//
- this->ToolStripMenuItem->Name = L"ToolStripMenuItem";
- this->ToolStripMenuItem->Size = System::Drawing::Size(251, 26);
- this->ToolStripMenuItem->Text = L" ";
- this->ToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::ToolStripMenuItem_Click);
+ this->добавитьАбитуриентаToolStripMenuItem->Name = L"добавитьАбитуриентаToolStripMenuItem";
+ this->добавитьАбитуриентаToolStripMenuItem->Size = System::Drawing::Size(251, 26);
+ this->добавитьАбитуриентаToolStripMenuItem->Text = L"Добавить абитуриента";
+ this->добавитьАбитуриентаToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::добавитьАбитуриентаToolStripMenuItem_Click);
//
- // ToolStripMenuItem
+ // наОбщежитиеToolStripMenuItem
//
- this->ToolStripMenuItem->Name = L"ToolStripMenuItem";
- this->ToolStripMenuItem->Size = System::Drawing::Size(251, 26);
- this->ToolStripMenuItem->Text = L" ";
- this->ToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::ToolStripMenuItem_Click);
+ this->наОбщежитиеToolStripMenuItem->Name = L"наОбщежитиеToolStripMenuItem";
+ this->наОбщежитиеToolStripMenuItem->Size = System::Drawing::Size(251, 26);
+ this->наОбщежитиеToolStripMenuItem->Text = L"На общежитие";
+ this->наОбщежитиеToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::наОбщежитиеToolStripMenuItem_Click);
//
// tableLayoutPanel1
//
@@ -531,7 +531,7 @@ namespace InvestWinApp {
//
// surname
//
- this->surname->HeaderText = L"";
+ this->surname->HeaderText = L"Фамилия";
this->surname->MinimumWidth = 6;
this->surname->Name = L"surname";
this->surname->ReadOnly = true;
@@ -539,7 +539,7 @@ namespace InvestWinApp {
//
// name
//
- this->name->HeaderText = L"";
+ this->name->HeaderText = L"Имя";
this->name->MinimumWidth = 6;
this->name->Name = L"name";
this->name->ReadOnly = true;
@@ -547,7 +547,7 @@ namespace InvestWinApp {
//
// patro
//
- this->patro->HeaderText = L"";
+ this->patro->HeaderText = L"Отчество";
this->patro->MinimumWidth = 6;
this->patro->Name = L"patro";
this->patro->ReadOnly = true;
@@ -556,14 +556,14 @@ namespace InvestWinApp {
// address
//
this->address->AutoSizeMode = System::Windows::Forms::DataGridViewAutoSizeColumnMode::Fill;
- this->address->HeaderText = L"";
+ this->address->HeaderText = L"Адрес";
this->address->MinimumWidth = 6;
this->address->Name = L"address";
this->address->ReadOnly = true;
//
// benefits
//
- this->benefits->HeaderText = L"";
+ this->benefits->HeaderText = L"Льгота";
this->benefits->MinimumWidth = 6;
this->benefits->Name = L"benefits";
this->benefits->ReadOnly = true;
@@ -571,7 +571,7 @@ namespace InvestWinApp {
//
// scores
//
- this->scores->HeaderText = L" ";
+ this->scores->HeaderText = L"Баллы ЕГЭ";
this->scores->MinimumWidth = 6;
this->scores->Name = L"scores";
this->scores->ReadOnly = true;
@@ -579,7 +579,7 @@ namespace InvestWinApp {
//
// trend
//
- this->trend->HeaderText = L"";
+ this->trend->HeaderText = L"Направление";
this->trend->MinimumWidth = 6;
this->trend->Name = L"trend";
this->trend->ReadOnly = true;
@@ -621,10 +621,10 @@ namespace InvestWinApp {
series1->Name = L"Series1";
dataPoint1->Color = System::Drawing::Color::LawnGreen;
dataPoint1->Label = L"#PERCENT{P2}";
- dataPoint1->LegendText = L"";
+ dataPoint1->LegendText = L"Льгота";
dataPoint2->Color = System::Drawing::Color::DeepSkyBlue;
dataPoint2->Label = L"#PERCENT{P2}";
- dataPoint2->LegendText = L" .";
+ dataPoint2->LegendText = L"На общих.";
series1->Points->Add(dataPoint1);
series1->Points->Add(dataPoint2);
this->chart->Series->Add(series1);
@@ -693,7 +693,7 @@ namespace InvestWinApp {
this->MainMenuStrip = this->menu;
this->MinimumSize = System::Drawing::Size(825, 500);
this->Name = L"MyForm";
- this->Text = L"";
+ this->Text = L"Инвестиции";
this->Closed += gcnew System::EventHandler(this, &MyForm::MyForm_Closed);
this->Load += gcnew System::EventHandler(this, &MyForm::MyForm_Load);
this->main_table->ResumeLayout(false);
@@ -716,7 +716,7 @@ namespace InvestWinApp {
}
#pragma endregion
-//
+// отслеживание действий формы
private: System::Void MyForm_Load(System::Object^ sender, System::EventArgs^ e) {
main_ico_Click(sender, e);
}
@@ -728,7 +728,7 @@ private: System::Void MyForm_MouseMove(System::Object^ sender, System::Windows::
}
}
-//
+// кнопки взаимодейстия с окном
private: System::Void close_Click(System::Object^ sender, System::EventArgs^ e) {
this->Close();
}
@@ -745,7 +745,7 @@ private: System::Void wrap_Click(System::Object^ sender, System::EventArgs^ e) {
this->WindowState = System::Windows::Forms::FormWindowState::Minimized;
}
-//
+// передвижения окна по экрану
private: System::Void moveWindow_MouseDown(System::Object^ sender, System::Windows::Forms::MouseEventArgs^ e) {
mPoint = Point(e->X, e->Y);
}
@@ -755,7 +755,7 @@ private: System::Void moveWindow_MouseMove(System::Object^ sender, System::Windo
}
}
-//
+// обновление таблицы
private: System::Void main_ico_Click(System::Object^ sender, System::EventArgs^ e) {
Table(sender, e);
}
@@ -770,12 +770,12 @@ private: System::Void after_btn_Click(System::Object^ sender, System::EventArgs^
MarshalString(data[i]->address, adr);
adr = adr.substr(0, adr.find(","));
- if (adr == ". ") local++;
+ if (adr == "г. Рязань") local++;
else unlocal++;
}
double perc = (100 / ((double)data->Count)) * unlocal;
- MessageBox::Show(" " + perc.ToString()->Substring(0, 4) + "%", "");
+ MessageBox::Show("Процент иногородних абитуриентов составил " + perc.ToString()->Substring(0, 4) + "%", "Вывод");
}
}
@@ -807,10 +807,10 @@ private: System::Void top_btn_Click(System::Object^ sender, System::EventArgs^ e
}
}
- String^ txt = " :\n";
- for (int i = 0; i < nums->Count; i++) txt += (i + 1).ToString() + ". " + nums[i] + " - " + nums_i[i].ToString() + "\n";
+ String^ txt = "Перечень направлений по популярности:\n";
+ for (int i = 0; i < nums->Count; i++) txt += (i + 1).ToString() + ". " + nums[i] + " в кол-ве " + nums_i[i].ToString() + "\n";
- MessageBox::Show(txt, "");
+ MessageBox::Show(txt, "Вывод");
}
}
@@ -819,7 +819,7 @@ private: System::Void comboBox_SelectedIndexChanged(System::Object^ sender, Syst
Chart(sender, e);
}
-//
+// самописные функции
private: System::Void Table(System::Object^ sender, System::EventArgs^ e) {
gridTable->Rows->Clear();
List^ data = ReadWrite::Load^>("applis.dat");
@@ -851,7 +851,7 @@ private: System::Void Chart(System::Object^ sender, System::EventArgs^ e) {
int bYes = 0, bNo = 0;
for (int i = 0; i < data->Count; i++) {
- if (data[i]->benefit == "") bNo++;
+ if (data[i]->benefit == "Нет") bNo++;
else bYes++;
}
double proc = 100 / (double)data->Count;
@@ -862,28 +862,28 @@ private: System::Void Chart(System::Object^ sender, System::EventArgs^ e) {
s1->Points->AddY(bYes * proc);
s1->Points[0]->Color = System::Drawing::Color::LawnGreen;
s1->Points[0]->Label = L"#PERCENT{P2}";
- s1->Points[0]->LegendText = L"";
+ s1->Points[0]->LegendText = L"Льгота";
s1->Points->AddY(bNo * proc);
s1->Points[1]->Color = System::Drawing::Color::DeepSkyBlue;
s1->Points[1]->Label = L"#PERCENT{P2}";
- s1->Points[1]->LegendText = L" .";
+ s1->Points[1]->LegendText = L"На общих.";
}
}
-//
-private: System::Void ToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
+// функции меню
+private: System::Void обновитьТаблицуToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
Table(sender, e);
- MessageBox::Show(" !", "");
+ MessageBox::Show("Таблица успешно обновлена!", "Таблица");
}
-private: System::Void ToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
+private: System::Void добавитьАбитуриентаToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
AddApplicant^ prt_data = gcnew AddApplicant();
prt_data->ShowDialog();
Table(sender, e);
}
-private: System::Void ToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
+private: System::Void наОбщежитиеToolStripMenuItem_Click(System::Object^ sender, System::EventArgs^ e) {
List^ data = ReadWrite::Load^>("applis.dat");
if (data) {
@@ -893,12 +893,12 @@ private: System::Void
MarshalString(data[i]->address, adr);
adr = adr.substr(0, adr.find(","));
- if (adr != ". ") {
+ if (adr != "г. Рязань") {
txt += data[i]->surname + " " + data[i]->name + " " + data[i]->patro + " " + data[i]->benefit + " " + data[i]->trend + "\n";
}
}
System::IO::File::WriteAllText("stud.txt", txt);
- MessageBox::Show(" !", "");
+ MessageBox::Show("Файл успешно записан!", "Уведомление");
system("notepad stud.txt");
}
}