-
Notifications
You must be signed in to change notification settings - Fork 82
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KinectViewer bug fix, Resizable Test project UI, Using KinectViewer at Test Project #12
Conversation
- Cleanup at KinectViewer.xaml and KinectViewer.xaml.cs - Added method Update(BitmapSource) to KinectViewer control for easier porting of code that wasn't using an Image and a Canvas directly instead of a KinectViewer control - At Test project's MainWindow.xaml changed XAML to use a Viewbox (set to Stretch="UniformToFill") hosting a Grid in which there is the Image (set to Stetch="None") and the Canvas - Updated Test project's MainWindow.xaml and MainWindow.xaml.cs at VitruviusTest project to use KinectViewer control instead of Image and Canvas controls (have previous XAML block commented-out and a conditional define USE_KINECTVIEWER in the code to switch to the previous code that doesn't use KinectViewer control) - Fixed bug at KinectViewer's "UserControl_SizeChanged" event handler which resulted into UpdateCanvas not getting called
(UPDATE: fixed the merge conflict with Readme.md file from my side) Probably the edit to README.md cause the Merge Conflict it says above. GitHub should be showing you some instructions on how to resolve this manually. I have tried to repeat the change you did to README.md at my repo in case it helps with the merging |
note that I have also done a bug fix to KinectViewer control (for Kinect v1) in this bunch of changes. It was in the SizeChanged event handler. Maybe the Kinect v2 and WinRT versions need similar change if they have the same control, haven't checked yet since I don't have the Kinect v2 |
You can now pull the above changes automatically, since I've managed to resolve the Merge conflict by creating a Pull Request from your repo to mine (telling GitHub to compare forks instead of branches after pressing Pull Request at your repo) and then at command line in my repo did the steps GitHub site suggested, with some guesswork in between (writing down here in case I come across this again): git checkout -b LightBuzz-master master git commit -am "merged Readme.md" (it wasn't suggesting this, but was needed since it was failing to automerge although our Readme.md files were identical after I had manually done and pushed the same change you had done to it) git checkout master |
…ined there after I added and then removed again Readme.md, since they were keeping full pathnames because they're outside the folder subtree of the .sln file)
Cleanup and some small optimization at Kinect V1 Solution
- using the VisualizationMode enum from Vitruvius library instead of a separate Mode helper enum type - added Mode property instead of mode class field, so that if USE_KINECTVIEWER conditional symbol is not defined, it will use an autoproperty, else it will use kinectViewer.FrameType
…r control - At VitruviusTest demo app using FlipHorizontally=true when set to use the KinectViewer control
KinectViewer bug fix, Resizable Test project UI, Using KinectViewer at Test Project
No description provided.