#TDP - 3 Fixed bug with time

Author: StrongerProgrammer7

ModelingWorkMachineWithBreakdowns/ModelingWorkForm.cpp

@@ -78,11 +78,12 @@ System::Void ModelingWorkMachineWithBreakdowns::ModelingWorkForm::Btn_execution_
 	double totalTimeWorkMachine = 0;
 	int countBrokenDetails = 0;
 	double totalTimeRepair = 0;
+	double totalTimeWait = 0;
 	while (countDetails > 0)
 	{
 		if (timeBeforeNextTask > 0)
 		{
-			totalTimeWorkMachine += timeBeforeNextTask; //äîáàâëÿåì âðåìÿ îæèäàíèÿ çàäàíèÿ
+			//totalTimeWorkMachine += timeBeforeNextTask; //äîáàâëÿåì âðåìÿ îæèäàíèÿ çàäàíèÿ
 			timeBeforeNextTask = 0;
 		}
 
@@ -101,11 +102,12 @@ System::Void ModelingWorkMachineWithBreakdowns::ModelingWorkForm::Btn_execution_
 		else
 		{
 			countBrokenDetails++;
-			totalTimeWorkMachine += timeBeforeBreakdownMachine; //îáùåå âðåìÿ ðàáîòû ñòàíêà + âðåìÿ ïðîñòîÿ
+			totalTimeWait += timeBeforeBreakdownMachine;
+			//totalTimeWorkMachine += timeBeforeBreakdownMachine; //îáùåå âðåìÿ ðàáîòû ñòàíêà + âðåìÿ ïðîñòîÿ
 			timeBeforeNextTask -= timeBeforeBreakdownMachine;
 			double repairTime = getTimeRepair(timeTroubleshootinFrom, timeTroubleshootinTo);
 			//cout repairTime
-			totalTimeWorkMachine += repairTime;
+			//totalTimeWorkMachine += repairTime;
 			timeBeforeNextTask -= repairTime;
 			timeBeforeBreakdownMachine = getTimeBeforeBreakdownMachine(timeBreakDown_M_X, timeBreakdown_StandartDeviation); 
 			totalTimeRepair += repairTime;
@@ -121,9 +123,10 @@ System::Void ModelingWorkMachineWithBreakdowns::ModelingWorkForm::Btn_execution_
 
 	lbl_countTask->Text = "Êîëè÷åñòâî äåòàëåé: " + allDetails.ToString();
 	lbl_CountBreakdown->Text = "Êîëè÷åñòâî ïîëîìîê: " + countBrokenDetails.ToString();
-	lbl_TimeWork->Text = "Âðåìÿ ðàáîòû: " + (static_cast<int>(totalTimeWorkMachine)).ToString() +" ÷. " + (static_cast<int>((int)totalTimeWorkMachine % 1 * 60)).ToString() +" ìèí.";
+	lbl_TimeWork->Text = "Âðåìÿ ðàáîòû ñòàíêà: " + (static_cast<int>(totalTimeWorkMachine)).ToString() +" ÷. " + (static_cast<int>((int)totalTimeWorkMachine % 1 * 60)).ToString() +" ìèí.";
 	lbl_DetailInQueue->Text = "Äåòàëåé â î÷åðåäè: " + countDetailInQueue.ToString();
 	lbl_TotalTimeRepair->Text = "Îáùåå âðåìÿ ðåìîíòà: " + (static_cast<int>(totalTimeRepair)).ToString() + " ÷. " + (static_cast<int>((int)totalTimeRepair % 1 * 60)).ToString() + " ìèí.";
+	lbl_totaltimeWait->Text = "Îáùåå âðåìÿ ïðîñòîÿ: " + (static_cast<int>(totalTimeWait)).ToString() + " ÷. " + (static_cast<int>((int)totalTimeWait % 1 * 60)).ToString() + " ìèí.";
 	//return brokenDetails,totalTimeWorkMachine, totalTimeWorkMachine/allDetails,countDetailInQueue,
 }
 

ModelingWorkMachineWithBreakdowns/ModelingWorkForm.h

@@ -55,6 +55,7 @@ namespace ModelingWorkMachineWithBreakdowns {
 	private: System::Windows::Forms::Label^ lbl_TimeWork;
 	private: System::Windows::Forms::Label^ lbl_DetailInQueue;
 	private: System::Windows::Forms::Label^ lbl_TotalTimeRepair;
+	private: System::Windows::Forms::Label^ lbl_totaltimeWait;
 
 
 
@@ -94,6 +95,7 @@ namespace ModelingWorkMachineWithBreakdowns {
 			this->lbl_TimeWork = (gcnew System::Windows::Forms::Label());
 			this->lbl_DetailInQueue = (gcnew System::Windows::Forms::Label());
 			this->lbl_TotalTimeRepair = (gcnew System::Windows::Forms::Label());
+			this->lbl_totaltimeWait = (gcnew System::Windows::Forms::Label());
 			(cli::safe_cast<System::ComponentModel::ISupportInitialize^>(this->numericUpDown1))->BeginInit();
 			this->SuspendLayout();
 			// 
@@ -308,11 +310,21 @@ namespace ModelingWorkMachineWithBreakdowns {
 			this->lbl_TotalTimeRepair->TabIndex = 19;
 			this->lbl_TotalTimeRepair->Text = L"label_answer";
 			// 
+			// lbl_totaltimeWait
+			// 
+			this->lbl_totaltimeWait->AutoSize = true;
+			this->lbl_totaltimeWait->Location = System::Drawing::Point(12, 387);
+			this->lbl_totaltimeWait->Name = L"lbl_totaltimeWait";
+			this->lbl_totaltimeWait->Size = System::Drawing::Size(69, 13);
+			this->lbl_totaltimeWait->TabIndex = 20;
+			this->lbl_totaltimeWait->Text = L"label_answer";
+			// 
 			// ModelingWorkForm
 			// 
 			this->AutoScaleDimensions = System::Drawing::SizeF(6, 13);
 			this->AutoScaleMode = System::Windows::Forms::AutoScaleMode::Font;
 			this->ClientSize = System::Drawing::Size(628, 409);
+			this->Controls->Add(this->lbl_totaltimeWait);
 			this->Controls->Add(this->lbl_TotalTimeRepair);
 			this->Controls->Add(this->lbl_DetailInQueue);
 			this->Controls->Add(this->lbl_TimeWork);