Merge branch 'master' into j2doll/LargeData

Author: j2doll

Example.md

@@ -106,15 +106,6 @@ int main(int argc, char *argv[])
 
 ![](markdown.data/read-color.jpg)
 
-## XlsxFactory 
-- Load xlsx file and display on Qt widgets. 
-- Moved to personal repository for advanced app.
-	- https://j2doll.tistory.com/654
-	- The source code of this program cannot be released because it contains a commercial license.
-
-![](markdown.data/copycat.png)
-![](markdown.data/copycat2.jpg)
-
 ## [csv](https://github.com/QtExcel/QXlsx/tree/master/csv)
 - Save the `xlsx` file as a `csv` file.
 ```cpp
@@ -130,6 +121,20 @@ int main(int argc, char *argv[])
         }
 ```
 
+## [ExcelViewer](https://github.com/QtExcel/QXlsx/tree/master/ExcelViewer)
+- Load xlsx file and display on Qt widgets. 
+
+![](markdown.data/excel-viewer.jpg)
+
+## XlsxFactory 
+- Load xlsx file and display on Qt widgets. 
+- Moved to personal repository for advanced app.
+	- https://j2doll.tistory.com/654
+	- The source code of this program cannot be released because it contains a commercial license.
+
+![](markdown.data/copycat.png)
+![](markdown.data/copycat2.jpg)
+
 ## [LargeData](https://github.com/QtExcel/QXlsx/tree/master/LargeData)
 - `LargeData` example demonstrates how to efficiently generate, write, and read large Excel `.xlsx` files using `QXlsx`.
 - It showcases:
@@ -168,7 +173,3 @@ LargeData -r 300000 -c 15 -S 60000 --use-style
 ```
 
 
-
-
-
-

ExcelViewer/CMakeLists.txt

@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.26)
+project(ExcelViewer LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+find_package(Qt6 REQUIRED COMPONENTS Widgets)
+
+# Tell QXlsx which Qt major version to use.
+set(QT_VERSION_MAJOR 6)
+
+# Add QXlsx from one directory above the current project.
+add_subdirectory(
+    ${CMAKE_CURRENT_SOURCE_DIR}/../QXlsx
+    ${CMAKE_CURRENT_BINARY_DIR}/QXlsx_build
+)
+
+add_executable(ExcelViewer
+    main.cpp
+    mainwindow.h
+    mainwindow.cpp
+    excelmodel.h
+    excelmodel.cpp
+)
+
+target_link_libraries(ExcelViewer PRIVATE
+    Qt6::Widgets
+    QXlsx::QXlsx
+)
+
+# Get full git hash of QXlsx (40 characters)
+execute_process(
+    COMMAND git rev-parse HEAD
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
+    OUTPUT_VARIABLE QXLSX_GIT_FULL_HASH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+message(STATUS "QXlsx Git full hash = ${QXLSX_GIT_FULL_HASH}")
+
+# Pass it to C++ code as a define
+add_compile_definitions(QXLSX_GIT_FULL_HASH="${QXLSX_GIT_FULL_HASH}")
+
+