Skip to content

Commit dad97e5

Browse files
#TDP - 10 Add comment
1 parent 62829f5 commit dad97e5

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

MethodMonte_Karlo/InteractionForm.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ System::Void MethodMonteKarlo::InteractionForm::Btn_squareTringle(System::Object
149149
*(triangleVertexCoord["yc"]- triangleVertexCoord["ya"]))).ToString();
150150
}
151151

152-
153-
154152
System::Void MethodMonteKarlo::InteractionForm::Btn_squareIntegral_Click(System::Object^ sender, System::EventArgs^ e)
155153
{
156154
clearInteractiveElementChartArea2();

MethodMonte_Karlo/InteractionForm.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,22 +279,24 @@ namespace MethodMonteKarlo {
279279
chartArea2->Position->Y = 49.61771F;
280280
this->chart1->ChartAreas->Add(chartArea1);
281281
this->chart1->ChartAreas->Add(chartArea2);
282+
legend1->BackColor = System::Drawing::Color::Transparent;
282283
legend1->HeaderSeparator = System::Windows::Forms::DataVisualization::Charting::LegendSeparatorStyle::DashLine;
283284
legend1->LegendStyle = System::Windows::Forms::DataVisualization::Charting::LegendStyle::Column;
284285
legend1->MaximumAutoSize = 25;
285286
legend1->Name = L"Legend1";
286-
legend1->Title = L"Ëåãåíäà ïëîùàäü";
287+
legend1->Title = L"Ïëîùàëü ôèãóðû";
287288
legend1->TitleFont = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
288289
static_cast<System::Byte>(204)));
289290
legend1->TitleSeparator = System::Windows::Forms::DataVisualization::Charting::LegendSeparatorStyle::GradientLine;
291+
legend2->BackColor = System::Drawing::Color::Transparent;
290292
legend2->DockedToChartArea = L"ChartArea2";
291293
legend2->HeaderSeparator = System::Windows::Forms::DataVisualization::Charting::LegendSeparatorStyle::DashLine;
292294
legend2->IsDockedInsideChartArea = false;
293295
legend2->ItemColumnSpacing = 10;
294296
legend2->MaximumAutoSize = 100;
295297
legend2->Name = L"Legend2";
296298
legend2->TableStyle = System::Windows::Forms::DataVisualization::Charting::LegendTableStyle::Tall;
297-
legend2->Title = L"Ëåãåíäà èíòåãðàë";
299+
legend2->Title = L"Èíòåãðàë";
298300
legend2->TitleFont = (gcnew System::Drawing::Font(L"Microsoft Sans Serif", 9.75F, System::Drawing::FontStyle::Bold, System::Drawing::GraphicsUnit::Point,
299301
static_cast<System::Byte>(204)));
300302
legend2->TitleSeparator = System::Windows::Forms::DataVisualization::Charting::LegendSeparatorStyle::DashLine;

MethodMonte_Karlo/InteractiveForm2.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ System::Void MethodMonteKarlo::InteractiveForm2::Button1_Click(System::Object^ s
1010
double R = Convert::ToDouble(this->numericUpDown_numVar->Value);
1111
int N = Convert::ToInt32(this->numericUpDown_CountPoint->Value);
1212
bool uniformRND = this->chb_randUniform->Checked;
13-
14-
//TODO a = ñìåùíèå êîîðäèíàò b = ñìåùåíèå êîîðèäàíì
1513

1614
this->chart1->Series[0]->Points->AddXY(0, 0);
1715
this->chart1->Series[0]->Points->AddXY(0, 2*R);
@@ -20,7 +18,7 @@ System::Void MethodMonteKarlo::InteractiveForm2::Button1_Click(System::Object^ s
2018
this->chart1->Series[0]->Points->AddXY(0, 0);
2119

2220
for (double h = 0; h < 2 * std::_Pi*2.0; h += 0.01)
23-
this->chart1->Series[1]->Points->AddXY(R+R*cos(h), R + R * sin(h));
21+
this->chart1->Series[1]->Points->AddXY(R+R*cos(h), R + R * sin(h));// ñìåùåíèå ïî õ, ñìåùåíèå ïî ó
2422

2523
std::vector<double> rnd_x = getRandomPoint(uniformRND, 0,2.0*R, N);
2624
std::vector<double> rnd_y = getRandomPoint(uniformRND, 0,2.0*R, N);
@@ -99,6 +97,7 @@ System::Void MethodMonteKarlo::InteractiveForm2::Btn_polar_Click(System::Object^
9997
max_b = y;
10098
this->chart1->Series[4]->Points->AddXY( x, y);
10199
}
100+
//For rectangle
102101
this->chart1->Series[5]->Points->AddXY(min_a, min_b);
103102
this->chart1->Series[5]->Points->AddXY(min_a, max_b);
104103
this->chart1->Series[5]->Points->AddXY(max_a, max_b);

MethodMonte_Karlo/InteractiveForm2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ namespace MethodMonteKarlo {
461461
this->Controls->Add(this->chart1);
462462
this->Icon = (cli::safe_cast<System::Drawing::Icon^>(resources->GetObject(L"$this.Icon")));
463463
this->Name = L"InteractiveForm2";
464-
this->Text = L"X";
464+
this->Text = L"Âû÷èñëåíèå ïëîùàäè êðóãà è ôèãóðû â ïîëÿðíûõ êîîðäèíàòàõ";
465465
(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->chart1))->EndInit();
466466
(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->numericUpDown_numVar))->EndInit();
467467
(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->numericUpDown_CountPoint))->EndInit();

0 commit comments

Comments
 (0)