Skip to content

Commit

Permalink
Fixed problem with busy cursor in scan
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Oct 16, 2024
1 parent 44e1d98 commit 44141ee
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,6 @@
},
"vcpkg.target.installDependencies": true,
"vcpkg.target.preferSystemLibs": false,
"vcpkg.target.useManifest": false
"vcpkg.target.useManifest": false,
"debug.focusWindowOnBreak": false
}
14 changes: 7 additions & 7 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
{
"taskName": "Clean & build all 5.15.2",
"type": "shell",
"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",
"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",
"args": [],
"group": {
"kind": "build"
Expand All @@ -70,9 +70,9 @@
"label": "Clean & build all 5.15.2"
},
{
"taskName": "Clean & build all 6.6.2",
"taskName": "Clean & build all 6.8.0",
"type": "shell",
"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",
"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",
"args": [],
"group": "build",
"problemMatcher": {
Expand All @@ -90,12 +90,12 @@
"message": 5
}
},
"label": "Clean & build all 6.6.2"
"label": "Clean & build all 6.8.0"
},
{
"taskName": "Clean & build all 6.7.2",
"taskName": "Clean & build all 6.7.3",
"type": "shell",
"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",
"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",
"args": [],
"group": "build",
"problemMatcher": {
Expand All @@ -113,7 +113,7 @@
"message": 5
}
},
"label": "Clean & build all 6.7.2"
"label": "Clean & build all 6.7.3"
},
{
"type": "shell",
Expand Down
6 changes: 2 additions & 4 deletions src/cfrmnodescan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ CFrmNodeScan::doScan(void)
}

QApplication::setOverrideCursor(Qt::WaitCursor);
QApplication::processEvents();
//QApplication::processEvents();

std::string interface = m_connObject["selected-interface"].toString().toStdString();
cguid guidInterface(interface);
Expand Down Expand Up @@ -793,7 +793,7 @@ CFrmNodeScan::doScan(void)
// Load mdf and standard registers if requested to do so
if (ui->chkFetchInfo->isChecked()) {
doLoadMdf(item);
QApplication::setOverrideCursor(Qt::WaitCursor);
//QApplication::setOverrideCursor(Qt::WaitCursor);
ui->progressBarScan->setValue(ui->progressBarScan->value() + (int)additem);
}
}
Expand All @@ -810,8 +810,6 @@ CFrmNodeScan::doScan(void)
ui->progressBarScan->setValue(100);

QApplication::restoreOverrideCursor();
QApplication::restoreOverrideCursor();
//QApplication::processEvents();

ui->actionScan->setEnabled(true);
}
Expand Down
3 changes: 2 additions & 1 deletion src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,15 @@ treeWidgetItemConn::treeWidgetItemConn(QTreeWidgetItem* topItem,
{
assert(nullptr != topItem);


setText(0, conn["name"].toString());
m_conn = conn;

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

setIcon(0, icon);
// item_test->setToolTip(0, "This is just a test connection from a snowy
// item_test->setToolTip(0, "This is just a te1st connection from a snowy
// country named Sweden.");
// m_connTreeTable->addTopLevelItem(item_test);
// topItem->addChild(this);
Expand Down

0 comments on commit 44141ee

Please sign in to comment.