Fixed device rotation/scaling in UI

src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorViewModel.cs

@@ -20,7 +20,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
     {
         private readonly IProfileService _profileService;
         private readonly IDialogService _dialogService;
-        private Profile _selectedProfile;
 
         public ProfileEditorViewModel(ProfileModule module, ICollection<ProfileEditorPanelViewModel> viewModels, IProfileService profileService, IDialogService dialogService)
         {
@@ -39,7 +38,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
 
             Items.AddRange(viewModels);
 
-            module.ActiveProfileChanged += ModuleOnActiveProfileChanged;
+            module.ActiveProfileChanged += ModuleOnActiveProfileChanged;            
         }
 
         public ProfileModule Module { get; }
@@ -50,28 +49,24 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
         public ProfileViewModel ProfileViewModel { get; }
 
         public BindableCollection<Profile> Profiles { get; set; }
-
         public Profile SelectedProfile
         {
-            get => _selectedProfile;
-            set
-            {
-                if (_selectedProfile == value)
-                    return;
-
-                var old = _selectedProfile;
-                _selectedProfile = value;
-                ChangeActiveProfile(old);
-            }
+            get => Module.ActiveProfile;
+            set => ChangeSelectedProfile(value);
         }
 
-        private void ChangeActiveProfile(Profile oldProfile)
+        private void ChangeSelectedProfile(Profile profile)
         {
-            Module.ChangeActiveProfile(_selectedProfile);
-            if (_selectedProfile != null)
-                _profileService.UpdateProfile(_selectedProfile, false);
+            if (profile == Module.ActiveProfile)
+                return;
+
+            var oldProfile = Module.ActiveProfile;
+            Module.ChangeActiveProfile(profile);
+
             if (oldProfile != null)
                 _profileService.UpdateProfile(oldProfile, false);
+            if (profile != null)
+                _profileService.UpdateProfile(profile, false);
         }
 
         public bool CanDeleteActiveProfile => SelectedProfile != null && Profiles.Count > 1;
@@ -107,7 +102,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor
             var newActiveProfile = index - 1 > -1 ? Profiles[index - 1] : Profiles[index + 1];
 
             // Activate the new active profile
-            Module.ChangeActiveProfile(newActiveProfile);
+            SelectedProfile = newActiveProfile;
 
             // Remove the old one
             Profiles.Remove(profile);

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileDeviceView.xaml

@@ -13,16 +13,21 @@
         <converters:NullToImageConverter x:Key="NullToImageConverter" />
         <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
     </UserControl.Resources>
-    <Grid>
+
+    <Grid Width="{Binding Device.RgbDevice.ActualSize.Width}" Height="{Binding Device.RgbDevice.ActualSize.Height}">
+        <Grid.LayoutTransform>
+            <RotateTransform Angle="{Binding Device.Rotation}" />
+        </Grid.LayoutTransform>
+
         <!-- Device image with fallback -->
-        <Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}, Mode=OneWay}" />
+        <Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" VerticalAlignment="Top" HorizontalAlignment="Left" />
 
         <Rectangle Fill="{DynamicResource ControlBackgroundBrush}"
                    Stroke="{DynamicResource ControlBorderBrush}"
                    StrokeThickness="1"
-                   Visibility="{Binding Device.RgbDevice.DeviceInfo.Image, ConverterParameter=Inverted, Converter={StaticResource NullToVisibilityConverter}, Mode=OneWay}" />
+                   Visibility="{Binding Device.RgbDevice.DeviceInfo.Image, ConverterParameter=Inverted, Converter={StaticResource NullToVisibilityConverter}}" />
         <TextBlock Text="{Binding Device.RgbDevice.DeviceInfo.DeviceName}"
-                   Visibility="{Binding Device.RgbDevice.DeviceInfo.Image, ConverterParameter=Inverted, Converter={StaticResource NullToVisibilityConverter}, Mode=OneWay}"
+                   Visibility="{Binding Device.RgbDevice.DeviceInfo.Image, ConverterParameter=Inverted, Converter={StaticResource NullToVisibilityConverter}}"
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
                    TextWrapping="Wrap"
@@ -37,13 +42,13 @@
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemContainerStyle>
                 <Style TargetType="{x:Type ContentPresenter}">
