Skip to content

Commit 44141ee

Browse files
Fixed problem with busy cursor in scan
1 parent 44e1d98 commit 44141ee

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,6 @@
126126
},
127127
"vcpkg.target.installDependencies": true,
128128
"vcpkg.target.preferSystemLibs": false,
129-
"vcpkg.target.useManifest": false
129+
"vcpkg.target.useManifest": false,
130+
"debug.focusWindowOnBreak": false
130131
}

.vscode/tasks.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
{
4848
"taskName": "Clean & build all 5.15.2",
4949
"type": "shell",
50-
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ; make -j4 -Wall",
50+
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/5.15.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/5.15.2/gcc_64 .. ; make -j4 -Wall",
5151
"args": [],
5252
"group": {
5353
"kind": "build"
@@ -70,9 +70,9 @@
7070
"label": "Clean & build all 5.15.2"
7171
},
7272
{
73-
"taskName": "Clean & build all 6.6.2",
73+
"taskName": "Clean & build all 6.8.0",
7474
"type": "shell",
75-
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.6.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ; make -j4",
75+
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.8.0/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/6.8.0/gcc_64 .. ; make -j4",
7676
"args": [],
7777
"group": "build",
7878
"problemMatcher": {
@@ -90,12 +90,12 @@
9090
"message": 5
9191
}
9292
},
93-
"label": "Clean & build all 6.6.2"
93+
"label": "Clean & build all 6.8.0"
9494
},
9595
{
96-
"taskName": "Clean & build all 6.7.2",
96+
"taskName": "Clean & build all 6.7.3",
9797
"type": "shell",
98-
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.7.2/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug .. ; make -j4",
98+
"command": "cd build; make clean; export CMAKE_PREFIX_PATH=~/Qt/6.7.3/gcc_64:$CMAKE_PREFIX_PATH; cmake -DCMAKE_BUILD_TYPE=Debug -DQt6_DIR=~/Qt/7.3.0/gcc_64 .. ; make -j4",
9999
"args": [],
100100
"group": "build",
101101
"problemMatcher": {
@@ -113,7 +113,7 @@
113113
"message": 5
114114
}
115115
},
116-
"label": "Clean & build all 6.7.2"
116+
"label": "Clean & build all 6.7.3"
117117
},
118118
{
119119
"type": "shell",

src/cfrmnodescan.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ CFrmNodeScan::doScan(void)
711711
}
712712

713713
QApplication::setOverrideCursor(Qt::WaitCursor);
714-
QApplication::processEvents();
714+
//QApplication::processEvents();
715715

716716
std::string interface = m_connObject["selected-interface"].toString().toStdString();
717717
cguid guidInterface(interface);
@@ -793,7 +793,7 @@ CFrmNodeScan::doScan(void)
793793
// Load mdf and standard registers if requested to do so
794794
if (ui->chkFetchInfo->isChecked()) {
795795
doLoadMdf(item);
796-
QApplication::setOverrideCursor(Qt::WaitCursor);
796+
//QApplication::setOverrideCursor(Qt::WaitCursor);
797797
ui->progressBarScan->setValue(ui->progressBarScan->value() + (int)additem);
798798
}
799799
}
@@ -810,8 +810,6 @@ CFrmNodeScan::doScan(void)
810810
ui->progressBarScan->setValue(100);
811811

812812
QApplication::restoreOverrideCursor();
813-
QApplication::restoreOverrideCursor();
814-
//QApplication::processEvents();
815813

816814
ui->actionScan->setEnabled(true);
817815
}

src/mainwindow.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,15 @@ treeWidgetItemConn::treeWidgetItemConn(QTreeWidgetItem* topItem,
9090
{
9191
assert(nullptr != topItem);
9292

93+
9394
setText(0, conn["name"].toString());
9495
m_conn = conn;
9596

9697
const QIcon icon =
9798
QIcon::fromTheme("network-transmit-receive", QIcon(":add.png"));
9899

99100
setIcon(0, icon);
100-
// item_test->setToolTip(0, "This is just a test connection from a snowy
101+
// item_test->setToolTip(0, "This is just a te1st connection from a snowy
101102
// country named Sweden.");
102103
// m_connTreeTable->addTopLevelItem(item_test);
103104
// topItem->addChild(this);

0 commit comments

Comments
 (0)