good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
ded013b7
Commit
ded013b7
authored
Aug 23, 2014
by
Jeffrey Wilcke
Browse files
Options
Downloads
Patches
Plain Diff
Minor updates to the UI
parent
5ac875b0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
ethereal/assets/qml/views/info.qml
+89
-41
89 additions, 41 deletions
ethereal/assets/qml/views/info.qml
ethereal/gui.go
+28
-0
28 additions, 0 deletions
ethereal/gui.go
ethereal/main.go
+0
-1
0 additions, 1 deletion
ethereal/main.go
with
117 additions
and
42 deletions
ethereal/assets/qml/views/info.qml
+
89
−
41
View file @
ded013b7
...
...
@@ -44,19 +44,40 @@ Rectangle {
gui
.
setCustomIdentifier
(
text
)
}
}
}
property
var
addressModel
:
ListModel
{
id
:
addressModel
TextArea
{
objectName
:
"
statsPane
"
width
:
parent
.
width
height
:
200
selectByMouse
:
true
readOnly
:
true
font.family
:
"
Courier
"
}
}
RowLayout
{
id
:
logLayout
width
:
parent
.
width
height
:
200
anchors.bottom
:
parent
.
bottom
TableView
{
id
:
addressView
width
:
parent
.
width
height
:
200
anchors.bottom
:
logLayout
.
top
anchors
{
left
:
parent
.
left
right
:
logLevelSlider
.
left
bottom
:
parent
.
bottom
top
:
parent
.
top
}
TableViewColumn
{
role
:
"
name
"
;
title
:
"
name
"
}
TableViewColumn
{
role
:
"
address
"
;
title
:
"
address
"
;
width
:
300
}
property
var
addressModel
:
ListModel
{
id
:
addressModel
}
model
:
addressModel
itemDelegate
:
Item
{
Text
{
...
...
@@ -101,9 +122,35 @@ Rectangle {
}
}
Slider
{
id
:
logLevelSlider
value
:
gui
.
getLogLevelInt
()
anchors
{
right
:
parent
.
right
top
:
parent
.
top
bottom
:
parent
.
bottom
rightMargin
:
5
leftMargin
:
5
topMargin
:
5
bottomMargin
:
5
}
orientation
:
Qt
.
Vertical
maximumValue
:
5
stepSize
:
1
onValueChanged
:
{
gui
.
setLogLevel
(
value
)
}
}
}
property
var
logModel
:
ListModel
{
id
:
logModel
}
/*
RowLayout {
id: logLayout
width: parent.width
...
...
@@ -147,6 +194,7 @@ Rectangle {
}
}
}
*/
function
addDebugMessage
(
message
){
debuggerLog
.
append
({
value
:
message
})
...
...
This diff is collapsed.
Click to expand it.
ethereal/gui.go
+
28
−
0
View file @
ded013b7
...
...
@@ -6,6 +6,7 @@ import (
"fmt"
"math/big"
"os"
"runtime"
"strconv"
"strings"
"time"
...
...
@@ -412,6 +413,7 @@ func (gui *Gui) update() {
peerUpdateTicker
:=
time
.
NewTicker
(
5
*
time
.
Second
)
generalUpdateTicker
:=
time
.
NewTicker
(
1
*
time
.
Second
)
statsUpdateTicker
:=
time
.
NewTicker
(
5
*
time
.
Second
)
state
:=
gui
.
eth
.
StateManager
()
.
TransState
()
...
...
@@ -488,6 +490,10 @@ func (gui *Gui) update() {
pow
:=
gui
.
miner
.
GetPow
()
miningLabel
.
Set
(
"text"
,
"Mining @ "
+
strconv
.
FormatInt
(
pow
.
GetHashrate
(),
10
)
+
"Khash"
)
}
case
<-
statsUpdateTicker
.
C
:
gui
.
setStatsPane
()
}
}
}()
...
...
@@ -507,6 +513,28 @@ func (gui *Gui) update() {
reactor
.
Subscribe
(
"peerList"
,
peerChan
)
}
func
(
gui
*
Gui
)
setStatsPane
()
{
var
memStats
runtime
.
MemStats
runtime
.
ReadMemStats
(
&
memStats
)
statsPane
:=
gui
.
getObjectByName
(
"statsPane"
)
statsPane
.
Set
(
"text"
,
fmt
.
Sprintf
(
`###### Ethereal 0.6.4 (%s) #######
CPU: # %d
Goroutines: # %d
CGoCalls: # %d
Alloc: %d
Heap Alloc: %d
CGNext: %x
NumGC: %d
`
,
runtime
.
Version
(),
runtime
.
NumCPU
,
runtime
.
NumGoroutine
(),
runtime
.
NumCgoCall
(),
memStats
.
Alloc
,
memStats
.
HeapAlloc
,
memStats
.
NextGC
,
memStats
.
NumGC
,
))
}
func
(
gui
*
Gui
)
CopyToClipboard
(
data
string
)
{
//clipboard.WriteAll("test")
fmt
.
Println
(
"COPY currently BUGGED. Here are the contents:
\n
"
,
data
)
...
...
This diff is collapsed.
Click to expand it.
ethereal/main.go
+
0
−
1
View file @
ded013b7
...
...
@@ -71,7 +71,6 @@ func main() {
// This is a bit of a cheat, but ey!
os
.
Setenv
(
"QTWEBKIT_INSPECTOR_SERVER"
,
"127.0.0.1:99999"
)
//qml.Init(nil)
qml
.
Run
(
run
)
var
interrupted
=
false
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment