From bb0dc575e514a1a90464946aa083a5c8555e41e4 Mon Sep 17 00:00:00 2001 From: Стоян Златев <47269030+Tony5768@users.noreply.github.com> Date: Sun, 5 Jun 2022 10:57:54 +0300 Subject: Update ShapeCollection.cpp --- Sem. 13/ShapeCollection/ShapeCollection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sem. 13/ShapeCollection/ShapeCollection.cpp b/Sem. 13/ShapeCollection/ShapeCollection.cpp index babe36d..1239fbf 100644 --- a/Sem. 13/ShapeCollection/ShapeCollection.cpp +++ b/Sem. 13/ShapeCollection/ShapeCollection.cpp @@ -13,7 +13,7 @@ void ShapeCollection::free() } void ShapeCollection::copyFrom(const ShapeCollection& other) { - shapes = new Shape* [other.shapesCount]; + shapes = new Shape* [other.capacity]; shapesCount = other.shapesCount; capacity = other.capacity; @@ -99,4 +99,4 @@ double ShapeCollection::getIfPointInShapeByIndex(size_t ind, int x, int y) const if (ind >= shapesCount) throw std::out_of_range("Out of range in shapes collection"); return shapes[ind]->isPointIn(x, y); -} \ No newline at end of file +} -- cgit v1.3.1-23-gd82d From 78cbe8004eb79c82b91fdc761c929c1992d97339 Mon Sep 17 00:00:00 2001 From: Angel Dimitriev Date: Mon, 6 Jun 2022 00:42:08 +0300 Subject: Update EventManager.cpp --- Utils/k_2_SI/task2/EventManager/EventManager.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Utils/k_2_SI/task2/EventManager/EventManager.cpp b/Utils/k_2_SI/task2/EventManager/EventManager.cpp index 2d56ec5..73d281d 100644 --- a/Utils/k_2_SI/task2/EventManager/EventManager.cpp +++ b/Utils/k_2_SI/task2/EventManager/EventManager.cpp @@ -18,9 +18,7 @@ void EventManager::copyFrom(const EventManager& other) capacity = other.capacity; for (size_t i = 0; i < eventsCount; i++) - { events[i] = other.events[i]->clone(); - } } void EventManager::resize() @@ -107,4 +105,4 @@ Event::EventType EventManager::getType(size_t ind) const if (ind >= eventsCount) throw std::out_of_range("Out of range"); return events[ind]->getType(); -} \ No newline at end of file +} -- cgit v1.3.1-23-gd82d From 5c6da013a652b41281a01b16e028a03c15642172 Mon Sep 17 00:00:00 2001 From: Angel Dimitriev Date: Mon, 6 Jun 2022 00:42:56 +0300 Subject: Update EventManager.cpp --- Utils/k_2_SI/task2/EventManager/EventManager.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Utils/k_2_SI/task2/EventManager/EventManager.cpp b/Utils/k_2_SI/task2/EventManager/EventManager.cpp index 73d281d..e630ffe 100644 --- a/Utils/k_2_SI/task2/EventManager/EventManager.cpp +++ b/Utils/k_2_SI/task2/EventManager/EventManager.cpp @@ -68,13 +68,11 @@ void EventManager::addEvent(Event* event) void EventManager::addEventTypeA(size_t startH, size_t startM, size_t endH, size_t endM, const char* name) { //validation - addEvent(new EventTypeA(startH, startM, endH, endM, name)); } void EventManager::addEventTypeB(size_t startH, size_t startM, size_t breakH, size_t breakM, size_t endH, size_t endM) { //validation - addEvent(new EventTypeB(startH, startM, endH, endM, breakH, breakM)); } void EventManager::addEventTypeC(size_t startH, size_t startM, size_t break1H, size_t break1M, size_t break2H, size_t break2M, size_t endH, size_t endM) -- cgit v1.3.1-23-gd82d