jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-12 10:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Info.plist:

Browse Source 
* packages.config:
* qController.iOS.csproj:
* qController.Droid.csproj:
* AndroidManifest.xml:
* qController.csproj: Update Packages

* ControlPage.xaml.cs:
* QLevelsCell.cs: Revert multi level sliders...ugh
This commit is contained in:
Joel Wetzell
2021-04-29 01:00:59 -05:00
parent 0621275605
commit d391e6a688
8 changed files with 106 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Cell/QLevelsCell.cs
+44 -44
View File
@@ -9,15 +9,11 @@ namespace qController.Cell
public List<double> levels;
public string activeCue;
public Slider mainSlider;
//public Slider leftSlider;
//public Slider rightSlider;
public Slider leftSlider;
public Slider rightSlider;
public Label mainLabel;
//public Label rightLabel;
//public Label leftLabel;
public List<Slider> sliders = new List<Slider>();
public List<Label> sliderLabels = new List<Label>();
public Label rightLabel;
public Label leftLabel;
public QLevelsCell()
{
Padding = new Thickness(5);
@@ -26,8 +22,6 @@ namespace qController.Cell
HasShadow = true;
BackgroundColor = Color.FromHex("D8D8D8");
IsVisible = false;
int numberOfChannelsVisible = 6;
//highlight for testing
//BackgroundColor = Color.Red;
@@ -37,13 +31,14 @@ namespace qController.Cell
Padding = new Thickness(0),
RowDefinitions = {
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star}
},
ColumnDefinitions = {
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}
}
};
@@ -55,48 +50,52 @@ namespace qController.Cell
};
for (int i = 0; i < numberOfChannelsVisible; i++)
leftSlider = new Slider
{
var sliderToAdd = new Slider
{
Minimum = -60,
Maximum = 12
};
Minimum = -60,
Maximum = 12
};
var labelToAdd = new Label
{
Text = $"{i + 1}:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
var valueLabelToAdd = new Label
{
Text = "",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
rightSlider = new Slider
{
Minimum = -60,
Maximum = 12
};
mainG.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
mainG.Children.Add(sliderToAdd, 1, i + 1);
Grid.SetColumnSpan(sliderToAdd, 4);
mainG.Children.Add(labelToAdd, 0, i + 1);
mainG.Children.Add(valueLabelToAdd, 5, i + 1);
sliders.Add(sliderToAdd);
sliderLabels.Add(valueLabelToAdd);
}
mainLabel = new Label
{
Text = "M:",
Text = "MAIN:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
leftLabel = new Label
{
Text = "1:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
rightLabel = new Label
{
Text = "2:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
mainG.Children.Add(mainSlider, 1, 0);
mainG.Children.Add(leftSlider, 1, 1);
mainG.Children.Add(rightSlider, 1, 2);
Grid.SetColumnSpan(mainSlider, 4);
Grid.SetColumnSpan(leftSlider, 4);
Grid.SetColumnSpan(rightSlider, 4);
mainG.Children.Add(mainLabel, 0, 0);
mainG.Children.Add(leftLabel, 0, 1);
mainG.Children.Add(rightLabel, 0, 2);
Content = mainG;
Margin = new Thickness(10);
@@ -109,12 +108,13 @@ namespace qController.Cell
{
mainSlider.Value = levels[0];
}
for (int i = 0; i < sliders.Count; i++)
if (leftSlider != null)
{
Slider slider = sliders[i];
Label label = sliderLabels[i];
slider.Value = levels[i + 1];
label.Text = $"{levels[i + 1]}";
leftSlider.Value = levels[1];
}
if (rightSlider != null)
{
rightSlider.Value = levels[2];
}
}
}
qController.Standard/Pages/ControlPage.xaml.cs
+13 -14
View File
@@ -176,22 +176,21 @@ namespace qController
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/0", (float)args.NewValue);
};
for (int i = 0; i < qLevelsCell.sliders.Count; i++)
qLevelsCell.leftSlider.ValueChanged += (sender, args) =>
{
var channel = i + 1;
Log.Debug("Setting value changed for channel: " + channel);
qLevelsCell.sliders[i].ValueChanged += (sender, args) =>
{
qLevelsCell.sliderLabels[channel - 1].Text = $"{args.NewValue}";
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/" + channel, (float)args.NewValue);
};
}
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/1", (float)args.NewValue);
};
qLevelsCell.rightSlider.ValueChanged += (sender, args) =>
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/2", (float)args.NewValue);
};
showLevelsButton = new QLevelsButton();
showLevelsButton.button.Clicked += ToggeQLevelsCellVisiblity;
showLevelsButton.button.Clicked += (s, e) =>
{
qLevelsCell.IsVisible = !qLevelsCell.IsVisible;
};
qControlsBlock = new QControlsBlock(SendOSCFromButton);
AbsoluteLayout.SetLayoutFlags(qControlsBlock, AbsoluteLayoutFlags.All);
@@ -203,12 +202,12 @@ namespace qController
{
case Device.iOS:
AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.53, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0, 0.63, 1, 0.35));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.40, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.34, App.HeightUnit * 8, App.HeightUnit * 8));
break;
case Device.Android:
AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.58, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0, 0.63, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.45, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.39, App.HeightUnit * 8, App.HeightUnit * 8));
break;
}
qController.Standard/qController.csproj
+7
View File
@@ -6,6 +6,13 @@
<RootNamespace>qController</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
<Compile Remove="MyPage.cs" />
<Compile Remove="Bespoke.Osc\Bespoke.Common.Osc\Properties\AssemblyInfo.cs" />