Implemented #1077

Author: MaartenHilferink

qtgui/exe/GeoDmsGuiQt.vcxproj.filters

@@ -121,9 +121,6 @@
     <ClInclude Include="src\StatisticsBrowser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\UpdatableBrowser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\DmsGuiParameters.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -133,6 +130,9 @@
     <ClInclude Include="src\DmsSplashScreen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\UpdatableBrowser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="GeoDmsGuiQt.rc" />

qtgui/exe/src/DmsActions.cpp

@@ -71,6 +71,12 @@ void createDmsActions() {
     main_window->m_edit_menu->addAction(main_window->m_edit_config_source_action.get());
     main_window->m_edit_config_source_action->setShortcut(QKeySequence(QObject::tr("Ctrl+E")));
 
+    // find TreeItem
+    main_window->m_find_treeitem_action = std::make_unique<QAction>(QObject::tr("&Find TreeItem"));
+    main_window->connect(main_window->m_find_treeitem_action.get(), &QAction::triggered, main_window, &MainWindow::findTreeItem);
+    main_window->m_edit_menu->addAction(main_window->m_find_treeitem_action.get());
+    main_window->m_find_treeitem_action->setShortcut(QKeySequence(QObject::tr("Ctrl+F")));
+
     // update treeitem
     main_window->m_update_treeitem_action = std::make_unique<QAction>(QObject::tr("&Update TreeItem"));
     auto update_treeitem_shortcut = new QShortcut(QKeySequence(QObject::tr("Ctrl+U")), main_window);

qtgui/exe/src/DmsMainWindow.cpp

@@ -1854,6 +1854,18 @@ void MainWindow::expandRecursiveFromCurrentItem() {
     m_treeview->expandRecursiveFromCurrentItem();
 }
 
+void MainWindow::findTreeItem() {
+    if (!m_treeview->find_window)
+    {
+        m_treeview->find_window = new FindTextWindow(m_treeview);
+    }
+
+    m_treeview->find_window->setWindowTitle("Find in configured TreeItems");
+    m_treeview->find_window->setSearchMode(true); // Set to TreeView mode
+    m_treeview->find_window->show();
+    m_treeview->find_window->find_text->setFocus();
+}
+
 void MainWindow::createDetailPagesDock() {
     m_detailpages_dock = new QDockWidget(QObject::tr("DetailPages"), this);
     m_detailpages_dock->setTitleBarWidget(new QWidget(m_detailpages_dock));

qtgui/exe/src/DmsMainWindow.h

@@ -215,6 +215,7 @@ public slots:
     void debugReports();
     void expandActiveNode(bool doExpand);
     void expandRecursiveFromCurrentItem();
+    void findTreeItem();
 
 public slots:
     void fileOpen();
@@ -284,7 +285,7 @@ public slots:
 
     // shared actions
     std::unique_ptr<QAction> m_export_primary_data_action
-        , m_step_to_failreason_action, m_go_to_causa_prima_action, m_edit_config_source_action
+		, m_step_to_failreason_action, m_go_to_causa_prima_action, m_edit_config_source_action, m_find_treeitem_action
         , m_update_treeitem_action, m_update_subtree_action, m_invalidate_action
         , m_defaultview_action, m_tableview_action, m_mapview_action, m_statistics_action
         //    , m_histogramview_action
@@ -324,6 +325,7 @@ public slots:
     QPointer<DmsExportWindow> m_export_window;
     QPointer<DmsErrorWindow> m_error_window;
     QPointer<DmsFileChangedWindow> m_file_changed_window;
+    QPointer<class FindTextWindow> m_find_treeitem_window;
 
     using processing_record = std::tuple<std::time_t, std::time_t, SharedStr>;
     //QList<QWidgetAction*> m_recent_files_actions;

qtgui/exe/src/DmsTreeView.h

@@ -93,6 +93,7 @@ class DmsTreeView : public QTreeView
 	void setDmsStyleSheet(bool connecting_lines = true);
 
 	int m_default_size = 0;
+	class FindTextWindow* find_window = nullptr;
 
 public slots:
 	void onDoubleClick(const QModelIndex& index);

qtgui/exe/src/UpdatableBrowser.cpp

@@ -4,6 +4,11 @@
 #include <QLayout>
 #include <qfontdatabase.h>
 
+#include "TicInterface.h"
+
+// Forward declaration of TreeItem_FindItem from TreeItem.cpp
+TIC_CALL SharedTreeItem TreeItem_FindItem(const TreeItem* searchLoc, TokenID id);
+
 FindTextWindow::FindTextWindow(QWidget* parent)
     : QWidget(parent)
 {
@@ -16,6 +21,7 @@ FindTextWindow::FindTextWindow(QWidget* parent)
     match_case = new QCheckBox("Match case", this);
     previous = new QPushButton("Previous", this);
     next = new QPushButton("Next", this);
+
     QWidget* spacer = new QWidget(this);
     spacer->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
     spacer->setFocusPolicy(Qt::FocusPolicy::NoFocus);
@@ -37,6 +43,68 @@ FindTextWindow::FindTextWindow(QWidget* parent)
     setLayout(layout);
 }
 
+void FindTextWindow::findInTreeView()
+{
+    auto search_text = find_text->text();
+    if (search_text.isEmpty())
+    {
+        result_info->setText("Please enter search text");
+        return;
+    }
+
+    auto main_window = MainWindow::TheOne();
+    if (!main_window)
+    {
+        result_info->setText("Main window not available");
+        return;
+    }
+
+    auto current_item = main_window->getCurrentTreeItem();
+    if (!current_item)
+    {
+        result_info->setText("No current item");
+        return;
+    }
+
+    try {
+        TokenID search_token = GetTokenID_mt(search_text.toUtf8().constData());
+        auto found_item = TreeItem_FindItem(current_item, search_token);
+
+        if (found_item)
+        {
+            main_window->setCurrentTreeItem(const_cast<TreeItem*>(found_item.get()));
+            result_info->setText(QString("Found: %1").arg(found_item->GetFullName().c_str()));
+        }
+        else
+        {
+            result_info->setText("Item not found");
+        }
+    }
+    catch (...)
+    {
+        result_info->setText("Error during search");
+    }
+}
+
+void FindTextWindow::setSearchMode(bool treeViewMode)
+{
+    m_treeViewMode = treeViewMode;
+    if (treeViewMode)
+    {
+        match_whole_word->setChecked(false);
+        match_case->setChecked(false);
+        match_whole_word->setEnabled(false);
+        match_case->setEnabled(false);
+        previous->setEnabled(false);
+    }
+    else
+    {
+        match_whole_word->setEnabled(true);
+        match_case->setEnabled(true);
+        previous->setEnabled(true);
+    }
+}
+
 void FindTextWindow::findInQTextBrowser(bool backwards)
 {
     auto* updatable_text_browser = dynamic_cast<QTextBrowser*>(parent());
@@ -56,16 +124,23 @@ void FindTextWindow::findInText(bool backwards)
 {
     if (find_text->text().isEmpty())
         return;
- 
-    auto* current_parent = parent();
-    auto* updatable_text_browser = dynamic_cast<QTextBrowser*>(current_parent);
-    MG_CHECK(updatable_text_browser);
-    findInQTextBrowser(backwards);
+
+    if (m_treeViewMode)
+    {
+        findInTreeView();
+    }
+    else
+    {
+        auto* current_parent = parent();
+        auto* updatable_text_browser = dynamic_cast<QTextBrowser*>(current_parent);
+        MG_CHECK(updatable_text_browser);
+        findInQTextBrowser(backwards);
+    }
 }
 
 void FindTextWindow::nextClicked(bool checked)
 {
-    findInText();
+    findInText(false);
 }
 
 void FindTextWindow::previousClicked(bool checked)

qtgui/exe/src/UpdatableBrowser.h

@@ -28,22 +28,30 @@
 
 class FindTextWindow : public QWidget
 {
+
 public:
     FindTextWindow(QWidget* parent);
     void findInText(bool backwards = false);
+    void setSearchMode(bool treeViewMode);
 
 public slots:
     void nextClicked(bool checked = false);
     void previousClicked(bool checked = false);
+    void onSourceGroupChanged(QAbstractButton* button, bool checked);
 
     void findInQTextBrowser(bool backwards = false);
+    void findInTreeView();
 
     QLineEdit* find_text = nullptr;
+
     QCheckBox* match_whole_word = nullptr;
     QCheckBox* match_case = nullptr;
     QPushButton* previous = nullptr;
     QPushButton* next = nullptr;
     QLabel* result_info = nullptr;
+
+private:
+    bool m_treeViewMode = false;
 };
 
 struct QUpdatableWebBrowser : QTextBrowser, MsgGenerator

tic/dll/src/TreeItem.cpp

@@ -4611,7 +4611,7 @@ auto TreeItem_FindItem_impl(template_set& visitedSet, const TreeItem* searchLoc,
 	return {};
 }
 
-auto TreeItem_FindItem(const TreeItem* searchLoc, TokenID id) -> SharedTreeItem
+TIC_CALL auto TreeItem_FindItem(const TreeItem* searchLoc, TokenID id) -> SharedTreeItem
 {
 	if (!searchLoc)
 		return {};