Slightly improve code quality of basic display

Author: stevenewald

.github/scripts/conan-ci-setup.sh

@@ -15,6 +15,14 @@ mv "$profile" "${profile}.bak"
 sed 's/^\(compiler\.cppstd=\).\{1,\}$/\1'"$std/" "${profile}.bak" > "$profile"
 rm "${profile}.bak"
 
+# Add lines to global.conf
+global_conf="$HOME/.conan2/global.conf"
+mkdir -p "$(dirname "$global_conf")"
+{
+  echo "tools.system.package_manager:mode = install"
+  echo "tools.system.package_manager:sudo = true"
+} >> "$global_conf"
+
 if [ -f conan_cache_save.tgz ]; then
   conan cache restore conan_cache_save.tgz
 fi

.github/workflows/ci.yml

@@ -29,57 +29,6 @@ jobs:
       if: always()
       run: cmake -P cmake/spell.cmake
 
-  coverage:
-    needs: [lint]
-
-    runs-on: ubuntu-22.04
-
-    # To enable coverage, delete the last line from the conditional below and
-    # edit the "<name>" placeholder to your GitHub name.
-    # If you do not wish to use codecov, then simply delete this job from the
-    # workflow.
-    if: github.repository_owner == '<name>'
-      && false
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Install LCov
-      run: sudo apt-get update -q
-        && sudo apt-get install lcov -q -y
-
-    - name: Install Python
-      uses: actions/setup-python@v5
-      with: { python-version: "3.12" }
-
-    - name: Conan cache
-      uses: actions/cache@v4
-      with:
-        path: conan_cache_save.tgz
-        key: conan-coverage-${{ hashFiles('conan*.[pl][yo]*') }}
-
-    - name: Install dependencies
-      run: bash < .github/scripts/conan-ci-setup.sh
-
-    - name: Configure
-      run: cmake --preset=ci-coverage
-
-    - name: Build
-      run: cmake --build build/coverage -j 2
-
-    - name: Test
-      working-directory: build/coverage
-      run: ctest --output-on-failure --no-tests=error -j 2
-
-    - name: Process coverage info
-      run: cmake --build build/coverage -t coverage
-
-    - name: Submit to codecov.io
-      uses: codecov/codecov-action@v4
-      with:
-        file: build/coverage/coverage.info
-        token: ${{ secrets.CODECOV_TOKEN }}
-
   sanitize:
     needs: [lint]
 

CMakeLists.txt

@@ -18,6 +18,7 @@ include(cmake/variables.cmake)
 add_library(
     fractal-generator_lib OBJECT
     source/lib.cpp
+    source/graphics/basic_display.cpp
 )
 
 target_include_directories(

source/graphics/basic_display.cpp

@@ -0,0 +1,49 @@
+#include "basic_display.hpp"
+
+#include <SFML/Graphics.hpp>
+
+namespace fractal {
+void BasicDisplay::set_pixel(std::size_t x_pos, std::size_t y_pos, uint8_t value)
+{
+    pixels_.at(x_pos).at(y_pos) = value;
+}
+
+void BasicDisplay::display_window()
+{
+    sf::RenderWindow window(sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "SFML Window");
+
+    window.setFramerateLimit(FRAME_RATE);
+
+    sf::Image image;
+    image.create(WINDOW_WIDTH, WINDOW_HEIGHT);
+    for (std::size_t x_pos = 0; x_pos < WINDOW_WIDTH; ++x_pos) {
+        for (std::size_t y_pos = 0; y_pos < WINDOW_HEIGHT; ++y_pos) {
+            std::uint8_t pixel_value = pixels_.at(x_pos).at(y_pos);
+            image.setPixel(
+                static_cast<unsigned int>(x_pos), static_cast<unsigned int>(y_pos),
+                sf::Color(pixel_value, pixel_value, pixel_value)
+            );
+        }
+    }
+
+    sf::Texture texture;
+    texture.loadFromImage(image);
+
+    sf::Sprite sprite(texture);
+
+    while (window.isOpen()) {
+        sf::Event event;
+        while (window.pollEvent(event)) {
+            if (event.type == sf::Event::Closed) {
+                window.close();
+            }
+        }
+
+        window.clear(sf::Color::Black);
+
+        window.draw(sprite);
+
+        window.display();
+    }
+}
+} // namespace fractal

source/graphics/basic_display.hpp

@@ -2,9 +2,6 @@
 
 #include "config.hpp"
 
-#include <SFML/Graphics.hpp>
-
-#include <cstddef>
 #include <cstdint>
 
 #include <array>
@@ -14,47 +11,7 @@ class BasicDisplay {
     std::array<std::array<uint8_t, WINDOW_HEIGHT>, WINDOW_WIDTH> pixels_{};
 
 public:
-    void set_pixel(std::size_t x_pos, std::size_t y_pos, uint8_t value)
-    {
-        pixels_.at(x_pos).at(y_pos) = value;
-    }
-
-    void display_window()
-    {
-        sf::RenderWindow window(
-            sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "SFML Window"
-        );
-
-        window.setFramerateLimit(FRAME_RATE);
-
-        sf::Image image;
-        image.create(WINDOW_WIDTH, WINDOW_HEIGHT);
-        for (std::size_t x = 0; x < WINDOW_WIDTH; ++x) {
-            for (std::size_t y = 0; y < WINDOW_HEIGHT; ++y) {
-                uint8_t pixel_value = pixels_.at(x).at(y);
-                image.setPixel(x, y, sf::Color(pixel_value, pixel_value, pixel_value));
-            }
-        }
-
-        sf::Texture texture;
-        texture.loadFromImage(image);
-
-        sf::Sprite sprite(texture);
-
-        while (window.isOpen()) {
-            sf::Event event;
-            while (window.pollEvent(event)) {
-                if (event.type == sf::Event::Closed) {
-                    window.close();
-                }
-            }
-
-            window.clear(sf::Color::Black);
-
-            window.draw(sprite);
-
-            window.display();
-        }
-    }
+    void set_pixel(std::size_t x_pos, std::size_t y_pos, std::uint8_t value);
+    void display_window();
 };
 } // namespace fractal

source/main.cpp

@@ -3,7 +3,7 @@
 int main()
 {
     fractal::BasicDisplay display;
-    for (size_t i = 0; i < 100; i++) {
+    for (std::size_t i = 0; i < 100; i++) {
         display.set_pixel(100, 100 + i, 255);
     }
     display.display_window();