[Flightgear-devel] New feature: METAR for multiple airports
Hi, I just pushed a patch that provides functionality for more than one METAR in the property tree. This patch also provides the magnetic variation for the reporting station exposed to a property. For backwards compatibility, the METAR for the nearest airport still live under /environment/metar. This report is pulled from NOAA on a regular schedule. I have configured eight additional sets of METAR properties, they live under /environment/metar[1] ..to.. /environment/metar[6] /environment/metar[10] /environment/metar[11] each of them share the same behaviour: everytime, the associated property time-to-live is zero, a report for the station named in the property station-id is requested from NOAA, parsed and written to the corresponding properties for that station. My idea is to have the /environment/metar indexes [1..6] to be used for ATIS weather. A system (still to be created) should check the currently selected radio frequencies, find the associated airport and write that airport id to it's corresponding station-id, along with set time-to-live set to zero and valid set to false. The realwx system now schedules a http request, tries to parse the response, fills all properties and sets valid to true. The report will be reloaded every time, the property time-to-live gets zero. This property counts down automatically. The metar indeces 10 and up are for user-defined weather systems, like the local-weather and can be used for lateral weather interpolation and alike. All these modifications should not change the current behaviour of the live- weather system. If it does, it's a bug! I hope, this prepares the ground for a more realistic weather system and correct ATIS report for the tuned station. Happy new year, everybody! Torsten -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] An introduction and what happened
In article 13d7d9d025e1422693ae173329a5d...@circustar2 you wrote: center. They were cleaning out and I inherited an IBM x455 cluster. Its 4 chassis each equipped with 4 1.5Ghz Itanium 2's and 16GB ram for a system total of 16 Itanium 2's and 64GB ram. The topic has been pretty silent for a while without any feedback. Is the system still available ? Cheers, Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! -- -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
On Tue, Jan 4, 2011 at 2:44 PM, Curtis Olson wrote: Ok, thanks for all the advice. git diff --cached did show me my actual change that git diff had lost. I doubt I'll remember that next time I need it. So I'll look at making changes to a branch in the future. At the moment I'm just trying to unwind my current tree. Apologies if I screw something up in the process ... Ok, I'm ready for some more hand holding with git. :-) Following the advice of the experts, I have created my own local branch of flightgear by cd'ing to the flightgear source tree and running: git branch mystuff It appears that the local changes I had made to the next branch were automatically migrated to the new mystuff branch. I can run git checkout mystuff and then run git branch and my new branch is listed with a star (*) next to it, which means it was actually created and now it is the current branch. (Correct?) I can now run git checkout next to get back to the head if that is the right term in git. And I can run git checkout mystuff to return to my local branch. Now questions: - What is the best way to clean up my next branch of all the changes I had previously made before I created my own branch? I'd like to return it to it's pristine untouched state now that I have a local branch for my local changes. - What is the best way now to keep my next branch current with upstream changes? - What is the best way to keep my mystuff branch current and merge upstream changes back to my local branch while preserving my local changes and possibly carrying any uncommitted tweaks forward as uncommitted tweaks? Thanks, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/http://www.flightgear.org/blogs/category/personal/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] mouse acceleration
Hi guys.
Is there any interest in mouse acceleration properties, besides myself ?
I,ve added it locally , and have mouse drag pedestal controls in the Aerostar .
The calculation is already done in the code, FGMouseInput.cxx , so
I've simply written each to a property:
At line 317:
if (x != m.x) {
int delta = x - m.x;
fgSetInt(/devices/status/mice/mouse/accel-x, delta);
for (unsigned int i = 0; i mode.x_bindings[modifiers].size(); i++)
mode.x_bindings[modifiers][i]-fire(double(delta), double(xsize));
}
if (y != m.y) {
int delta = y - m.y;
fgSetInt(/devices/status/mice/mouse/accel-y, -1 * delta);
for (unsigned int i = 0; i mode.y_bindings[modifiers].size(); i++)
mode.y_bindings[modifiers][i]-fire(double(delta), double(ysize));
}
I figured there was no point doing a patch for 2 lines of code , and
if no one else sees a use for it , it's easy to do with nasal...
Cheers
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Hi,
Can you explain it a bit more detailed?
Is this the same as the manual which you move with the mouse in the
B1900d-cockpit?
Cheers
Heiko
Hi guys.
Is there any interest in mouse acceleration properties,
besides myself ?
I,ve added it locally , and have mouse drag pedestal
controls in the Aerostar .
The calculation is already done in the code,
FGMouseInput.cxx , so
I've simply written each to a property:
At line 317:
if (x != m.x) {
int delta = x - m.x;
fgSetInt(/devices/status/mice/mouse/accel-x,
delta);
for (unsigned int i = 0; i
mode.x_bindings[modifiers].size(); i++)
mode.x_bindings[modifiers][i]-fire(double(delta),
double(xsize));
}
if (y != m.y) {
int delta = y - m.y;
fgSetInt(/devices/status/mice/mouse/accel-y, -1 * delta);
for (unsigned int i = 0; i
mode.y_bindings[modifiers].size(); i++)
mode.y_bindings[modifiers][i]-fire(double(delta),
double(ysize));
}
I figured there was no point doing a patch for 2 lines of
code , and
if no one else sees a use for it , it's easy to do with
nasal...
Cheers
--
Gaining the trust of online customers is vital for the
success of any company
that requires sensitive data to be transmitted over the
Web. Learn how to
best implement a security strategy that keeps consumers'
information secure
and instills the confidence they need to proceed with
transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
Another git question ... I created a mychanges branch with git branch mychanges. I run git branch and I see a * beside mychanges in the list of branches. I make a small test edit to a file (src/GUI/MapWidget.cxx). I run git checkout next to return to the pristine unchanged branch that tracks the head on gitorious --- but here is the output: $ git checkout next M src/GUI/MapWidget.cxx Switched to branch 'next' $ git branch maint mychanges * next next is the current branch, but the change I made in the mychanges branch to MapWidget.cxx is still visible. What am I missing? Why is a change that I made in one branch being shown in a different branch? Thanks, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/http://www.flightgear.org/blogs/category/personal/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Yes, the two lines of code I added just write the mouse xy movement to
properties.With nasal I have to calculate the movement,which is done
in the mouse code already.I've set up the Aerostar so I can click and
slide the throttle,mixture and propeller levers in pairs, or
Shift-drag to move each lever individually,by dragging the mouse up
and down.
On Friday, January 7, 2011, Heiko Schulz aeitsch...@yahoo.de wrote:
Hi,
Can you explain it a bit more detailed?
Is this the same as the manual which you move with the mouse in the
B1900d-cockpit?
Cheers
Heiko
Hi guys.
Is there any interest in mouse acceleration properties,
besides myself ?
I,ve added it locally , and have mouse drag pedestal
controls in the Aerostar .
The calculation is already done in the code,
FGMouseInput.cxx , so
I've simply written each to a property:
At line 317:
if (x != m.x) {
int delta = x - m.x;
fgSetInt(/devices/status/mice/mouse/accel-x,
delta);
for (unsigned int i = 0; i
mode.x_bindings[modifiers].size(); i++)
mode.x_bindings[modifiers][i]-fire(double(delta),
double(xsize));
}
if (y != m.y) {
int delta = y - m.y;
fgSetInt(/devices/status/mice/mouse/accel-y, -1 * delta);
for (unsigned int i = 0; i
mode.y_bindings[modifiers].size(); i++)
mode.y_bindings[modifiers][i]-fire(double(delta),
double(ysize));
}
I figured there was no point doing a patch for 2 lines of
code , and
if no one else sees a use for it , it's easy to do with
nasal...
Cheers
--
Gaining the trust of online customers is vital for the
success of any company
that requires sensitive data to be transmitted over the
Web. Learn how to
best implement a security strategy that keeps consumers'
information secure
and instills the confidence they need to proceed with
transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Is there any interest in mouse acceleration properties, besides myself ? Defenitely yes! Much, much nicer/realistic for levers! Gijs -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
On Jan 7, 2011, at 1:13 PM, syd adams wrote:
Yes, the two lines of code I added just write the mouse xy movement to
properties.With nasal I have to calculate the movement,which is done
in the mouse code already.I've set up the Aerostar so I can click and
slide the throttle,mixture and propeller levers in pairs, or
Shift-drag to move each lever individually,by dragging the mouse up
and down.
This is an excellent addition!
On Friday, January 7, 2011, Heiko Schulz aeitsch...@yahoo.de wrote:
Hi,
Can you explain it a bit more detailed?
Is this the same as the manual which you move with the mouse in the
B1900d-cockpit?
Cheers
Heiko
Hi guys.
Is there any interest in mouse acceleration properties,
besides myself ?
I,ve added it locally , and have mouse drag pedestal
controls in the Aerostar .
The calculation is already done in the code,
FGMouseInput.cxx , so
I've simply written each to a property:
At line 317:
if (x != m.x) {
int delta = x - m.x;
fgSetInt(/devices/status/mice/mouse/accel-x,
delta);
for (unsigned int i = 0; i
mode.x_bindings[modifiers].size(); i++)
mode.x_bindings[modifiers][i]-fire(double(delta),
double(xsize));
}
if (y != m.y) {
int delta = y - m.y;
fgSetInt(/devices/status/mice/mouse/accel-y, -1 * delta);
for (unsigned int i = 0; i
mode.y_bindings[modifiers].size(); i++)
mode.y_bindings[modifiers][i]-fire(double(delta),
double(ysize));
}
I figured there was no point doing a patch for 2 lines of
code , and
if no one else sees a use for it , it's easy to do with
nasal...
Cheers
--
Gaining the trust of online customers is vital for the
success of any company
that requires sensitive data to be transmitted over the
Web. Learn how to
best implement a security strategy that keeps consumers'
information secure
and instills the confidence they need to proceed with
transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
On Fri, Jan 7, 2011 at 6:58 PM, Curtis Olson wrote: I make a small test edit to a file (src/GUI/MapWidget.cxx). I run git checkout next to return to the pristine unchanged branch that tracks the head on gitorious --- but here is the output: $ git checkout next M src/GUI/MapWidget.cxx Switched to branch 'next' $ git branch maint mychanges * next next is the current branch, but the change I made in the mychanges branch to MapWidget.cxx is still visible. What am I missing? Why is a change that I made in one branch being shown in a different branch? The change you made is _not_ in any branch yet. It's just a local change in your filesystem. git doesn't automatically add any changes to a branch. Maybe you just edited the file for a temporary test. Or you find out the change doesn't work at all and want to revert it immediately. You need to explicitly add any change to a branch - otherwise the change isn't in git. So, only when you run git add MapWidget.cxx; git commit is your modified file added to the current branch. Running git checkout somebranch won't touch modified files in your filesystem. I actually really like this feature: you can make local changes and then quickly change branches to see how the changes work with different branches. When you're happy, you switch to the branch you want to commit it to and finally add and commit the change to git. cheers, Thorsten -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
On Fri, Jan 7, 2011 at 6:58 PM, Curtis Olson wrote: I make a small test edit to a file (src/GUI/MapWidget.cxx). I run git checkout next to return to the pristine unchanged branch that tracks the head on gitorious --- but here is the output: $ git checkout next M src/GUI/MapWidget.cxx Switched to branch 'next' $ git branch maint mychanges * next next is the current branch, but the change I made in the mychanges branch to MapWidget.cxx is still visible. What am I missing? Why is a change that I made in one branch being shown in a different branch? On Fri, Jan 7, 2011 at 12:34 PM, ThorstenB wrote: The change you made is _not_ in any branch yet. It's just a local change in your filesystem. git doesn't automatically add any changes to a branch. Maybe you just edited the file for a temporary test. Or you find out the change doesn't work at all and want to revert it immediately. You need to explicitly add any change to a branch - otherwise the change isn't in git. So, only when you run git add MapWidget.cxx; git commit is your modified file added to the current branch. Running git checkout somebranch won't touch modified files in your filesystem. I actually really like this feature: you can make local changes and then quickly change branches to see how the changes work with different branches. When you're happy, you switch to the branch you want to commit it to and finally add and commit the change to git. Hi Torsten, Ok, this makes sense the way you explain it. So what happens if I'm messing around with my WildCrazyIdea-I-WantToTry branch over lunch, and suddenly I get a phone call and have to jump back to doing something serious with FlightGear and need to quickly switch back to my RealWork branch. Do I have to commit my CrazyIdea branch changes --- no matter what intermediate state of weirdness they are in --- before I can switch back to the RealWork branch? Thanks, Curt. -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/http://www.flightgear.org/blogs/category/personal/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
On Fri, Jan 7, 2011 at 7:48 PM, Curtis Olson wrote: So what happens if I'm messing around with my WildCrazyIdea-I-WantToTry branch over lunch, and suddenly I get a phone call and have to jump back to doing something serious with FlightGear and need to quickly switch back to my RealWork branch. Do I have to commit my CrazyIdea branch changes --- no matter what intermediate state of weirdness they are in --- before I can switch back to the RealWork branch? If you want git to take care of switching these files, then yes, you'll need to commit them to some branch. I'm not familiar with this stashing option. What I'd do is either commit the changes to the current branch - or, in case the changes are just too experimental and I really don't want to modify the current branch, I just create a new branch git checkout crazyidea. The new branch is identical to the former current branch then. So I can just addcommit the experimental changes to the new crazyidea branch and then switch back to the former working branch - or to some other stable branch... And you can always remove the crazyidea branch again - if the idea turns out not to be so good after all, or you just wanted something temporary. cheers, Thorsten -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
Hi Thorsten, Thanks for explaining this in detail. So here is my next question related to dealing with local branches. Let's say I make a local branch, make some changes, and I'm finally happy with those changes, so I commit them. (Or maybe I've committed several revisions of my changes over the past few days and I'm finally happy with the current state of things.) Now I want to roll these changes in my local branch back into next and push them up to the upstream repository. What is the procedure for doing that? And if in the mean time, other people have made changes and commited them and pushed them up to the next branch, how do I update my local branch to have all the latest changes that other people have made? Thanks, Curt. On Fri, Jan 7, 2011 at 1:00 PM, ThorstenB bre...@gmail.com wrote: On Fri, Jan 7, 2011 at 7:48 PM, Curtis Olson wrote: So what happens if I'm messing around with my WildCrazyIdea-I-WantToTry branch over lunch, and suddenly I get a phone call and have to jump back to doing something serious with FlightGear and need to quickly switch back to my RealWork branch. Do I have to commit my CrazyIdea branch changes --- no matter what intermediate state of weirdness they are in --- before I can switch back to the RealWork branch? If you want git to take care of switching these files, then yes, you'll need to commit them to some branch. I'm not familiar with this stashing option. What I'd do is either commit the changes to the current branch - or, in case the changes are just too experimental and I really don't want to modify the current branch, I just create a new branch git checkout crazyidea. The new branch is identical to the former current branch then. So I can just addcommit the experimental changes to the new crazyidea branch and then switch back to the former working branch - or to some other stable branch... And you can always remove the crazyidea branch again - if the idea turns out not to be so good after all, or you just wanted something temporary. cheers, Thorsten -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/http://www.flightgear.org/blogs/category/personal/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
Hi Curt, git merge is your friend! Perhaps a complete example workflow will help you get along: suppose you are on branch next tracking the gitorious branch next. git branch wip -- wip is now an exact copy of the next branch git checkout wip Edit files to add some really cool feature git add [files to add] -- select which modified files you want to commit to branch wip git commit Suppose you want to update your next branch, and incorporate those changes in you wip branch: git checkout next git pull -- updates your branch next. Should not produce any merge-conflicts, since you didn't alter anything in your local branch git checkout wip git merge next -- merges changes in next into your wip branch (in case of merge-conflicts, fix 'em) git add [conflicted files] -- git's way of marking the conflicts resolved git commit Suppose you've got your wip branch in good shape, and up to date (ie, you've just merged next into wip) and want to push to gitorious: git checkout next git merge wip -- should not produce merge-conflicts, since wip was already up to date git push Then another useful feature of git: you can easily alter history. (NOTE: you should only change history that is only your own repo. Don't change the history which is already in more repos (pushed to gitorious) git commit --amend-- extends the previous commit. Useful when you're working in a branch, and need to make a temp commit to be able to switch branches. You should also be able to use git stash in this case, but I find this to be a lot less confusing than git stash Hope this helps, Stefan 2011/1/7 Curtis Olson curtol...@gmail.com: Hi Thorsten, Thanks for explaining this in detail. So here is my next question related to dealing with local branches. Let's say I make a local branch, make some changes, and I'm finally happy with those changes, so I commit them. (Or maybe I've committed several revisions of my changes over the past few days and I'm finally happy with the current state of things.) Now I want to roll these changes in my local branch back into next and push them up to the upstream repository. What is the procedure for doing that? And if in the mean time, other people have made changes and commited them and pushed them up to the next branch, how do I update my local branch to have all the latest changes that other people have made? Thanks, Curt. On Fri, Jan 7, 2011 at 1:00 PM, ThorstenB bre...@gmail.com wrote: On Fri, Jan 7, 2011 at 7:48 PM, Curtis Olson wrote: So what happens if I'm messing around with my WildCrazyIdea-I-WantToTry branch over lunch, and suddenly I get a phone call and have to jump back to doing something serious with FlightGear and need to quickly switch back to my RealWork branch. Do I have to commit my CrazyIdea branch changes --- no matter what intermediate state of weirdness they are in --- before I can switch back to the RealWork branch? If you want git to take care of switching these files, then yes, you'll need to commit them to some branch. I'm not familiar with this stashing option. What I'd do is either commit the changes to the current branch - or, in case the changes are just too experimental and I really don't want to modify the current branch, I just create a new branch git checkout crazyidea. The new branch is identical to the former current branch then. So I can just addcommit the experimental changes to the new crazyidea branch and then switch back to the former working branch - or to some other stable branch... And you can always remove the crazyidea branch again - if the idea turns out not to be so good after all, or you just wanted something temporary. cheers, Thorsten -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list
Re: [Flightgear-devel] git for dummies
Curtis Olson wrote: - What is the best way to clean up my next branch of all the changes I had previously made before I created my own branch? I'd like to return it to it's pristine untouched state now that I have a local branch for my local changes. If anything else fails, if next in your local GIT repo is in clean state without any local changes added, if you just want to have a clean checkout of next, then rm -rf *; git checkout -f next should do the job. Cheers, Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! -- -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
Hi Stefan, Thanks for the reply. You are exactly right to notice that I am struggling a bit to understand the proper git workflow when dealing with branches. I have a couple more questions inserted below ... On Fri, Jan 7, 2011 at 1:39 PM, stefan riemens wrote: Hi Curt, git merge is your friend! Perhaps a complete example workflow will help you get along: suppose you are on branch next tracking the gitorious branch next. git branch wip -- wip is now an exact copy of the next branch git checkout wip Edit files to add some really cool feature git add [files to add] -- select which modified files you want to commit to branch wip git commit Suppose you want to update your next branch, and incorporate those changes in you wip branch: git checkout next git pull -- updates your branch next. Should not produce any merge-conflicts, since you didn't alter anything in your local branch Clarification: as long as I've committed all my local changes to the wip branch before I switch back to the next branch, then I shouldn't ever have any conflicts, right? If I switch back to the next branch with some uncommited changes in my branch, those will be sitting there still in my local next branch and I could have problems with the pull (and blindly following the suggestions in the git error messages isn't probably always the best solution I've found.) :-) Am I understanding all this right? git checkout wip git merge next -- merges changes in next into your wip branch (in case of merge-conflicts, fix 'em) Questions: Can you explain exactly what this git merge next does? Does the it only merge my local changes in the next branch into my wip branch? Does it merge all remote changes to the remote next branch into my local wip branch? Do I first need to do a git pull in my next branch before switching to my wip branch and doing the merge? What if it's been a few days since I created my wip branch and I've committed a few local changes to it. Now I want to make sure my wip branch is fully up to date with all remote changes on the remote/server's next branch? What is the proper way to do that? I could describe this another way. Pretend I want to do something similar/analogous to an svn update on a tree where I've made some local changes, but I want to catch up with all the remote changes and make sure my local changes are compatible and function correctly and there aren't merge conflicts. But in the git world I now have my own separate branch, my own local commits, and now I want to update that my local wip branch to reflect all the changes that have been subsequently pushed to the remote next branch by other developers. git add [conflicted files] -- git's way of marking the conflicts resolved git commit Suppose you've got your wip branch in good shape, and up to date (ie, you've just merged next into wip) and want to push to gitorious: git checkout next git merge wip -- should not produce merge-conflicts, since wip was already up to date git push One question here: Let's say I have committed two unrelated features into my wip branch. Is there a way to merge individual features/commits? Or is it all or nothing? If I want finer grain control would I have to create a new branch for each independent feature/idea I am working on? Then another useful feature of git: you can easily alter history. (NOTE: you should only change history that is only your own repo. Don't change the history which is already in more repos (pushed to gitorious) git commit --amend-- extends the previous commit. Useful when you're working in a branch, and need to make a temp commit to be able to switch branches. You should also be able to use git stash in this case, but I find this to be a lot less confusing than git stash When studying robotics, the level of intelligence of a system is defined by how detailed your instructions to the system have to be in order for it to successfully accomplish the task. For instance, let's say the task we want to accomplish is to open a jar of pickles. Can you just say open the jar. Or do you have to say lift up your hand, now put it on the jar, no on the jar Patrick, the jar, no the lid of the jar, ok turn it, no turn the lid, no hold the jar still while you turn the lid ... (spongebob reference) :-) I'm not sure why this thought popped into my head right now ... and I'm not sure at the moment if it would apply to git or apply to myself. :-) Curt -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/http://www.flightgear.org/blogs/category/personal/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure
Re: [Flightgear-devel] mouse acceleration
Is there any interest in mouse acceleration properties, besides myself ? Defenitely yes! Much, much nicer/realistic for levers! Gijs Good idea, and cheap to implement. I just pushed the patch with some tiny modifications. I added some code cleanup, too, to make it look more worthy than a 2-line-patch ;-) Torsten -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Hi, Good idea, and cheap to implement. I just pushed the patch with some tiny modifications. I added some code cleanup, too, to make it look more worthy than a 2-line-patch ;-) Torsten And now we need just a good documentation in how to use this feature. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] git for dummies
Hi Curt, 2011/1/7 Curtis Olson curtol...@gmail.com: Hi Stefan, Thanks for the reply. You are exactly right to notice that I am struggling a bit to understand the proper git workflow when dealing with branches. I have a couple more questions inserted below ... On Fri, Jan 7, 2011 at 1:39 PM, stefan riemens wrote: Hi Curt, git merge is your friend! Perhaps a complete example workflow will help you get along: suppose you are on branch next tracking the gitorious branch next. git branch wip -- wip is now an exact copy of the next branch git checkout wip Edit files to add some really cool feature git add [files to add] -- select which modified files you want to commit to branch wip git commit Suppose you want to update your next branch, and incorporate those changes in you wip branch: git checkout next git pull -- updates your branch next. Should not produce any merge-conflicts, since you didn't alter anything in your local branch Clarification: as long as I've committed all my local changes to the wip branch before I switch back to the next branch, then I shouldn't ever have any conflicts, right? If I switch back to the next branch with some uncommited changes in my branch, those will be sitting there still in my local next branch and I could have problems with the pull (and blindly following the suggestions in the git error messages isn't probably always the best solution I've found.) :-) Am I understanding all this right? Yes, that is correct. Uncommitted changes are at the filesystem level and don't belong to any branch. Note that switching branches in this case may fail, because git can't merge uncommitted files. That's also the reason that a pull may fail if you have uncommitted changes. git checkout wip git merge next -- merges changes in next into your wip branch (in case of merge-conflicts, fix 'em) Questions: Can you explain exactly what this git merge next does? Does the it only merge my local changes in the next branch into my wip branch? Does it merge all remote changes to the remote next branch into my local wip branch? Do I first need to do a git pull in my next branch before switching to my wip branch and doing the merge? What if it's been a few days since I created my wip branch and I've committed a few local changes to it. Now I want to make sure my wip branch is fully up to date with all remote changes on the remote/server's next branch? What is the proper way to do that? I could describe this another way. Pretend I want to do something similar/analogous to an svn update on a tree where I've made some local changes, but I want to catch up with all the remote changes and make sure my local changes are compatible and function correctly and there aren't merge conflicts. But in the git world I now have my own separate branch, my own local commits, and now I want to update that my local wip branch to reflect all the changes that have been subsequently pushed to the remote next branch by other developers. Git merge next will do just that: merge your local branch next into the current branch. So in this example where wip is a couple of days old, you could bring it up to date using this sequence: git checkout next -- checkout your local next branch git pull -- get the changes in the gitorious next branch, and merge them into your local next branch. git checkout wip -- checkout your local wip branch git merge next -- merge your local branch next into the currently checked out branch (wip) git add [conflicted files] -- git's way of marking the conflicts resolved git commit Suppose you've got your wip branch in good shape, and up to date (ie, you've just merged next into wip) and want to push to gitorious: git checkout next git merge wip -- should not produce merge-conflicts, since wip was already up to date git push One question here: Let's say I have committed two unrelated features into my wip branch. Is there a way to merge individual features/commits? Or is it all or nothing? If I want finer grain control would I have to create a new branch for each independent feature/idea I am working on? Yes, that sure is possible. git merge [commit hash] works fine for this. There is also git cherry-pick, I've never used that myself though, so I can't tell you how that works exactly. However, always remember that branches are cheap with git, so it is very git-like to use a branch per feature. Then another useful feature of git: you can easily alter history. (NOTE: you should only change history that is only your own repo. Don't change the history which is already in more repos (pushed to gitorious) git commit --amend -- extends the previous commit. Useful when you're working in a branch, and need to make a temp commit to be able to switch branches. You should also be able to use git stash in this case, but I find this to be a lot less confusing than git stash When studying
Re: [Flightgear-devel] World Scenery Reissue?
Locally I've been doing a complete svn update of the complete world scenery every few days and calling v2.0.0 - svn-rev-num Perhaps when 2.2.0 is released we could take the svn version of the day, call it v2.2.0 - svn-rev-num-of-that-day and push it out to the server. This is a less than optimal distribution mechanism though. Another option would be to remove the scenery chunks from the server (because they get out dated so fast) and force people to use svn, but I'm not sure I like that as our only option. I do like the idea of taking a scenery snapshot at the time of the source code release and publishing that on our ftp mirror system. That way, if someone is running FlightGear v X.Y.Z, they can download scenery that is known to be compatible with that version. We can't support every version we've ever released in the past by keeping a matching scenery release on our servers, but we can at least make a tree available that matches our current release. That way we would be free to move forward with development and include features to the svn scenery that require code support that hasn't been added until after the most recent official release. Regards, Curt. On Fri, Jan 7, 2011 at 2:08 PM, J. Holden stattosoftw...@yahoo.com wrote: I don't think TerraSync and the world scenery should always be in, er, sync, but I still think rolling the last two years worth of work over into another minor scenery release is a good idea, especially if we are directing people to that specific scenery download page. I just don't know how hard this would be to do? -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Curtis Olson: http://www.atiak.com - http://aem.umn.edu/~uav/ http://www.flightgear.org - http://www.flightgear.org/blogs/category/curt/http://www.flightgear.org/blogs/category/personal/curt/ -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Thanks,now I can undo my nasal versions.I didn't want to get too far in case the idea didnt fly;) On Friday, January 7, 2011, Heiko Schulz aeitsch...@yahoo.de wrote: Hi, Good idea, and cheap to implement. I just pushed the patch with some tiny modifications. I added some code cleanup, too, to make it look more worthy than a 2-line-patch ;-) Torsten And now we need just a good documentation in how to use this feature. -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- Gaining the trust of online customers is vital for the success of any company that requires sensitive data to be transmitted over the Web. Learn how to best implement a security strategy that keeps consumers' information secure and instills the confidence they need to proceed with transactions. http://p.sf.net/sfu/oracle-sfdevnl ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Hi Torsten , i have one little request , could you invert the y
acceleration before updating the property ? I had it inverted
originally , otherwise you get negative values pushing the mouse
forward , positive pulling back. It could be inverted with nasal for
use , but it feels more natural with positive /forward , negative /
back . Thanks
Heiko , this patch just exposes the mouses x,y movement to
/devices/status/mice/mouse/accel-x and accel-y. These values can be
added to controls/engines/engine[]/throttle , via nasal . They need to
be scaled down considerably , and is affected by the pick animations
repeatable interval-sec value . It takes a bit of testing to get a
good lever movement , but definately worth the work.
This is my current nasal function I use , called from a pick animation with
animation
typepick/type
object-nameThrottle0/object-name
action
button0/button
repeatabletrue/repeatable
interval-sec0.01/interval-sec
binding
commandnasal/command
scriptaerostar.engControl(0.005,0,throttle)/script
/binding
/action
/animation
and in a nasal file I have:
var engControl = func(scale,eng,ctrl) {
var shft = getprop(devices/status/keyboard/shift);
var amt = getprop(/devices/status/mice/mouse/accel-y);
var eng2 =1-eng;
var prop1=controls/engines/engine[~eng~]/~ctrl;
var prop2=controls/engines/engine[~eng2~]/~ctrl;
var val1=getprop(prop1) + (amt * scale);
if(val1 1.0) val1 = 1.0;
if(val1 0.0) val1 = 0.0;
setprop(prop1,val1);
if(!shft){
var val2=getprop(prop2) + (amt * scale);
if(val2 1.0) val2 = 1.0;
if(val2 0.0) val2 = 0.0;
setprop(prop2,val2);
}
}
Hope that eplains it a bit better
Now , since I got an ipod touch for Christmas , Im hoping for a Flightgear app !
Cheers
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] mouse acceleration
Brilliant, a huge leap over click-click-click. Thank you Syd!
-Gary aka Buckaroo
On Fri, Jan 7, 2011 at 12:45 PM, syd adams adams@gmail.com wrote:
Hi guys.
Is there any interest in mouse acceleration properties, besides myself ?
I,ve added it locally , and have mouse drag pedestal controls in the
Aerostar .
The calculation is already done in the code, FGMouseInput.cxx , so
I've simply written each to a property:
At line 317:
if (x != m.x) {
int delta = x - m.x;
fgSetInt(/devices/status/mice/mouse/accel-x, delta);
for (unsigned int i = 0; i mode.x_bindings[modifiers].size(); i++)
mode.x_bindings[modifiers][i]-fire(double(delta), double(xsize));
}
if (y != m.y) {
int delta = y - m.y;
fgSetInt(/devices/status/mice/mouse/accel-y, -1 * delta);
for (unsigned int i = 0; i mode.y_bindings[modifiers].size(); i++)
mode.y_bindings[modifiers][i]-fire(double(delta), double(ysize));
}
I figured there was no point doing a patch for 2 lines of code , and
if no one else sees a use for it , it's easy to do with nasal...
Cheers
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
--
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
