Add power #22
Merged
Add power #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sdercolin
reviewed
Jul 2, 2023
| PreferencesChartsPowerHeight -> "Height relative to waveforms (%%)" | ||
| PreferencesChartsPowerUnitSize -> "Points per pixel" | ||
| PreferencesChartsPowerUnitSizeDescription -> "Increase for lower image quality." | ||
| PreferencesChartsPowerUnitSizeInvalid -> "Unit size must be greater than or equal to Window size." |
| PreferencesChartsPowerHeight -> "波形グラフの高さに対する高さの割合（%%）" | ||
| PreferencesChartsPowerUnitSize -> "データポイント/ピクセル" | ||
| PreferencesChartsPowerUnitSizeDescription -> "この値を大きくすると、グラフの描画は高速になりますが、品質は低下します。" | ||
| PreferencesChartsPowerUnitSizeInvalid -> "データポイント/ピクセルはパワーのウィンドウサイズ以上でなければなりません。" |
| PreferencesChartsPowerUnitSizeDescription -> "この値を大きくすると、グラフの描画は高速になりますが、品質は低下します。" | ||
| PreferencesChartsPowerUnitSizeInvalid -> "データポイント/ピクセルはパワーのウィンドウサイズ以上でなければなりません。" | ||
| PreferencesChartsPowerWindowSize -> "パワーのウィンドウサイズ" | ||
| PreferencesChartsPowerWindowSizeInvalid -> "パワーのウィンドウサイズはデータポイント/ピクセル以下でなければなりません。" |
| PreferencesChartsPowerUnitSizeDescription -> "Increase for lower image quality." | ||
| PreferencesChartsPowerUnitSizeInvalid -> "Unit size must be greater than or equal to Window size." | ||
| PreferencesChartsPowerWindowSize -> "Window size" | ||
| PreferencesChartsPowerWindowSizeInvalid -> "Window size must be less than or equal to Unit size." |
| infoMap[moduleName to sampleFile.name]?.let { | ||
| if (it.maxSampleRate == maxSampleRate && | ||
| it.normalize == normalize && | ||
| it.getFile(project).exists() && | ||
| it.lastModified == sampleFile.lastModified() | ||
| it.lastModified == sampleFile.lastModified() && | ||
| ((mergeChannels && it.powerChannels == 1) || (!mergeChannels && it.channels == it.powerChannels)) |
There was a problem hiding this comment.
Probably we will need to check hasPower and hasSpectrogram as well?
We can have a member function in SampleInfo class to handle this logic.
fun shouldReload(appConf: AppConf, algorithmVersion: Int, ...): Boolean = ...| @@ -186,7 +186,8 @@ class EditorState( | |||
| val updated = chartStore.prepareForNewLoading(project, appConf, it) | |||
| appState.updateProjectOnLoadedSample(it, moduleName) | |||
| if (updated) { | |||
| val renderProgressTotal = it.chunkCount * (it.channels + if (it.hasSpectrogram) 1 else 0) | |||
| val renderProgressTotal = it.chunkCount * | |||
| (it.channels + (if (it.hasSpectrogram) 1 else 0) + (if (it.hasPower) it.powerChannels else 0)) | |||
There was a problem hiding this comment.
We need to update totalCharts in ChartPrerenderer.kt L72 as well. Since the logic is the same, we can have a property in SampleInfo :
val SampleInfo.totalChartCount: Int get() = ...
sdercolin
reviewed
Jul 2, 2023
| @@ -63,7 +65,11 @@ object SampleInfoRepository { | |||
| existingInfo.normalize == normalize && | |||
| existingInfo.maxSampleRate == maxSampleRate && | |||
| existingInfo.getFile(project).exists() && | |||
| existingInfo.lastModified == sampleFile.lastModified() | |||
| existingInfo.lastModified == sampleFile.lastModified() && | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add power (dB) for #5.