These are chat archives for codyhan94/cs135-data-visualization

28th
Mar 2015
Jan Van Bruggen
@jvanbrug
Mar 28 2015 00:05
@yaoshenghan what files from the only_internal branch should be merged?
Jan Van Bruggen
@jvanbrug
Mar 28 2015 00:26
@yaoshenghan @minfawan @fictivelogic @codyhan94 @obinnae I want to make the repository safe for Desmond to merge into his repo. To do this, we will need to eliminate our unnecessary changes to GUI_Demo. Can I revert all of your work? Secondly, do you think I should revert to BEFORE or AFTER my reformatting/refactoring/cleanup?
minfawang
@minfawang
Mar 28 2015 01:32
I didn’t have any un-committed progress, so it’s okay for me..
Jan Van Bruggen
@jvanbrug
Mar 28 2015 02:14
Sorry, I'll clarify. You all committed changes to GUI_Demo related to mulithreading and database, but those changes don't add anything to GUI_Demo and all changes have been merged into rossiviz. I'm asking if I can safely revert GUI_Demo to my early reformatting commits.
yaoshenghan
@yaoshenghan
Mar 28 2015 15:53
Sorry I just got back, I think we can revert to BEFORE and keep a branch of AFTER so they can test on AFTER. As far as the only_internal branch, I only modified Scenario.
I think we should be fine just revert to AFTER, I think it should be good, but just in case they want to test, we can have multiple branches.
My file has not been finished yet, but I commented the code in very detail, so I think they can carry it on. I will try to keep work on it and finish it up in the next a few days, but can’t guarantee :)
Jan Van Bruggen
@jvanbrug
Mar 28 2015 16:04
@yaoshenghan Sure, take your time with that :smile:
@minfawan @yaoshenghan I just realized some of your statistics might actually be useful to their GUI_Demo. Would you recommend keeping any of your changes? Does anything improve GUI_Demo with multithreading or pre-processing?
yaoshenghan
@yaoshenghan
Mar 28 2015 16:12
Yes, they will be helpful and they integrate quite well with their existing code.
Jan Van Bruggen
@jvanbrug
Mar 28 2015 16:28
Okay, then let me know what commits should stay with GUI_Demo to merge into their repo