Skip to content

Commit

Permalink
7.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrPlusGH
MrPlusGH committed May 19, 2020
1 parent a36cf77 commit 9feab3f
Show file tree
Hide file tree
Showing 43 changed files with 3,876 additions and 515 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Includes/NPM.gif export-ignore
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bin/*
Stats/*
Logs/*
*.rar
*.7z
*.zip
*.zip
Includes/NPM.gif
22 changes: 16 additions & 6 deletions Config/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"Currency": "USD",
"Delay": 1,
"DisableGPU0": false,
"Donate": 8,
"Donate": 16,
"EnableEarningsTrackerLogs": false,
"FirstInterval": 30,
"HideConsole": true,
"IdleSec": "15",
"IncludeOptionalMiners": false,
"Interval": 240,
"Interval": 300,
"IsFixedSize": false,
"IsReadOnly": false,
"IsSynchronized": true,
Expand All @@ -37,20 +37,30 @@
"Passwordcurrency": "BTC",
"PenalizeSoloInPlus": true,
"PoolName": [
"nicehash",
"miningpoolhub",
"zergpoolplus"
"zpoolplus"
],
"Proxy": "",
"ReportToServer": false,
"SelGPUCC": "0",
"SelGPUDSTM": "0",
"Server_Client": true,
"Server_ClientIP": "127.0.0.1",
"Server_ClientPassword": "3890292d-990c-44ba-b779-552829fc0bc4",
"Server_ClientPort": "4028",
"Server_ClientUser": "NPlusMiner",
"Server_Log": false,
"Server_On": true,
"Server_Password": "3890292d-990c-44ba-b779-552829fc0bc4",
"Server_Port": "4028",
"Server_ServerProxyTimeOut": 1,
"Server_Standalone": false,
"Server_User": "NPlusMiner",
"ShowOnlyTopCoins": true,
"ShowWorkerStatus": false,
"SSL": false,
"StartGUIMinimized": false,
"StartPaused": false,
"StatsInterval": 180,
"StatsInterval": 60,
"SyncRoot": {

},
Expand Down
6 changes: 4 additions & 2 deletions Includes/Algorithms.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,12 @@
"equihash": "Equihash",
"exosis": "Exosis",
"equihash192": "Equihash192",
"EquihashZcl": "Equihash192",
"Equihash1254": "Equihash125",
"equihash144": "Equihash144",
"Equihash1445": "Equihash144",
"EquihashBTG": "Equihash144",
"equihash96": "Equihash96",
"equihash-btg": "EquihashBTG",
"equihashbtg": "EquihashBTG",
"Espers": "HMQ1725",
"eth": "Ethash",
"ethash": "Ethash",
Expand Down
38 changes: 25 additions & 13 deletions Includes/Charting.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ param(
[Parameter(Mandatory=$true)]
[String]$Width = 700,
[Parameter(Mandatory = $true)]
[String]$Height = 85
[String]$Height = 85,
[Parameter(Mandatory = $false)]
[String]$Currency = "BTC"
)

Function GetNextColor {
Expand Down Expand Up @@ -115,8 +117,11 @@ Switch ($Chart) {
# $BaseColor = "424B54"
$BaseColor = "FFFFFF"
# $BaseColor = "F7931A"
$Color = $BaseColor
$A=255
$StartColor = "FFFFFF"
$EndColor = "f2a900"
$i=0
# $Colors = Get-ColorPalette $StartColor $EndColor (($datasource | sort DaySum -Unique).DaySum | % {[math]::Round($_*1000, 3)} | sort -Unique).count
$Colors = Get-ColorPalette $StartColor $EndColor 100

[void]$chart1.Series.Add("Total")
$chart1.Series["Total"].ChartType = "Column"
Expand All @@ -129,11 +134,17 @@ Switch ($Chart) {
# $chart1.Series[$Pool].color = [System.Drawing.Color]::FromArgb($A,247,147,26)
$chart1.Series["Total"].label = "#VALY{N3}"
$chart1.Series["Total"].LabelForeColor = "#FFFFFF"
$chart1.Series["Total"].ToolTip = "#VALX: #VALY mBTC" # - Total: #TOTAL mBTC";
$chart1.Series["Total"].ToolTip = "#VALX: #VALY" # - Total: #TOTAL mBTC";
# $datasource | select Date,DaySum -Unique | ForEach-Object {$chart1.Series["Total"].Points.addxy( $_.Date , ("{0:N3}" -f ([Decimal]$_.DaySUm*1000))) | Out-Null }
$datasource | select Date,DaySum -Unique | ForEach-Object {$chart1.Series["Total"].Points.addxy( $_.Date , (([Decimal]$_.DaySUm*1000))) | Out-Null }
$datasource | select Date,DaySum -Unique | ForEach-Object {$chart1.Series["Total"].Points.addxy( $_.Date , (([Decimal](Get-DisplayCurrency $_.DaySum).Value))) | Out-Null }

$Chart1.Series | foreach {$_.CustomProperties = "DrawSideBySide=True"}
Try{
$Chart1.Series["Total"].Points | ForEach-Object {
# $PSItem.Color = "#$($Colors[((($datasource | sort DaySum -Unique).DaySum | % {[math]::Round($_*1000, 3)} | sort -Unique)).IndexOf([math]::Round(($PSItem.YValues[0]), 3))])"
$PSItem.Color = "#$($Colors[[Int](100 * ($PSItem.YValues[0]) / (($datasource | group date | % {($_.group.DailyEarnings | measure -sum).sum} | measure -maximum).maximum * 1000))])"
}
} Catch {}
}
"Front7DaysEarningsWithPoolSplit" {
$datasource = If (Test-Path ".\logs\DailyEarnings.csv" ) {Import-Csv ".\logs\DailyEarnings.csv" | ? {[DateTime]$_.date -ge (Get-Date).AddDays(-7)}}
Expand Down Expand Up @@ -186,8 +197,8 @@ Switch ($Chart) {
$chart1.Series[$Pool].color = "#$($Color)"
# $chart1.Series[$Pool].color = [System.Drawing.Color]::FromArgb($A,247,147,26)
# $chart1.Series[$Pool].label = "#VALY"
$chart1.Series[$Pool].ToolTip = "#SERIESNAME: #VALY mBTC" # - Total: #TOTAL mBTC";
$datasource | ? {$_.Pool -eq $Pool} | ForEach-Object {$chart1.Series[$Pool].Points.addxy( $_.Date , ("{0:N3}" -f ([Decimal]$_.DailyEarnings*1000))) | Out-Null }
$chart1.Series[$Pool].ToolTip = "#SERIESNAME: #VALY" # - Total: #TOTAL mBTC";
$datasource | ? {$_.Pool -eq $Pool} | ForEach-Object {$chart1.Series[$Pool].Points.addxy( $_.Date , ("{0:N3}" -f (([Decimal](Get-DisplayCurrency $_.DailyEarnings).Value)))) | Out-Null }
}

[void]$chart1.Series.Add("Total")
Expand All @@ -200,13 +211,14 @@ Switch ($Chart) {
$chart1.Series["Total"].color = "#FFFFFF"
# $chart1.Series[$Pool].color = [System.Drawing.Color]::FromArgb($A,247,147,26)
# $chart1.Series[$Pool].label = "#VALY"
$chart1.Series["Total"].ToolTip = "#SERIESNAME: #VALY mBTC" # - Total: #TOTAL mBTC";
$datasource | select Date,DaySum -Unique | ForEach-Object {$chart1.Series[$Pool].Points.addxy( $_.Date , ("{0:N3}" -f ([Decimal]$_.DaySUm*1000))) | Out-Null }
$chart1.Series["Total"].ToolTip = "#SERIESNAME: #VALY" # - Total: #TOTAL mBTC";
$datasource | select Date,DaySum -Unique | ForEach-Object {$chart1.Series[$Pool].Points.addxy( $_.Date , ("{0:N3}" -f (([Decimal](Get-DisplayCurrency $_.DailyEarnings).Value)))) | Out-Null }

$Chart1.Series | foreach {$_.CustomProperties = "DrawSideBySide=True"}
}
"DayPoolSplit" {
$datasource = If (Test-Path ".\logs\DailyEarnings.csv" ) {Import-Csv ".\logs\DailyEarnings.csv" | ? {$_.date -ge (Get-Date).date.AddDays(-1).ToString("MM/dd/yyyy")}}
$datasource = If (Test-Path ".\logs\DailyEarnings.csv" ) {Import-Csv ".\logs\DailyEarnings.csv" | ? {[datetime]$_.date -ge [datetime](Get-Date).date.AddDays(-1).ToString("MM/dd/yyyy")}}
# $datasource = If (Test-Path ".\logs\DailyEarnings.csv" ) {Import-Csv ".\logs\DailyEarnings.csv" }
$dataSource | % {$_.DailyEarnings = [Decimal]$_.DailyEarnings}
$datasource = $dataSource | ? {$_.DailyEarnings -gt 0} | sort DailyEarnings #-Descending

Expand Down Expand Up @@ -263,13 +275,13 @@ Switch ($Chart) {
# $chart1.Series[$Pool].color = "#FFFFFF"
# $chart1.Series[$Pool].color = [System.Drawing.Color]::FromArgb($A,247,147,26)
# $chart1.Series[$Pool].label = "#SERIESNAME: #VALY mBTC"
$chart1.Series[$Pool].ToolTip = "#VALX - #SERIESNAME: #VALY mBTC" # - Total: #TOTAL mBTC";
$datasource | ? {$_.Pool -eq $Pool} | Sort date | ForEach-Object {$chart1.Series[$Pool].Points.addxy( $_.Date , ("{0:N3}" -f ([Decimal]$_.DailyEarnings*1000))) | Out-Null }
$chart1.Series[$Pool].ToolTip = "#VALX - #SERIESNAME: #VALY" # - Total: #TOTAL mBTC";
$datasource | ? {$_.Pool -eq $Pool} | Sort date | ForEach-Object {$chart1.Series[$Pool].Points.addxy( $_.Date , ("{0:N3}" -f (([Decimal](Get-DisplayCurrency $_.DailyEarnings).Value)))) | Out-Null }
# $Chart1.Series["Data"].Points.DataBindXY($datasource.pool, $datasource.DailyEarnings)
}
}
}

# save chart
# $chart1.SaveImage("$scriptpath\ChartTest.png","png") | Out-Null
$chart1.SaveImage(".\Logs\$($chart).png","png") | Out-Null
$chart1
Loading

0 comments on commit 9feab3f

Please sign in to comment.