If your bugfix is approved for v2.4_branch, then it will also be fixed on master when changes in the branch are merged up.
this doesn't follow from my step-by-step where the merge with master is already done
cradek: sorry, I probably muddled the waters by saying that.
cradek: I'm still looking for the optimum mix between our old cvs-style practices and what we can do with git. I want to try merging v2.3_branch into master as a way to get bugfixes done on both branches, but that plus my insistence on reviewing everything before it goes into v2.3_branch means that someone may wish to merge the fix into master while waiting for it to get my nod for 2.3.
jepler: what do you think of the rehoming patch?
I think the idea is fine, but I can't judge the implementation (except to say that "YES/Cancel" is right out)
so you think hardly anybody would be annoyed by having to confirm homing an already-homed machine?
on a machine with real homing I bet that is true (why do it more than once?)
if someone uses homing to set the origin willynilly, I bet it would be irritating
oh, well, that person I want to discourage :-P
yes I also think that's a poor way to handle origins
I hadn't thought of it before, but yes I bet we'd hear from them.
hmm, we can actually tell whether the machine has real homing
perhaps we could skip the confirmation if their velocities are zero
Just this once .. here's the log: http://www.linuxcnc.org/irc/irc.freenode.net:6667/emcdevel/2010-02-09.txt
I guess I don't mind causing that user a little trouble
it is a teaching moment
With my limited mind :D this was the only way I could think off I am willing to accept any change... The way I tied to implement is , was to show that dialog the least amouth possible...
so, basicly if a user has a machine with real homing, then we don't want to show the dialog 'are you sure' right? Because it would always home at teh correct homing point, instead of in the middle of nowhere...
well I was thinking the opposite
I guess we don't know when the prompt is appropriate
some people (incorrectly, in some opinions) use homing to set the workpiece origin
on machines with no real homing setup
I think those people would be irritated, but I'm only guessing
But they use the software incorrectly... since you need to touch off, not re-home..
that fact does not make us not hear them complain :-)
then I wonder, are there any situations where a users needs home to set his workpiece?? (I don't think so but...)
I don't think so. in my thinking, homing establishes the machine origin, not any workpiece origin
but many people seem to work with no particular machine origin and therefore no soft limit protection
my experience is that often those folks are averse to any suggestion of a better way to do it
yes I see, but don't these people have limits on there machine? Even a lathe has....
no they generally don't have limits
I guess the reason might be that nobody complains about the re-homing issue is that most people uses ballscrews with mills in the EMC word (just a guess) they don't have big issues with jogging fast and a heavy gantry moving around.
One thing that can be done to keep these people happy (and me :D ) is having the dialog pop-up only when some option in a ini file is set, but I wouldn't like to add more options for these stuff..... OR the dialog can have a tickbox that states 'don't ask me again'.... (just trowing out some ideas)
cradek's idea (base it on home velocity being zero) will not give this protection to the people who would benefit most from it: the ones who "home by eye" (so the home is good enough for soft limits to be helpful, but not repeatable enough that you'd want to do it during a run without good cause)
sounds like it needs to be an ini setting. So the user can descide what happens when the home button is pushed. re-home or ask... maybe
jepler: me as a newbie... what is "home velocity" ?
just the velocity during a homing sequence or something else?
ries: it's an item in the inifile. I think it's spelled [AXIS_#]HOME_VELOCITY
[15:07:09] <JT-Work> http://www.linuxcnc.org/docview/html//config_ini_homing.html
When it's 0, then homing just takes the current position and uses it as the home position
cradek, you said : "some people (incorrectly, in some opinions) use homing to set the workpiece origin" how do you know?
* jepler has an "aha" moment about the image-to-gcode bug
w, h = im.size
nim = numarray.fromstring(im.tostring(), 'UInt8', (h, w)).astype('Float32')
obviously there's some confusion about whether arrays are row-major or column-major
ries: just that they've said so
I always tested with torus.png which happens to be square
the same people often continue by saying something like "I never have bad G-code, so why would I care about limits?"
I like the idea of "[ ] Don't ask me again"
SWPadnos: I wasn't going to name names...
me either, I think :)
hm, I wonder if acemi ever tested my fix for empty ctrl_type
* jepler finds it in one of his trees
SWPadnos: for me it's mostly a jogging issue actually...
cradek: if I where to implement a 'don't ask me again' feature, where would I store the info if teh users want's to see it again or not?
that could be per run, you don't need to save it
so just a variable
disagree with SWPadnos
I think you'd want to use AxisPreferences
you could also just add a menu item "disable home button"
the idea was to prevent a other menu item....
when you get "never ask this again" checkboxes, you'll also inevitably need a way to restore all questions (typically a menu item)
I was just going to ask that (and ick).
it also did pop up in my mind...
there's one other thing that is obvious to add a "don't ask again" checkbox to: "program exceeds limits", since that's unreliable on certain machines
(users will also want it for the must-home-before-running, but that they'll have to do in the inifile)
(since it's in task, axis can't override that)
cradek: Actually, I like the idea of doing it per session, reason given is that usually you want to home only once per session anyways
if you exit and restart axis you properly want to home again
right, but the prompt isn't shown when an axis is unhomed
at least that's how I understood the original patch
that's correct, it only shows when teh axis was already homed, when auto homing is enabled it will only pop-up when any of the axis was un-homed
when auto homing is enabled it will only pop-up when all the axis where already homed
be back in 10 mins
if you have a stepper machine and turn off machine power you would/might want to home again
JT-Work: and if I'm not mistaken you can get that automatically in 2.4 with VOLATILE_HOME
so again that would work OK with this feature
yep, I forgot about that
I'd like to try setting the sf bugtracker to mail emc-developers for all bug activity, not just when a new bug is filed. I don't think this will generate a whole lot of traffic. Anyone have a strong opinion?
the current question is (I think) are we going to show a 'Don't ask me again' message? The only reason for doing that tick box is for teh people that uses the home button to position there workpiece. For all (I think) other pe
All other people don't want to re-home when a machine is already re-homed, because there soft limits are screwed
yes, that's my understanding too
adding a tickbox that is per session is easy, just a var you remember... But doing this across different sessions (start/stop axis) we need to have a framework to reset these variables.
I'd rather teach those people to use "touch off" than add the "don't ask again" button to the new homing dialog
(well, I'd rather they learn; I don't really want to teach them :-P)
I'm now mostly ambivalent - adding it is fine with me - not adding it is fine with me
I think these people started to mis-use the home for positiong there workplace because the touchoff and home buttons are to close on the screen (and they don't read the manual)
if it takes focus and has the usual keyboard shortcuts, it's not going to be much pain for anyone, no matter what
Good point, I don't think I tested keyboard shortcuts.. they are added, just not tested...
will this popup happen when pressing Home or Ctrl-Home on the keyboard too?
(imo it should)
cradek: the question boxes are added to home_axis and home_all_axis
Just tested, and they dialog pop's up
dialog box doesn't respond to keyboard shortcuts, so I will check that out and provide a new patch
bizarre, I get the same error running master that stuart reports, but I thought it ran before: AttributeError: 'cairo.ImageSurface' object has no attribute 'get_data'
ries: fix it so it says the standard OK/Cancel too, please
ok => enter
cancel => escape
(even though it's a yes/no question, that's the standard that the world has picked)
yes, and space is also ok, I think
auto of curiosity, what time zone are you guys in?
-0600, US Central
-5 here, Ecuador
EMC: 03jepler 07master * r9110af6b2b5a 10/lib/python/glnav.py: work around absent ImageSurface.get_data
a lot of us are in the americas. alex_joni and micges are two european exceptions.
jepler: that fixes it, thanks
huh, my dro zeroes have dots here (6.06) - at home (9.?) they didn't
I hate fonts
me too, especially most of them
if only nobody had ever discovered that we could make the "same" letters with slightly different shapes we wouldn't have this problem.
I mean, how is it possible that 0 can be shaped this way *and* that way? It flies in the face of logic.
that dot is really the only thing wrong with bitstream vera sans mono
hm, once I was able to repeatedly pop the "re home" window up, so that I had several showing at the same time
Hmm should I create a patch against my last patch or a complete new patch?
probably a new patch is best
to add the "don't ask again"? I don't think it's clear that we want that.
jepler: yes... I thought it was already clear... what are your against?
but if you have refinements to make, put them in the same commit with "git commit --amend"; that will help you get one patch that does all the changes for this feature.
the only problem we've identified in the patch (users who use "home" to set workpiece origin) is fixed by using touch off.
My 'problem' (although I understand a bit against for the patch) is that users do use there software incorrectly, if used correctly it's not really a issue
excuse me for asking stupid git questions... when I use git commit --amend it doesn't create a new patch file? (svn seems to work totally different)
you don't get a patch file until you use git format-patch
yes git is very different than svn
jepler: if I use now git format-patch then I don't see my changes, only my old one... do I need to commit this locally?
right now, does 'git show' (which on its own shows just the most recent commit) show your original commit, the one you sent to the mailing list as a diff?
and 'git diff' shows the incremental changes you made since then?
git show shows me teh difference between this change and my last change, not between the origional
git diff shows nothing
OK, next let's look at what this shows: git log --oneline origin/master..
that will show one line for each commit you've made on your own system
are there two lines, one for the original commit that you sent as a patch and above it a line for the subsequent change?
OK, that just means that when you made the second set of changes you did "git commit" alone, not "git commit --amend"
may be I did something wrong teh last time? I was expecting to create a ptch against the online repro, not something I did locally
Should I just delete git and download it again?
nah, that's almost never the solution
if you want, you can just send the second patch to the mailing list; if we decide to include it, I can make the two commits into just one
git format-patch -1 will create a new 0001-*.patch file for your most recent commit, which consists of your changes since the first message
can I uncommit locally?
yes, there are at least two ways to change your two local commits into one commit. I'd be happy to tell you about them if you want to learn.
I don't have a problem to learn... I have only used SVN in the past, git is new for me
OK. The way I would do it is: git rebase -i origin/master. on the second line, change "edit" to "squash", and edit the editor. revise the change message so that it describes the new commit accurately, and save/exit the editor again.
origin/master names the version you got last from git.linuxcnc.org with git clone or git pull, and so 'git rebase -i origin/master' means something like 'give me a chance to revise all the commits that come after origin/master' (i.e., your commits that you made locally with 'git commit')
I just executed git rebase -i origin/master, then my editor poped up, you did mean I needed to edit something there?
oops, the instruction should have said 'change "pick" to "squash"'
this is what I get : http://pastebin.com/d7210598f
taht I see in GNU nano...
change it to say: http://pastebin.com/m6e63601d
(on line 2, change "pick" to "squash"; this means that git will turn the two commits into a single commit)
done that... now it comes with a other editor, so now I must combine teh two commit messages, right?
yes, write one message that describes all the changes
now 'git show' should show you all the changes together, and 'git format-patch -1' will give you a 0001-*.patch that contains all the changes suitable for mailing
yes.. amazing, that worked...
git takes a while to learn, but I feel like it's worth it
I think git has some great features indeed not found in svn... for example, I have used svn on fairly big trees (java, adobe flex stuff) and finding patches and stuff took ages, I am on a slow 512KB/sec connection
last GIT question... what would have been the correct way to modify the code after I used git format-patch -M origin ?
to make incremental changes to the most recent commit, use 'git commit --amend'.
going to fool around with that
just send a new patch to teh ML
will look at it later, bbl
jepler: in master in the AXIS preview I'm only getting about 5 updates a second. I think it used to be a lot more smooth on this machine. If I keep it redrawing by slowly panning the display, it is very smooth.
^ that was demo_sim_cl. sim/axis is smoother for some reason.
CYCLE_TIME = 0.200
yeah, I bet about 5 updates per second
I just found that too. sorry.
seb_kuzminsky: I took my table apart and started boxing stuff up... the table is at the head of the lathe now, which is sure nice.
EMC: 03jepler 07master * r79c83be8fada 10/src/emc/usr_intf/axis/scripts/axis.py: Show a prompt when a user re-homes.
ries: congratulations, you're now a co-author of emc.
jepler: cool... thanks.. :)
this goes into 2.4?
so far I only put it in master, not 2.4.
what's teh development runs?
Current only bug fixes and now releases also contains new features?
so 2.3 will only have bug fixes, 2.4 will have new features and trunc is just 'all' ?
ries: that was correct 2 weeks ago
there will probably be one more release of 2.3 which will have only bugfixes.
but now 2.4 is in feature freeze - preparing for 2.4.0
2.4 has a bunch of new features, but the deadline to add them was supposed to be Feb 1, and after that only bugfixes ..we've bent that rule a little bit, though
jepler: we should probably send a call for translators for 2.4
Oooo crap. I was a tad to late :D
I will try to get de and ro into shape these days
alex_joni: great, thanks
and you're right, I should send a messag
e about it
EMC: 03jepler 07v2.4_branch * r655325379df5 10/src/emc/usr_intf/axis/scripts/image-to-gcode.py: "extend image" crash on non-square image (SF#2947390)
EMC: 03jepler 07v2.4_branch * r5faccbbe8e0e 10/src/emc/usr_intf/axis/scripts/image-to-gcode.py: Merge branch 'extend-image' into v2.4_branch
EMC: 03jepler 07v2_3_branch * raab9f23dc2cb 10/src/emc/usr_intf/axis/scripts/image-to-gcode.py: "extend image" crash on non-square image (SF#2947390)
* jepler wonders which version(s) of emc he should put the workaround for the 64bit python-numeric bug in
(instead of slicing a numarray like x[a:b], which erroneously gives a slice with b items in it, slice it like x[a:][:b])
er, that's not right
instead of slicing like x[a:a+b] slice like x[a:][:b]
did that fix end up in master too?
ah, ok.. thought I didn't interpret it right :D