Skip to content

Commit

Permalink
fix wavesim label bug, bump to 1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
tomcl committed Jan 29, 2021
1 parent 355ee8c commit 3bcfb96
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "issie",
"version": "1.1.3",
"version": "1.1.4",
"description": "Schematic editor and Simulator",
"homepage": "https://github.com/tomcl/issie",
"bugs": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"title": true
},
"build": {
"appId": "ISSIE.113",
"appId": "ISSIE.114",
"asar": true,
"win": {
"target": "zip"
Expand Down
2 changes: 1 addition & 1 deletion src/Renderer/Interface/Version.fs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Version
let VERSION = [ 1 ; 1 ; 3]
let VERSION = [ 1 ; 1 ; 4]

// The first 12 white-space separated words in this file must be in the above format - note that spaces are required.
// This works as valid F# data for displaying the code version and can also be read programmatically from the master branch github file
Expand Down
10 changes: 7 additions & 3 deletions src/Renderer/UI/WaveSimHelpers.fs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ let reactMoreWaves ((sheets,ticks): MoreWaveSetup) (sg:SimulationGraph) (dispatc
|> List.map makeReactCol
|> List.map makeTableCell
if cols = [] then
str "There are no subsheets with internal bus labels or I/Os, nor memories (RAM or ROM), in this design."
str "There are no memories (RAM or ROM), in this design."
else
table [] [tbody [] [tr [] cols]]

Expand Down Expand Up @@ -773,8 +773,12 @@ let netGroup2Label compIds graph netList (netGrp: NetGroup) =
/// display then in wave windows where needed to disambiguate waveforms.
let removeSuffixFromWaveLabel (label:string) =
label
|> Seq.takeWhile (fun ch -> ch <> '.')
|> Seq.map string
|> Seq.toList
|> List.rev
|> List.skipWhile (fun ch -> ch <> '.')
|> (function | '.' :: rest -> rest | chars -> chars)
|> List.rev
|> List.map string
|> String.concat ""


Expand Down

0 comments on commit 3bcfb96

Please sign in to comment.