Skip to content

Commit 95b4194

Browse files
Kung-vrKung-vr
authored
Merge pull request #318 from OpenVR-Advanced-Settings/bigger-gainz
Increase the max gain on color to 9999
2 parents e5061ae + 9168a02 commit 95b4194

File tree

2 files changed

+76
-45
lines changed

2 files changed

+76
-45
lines changed

‎src/res/qml/video_page/color/ColorGroupBox.qml‎

Lines changed: 55 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ GroupBox {
4848
onPositionChanged: {
4949
var val = (this.value * 100)
5050
colorRedText.text = Math.round(val) + "%"
51-
}
52-
onValueChanged: {
53-
5451
VideoTabController.setColorRed(value.toFixed(2), true)
5552
}
5653
}
@@ -65,13 +62,20 @@ GroupBox {
6562
function onInputEvent(input) {
6663
var val = parseFloat(input)
6764
if (!isNaN(val)) {
68-
if (val < 5) {
69-
val = 5
70-
} else if (val > 100.0) {
71-
val = 100.0
65+
if (val < 1) {
66+
val = 1
67+
} else if (val > 9999.0) {
68+
val = 9999.0
7269
}
73-
var v = (val/100).toFixed(2)
70+
71+
var v = (val/100)
72+
VideoTabController.setColorRed(v.toFixed(2), true)
73+
if (v > 1)
74+
{
75+
colorRedSlider.value = 1
76+
} else {
7477
colorRedSlider.value = v
78+
}
7579
}
7680
text = Math.round(VideoTabController.colorRed * 100) + "%"
7781
}
@@ -92,9 +96,6 @@ GroupBox {
9296
onPositionChanged: {
9397
var val = (this.value * 100)
9498
colorGreenText.text = Math.round(val) + "%"
95-
}
96-
onValueChanged: {
97-
9899
VideoTabController.setColorGreen(value.toFixed(2), true)
99100
}
100101
}
@@ -109,13 +110,20 @@ GroupBox {
109110
function onInputEvent(input) {
110111
var val = parseFloat(input)
111112
if (!isNaN(val)) {
112-
if (val < 5) {
113-
val = 5
114-
} else if (val > 100.0) {
115-
val = 100.0
113+
if (val < 1) {
114+
val = 1
115+
} else if (val > 9999.0) {
116+
val = 9999.0
116117
}
117-
var v = (val/100).toFixed(2)
118+
119+
var v = (val/100)
120+
VideoTabController.setColorGreen(v.toFixed(2), true)
121+
if (v > 1)
122+
{
123+
colorGreenSlider.value = 1
124+
} else {
118125
colorGreenSlider.value = v
126+
}
119127
}
120128
text = Math.round(VideoTabController.colorGreen * 100) + "%"
121129
}
@@ -137,9 +145,6 @@ GroupBox {
137145
onPositionChanged: {
138146
var val = (this.value * 100)
139147
colorBlueText.text = Math.round(val) + "%"
140-
}
141-
onValueChanged: {
142-
143148
VideoTabController.setColorBlue(value.toFixed(2), true)
144149
}
145150
}
@@ -154,13 +159,20 @@ GroupBox {
154159
function onInputEvent(input) {
155160
var val = parseFloat(input)
156161
if (!isNaN(val)) {
157-
if (val < 5) {
158-
val = 5
159-
} else if (val > 100.0) {
160-
val = 100.0
162+
if (val < 1) {
163+
val = 1
164+
} else if (val > 9999.0) {
165+
val = 9999.0
161166
}
162-
var v = (val/100).toFixed(2)
167+
168+
var v = (val/100)
169+
VideoTabController.setColorBlue(v.toFixed(2), true)
170+
if (v > 1)
171+
{
172+
colorBlueSlider.value = 1
173+
} else {
163174
colorBlueSlider.value = v
175+
}
164176
}
165177
text = Math.round(VideoTabController.colorBlue * 100) + "%"
166178
}
@@ -171,21 +183,34 @@ GroupBox {
171183
}
172184

173185
Component.onCompleted: {
174-
colorRedSlider.value = VideoTabController.colorRed
175-
colorGreenSlider.value = VideoTabController.colorGreen
176-
colorBlueSlider.value = VideoTabController.colorBlue
186+
// set up var here to prevent double call to c++ from qml
187+
var redValue = VideoTabController.colorRed
188+
var greenValue = VideoTabController.colorGreen
189+
var blueValue = VideoTabController.colorBlue
190+
colorRedText.text = Math.round(redValue * 100) + "%"
191+
colorGreenText.text = Math.round(greenValue * 100) + "%"
192+
colorBlueText.text = Math.round(blueValue * 100) + "%"
193+
colorRedSlider.value = redValue
194+
colorGreenSlider.value = greenValue
195+
colorBlueSlider.value = blueValue
177196
}
178197

179198
Connections {
180199
target: VideoTabController
181200
onColorRedChanged:{
182-
colorRedSlider.value = VideoTabController.colorRed
201+
var redValue = VideoTabController.colorRed
202+
colorRedText.text = Math.round(redValue * 100) + "%"
203+
colorRedSlider.value = redValue
183204
}
184205
onColorGreenChanged:{
185-
colorGreenSlider.value = VideoTabController.colorGreen
206+
var greenValue = VideoTabController.colorGreen
207+
colorGreenText.text = Math.round(greenValue * 100) + "%"
208+
colorGreenSlider.value = greenValue
186209
}
187210
onColorBlueChanged:{
188-
colorBlueSlider.value = VideoTabController.colorBlue
211+
var blueValue = VideoTabController.colorBlue
212+
colorBlueText.text = Math.round(blueValue * 100) + "%"
213+
colorBlueSlider.value = blueValue
189214
}
190215
}
191216
}

‎src/res/qml/video_page/overlaycolorbright/OverlayMethodGroupBox.qml‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ GroupBox {
169169
onPositionChanged: {
170170
var val = (this.value * 100)
171171
colorRedText.text = Math.round(val) + "%"
172-
}
173-
onValueChanged: {
174-
175172
VideoTabController.setColorRed(value.toFixed(2), true)
176173
}
177174
}
@@ -193,6 +190,7 @@ GroupBox {
193190
}
194191
var v = (val/100).toFixed(2)
195192
colorRedSlider.value = v
193+
VideoTabController.setColorRed(v.toFixed(2), true)
196194
}
197195
text = Math.round(VideoTabController.colorRed * 100) + "%"
198196
}
@@ -213,9 +211,6 @@ GroupBox {
213211
onPositionChanged: {
214212
var val = (this.value * 100)
215213
colorGreenText.text = Math.round(val) + "%"
216-
}
217-
onValueChanged: {
218-
219214
VideoTabController.setColorGreen(value.toFixed(2), true)
220215
}
221216
}
@@ -237,6 +232,7 @@ GroupBox {
237232
}
238233
var v = (val/100).toFixed(2)
239234
colorGreenSlider.value = v
235+
VideoTabController.setColorGreen(v.toFixed(2), true)
240236
}
241237
text = Math.round(VideoTabController.colorGreen * 100) + "%"
242238
}
@@ -258,9 +254,6 @@ GroupBox {
258254
onPositionChanged: {
259255
var val = (this.value * 100)
260256
colorBlueText.text = Math.round(val) + "%"
261-
}
262-
onValueChanged: {
263-
264257
VideoTabController.setColorBlue(value.toFixed(2), true)
265258
}
266259
}
@@ -282,6 +275,7 @@ GroupBox {
282275
}
283276
var v = (val/100).toFixed(2)
284277
colorBlueSlider.value = v
278+
VideoTabController.setColorBlue(v.toFixed(2), true)
285279
}
286280
text = Math.round(VideoTabController.colorBlue * 100) + "%"
287281
}
@@ -295,9 +289,15 @@ GroupBox {
295289
brightnessToggle.checked = VideoTabController.brightnessEnabled
296290
colorToggle.checked = VideoTabController.colorOverlayEnabled
297291
opacitySlider.value = VideoTabController.colorOverlayOpacity
298-
colorRedSlider.value = VideoTabController.colorRed
299-
colorGreenSlider.value = VideoTabController.colorGreen
300-
colorBlueSlider.value = VideoTabController.colorBlue
292+
var redValue = VideoTabController.colorRed
293+
var greenValue = VideoTabController.colorGreen
294+
var blueValue = VideoTabController.colorBlue
295+
colorRedText.text = Math.round(redValue * 100) + "%"
296+
colorGreenText.text = Math.round(greenValue * 100) + "%"
297+
colorBlueText.text = Math.round(blueValue * 100) + "%"
298+
colorRedSlider.value = redValue
299+
colorGreenSlider.value = greenValue
300+
colorBlueSlider.value = blueValue
301301
}
302302

303303
Connections {
@@ -317,13 +317,19 @@ GroupBox {
317317
}
318318

319319
onColorRedChanged:{
320-
colorRedSlider.value = VideoTabController.colorRed
320+
var redValue = VideoTabController.colorRed
321+
colorRedText.text = Math.round(redValue * 100) + "%"
322+
colorRedSlider.value = redValue
321323
}
322324
onColorGreenChanged:{
323-
colorGreenSlider.value = VideoTabController.colorGreen
325+
var greenValue = VideoTabController.colorGreen
326+
colorGreenText.text = Math.round(greenValue * 100) + "%"
327+
colorGreenSlider.value = greenValue
324328
}
325329
onColorBlueChanged:{
326-
colorBlueSlider.value = VideoTabController.colorBlue
330+
var blueValue = VideoTabController.colorBlue
331+
colorBlueText.text = Math.round(blueValue * 100) + "%"
332+
colorBlueSlider.value = blueValue
327333
}
328334
}
329335
}

0 commit comments

Comments
 (0)