Group PAG
/
PAG-CourseWork-NicksEdits
Minor fixes
Fork of Coursework by
Clock.cpp@44:2b23c7407547, 2017-05-04 (annotated)
- Committer:
- noutram
- Date:
- Thu May 04 14:54:07 2017 +0000
- Revision:
- 44:2b23c7407547
- Parent:
- 43:4ddc392dd0cc
Now builds - Queue was the name of an existing class
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
RossalaTTM | 37:1a621144e73f | 1 | #include "Clock.h" |
RossalaTTM | 37:1a621144e73f | 2 | |
RossalaTTM | 37:1a621144e73f | 3 | Clock::Clock(int y, int mo, int d, int h,int mi,int s){ |
RossalaTTM | 37:1a621144e73f | 4 | year = y; |
RossalaTTM | 37:1a621144e73f | 5 | month = mo; |
RossalaTTM | 37:1a621144e73f | 6 | day = d; |
RossalaTTM | 37:1a621144e73f | 7 | hour = h; |
RossalaTTM | 37:1a621144e73f | 8 | minute = mi; |
RossalaTTM | 37:1a621144e73f | 9 | second = s; |
pburtenshaw | 43:4ddc392dd0cc | 10 | } |
RossalaTTM | 37:1a621144e73f | 11 | Clock::Clock(){ |
RossalaTTM | 37:1a621144e73f | 12 | year = 2017; |
RossalaTTM | 37:1a621144e73f | 13 | month = 01; |
RossalaTTM | 37:1a621144e73f | 14 | day = 01; |
RossalaTTM | 37:1a621144e73f | 15 | hour = 12; |
RossalaTTM | 37:1a621144e73f | 16 | minute = 0; |
RossalaTTM | 37:1a621144e73f | 17 | second = 0; |
pburtenshaw | 43:4ddc392dd0cc | 18 | } |
RossalaTTM | 37:1a621144e73f | 19 | |
RossalaTTM | 37:1a621144e73f | 20 | void Clock::TickTock(){ |
pburtenshaw | 38:d806504b415a | 21 | //Adds a second every second |
pburtenshaw | 38:d806504b415a | 22 | second = second +1; |
pburtenshaw | 38:d806504b415a | 23 | if (second == 60){ |
pburtenshaw | 38:d806504b415a | 24 | second = 0; |
pburtenshaw | 38:d806504b415a | 25 | minute = minute +1; |
pburtenshaw | 38:d806504b415a | 26 | if (minute == 60){ |
pburtenshaw | 38:d806504b415a | 27 | minute = 0; |
pburtenshaw | 38:d806504b415a | 28 | hour = hour +1; |
pburtenshaw | 38:d806504b415a | 29 | if (hour == 24){ |
pburtenshaw | 38:d806504b415a | 30 | hour = 0; |
pburtenshaw | 38:d806504b415a | 31 | day = day +1; |
pburtenshaw | 38:d806504b415a | 32 | //check for month length - leap years to be added |
pburtenshaw | 38:d806504b415a | 33 | if (month == 1||month == 3||month == 5||month == 7||month == 8||month == 10||month == 12){ |
pburtenshaw | 38:d806504b415a | 34 | if (day == 31){ |
pburtenshaw | 38:d806504b415a | 35 | day = 1; |
pburtenshaw | 38:d806504b415a | 36 | month = month +1; |
pburtenshaw | 39:c796c049b42d | 37 | if (month == 12){ |
pburtenshaw | 39:c796c049b42d | 38 | month = 1; |
pburtenshaw | 39:c796c049b42d | 39 | year = year +1; |
pburtenshaw | 38:d806504b415a | 40 | } |
pburtenshaw | 39:c796c049b42d | 41 | } |
pburtenshaw | 38:d806504b415a | 42 | } |
pburtenshaw | 38:d806504b415a | 43 | else if (month == 4||month == 6||month == 9||month == 11){ |
pburtenshaw | 38:d806504b415a | 44 | if (day == 30) { |
pburtenshaw | 38:d806504b415a | 45 | day = 1; |
pburtenshaw | 38:d806504b415a | 46 | month = month +1; |
pburtenshaw | 39:c796c049b42d | 47 | if (month == 12){ |
pburtenshaw | 39:c796c049b42d | 48 | month = 1; |
pburtenshaw | 39:c796c049b42d | 49 | year = year +1; |
pburtenshaw | 39:c796c049b42d | 50 | } |
pburtenshaw | 38:d806504b415a | 51 | } |
pburtenshaw | 38:d806504b415a | 52 | } |
pburtenshaw | 38:d806504b415a | 53 | else if (month == 2){//FEB LEAP YEAR TO ADD! |
pburtenshaw | 38:d806504b415a | 54 | if (day == 28){ |
pburtenshaw | 38:d806504b415a | 55 | day = 1; |
pburtenshaw | 38:d806504b415a | 56 | month = month +1; |
pburtenshaw | 39:c796c049b42d | 57 | if (month == 12){ |
pburtenshaw | 39:c796c049b42d | 58 | month = 1; |
pburtenshaw | 39:c796c049b42d | 59 | year = year +1; |
pburtenshaw | 39:c796c049b42d | 60 | } |
pburtenshaw | 38:d806504b415a | 61 | } |
pburtenshaw | 38:d806504b415a | 62 | } |
pburtenshaw | 38:d806504b415a | 63 | } |
pburtenshaw | 38:d806504b415a | 64 | } |
pburtenshaw | 38:d806504b415a | 65 | } |
pburtenshaw | 38:d806504b415a | 66 | } |
pburtenshaw | 38:d806504b415a | 67 | |
RossalaTTM | 37:1a621144e73f | 68 | void Clock::setClock(Clock *dt){ |
RossalaTTM | 37:1a621144e73f | 69 | year = dt->year; |
RossalaTTM | 37:1a621144e73f | 70 | month = dt->month; |
RossalaTTM | 37:1a621144e73f | 71 | day = dt->day; |
RossalaTTM | 37:1a621144e73f | 72 | hour = dt->hour; |
RossalaTTM | 37:1a621144e73f | 73 | minute = dt->minute; |
RossalaTTM | 37:1a621144e73f | 74 | second = dt->second; |
pburtenshaw | 43:4ddc392dd0cc | 75 | } |