Thursday, March 13, 2014

Week10 Blog6

Progress I made
  • Researched how to flash the countdown screen and countdown text. Found some code for flashing the text using QPropertyAnimation: https://gist.github.com/justinfx/5318065. But when I tried using this method, it keeps giving me "TypeError: unable to convert a Python 'QBrush' object to a C++ 'QColor' instance". So in the end, I decided to implement it my own way, which is to use another timer to keep track of when to change the colour of the display.
  • Following others' advice, made changes to the display: 1. If there's more than 2 minutes remaining, display only the minutes, e.g. "X min.", otherwise display minutes and seconds, e.g. "01:25"; 2. Flash the screen at 1 minute and at 30 seconds, using inverted screen colours; 3. When there's 10 seconds left, change countdown colour to red.
  • Looked over mentors' code reviews on Github and made some minor changes accordingly

Plans for next week
  •  I found that the display text size I set for the countdown string shows properly on my computer, but if I show it on a small computer, the proportion isn't right. I need to figure out a way to show the relative position instead of setting an absolute size.
  • Research and implement reminder sound function before the starting the recording of the current talk.

Problems
  • It seems that I don't understand what "rebase" does in git. On Freeseer's contributor guide, it says "Rebase frequently to incorporate changes from upstream". When I did that, it gave me all the merge conflicts, starting from the first commit I made in my pull request. So after an hour of solving the merge conflicts and pushing the unconflicted version into my Github pull request, I did "rebase" again to make sure I got the latest changes. But this put me right back to where I started: it again showed me all the merge conflicts starting from the first commit... I think I really need to go look up what "rebase" is before doing anything else.

No comments:

Post a Comment