-
Notifications
You must be signed in to change notification settings - Fork 266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Network Graph layout - debug window improvement. #291
Network Graph layout - debug window improvement. #291
Conversation
tACK 99f6f43 on Windows 10. Looks good to me, agree this does look slightly more clean. Other windows seem fine. Before / After screens: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested Concept ACK. This seems like a nice design improvement.
Suggest reviewers look at the diff with colorMoved = dimmed-zebra
and colorMovedWs = allow-indentation-change
.
Is the slider working correctly? It seems like I lose the traffic history if I move it. Edit: bug(?) seems to be the same on current master.
src/qt/forms/debugwindow.ui
Outdated
<item> | ||
<widget class="QGroupBox" name="groupBox_2"> | ||
<property name="toolTip"> | ||
<string extracomment="Totals"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does a user see this tooltip?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks - removed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The traffic history always took time to repaint.
I doubt there is an easy fix - it would require caching excessive data in anticipation of a resolution change.
I would lean toward prudent disk space usage over this inconvenience.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, makes sense and is unrelated to this change. Will re-review tomorrow.
99f6f43
to
1cdcdb3
Compare
Idunno about Network Info tab. It's now inconsistent with Peers tab, where details are shown on the right. |
there is plenty of room for more tabs. 😄 |
ACK 1cdcdb3 |
What I mean is if there's more data series needed (in addition to "Sent", and "Received") on the same graph, not about new tabs. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tACK 1cdcdb3
Tested on macOS 11.3 Qt 5.15.2. I agree that this is a better use of space.
@RandyMcMillan
You may want to fix your commit author; it's currently authored by git
. You may want to change that back to you.
What I mean is if there's more data series needed (in addition to "Sent", and "Received") on the same graph, not about new tabs.
That can be figured out when new data series are proposed
IIUC this is a reincarnation of #90.
^ this (the authorship) should be fixed before merging. |
With this change --- a/src/qt/forms/debugwindow.ui
+++ b/src/qt/forms/debugwindow.ui
@@ -642,9 +642,7 @@
<attribute name="title">
<string>&Network Traffic</string>
</attribute>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="TrafficGraphWidget" name="trafficGraph" native="true">
<property name="sizePolicy">
@@ -867,8 +865,6 @@
</item>
</layout>
</item>
- </layout>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab_peers"> we have |
1cdcdb3
to
0174e68
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approach ACK 0174e68 Withdrawn in #291 (comment).
A slider glitching was introduced:
I think the root of this bug is the changed layout of the sldGraphRange
, lblGraphRange
and btnClearTrafficGraph
widgets.
On master:
<widget class="QLabel" name="lblGraphRange">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
This PR:
<widget class="QLabel" name="lblGraphRange">
</widget>
0174e68
to
99f5026
Compare
So we gonna move back to the right? :) . Maybe adding a splitter, making right pane collapsible would help if someone wants "full screen like" graph? |
yes @Talkless - that is an option. I will take a look at that. |
99f5026
to
797b1a5
Compare
Update: 1f373f9 Landscape Layout: Widget Layout: |
8cc2bba
to
1f373f9
Compare
</layout> | ||
</widget> | ||
</item> | ||
<item> | ||
<widget class="QSlider" name="sldGraphRange"> | ||
<property name="minimumSize"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(re) setting minimum size to address sizing issue when time interval changes
</item> | ||
<item> | ||
<widget class="QLabel" name="lblGraphRange"> | ||
<property name="minimumSize"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(re) setting minimum size to address sizing issue when time interval changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concept ACK
Tested Successfully on Ubuntu 20.04
The New Layout for the Network Traffic Window looks much better than the current master.
It is also not affecting the functionality of other Node Windows.
Nice Work!
The bug discussed here is also fixed. This was done by op by setting a minimum size of 60px for the lblGraphRange.
But I think op should increase the minimum size a little more because it is causing some overflow issues. Adding a screenshot of the problem:
Overflowing of time (in the blue box near the slider)
Other than this the PR seems to work excellently
Adding some screenshots for comparison.
On Maximum Size:
Master | PR |
---|---|
On Minimum Size:
Master | PR |
---|---|
Difference in Layout (Screenshot from Qt Designer):
Master | PR |
---|---|
I've reconsidered my opinion, and withdraw my ACKs (#291 (comment), #291 (review)). Agree with @Talkless's point (#291 (comment), #291 (comment), #291 (comment)). One of such changes, that require the current layout, are "Received" and "Send" counters separated by data type: blocks, transactions, addresses, service messages. Especially, this could be helpful with upcoming Erlay protocol (at least for me, of course). So, for now, Concept NACK from me. |
Can we make it so the default is 3 hours not 30 minutes? Or make it so that this can be configured somewhere? Also, can we make it so that when the time range is changed that the data is not lost? |
src/qt/forms/debugwindow.ui
Outdated
<item> | ||
<layout class="QHBoxLayout" name="horizontalLayout_4"> | ||
<layout class="QHBoxLayout" name="RecievedBox"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo here and 2 more
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Recieved ==> Received
fef97d9
to
f044190
Compare
a170c84
to
21ed56e
Compare
21ed56e
to
500841e
Compare
Looks good with PR #473 as well... |
Rearrange the views for (imo) better layout and debug window resizing options.
Removing "lblGraphRange" minimumSize enables the view to be reduced to the size of a desktop "widget" :)
https://github.com/bitcoin-core/gui/pull/291/files#diff-a24601363160c5ffd048f45a763e702c988b067f96e48a816c36f855f9820826L681
The peers tab resizes if the detail view is revealed.
Info tab still useful at the "widget" size.
Console tab still functional at "widget" size.