From d15c84e686aa77c9cb2949faea3eb86fde9aa5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 12 Mar 2018 18:57:16 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@365 a8b55f48-bf90-11e4-a774-851b48703e85 --- project_fs/projectfilesystemwidget.cpp | 2 ++ qad/graphic/graphic.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/project_fs/projectfilesystemwidget.cpp b/project_fs/projectfilesystemwidget.cpp index 271fda7..764fcf5 100644 --- a/project_fs/projectfilesystemwidget.cpp +++ b/project_fs/projectfilesystemwidget.cpp @@ -169,6 +169,7 @@ void ProjectFilesystemWidget::projectsChanged() { int spos = tree->verticalScrollBar()->value(); rememberExpanded(tree->invisibleRootItem()); tree->clear(); + QApplication::setOverrideCursor(Qt::WaitCursor); QList pl = ProjectExplorer::SessionManager::projects(); for (ProjectExplorer::Project * p: pl) { QTreeWidgetItem * ri = new QTreeWidgetItem(); @@ -188,6 +189,7 @@ void ProjectFilesystemWidget::projectsChanged() { fileChanged(); filter(); restoreExpanded(tree->invisibleRootItem()); + QApplication::restoreOverrideCursor(); qApp->processEvents(); tree->verticalScrollBar()->setValue(spos); } diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 892a56e..20252e7 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -764,6 +764,8 @@ void Graphic::findGraphicsRect(double start_x, double end_x, double start_y, dou //bool fast = true; bool can_fast = (start_x == 0 && end_x == 0 && start_y == 0 && end_y == 0); bool anyVisible = false, isTimeLimit = (visible_time > 0.) && !(isRangeX || isRangeY); + bool force_find = (visible_time > 0.) && (history > 0.) && (visible_time < history); + if (force_find) can_fast = false; // foreach (const GraphicType & t, graphics) { // const QPolygonF & pol(pause_ ? t.polyline_pause : t.polyline); // if (!pol.isEmpty()) { @@ -785,7 +787,7 @@ void Graphic::findGraphicsRect(double start_x, double end_x, double start_y, dou if (vx < (pause_ ? t.max_x_pause : t.max_x)) vx = (pause_ ? t.max_x_pause : t.max_x); } vx -= visible_time; -// qDebug() << "[Graphic]" << "can_fast" << can_fast; + //qDebug() << "[Graphic]" << "can_fast" << can_fast; for (int g = 0; g < graphics.size(); g++) { GraphicType & t(graphics[g]); if (!t.visible) continue;