SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@716 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-02-11 09:44:21 +00:00
parent b11ee54855
commit 7eebcdc8a6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
qad/graphic/graphic.cpp
View File

@@ -934,8 +934,8 @@ void Graphic::findGraphicsRect(double start_x, double end_x, double start_y, dou
//bool fast = true; //bool fast = true;
bool can_fast = (start_x == 0 && end_x == 0 && start_y == 0 && end_y == 0); 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 anyVisible = false, isTimeLimit = (visible_time > 0.) && !(isRangeX || isRangeY);
bool force_find = (visible_time > 0.) && (history > 0.) && (visible_time < history); //bool force_find = (visible_time > 0.) && (history > 0.) && (visible_time < history);
if (force_find) can_fast = false; //if (force_find) can_fast = false;
// foreach (const GraphicType & t, graphics) { // foreach (const GraphicType & t, graphics) {
// const QPolygonF & pol(pause_ ? t.polyline_pause : t.polyline); // const QPolygonF & pol(pause_ ? t.polyline_pause : t.polyline);
// if (!pol.isEmpty()) { // if (!pol.isEmpty()) {
@@ -1027,7 +1027,13 @@ void Graphic::findGraphicsRect(double start_x, double end_x, double start_y, dou
else if (isRangeY) selrect.setRect(minX, start_y, maxX - minX, end_y - start_y); else if (isRangeY) selrect.setRect(minX, start_y, maxX - minX, end_y - start_y);
else grect.setRect(minX, minY, maxX - minX, maxY - minY); else grect.setRect(minX, minY, maxX - minX, maxY - minY);
grect = grect.normalized(); grect = grect.normalized();
if (isFit)/* || isRangeX || isRangeY)*/ selrect = grect; if (isFit)/* || isRangeX || isRangeY)*/ {
if (visible_time > 0.) {
if (grect.width() > visible_time)
grect.setLeft(grect.right() - visible_time);
}
selrect = grect;
}
setRectToLines(); setRectToLines();
} }