NEW Added CMake option JKQtPlotter_ENABLED_STD_FORMAT which allows to explicitly switch std::format on/off, even if C++20-support is enabled!

Author: jkriege2

.github/workflows/build-and-test.yml

@@ -187,7 +187,7 @@ jobs:
           cd build
           cmake --version
           echo "now:        QT_QPA_PLATFORM='$QT_QPA_PLATFORM'"
-          cmake -G "${{ env.GENERATOR }}" "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}" "-DCMAKE_INSTALL_PREFIX=../install" "-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}"  ..
+          cmake -G "${{ env.GENERATOR }}" "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}" "-DCMAKE_INSTALL_PREFIX=../install" "-DJKQtPlotter_ENABLED_STD_FORMAT=${{ env.USE_CXX20 }}" "-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}"  ..
         shell: bash
 
 
@@ -239,7 +239,7 @@ jobs:
           mkdir -p build
           cd build
           cmake --version
-          cmake -G "${{ env.GENERATOR }}" "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}" "-DCMAKE_INSTALL_PREFIX=../install" "-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}" ..
+          cmake -G "${{ env.GENERATOR }}" "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}" "-DCMAKE_INSTALL_PREFIX=../install" "-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}"  "-DJKQtPlotter_ENABLED_STD_FORMAT=${{ env.USE_CXX20 }}" ..
           cmake --build . --config ${{ env.BUILD_TYPE }} -j${{ env.NUM_PROC }} -- ${{ env.CMAKE_BUILDFLAGS }}
         shell: bash
 
@@ -251,7 +251,7 @@ jobs:
           mkdir -p build
           cd build
           cmake --version
-          cmake -G "${{ env.GENERATOR }}" "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}" "-DCMAKE_INSTALL_PREFIX=../install" "-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}" ..
+          cmake -G "${{ env.GENERATOR }}" "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}" "-DCMAKE_PREFIX_PATH=${{ env.CMAKE_PREFIX_PATH }}" "-DCMAKE_INSTALL_PREFIX=../install" "-DJKQtPlotter_ENABLED_CXX20=${{ env.USE_CXX20 }}" "-DJKQtPlotter_ENABLED_STD_FORMAT=${{ env.USE_CXX20 }}" ..
           cmake --build . --config ${{ env.BUILD_TYPE }} -j${{ env.NUM_PROC }} -- ${{ env.CMAKE_BUILDFLAGS }}
         shell: bash
 

.github/workflows/codeql-analysis.yml

@@ -65,7 +65,7 @@ jobs:
         mkdir build
         cd build
         cmake --version
-        cmake -G "Unix Makefiles" "-DCMAKE_BUILD_TYPE=Release" "-DJKQtPlotter_BUILD_EXAMPLES:BOOL=OFF" ..
+        cmake -G "Unix Makefiles" "-DCMAKE_BUILD_TYPE=Release" "-DJKQtPlotter_BUILD_EXAMPLES:BOOL=OFF" "-DJKQtPlotter_ENABLED_STD_FORMAT=ON" "-DJKQtPlotter_ENABLED_CXX20=ON" ..
         cmake --build . --config "Release"
         cd ..
 

.github/workflows/msvc-codeanalysis.yml

@@ -30,7 +30,7 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Configure CMake
-        run: cmake -B "${{ env.build }}" -DCMAKE_BUILD_TYPE=${{ env.config }} -DJKQtPlotter_BUILD_EXAMPLES=OFF -DJKQtPlotter_BUILD_TOOLS=OFF -DJKQtPlotter_BUILD_WITH_PRECOMPILED_HEADERS=OFF
+        run: cmake -B "${{ env.build }}" -DCMAKE_BUILD_TYPE=${{ env.config }} -DJKQtPlotter_BUILD_EXAMPLES=OFF -DJKQtPlotter_BUILD_TOOLS=OFF -DJKQtPlotter_BUILD_WITH_PRECOMPILED_HEADERS=OFF -DJKQtPlotter_ENABLED_STD_FORMAT=ON -DJKQtPlotter_ENABLED_CXX20=ON
 
       - name: Build CMake
         run: cmake --build "${{ env.build }}" --config "${{ env.config }}"

cmake/jkqtplotter_cmake_options.cmake

