Checking in old Bar. Added BarLine.

bar.cpp

@@ -167,12 +167,6 @@ void Bar::update_bar(void) {
           text.append(1, '\xb2');
         break;
       }
-      /*
-      if (door::unicode)
-        text.append("\u258c");
-      else
-        text.append(1, '\xdd');
-        */
 
       while (steps % 4 != 0)
         steps++;
@@ -209,7 +203,7 @@ void Bar::set(unsigned long percent) {
  * Output Bar
  *
  * This outputs the Progress Bar's internal line.
-  *
+ *
  * @param os std::ostream
  * @param b const Bar &
  * @return std::ostream&
@@ -221,4 +215,238 @@ std::ostream &operator<<(std::ostream &os, const Bar &b) {
   return os;
 }
 
+BarLine::BarLine(const std::string &txt, int width)
+    : Line(txt, width), barstyle{BarStyle::SOLID},
+      current_percent{0}, length{width} {
+  init();
+}
+
+BarLine::BarLine(const char *txt, int width)
+    : Line(txt, width), barstyle{BarStyle::SOLID},
+      current_percent{0}, length{width} {
+  init();
+}
+
+BarLine::BarLine(const std::string &txt, int width, ANSIColor c)
+    : Line(txt, width, c), barstyle{BarStyle::SOLID},
+      current_percent{0}, length{width} {
+  init();
+}
+
+BarLine::BarLine(const char *txt, int width, ANSIColor c)
+    : Line(txt, width, c), barstyle{BarStyle::SOLID},
+      current_percent{0}, length{width} {
+  init();
+}
+
+void BarLine::init(void) {
+  // set update function.
+  door::updateFunction barLineUpdate = [this](void) -> std::string {
+    if (!colorRange.empty()) {
+      // Ok, there is a range, so test for it.
+      ANSIColor ac;
+      // unsigned long p;
+      for (auto bc : colorRange) {
+        if (current_percent <= bc.percent) {
+          ac = bc.c;
+          // p = bc.percent;
+          break;
+        };
+      }
+      // cout << "!" << current_percent << "," << p << " ";
+      setColor(ac);
+    }
+    return this->update_bar();
+  };
+  setUpdater(barLineUpdate);
+  update();
+}
+
+void BarLine::setStyle(BarStyle s) { barstyle = s; }
+void BarLine::set(int value, int max) {
+  unsigned long percentage = value * 100 * 100 / max;
+  set(percentage);
+}
+
+void BarLine::set(float percent) {
+  unsigned long percentage = (unsigned long)(percent * 100.0);
+  set(percentage);
+}
+
+void BarLine::set(unsigned long percent) {
+  current_percent = percent;
+  update_bar();
+}
+
+std::string BarLine::update_bar(void) {
+  unsigned long step_width;
+  std::string btext;
+
+  switch (barstyle) {
+  case BarStyle::SOLID:
+  case BarStyle::PERCENTAGE:
+  case BarStyle::PERCENT_SPACE: {
+    step_width = 100 * 100 / length;
+    int steps = current_percent / step_width;
+    // number of steps visible.
+
+    // for now:
+    if (door::unicode)
+      for (int i = 0; i < steps; ++i)
+        btext.append("\u2588");
+    else
+      btext.assign(steps, '\xdb');
+
+    for (int x = steps; x < length; ++x)
+
+      btext.append(" ");
+
+    // line.setText(text);
+    /*
+    cout << "percent " << std::setw(5) << current_percent << " : step_width "
+         << std::setw(5) << step_width << std::setw(5) << steps << " of "
+         << std::setw(5) << length << " ";
+    */
+    if ((barstyle == BarStyle::PERCENTAGE) ||
+        (barstyle == BarStyle::PERCENT_SPACE)) {
+      // Put the % text in the text.
+      std::string percent;
+      percent = std::to_string(current_percent / 100);
+
+      int pos = (length / 2) - 1;
+
+      if (percent != "100") {
+        percent.append(1, '%');
+        if (percent.length() < 3)
+          percent.insert(0, " ");
+      }
+      if (barstyle == BarStyle::PERCENT_SPACE) {
+        percent.insert(0, 1, ' ');
+        percent.append(1, ' ');
+        pos -= 1;
+      }
+
+      // cout << "[" << percent << "] " << std::setw(3) << pos << " ";
+
+      // unicode ... is unipain.
+      if (door::unicode) {
+        // handle unicode here
+        // Find start position, and ending position for the replacement.
+        const char *cp = btext.c_str();
+        const char *end = cp;
+        while (*end != 0)
+          end++;
+
+        for (int i = 0; i < pos; i++) {
+          utf8::next(cp, end);
+        }
+        // find position using unicode position
+        int unicode_pos = cp - btext.c_str();
+
+        const char *cp_len_start = cp;
+        const char *cp_len = cp;
+        for (int i = 0; i < (int)percent.length(); i++) {
+          utf8::next(cp_len, end);
+        }
+
+        int unicode_len = cp_len - cp_len_start;
+        // cout << " " << std::setw(3) << unicode_pos << " " << std::setw(3) <<
+        // unicode_len << " ";
+        btext.replace(unicode_pos, unicode_len, percent);
+      } else {
+        btext.replace(pos, percent.length(), percent);
+      };
+    }
+
+    return btext;
+    break;
+  };
+  case BarStyle::HALF_STEP: {
+    step_width = 100 * 100 / length;
+    int steps = current_percent * 2 / step_width;
+
+    /*
+    cout << "percent " << std::setw(5) << current_percent << " : step_width "
+         << std::setw(5) << step_width << std::setw(5) << steps << " of "
+         << std::setw(5) << length << " ";
+    */
+
+    if (door::unicode)
+      for (int i = 0; i < steps / 2; i++)
+        btext.append("\u2588");
+    else
+      btext.assign(steps / 2, '\xdb');
+
+    if (steps % 2 == 1) {
+      if (door::unicode)
+        btext.append("\u258c");
+      else
+        btext.append(1, '\xdd');
+      steps++;
+    }
+    for (int x = steps; x < length * 2; x += 2)
+      btext.append(" ");
+
+    return btext;
+    break;
+  }
+
+  case BarStyle::GRADIENT: {
+    step_width = 100 * 100 / length;
+    int steps = current_percent * 4 / step_width;
+
+    /*
+    cout << "percent " << std::setw(5) << current_percent << " : step_width "
+         << std::setw(5) << step_width << std::setw(5) << steps << " of "
+         << std::setw(5) << length << " ";
+    */
+
+    if (door::unicode)
+      for (int i = 0; i < steps / 4; i++)
+        btext.append("\u2588");
+    else
+      btext.assign(steps / 4, '\xdb');
+
+    if (steps % 4 != 0) {
+      // display the gradient
+      switch (steps % 4) {
+      case 1:
+        if (door::unicode)
+          btext.append("\u2591");
+        else
+          btext.append(1, '\xb0');
+        break;
+
+      case 2:
+        if (door::unicode)
+          btext.append("\u2592");
+        else
+          btext.append(1, '\xb1');
+        break;
+
+      case 3:
+        if (door::unicode)
+          btext.append("\u2593");
+        else
+          btext.append(1, '\xb2');
+        break;
+      }
+
+      while (steps % 4 != 0)
+        steps++;
+    }
+    for (int x = steps; x < length * 4; x += 4)
+      btext.append(" ");
+
+    return btext;
+    break;
+  }
+  }
+  // cout << "percent" << current_percent << " : " << steps << " of " << length
+  // << " " << std::endl;
+  return btext;
+}
+
+void BarLine::setColorRange(vector<BarColorRange> bcr) { colorRange = bcr; }
+
 } // namespace door

