From 26848bfd93df36378a9c33828ab25b2b92ef9957 Mon Sep 17 00:00:00 2001 From: amazing-username Date: Sat, 29 Apr 2017 19:09:50 +0000 Subject: [PATCH] Fixed bug where the current percentage was not displaying --- AlterBrightness.cpp | 8 ++++++-- Brightness.cpp | 2 +- Main.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/AlterBrightness.cpp b/AlterBrightness.cpp index 146dd9c..a92c2b1 100644 --- a/AlterBrightness.cpp +++ b/AlterBrightness.cpp @@ -24,7 +24,7 @@ AlterBrightness::AlterBrightness(const int& change, const int& current, const in maxBrightness = max; } AlterBrightness::~AlterBrightness() -{ } +{ overwriteBrightness.close(); } void AlterBrightness::setIncrement(const int& change) { increment = change; } @@ -67,7 +67,11 @@ void AlterBrightness::chooseChange(const std::string& changeChoice) overwriteBrightness << currentBrightness; } else if (options.at(3).compare(changeChoice) == 0) - std::cout << "The current percentage is: " << getCurrentBrightness() << "%" << std::endl; + { + float percentage{static_cast(getCurrentBrightness()) / static_cast(getMaxBrightness())}; + percentage*=100; + std::cout << "The current percentage is: " << percentage << "%" << std::endl; + } else std::cout << "Neither increase or decrease" << std::endl; } diff --git a/Brightness.cpp b/Brightness.cpp index 0dadd0c..7832807 100644 --- a/Brightness.cpp +++ b/Brightness.cpp @@ -3,7 +3,7 @@ #include "Brightness.h" int Brightness::maxBrightness = 0; -int Brightness::currentBrightness = 30; +int Brightness::currentBrightness = 0; Brightness::Brightness() { } diff --git a/Main.cpp b/Main.cpp index f9b9893..d3cd933 100644 --- a/Main.cpp +++ b/Main.cpp @@ -34,6 +34,7 @@ int main(int argc, char* argv[]) if (control.compare("cur") == 0) { br.grabBrightness(); + br.grabMaxBrightness(); AlterBrightness ab{}; ab.chooseChange(control); } @@ -52,7 +53,6 @@ int main(int argc, char* argv[]) std::cout << "If cur then the current percentage is printed" << std::endl; std::cout << "Adjusting the percentage by brightness is recommended" << std::endl << std::endl; std::cout << "Example: Hot.out per 30" << std::endl << std::endl; - } return 0;