@@ -43,6 +43,9 @@ endif()
 if(NOT DEFINED JKQtPlotter_ENABLED_CXX20)
     option(JKQtPlotter_ENABLED_CXX20 "Build the library using C++20" OFF)
 endif()
+if(NOT DEFINED JKQtPlotter_ENABLED_STD_FORMAT)
+    option(JKQtPlotter_ENABLED_STD_FORMAT "Build the library with support for std::format from C++20 (i.e. JKQtPlotter_ENABLED_CXX20=ON is required!)" ON)
+endif()
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
     option(CMAKE_INSTALL_PREFIX "Install directory" ${CMAKE_CURRENT_SOURCE_DIR}/install)
 endif()

cmake/jkqtplotter_macros.cmake

@@ -22,7 +22,10 @@ function(jkqtplotter_setDefaultLibOptions TARGETNAME libBaseName PRECOMPHEADERFI
     if(JKQtPlotter_ENABLED_CXX20)
         set_property(TARGET ${TARGETNAME} PROPERTY CXX_STANDARD ${JKQtPlotter_QT_CXX_STANDARD})
         set_property(TARGET ${TARGETNAME} PROPERTY CXX_STANDARD_REQUIRED ${JKQtPlotter_QT_CXX_STANDARD_REQUIRED})
-        target_compile_features(${TARGETNAME} PUBLIC ${JKQtPlotter_QT_CXX_COMPILE_FEATURE})
+        target_compile_features(${TARGETNAME} PUBLIC ${JKQtPlotter_QT_CXX_COMPILE_FEATURE})        
+        if(JKQtPlotter_ENABLED_STD_FORMAT)
+            target_compile_definitions(${TARGETNAME} PUBLIC JKQtPlotter_USE_STD_FORMAT)
+        endif()
     endif()
     # set options, specific to shared libraries
     if (BUILD_SHARED_LIBS)

doc/dox/buildinstructions_cmake.dox

@@ -58,7 +58,8 @@ The CMake build system offers several configuration variables that you may set/c
   - \c JKQtPlotter_BUILD_FORCE_NO_PRINTER_SUPPORT : switches off print-support (when set to \c ON ), even if the current platform supports it (default: \c OFF )
   - \c JKQtPlotter_BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE : If set, the build-type is appended to the library name (default: \c ON )
   - \c JKQtPlotter_BUILD_WITH_PRECOMPILED_HEADERS : If set, the build uses precompiled headers to speed up (a bit) (default: \c ON )
-  - \c JKQtPlotter_ENABLED_CXX20 : Build using C++20 (requires a compiler that supports this! (default: \c OFF )
+  - \c JKQtPlotter_ENABLED_CXX20 : Build using C++20 (requires a compiler that supports this and \c JKQtPlotter_ENABLED_CXX20=ON!, default: \c ON ). This option was added as sometimes there were compatibility issues with std::format
+  - \c JKQtPlotter_ENABLED_STD_FORMAT : Build using std::format from C++20 (requires a compiler that supports this! (default: \c OFF )
   - \c JKQtPlotter_BUILD_WITH_TIMING_INFO_OUTPUT : If enabled (\c ON ), additional tiing code is activated (and built into the library), which outputs timming information for several functions of the library into \c qDebug() . This is intended for development putposes only, NOT for productive builds!  (default: \c OFF )
   - \c JKQtPlotter_BUILD_EXAMPLES : Build examples (default: \c ON )
   - \c JKQtPlotter_BUILD_TOOLS : Build tools (default: \c ON )

doc/dox/whatsnew.dox

@@ -145,6 +145,8 @@ Changes, compared to  \ref page_whatsnew_V4_0_0 "v4.0.0" include:
     <li>NEW: added JKQTPlotterUpdateGuard guard class that prevents redrawing of a JKQTPlotter during the lifetime of a code block, improved documentation of speed during plot setup</li>
     <li>NEW: add getters to JKQTPDatastore which return information on the datamanegement of single columns (internal/external/vector): JKQTPDatastore::isVectorColumn(), JKQTPDatastore::isColumnDataExternal(), JKQTPDatastore::isColumnDataInternal()</li>
     <li>NEW: added JKQTPDatastore::convertToVectorColumn()</li>
+    <li>NEW: reworked several functions within JKQTPDatastore, so they contain a fast path for certain column types</li>
+    <li>NEW Added CMake option JKQtPlotter_ENABLED_STD_FORMAT which allows to explicitly switch std::format on/off, even if C++20-support is enabled!</li>
   </ul></li>
 
   <li>JKQTMathText:<ul>

lib/jkqtplotter/jkqtpcoordinateaxes.cpp

@@ -28,7 +28,7 @@
 #include <QApplication>
 #if __cplusplus >= 202002L
 # include <version>
-# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)
 #  include <format>
 # endif
 #endif
@@ -482,7 +482,7 @@ QString JKQTPCoordinateAxis::floattolabel(double data, int past_comma) const {
                 return QString::asprintf(axisStyle.tickPrintfFormat.toLatin1().data(), data, tickUnitName.toStdString().c_str());
             }; break;
 #if __cplusplus >= 202002L
-# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)
     case JKQTPCALTformat: {
             const std::string tickUName=tickUnitName.toStdString();
             return QString::fromStdString(std::vformat(axisStyle.tickFormatFormat.toStdString(), std::make_format_args(data, tickUName)));
@@ -873,7 +873,7 @@ void JKQTPCoordinateAxis::setTickPrintfFormat(const QString& __value) {
     redrawPlot();
 }
 #if __cplusplus >= 202002L
-# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)
 void JKQTPCoordinateAxis::setTickFormatFormat(const QString &__value)
 {
     this->axisStyle.tickFormatFormat = __value;

lib/jkqtplotter/jkqtpcoordinateaxes.h

@@ -371,7 +371,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
         /** \copydoc JKQTPCoordinateAxisStyle::tickMode */
         inline JKQTPLabelTickMode getTickMode() const { return this->axisStyle.tickMode; }
 #if __cplusplus >= 202002L || DOXYGEN
-# if (defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))) || DOXYGEN
+# if (defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)) || DOXYGEN
         /** \copydoc JKQTPCoordinateAxisStyle::tickFormatFormat */
         inline QString getTickFormatfFormat() const { return this->axisStyle.tickFormatFormat; }
 # endif
@@ -619,7 +619,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
         /** \copydoc JKQTPCoordinateAxisStyle::tickPrintfFormat */
         void setTickPrintfFormat(const QString& __value);
 #if __cplusplus >= 202002L || DOXYGEN
-# if (defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))) || DOXYGEN
+# if (defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)) || DOXYGEN
         /** \copydoc JKQTPCoordinateAxisStyle::tickFormatFormat */
         void setTickFormatFormat(const QString& __value);
 # endif

lib/jkqtplotter/jkqtpcoordinateaxesstyle.cpp

@@ -60,7 +60,7 @@ JKQTPCoordinateAxisStyle::JKQTPCoordinateAxisStyle():
     tickDateTimeFormat(QLocale().dateTimeFormat(QLocale::NarrowFormat)),
     tickPrintfFormat("%f %s"),
 #if __cplusplus >= 202002L
-# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)
     tickFormatFormat("{}{}"),
 # endif
 #endif
@@ -111,7 +111,7 @@ void JKQTPCoordinateAxisStyle::loadSettings(const QSettings &settings, const QSt
     tickDateTimeFormat = settings.value(group+"ticks/datetime_format", defaultStyle.tickDateTimeFormat).toString();
     tickPrintfFormat = settings.value(group+"ticks/printf_format", defaultStyle.tickPrintfFormat).toString();
 #if __cplusplus >= 202002L
-# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)
     tickFormatFormat = settings.value(group+"ticks/format_format", defaultStyle.tickFormatFormat).toString();
 # endif
 #endif
@@ -170,7 +170,7 @@ void JKQTPCoordinateAxisStyle::saveSettings(QSettings &settings, const QString &
     settings.setValue(group+"ticks/datetime_format", tickDateTimeFormat);
     settings.setValue(group+"ticks/printf_format", tickPrintfFormat);
 #if __cplusplus >= 202002L
-# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0))
+# if defined(__cpp_lib_format) && (QT_VERSION>=QT_VERSION_CHECK(6, 0, 0)) && defined(JKQtPlotter_USE_STD_FORMAT)
     settings.setValue(group+"ticks/format_format", tickFormatFormat);
 # endif
 #endif