Skip to content
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

Added 20*log10(mag) for Pyqtgraph #395

Merged
merged 20 commits into from
Jun 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fc27f24
Added Log(mag**2)
jeremiahnlin May 24, 2023
a1c566a
Merge branch 'log_scale' of https://github.com/jeremiahnlin/plottr in…
jeremiahnlin May 24, 2023
3767bb0
changed label of logmag
jeremiahnlin May 24, 2023
af3a0cf
added log lines to new complexRepresentation
jeremiahnlin May 25, 2023
0091ebb
made so the complexRepresentation did not have log scale for phase, m…
jeremiahnlin May 25, 2023
e50f25c
changed complexRepresentation to 20*log10(mag) and took out logarithm…
jeremiahnlin May 26, 2023
738a4fd
Merge branch 'toolsforexperiments:master' into log_scale
jeremiahnlin May 26, 2023
f4c81e7
made style revisions
jeremiahnlin May 26, 2023
6a7c1b0
more style edits
jeremiahnlin May 26, 2023
98a7b31
Merge branch 'toolsforexperiments:master' into log_scale
jeremiahnlin May 31, 2023
d28f399
disabled logmag for two independent axes
jeremiahnlin Jun 7, 2023
e8ce42b
changed so non-imaginary data will only have the option for real comp…
jeremiahnlin Jun 7, 2023
d523cee
Merge branch 'toolsforexperiments:master' into log_scale
jeremiahnlin Jun 7, 2023
f8260f0
stylistic changes
jeremiahnlin Jun 7, 2023
875fc75
mypy check fix maybe?
jeremiahnlin Jun 7, 2023
9fa3772
maybe fixed the mypy issues
jeremiahnlin Jun 7, 2023
d4ad24b
style changes and fixed crashing error
jeremiahnlin Jun 9, 2023
a5638bc
fixed minor naming issue
jeremiahnlin Jun 9, 2023
41dad4d
helped readability with _1dPlot function
jeremiahnlin Jun 9, 2023
d5c1ed2
changed readability of _1dPlot
jeremiahnlin Jun 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changed label of logmag
  • Loading branch information
jeremiahnlin committed May 24, 2023
commit 3767bb0d13b04436e5de2421be98a4bda95d7eda
9 changes: 5 additions & 4 deletions plottr/plot/base.py
Original file line number Diff line number Diff line change
@@ -264,8 +264,9 @@ class ComplexRepresentation(LabeledOptions):
#: magnitude and phase
magAndPhase = "Mag/Phase"

#: Logarithmic magnitude and phase
log_magAndPhase = "Logarithmic Mag/Phase"
#: Natural Logarithmic magnitude and phase
log_magAndPhase = "ln(Mag**2)/Phase"




@@ -475,9 +476,9 @@ def _splitComplexData(self, plotItem: PlotItem) -> List[PlotItem]:
phase_data = np.angle(data)

if label == '':
mag_label, phase_label = 'Log(Mag**2)', 'Phase'
mag_label, phase_label = 'ln(Mag**2)', 'Phase'
else:
mag_label, phase_label = label + ' (Log(Mag**2))', label + ' (Phase)'
mag_label, phase_label = label + ' (ln(Mag**2))', label + ' (Phase)'

mag_plotItem = plotItem
phase_plotItem = deepcopy(mag_plotItem)