-                    <Setter Property="Canvas.Left" Value="{Binding X, Mode=OneWay}" />
-                    <Setter Property="Canvas.Top" Value="{Binding Y, Mode=OneWay}" />
+                    <Setter Property="Canvas.Left" Value="{Binding X}" />
+                    <Setter Property="Canvas.Top" Value="{Binding Y}" />
                 </Style>
             </ItemsControl.ItemContainerStyle>
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <ContentControl Width="{Binding Width, Mode=OneWay}" Height="{Binding Height, Mode=OneWay}" s:View.Model="{Binding}" />
+                    <ContentControl Width="{Binding Width}" Height="{Binding Height}" s:View.Model="{Binding}" />
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedView.xaml

@@ -12,7 +12,7 @@
     <UserControl.Resources>
         <converters:NullToImageConverter x:Key="NullToImageConverter" />
     </UserControl.Resources>
-    <Canvas Width="{Binding Width, Mode=OneWay}" Height="{Binding Height, Mode=OneWay}">
+    <Canvas Width="{Binding Led.ActualSize.Width, Mode=OneWay}" Height="{Binding Led.ActualSize.Height, Mode=OneWay}">
         <Canvas.Background>
             <ImageBrush AlignmentX="Center" AlignmentY="Center" Stretch="Fill"
                         ImageSource="{Binding Led.Image, Converter={StaticResource NullToImageConverter}, Mode=OneWay}" />

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileLedViewModel.cs

@@ -13,10 +13,12 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
         public ProfileLedViewModel(Led led)
         {
             Led = led;
-            X = Led.Location.X;
-            Y = Led.Location.Y;
-            Width = Led.Size.Width;
-            Height = Led.Size.Height;
+
+            // Don't want ActualLocation here since rotation is done in XAML
+            X = Led.Location.X * Led.Device.Scale.Horizontal;
+            Y = Led.Location.Y * Led.Device.Scale.Vertical;
+            Width = Led.ActualSize.Width;
+            Height = Led.ActualSize.Height;
 
             Execute.OnUIThread(CreateLedGeometry);
         }
@@ -63,17 +65,18 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
 
         private void CreateRectangleGeometry()
         {
-            DisplayGeometry = new RectangleGeometry(new Rect(0.5, 0.5, Led.Size.Width - 1, Led.Size.Height - 1));
+
+            DisplayGeometry = new RectangleGeometry(new Rect(0.5, 0.5, Width - 1, Height - 1));
         }
 
         private void CreateCircleGeometry()
         {
-            DisplayGeometry = new EllipseGeometry(new Rect(0.5, 0.5, Led.Size.Width - 1, Led.Size.Height - 1));
+            DisplayGeometry = new EllipseGeometry(new Rect(0.5, 0.5, Width - 1, Height - 1));
         }
 
         private void CreateKeyCapGeometry()
         {
-            DisplayGeometry = new RectangleGeometry(new Rect(1, 1, Led.Size.Width - 2, Led.Size.Height - 2), 1.6, 1.6);
+            DisplayGeometry = new RectangleGeometry(new Rect(1, 1, Width - 2, Height - 2), 1.6, 1.6);
         }
 
         private void CreateCustomGeometry(double deflateAmount)
@@ -88,7 +91,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization
                     {
                         Children = new TransformCollection
                         {
-                            new ScaleTransform(Led.Size.Width - deflateAmount, Led.Size.Height - deflateAmount),
+                            new ScaleTransform(Width - deflateAmount, Height - deflateAmount),
                             new TranslateTransform(deflateAmount / 2, deflateAmount / 2)
                         }
                     }

src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/ProfileView.xaml

@@ -43,8 +43,7 @@
                   MouseDown="{s:Action EditorGridMouseClick}"
                   MouseMove="{s:Action EditorGridMouseMove}">
         <Grid.Background>
-            <VisualBrush TileMode="Tile" Stretch="Uniform"
-                                 Viewport="{Binding PanZoomViewModel.BackgroundViewport}" ViewportUnits="Absolute">
+            <VisualBrush TileMode="Tile" Stretch="Uniform" Viewport="{Binding PanZoomViewModel.BackgroundViewport}" ViewportUnits="Absolute">
                 <VisualBrush.Visual>
                     <Grid Width="20" Height="20">
                         <Grid.RowDefinitions>
@@ -102,9 +101,7 @@
                 </ItemsControl.ItemContainerStyle>
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <ContentControl Width="{Binding Device.RgbDevice.Size.Width}"
-                                                Height="{Binding Device.RgbDevice.Size.Height}"
-                                                s:View.Model="{Binding}" />
+                        <ContentControl s:View.Model="{Binding}" />
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>