Skip to content

Commit 8b94875

Browse files
committed
Improve volume analytics layout, invoke placeholder functions
1 parent 8b32de3 commit 8b94875

2 files changed

Lines changed: 20 additions & 10 deletions

File tree

code/gui.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,6 +1524,8 @@ class DrumMachineGui {
15241524
circle.fill = self.configurations.buttonBehavior.buttonHoverColor
15251525
rowSelectionRectangle.stroke = self.configurations.buttonBehavior.buttonHoverColor
15261526
self.initializeRowVolumeAdjustmentHoverVariablesAndVisuals(rowIndex);
1527+
self.setAnalyticsBarToVolumesMode()
1528+
self.setAnalyticsBarVolumesModeText(self, rowIndex)
15271529
}
15281530
}
15291531
}
@@ -1537,6 +1539,8 @@ class DrumMachineGui {
15371539
rowSelectionRectangle.stroke = 'transparent'
15381540
if (self.shiftToolTracker.selectedRowIndex === null && self.rowVolumeAdjustmentTracker.selectedRowIndex === null) {
15391541
self.unhighlightNoteCirclesForRowVolumeAdjustment();
1542+
self.hideAllAnalyticsBarText()
1543+
self.setAnalyticsBarVolumesModeText(self, -1, true)
15401544
}
15411545
}
15421546
}
@@ -1565,6 +1569,8 @@ class DrumMachineGui {
15651569
circle.fill = self.configurations.volumeAdjusterRowHandles.unselectedColor
15661570
rowSelectionRectangle.stroke = self.configurations.volumeAdjusterRowHandles.unselectedColor
15671571
self.unhighlightNoteCirclesForRowVolumeAdjustment();
1572+
self.hideAllAnalyticsBarText()
1573+
self.setAnalyticsBarVolumesModeText(self, -1, true)
15681574
}
15691575
}
15701576

@@ -3356,6 +3362,8 @@ class DrumMachineGui {
33563362
} else {
33573363
self.components.domElements.divs.bottomBarText.innerHTML = self.configurations.helpText.changeRowVolume
33583364
}
3365+
self.setAnalyticsBarToVolumesMode()
3366+
self.setAnalyticsBarVolumesModeText(self, self.rowVolumeAdjustmentTracker.selectedRowIndex)
33593367
}
33603368

33613369
// this method is very messy. my top priority was to get it working, and not worry about duplicated code or using the most perfect straightforward logic flow.
@@ -3889,6 +3897,8 @@ class DrumMachineGui {
38893897
rowVolumeAdjustmentWindowMouseUpHandler(self, event) {
38903898
self.components.domElements.divs.bottomBarText.innerHTML = this.configurations.helpText.defaultText
38913899
self.rowVolumeAdjustmentTracker.selectedRowIndex = null
3900+
self.hideAllAnalyticsBarText()
3901+
self.setAnalyticsBarVolumesModeText(self, -1, true)
38923902
self.redrawSequencer();
38933903
self.saveCurrentSequencerStateToUrlHash();
38943904
}
@@ -4825,15 +4835,15 @@ class DrumMachineGui {
48254835
*/
48264836
setAnalyticsBarVolumesModeText(self, sequencerRowIndex, hidedValues=false) {
48274837
if (hidedValues || sequencerRowIndex < 0) {
4828-
self.components.domElements.text.analyticsBarVolumesModeMinimumVolumeForRowText.innerHTML = "minimum volume for row: -"
4829-
self.components.domElements.text.analyticsBarVolumesModeMaximumVolumeForRowText.innerHTML = "maximum volume for row: -"
4838+
self.components.domElements.text.analyticsBarVolumesModeMinimumVolumeForRowText.innerHTML = "minimum on row: -"
4839+
self.components.domElements.text.analyticsBarVolumesModeMaximumVolumeForRowText.innerHTML = "maximum on row: -"
48304840
self.components.domElements.text.analyticsBarVolumesModeIsRowMutedText.innerHTML = "is row muted: -"
48314841
}
48324842
let minimumNoteVolumeForRow = 0;
48334843
let maximumNoteVolumeForRow = 0;
48344844
let isRowMuted = false;
4835-
self.components.domElements.text.analyticsBarVolumesModeMinimumVolumeForRowText.innerHTML = "minimum volume for row: " + minimumNoteVolumeForRow
4836-
self.components.domElements.text.analyticsBarVolumesModeMaximumVolumeForRowText.innerHTML = "maximum volume for row: " + maximumNoteVolumeForRow
4845+
self.components.domElements.text.analyticsBarVolumesModeMinimumVolumeForRowText.innerHTML = "minimum on row: " + minimumNoteVolumeForRow
4846+
self.components.domElements.text.analyticsBarVolumesModeMaximumVolumeForRowText.innerHTML = "maximum on row: " + maximumNoteVolumeForRow
48374847
self.components.domElements.text.analyticsBarVolumesModeIsRowMutedText.innerHTML = "is row muted: " + isRowMuted
48384848
}
48394849

index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,17 @@
200200
border-left: 1px solid black;
201201
height: 100px;
202202
position: fixed;
203-
left: 270px;
203+
left: 410px;
204204
padding-left: 50px;
205205
}
206206
#analytics-bar-volumes-mode-column-2-text {
207207
/* border: 1px solid black; */
208208
position: fixed;
209-
left: 350px;
209+
left: 670px;
210210
}
211211
#analytics-bar-volumes-mode-column-3-text {
212212
position: fixed;
213-
left: 550px;
213+
left: 970px;
214214
}
215215
</style>
216216

@@ -310,11 +310,11 @@
310310
</div>
311311
<div id="analytics-bar-volumes-mode-text-div">
312312
<div id="analytics-bar-volumes-mode-column-1-text">
313-
<p>volume:</p>
313+
<p>volumes:</p>
314314
</div>
315315
<div id="analytics-bar-volumes-mode-column-2-text">
316-
<p id="analytics-minimum-volume-for-row-text">minimum volume for row: -</p>
317-
<p id="analytics-maximum-volume-for-row-text">maximum volume for row: -</p>
316+
<p id="analytics-minimum-volume-for-row-text">minimum on row: -</p>
317+
<p id="analytics-maximum-volume-for-row-text">maximum on row: -</p>
318318
</div>
319319
<div id="analytics-bar-volumes-mode-column-3-text">
320320
<p id="analytics-is-row-muted-text">is row muted: -</p>

0 commit comments

Comments
 (0)