door.h

@@ -454,7 +454,7 @@ public:
 };
 
 class BasicLine {
-private:
+protected:
   std::string text;
   bool hasColor;
   ANSIColor color;
@@ -480,7 +480,7 @@ public:
 };
 
 class MultiLine {
-private:
+protected:
   std::vector<std::shared_ptr<BasicLine>> lines;
 
 public:
@@ -500,7 +500,7 @@ public:
  * @brief Text and ANSIColor
  */
 class Line {
-private:
+protected:
   /// Text of the line
   std::string text;
 
@@ -594,7 +594,7 @@ Progress Bar
 This sets up the internal "Line" to display the progress bar.
  */
 class Bar {
-private:
+protected:
   unsigned long current_percent;
   BarStyle style;
   std::string text;
@@ -611,6 +611,47 @@ public:
   friend std::ostream &operator<<(std::ostream &os, const Bar &b);
 };
 
+/**
+ * BarColorRange
+ * 
+ * vector<door::BarColorRange> colorRange = {
+ *     {2500, door::ANSIColor(door::COLOR::RED)},
+ *     {5000, door::ANSIColor(door::COLOR::BROWN)},
+ *     {7500, door::ANSIColor(door::COLOR::YELLOW, door::ATTR::BOLD)},
+ *     {9500, door::ANSIColor(door::COLOR::GREEN)},
+ *     {10100, door::ANSIColor(door::COLOR::GREEN, door::ATTR::BOLD)}};
+ * BarLine.setColorRange(colorRange);
+ * 
+ */
+struct BarColorRange {
+  unsigned long percent;
+  ANSIColor c;
+};
+
+class BarLine : public Line {
+protected:
+  BarStyle barstyle;
+  unsigned long current_percent;
+  void init(void);
+  std::string update_bar(void);
+  int length;
+  vector<BarColorRange> colorRange;
+
+public:
+  BarLine(const std::string &txt, int width);
+  BarLine(const char *txt, int width);
+  BarLine(const std::string &txt, int width, ANSIColor c);
+  BarLine(const char *txt, int width, ANSIColor c);
+
+  void setStyle(BarStyle s);
+  void set(int value, int max);
+  void set(float percent);
+  void set(unsigned long percent);
+  void setColorRange(vector<BarColorRange> bcr);
+  // friend std::ostream &operator<<(std::ostream &os, const BarLine &b);
+};
+
+
 /**
  * The different Borders supported by Panel.
  *
@@ -718,7 +759,7 @@ Remaining LC text = c4
  */
 
 class Menu : public Panel {
-private:
+protected:
   unsigned int chosen;
   std::vector<char> options;
   renderFunction selectedRender;
@@ -755,7 +796,7 @@ public:
 };
 
 class Screen {
-private:
+protected:
   // bool hidden;
   /**
    * @brief vector of panels.