diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp index 7e22d5d1..95143a85 100644 --- a/src/lib/data/Storage.cpp +++ b/src/lib/data/Storage.cpp @@ -690,9 +690,10 @@ StorageStats Storage::getStorageStats() const stats.nodeCount = m_sqliteStorage.getNodeCount(); stats.edgeCount = m_sqliteStorage.getEdgeCount(); - stats.charCount = m_tokenIndex.getCharCount(); - stats.wordCount = m_tokenIndex.getWordCount(); - stats.searchNodeCount = m_tokenIndex.getNodeCount(); + // Takes too much time + // stats.charCount = m_tokenIndex.getCharCount(); + // stats.wordCount = m_tokenIndex.getWordCount(); + // stats.searchNodeCount = m_tokenIndex.getNodeCount(); stats.fileCount = m_sqliteStorage.getFileCount(); stats.fileLOCCount = m_sqliteStorage.getFileLOCCount(); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp index df3b5c1c..c625bb70 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp @@ -534,6 +534,13 @@ void QtProjectWizzard::showSummary() summary->addContent(headers, false, true); connectShowFiles(headers); + summary->addContent(new QtProjectWizzardContentPathsHeaderSearchGlobal(settings, window), false, true); + + if (QSysInfo::macVersion() != QSysInfo::MV_None) + { + summary->addContent(new QtProjectWizzardContentPathsFrameworkSearchGlobal(settings, window), false, false); + } + data->hideLanguage(); } diff --git a/web/documentation/img/path_list_box.png b/web/documentation/img/path_list_box.png index 3ab3734b..47751b38 100644 Binary files a/web/documentation/img/path_list_box.png and b/web/documentation/img/path_list_box.png differ diff --git a/web/documentation/img/project_setup_wizard_compilation_header.png b/web/documentation/img/project_setup_wizard_compilation_header.png new file mode 100644 index 00000000..8c29497e Binary files /dev/null and b/web/documentation/img/project_setup_wizard_compilation_header.png differ diff --git a/web/documentation/img/project_setup_wizard_start.png b/web/documentation/img/project_setup_wizard_start.png index 1a15d7dd..1b7539b7 100644 Binary files a/web/documentation/img/project_setup_wizard_start.png and b/web/documentation/img/project_setup_wizard_start.png differ diff --git a/web/documentation/index.html b/web/documentation/index.html index f9ffaeec..bb5902c5 100644 --- a/web/documentation/index.html +++ b/web/documentation/index.html @@ -454,9 +454,9 @@

Path List Box

-

The Path List Box is a user interface element that is used within the Preferences Window and the Project Setup Wizard. It allows for entering a list of file and directory paths.

TODO: Replace +

The Path List Box is a user interface element that is used within the Preferences Window and the Project Setup Wizard. It allows for entering a list of file and directory paths.

-
+
@@ -595,6 +595,32 @@

Create a Project from Visual Studio Solution

If you already have a Visual Studio solution file, this is the way to go. Just select the solution file in the file picker and Coati will automatically analyze (this may take a second) it to prepopulate the New Project Summary Window.

+

Create a Project from Compilation Database

+

If you are using CMake you can export compile commands by defining the flag CMAKE_EXPORT_COMPILE_COMMANDS. Just select the exportet .json file in the file picker.

+ + Compilation Database Headers +

In the next step you can define the locations of the corresponding header files of the source files in the compilation database.

+

These header files will only be analyzed if they are included in one of the source files.

+
+
+ +
+
+ + + + + + + + +
Setting Description
Source Files Clicking show source files will show you a list of all source files in the compilation database
Header Paths Specify one or multiple locations that contain the header files to the source files defined in the compilation database. (For instructions on how to add paths see Path List Box.) Clicking show header files will show you the list of the header files that will be analyzed if included.
+ Interactions: +

New Project Summary

This window appears at the end of the Project Setup Wizard to summarize all the information entered before. It is the same as the Edit Project Window.

@@ -615,9 +641,12 @@ Language Select the language of your project. This setting is preselected according to your choice in the previous screen. (See Language Support) Standard Select the language standard that should be used for analyzing your project. Usually the most recent language standard is preselected here. (See Language Support) - Visual Studio Solution Only when using Setup from Visual Studio Solution. Provide the path to your Visual Studio Solution. Clicking the refresh arrow inside the text box will refresh the Project Paths and the Header Search Paths below. - Project Paths Provide the paths that contain your project's files. Coati will analyze all the source and header files in the specified paths, including subdirectories. + + Visual Studio Solution Only when using Setup from Visual Studio Solution. Provide the path to your Visual Studio Solution. Clicking the refresh arrow inside the text box will refresh the Project Paths and the Header Search Paths below. + Compilation Database Only when using Setup from Compilation Database. Provide the path to your Compilation Database. + Header Paths Only when using Setup from Compilation Database. Provide the paths to the corresponding header paths of your Compilation Database. + Simple Setup If this checkbox is checked Coati also looks into the analyzed paths (including subdirectories) when resolving #include directives. Header Search Paths Specify where Coati should be looking for included headers. Global Header Search Paths Same as Header Search Paths but these are used application wide for all of your Coati projects. @@ -632,6 +661,8 @@ Compiler Flags Define compiler flags used during analysis e.g. -v + Header File Extensions Define extensions for header files including the dot e.g. .h + Source File Extensions Define extensions for source files including the dot e.g. .cpp Interactions: @@ -940,10 +971,17 @@
- Interactions: +

Interactions:

+ Panning: + Zooming: +

Nodes