v0.1.1

- Support for Wacom CTL-4100 (USB and Bluetooth). - Settings import / export to the main menu. - Wacom backup reader to the Wacom area tool. - Tablet benchmark tools to the console output context menu (Right click). - Moved the config.xml to the config folder. - Added noise reduction filter ("Noise" command, not in the GUI). - Refactored C++ code.
hawku · Mar 23, 2018 · 4903567 · 4903567
1 parent d33ab6c
commit 4903567
Show file tree

Hide file tree

Showing 28 changed files with 1,313 additions and 504 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.1.0.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.1.1.zip
 
 #
 
@@ -31,14 +31,16 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom CTL-480
   - Wacom CTH-480
   - Wacom CTL-490
-  - XP Pen G430
+  - XP Pen G430 (New 2016-2017 "Model B")
   - XP Pen G640
   - Huion 420
   - Huion H640P
   - Gaomon S56K
 
 ### Configured, but not properly tested:
   - Huion H420
+  - Wacom CTL-4100 USB
+  - Wacom CTL-4100 Bluetooth
   - Wacom CTH-470
   - Wacom CTH-670
   - Wacom CTL-671
@@ -63,10 +65,12 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 6. Start the TabletDriverGUI.exe
 
 ## Updating to a new version
+
 1. Unzip the new version
 2. Start the TabletDriverGUI.exe
 
 ## Uninstallation
+
 1. Uncheck the "Run at Windows startup" option in the GUI.
 2. Run `remove_vmulti_driver.bat`
 3. Run `remove_huion_64.bat`, which is in the `driver_huion` directory.
@@ -87,6 +91,15 @@ If you want to compile the code and don't want to install anything from the Tabl
 
 ## Changelog
 
+>**v0.1.1:**
+> - Added support for Wacom CTL-4100 (USB and Bluetooth)
+> - Added settings import / export to the main menu.
+> - Added Wacom backup reader to the Wacom area tool.
+> - Added tablet benchmark tools to the console output context menu (Right click).
+> - Moved the `config.xml` to the `config` folder.
+> - Added noise reduction filter (`Noise` command, not in the GUI)
+> - Code refactoring
+
 >**v0.1.0:**
 > - Added `Bench` / `Benchmark` command.
 > - Added `-hide` GUI command line parameter. GUI will start as minimized when you run `TabletDriverGUI.exe -hide` 

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
@@ -26,9 +26,9 @@ public enum OutputModes
 
         public Area ScreenArea;
 
-        public double FilterLatency;
-        public int FilterInterval;
-        public bool FilterEnabled;
+        public double SmoothingLatency;
+        public int SmoothingInterval;
+        public bool SmoothingEnabled;
 
         public Area DesktopSize;
         public bool AutomaticDesktopSize;
@@ -78,15 +78,15 @@ public Configuration()
             ButtonMap = new int[] { 1, 2, 3 };
             DisableButtons = false;
 
-            FilterEnabled = false;
-            FilterLatency = 0;
-            FilterInterval = 4;
+            SmoothingEnabled = false;
+            SmoothingLatency = 0;
+            SmoothingInterval = 4;
 
             CommandsAfter = new string[] { "" };
             CommandsBefore = new string[] { "" };
 
             WindowWidth = 800;
-            WindowHeight = 690;
+            WindowHeight = 710;
 
             RunAtStartup = false;
 

diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
-        Title="TabletDriverGUI" Height="670" Width="800"
+        Title="TabletDriverGUI" Height="670" Width="750"
         >
   <Window.Resources>
     <Style TargetType="GroupBox">
@@ -19,8 +19,21 @@
     </Style>
   </Window.Resources>
 
-  <Grid Background="Transparent">
-    <TabControl Name="tabControl" Margin="0,0,0,59"  Selector.IsSelected="True">
+  <Grid Background="Transparent" Margin="0,0,0,0">
+
+    <DockPanel Background="White">
+      <Menu DockPanel.Dock="Top"  Background="White">
+        <MenuItem Header="_File">
+          <MenuItem Name="mainMenuImport" Header="_Import Settings" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuExport" Header="_Export Settings" Click="MainMenuClick" />
+          <Separator />
+          <MenuItem Name="mainMenuExit" Header="E_xit" Click="MainMenuClick" />
+        </MenuItem>
+      </Menu>
+      <TextBox AcceptsReturn="True" />
+    </DockPanel>
+
+    <TabControl Name="tabControl" Margin="0,20,0,59"  Selector.IsSelected="True" Background="White">
       <TabItem Header="Settings">
         <ScrollViewer VerticalScrollBarVisibility="Auto">
           <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
@@ -48,6 +61,7 @@
               <StackPanel>
                 <!-- Screen map canvas -->
                 <Canvas Name="canvasScreenMap"
+                      Cursor="Hand"
                       Height="130" Margin="0,0,0,0"
                       Background="Transparent"
                       ClipToBounds="True"
@@ -162,7 +176,8 @@
 
                   </StackPanel>
                   <Canvas Grid.Column="1" Name="canvasTabletArea"
-                      Height="120" Margin="0"
+                      Cursor="Hand"
+                      Height="120" Margin="5,0,5,0"
                       Background="Transparent"
                       ClipToBounds="True"
 
@@ -265,7 +280,7 @@
                     Button Mapping
                     </TextBlock>
                     <TextBlock>
-                      - You can disable single button by selecting "Disable" from the list.
+                      - You can disable a single button by selecting "Disable" from the list.
                       <LineBreak/>
                       - The "Disable buttons" checkbox will disable all tablet buttons.
                     </TextBlock>
@@ -330,7 +345,7 @@
                   <!-- Filter Latency -->
                   <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
                     <Grid>
-                      <TextBox Name="textFilterLatency" Padding="4,0,0,0"
+                      <TextBox Name="textSmoothingLatency" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">0</TextBox>
                       <Label Width="30" HorizontalAlignment="Right">ms</Label>
@@ -339,7 +354,7 @@
 
                   <!-- Filter Rate -->
                   <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="85" Height="50">
-                    <ComboBox Name="comboBoxFilterRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
+                    <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
 
 
                       <ComboBoxItem>500 Hz</ComboBoxItem>
@@ -350,7 +365,7 @@
                   </GroupBox>
 
                   <!-- Filter enabled -->
-                  <CheckBox Name="checkBoxFilter"
+                  <CheckBox Name="checkBoxSmoothing"
                             VerticalAlignment="Center"
                             Margin="5"
                             Checked="CheckboxChanged" Unchecked="CheckboxChanged">
@@ -475,6 +490,8 @@
                   <MenuItem Name="menuStartDebug" Header="Start Debug Log" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuStopDebug" Header="Stop Debug Log" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuOpenDebug" Header="Open Latest Debug Log" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuRunBenchmark" Header="Run Benchmark" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuCopyBenchmark" Header="Copy Benchmark Result" Click="ConsoleMenuClick"></MenuItem>
                   <Separator/>
                   <MenuItem Name="menuOpenStartup" Header="Open Startup Log" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuOpenFolder" Header="Open TabletDriver Folder" Click="ConsoleMenuClick"></MenuItem>