Back
[01:11:17] <jthornton> jepler: I've only had the chance to run thc once... afaik it works. The plasma cutter has been covered up with Hardinge parts
[01:13:32] <cradek> hm, if I run those git package builds from buidlbot, I'll get master and not v2.4_branch
[01:23:04] <jepler> yeah, I think that's true at the moment
[01:23:13] <jepler> seb wants me to do something with tags, but I ignored him and let it scroll away
[01:25:15] <cradek> heh
[01:25:28] <cradek> hey I think the visual touchy stuff in 2.4 looks right
[01:26:23] <jepler> oh good
[01:26:33] <cradek> and my tool table converted right!
[01:26:38] <jepler> oh good
[01:26:50] <cradek> (but it sure is harder to read...)
[01:27:07] <jepler> maybe you want to try the tool table editor gui
[01:27:15] <cradek> hey you might be right
[01:27:57] <cradek> hm, lots of 'extra' columns now...
[01:28:09] <cradek> I need a better way to keep track of what tool is what
[01:28:20] <cradek> if my pockets were marked it wouldn't be quite so bad, but still kind of bad
[01:28:50] <cradek> maybe I need a chalk board or some other silly low-tech thing
[01:33:00] <jt-hardinge> I just need to do git checkout v2.4_branch after build-dep and build-essential to get 2.4 on the Hardinge?
[01:34:39] <cradek> yeah pretty much
[01:35:11] <jt-hardinge> thanks
[17:12:43] <cradek> jepler: can we now have the dro, program listing, mdi entry, mdi history, active gcodes all be the same font? I think right now they are all subtly different. Or are there apples and oranges here?
[17:13:48] <jepler> cradek: the overlay dro is going to be different, unfortunately; there's no reason the rest can't be the same
[17:33:59] <jepler> on systems with tk8.5 both the overlay dro and the widget fonts are coming from the same font renderer, but described using different intermediate APIs
[17:39:20] <jepler> hmph, tk8.5 may have antialiased fonts but they still don't follow the gnome font preferences
[18:41:19] <jepler> today is definitely an "I hate Tk" day. I think I just spent two hours trying and failing to get "_File" to look the same in wish8.5 and a gnome app
[18:42:41] <jepler> but with glrefactor merged into master, I can forget all that and just wait for someone to rewrite axis as a pygtk program for emc2.5.
[18:51:35] <cradek> if I want to make a little one-line fix in 2.4 and master, how do I do it?
[19:19:52] <cradek> http://timeguy.com/cradek-files/emc/gitk.png
[19:20:17] <cradek> is this what I do? I think the magenta line comes from the merge-base, way down there
[19:20:50] <cradek> git push --dry-run gives my one commit plus a merge commit for each of v2.4_branch and master
[19:23:06] <jepler> yes, I think so.
[19:23:33] <cradek> ok. my little branch with one commit won't get pushed, will it?
[19:23:53] <jepler> not if it's not shown by push --dry-run
[19:23:59] <cradek> right
[19:24:00] <jepler> it would show as [new branch] if it was being pushed
[19:24:11] <jepler> I think you have to specify new branches explicitly(?)
[19:24:43] <cradek> yeah, push branchname origin, I think
[19:38:26] <alex_joni> it would be nice if you guys figure out the preferred way of doing this, and add it to the wiki
[20:49:27] <cradek> if only I could remember all the fiddly little things I'd been wanting to fix before 2.4...
[20:54:28] <CIA-81> EMC: 03cradek 07master * rf7b45ba8968e 10/src/emc/usr_intf/touchy/emc_interface.py: Merge branch 'touchy-feedhold'
[20:54:30] <CIA-81> EMC: 03cradek 07v2.4_branch * rb71806a55bd4 10/src/emc/usr_intf/touchy/emc_interface.py: Merge branch 'touchy-feedhold' into v2.4_branch
[20:54:38] <CIA-81> EMC: 03cradek 07master * rda874d2ed681 10/src/emc/usr_intf/touchy/emc_interface.py: make the single block switch work more like a feed hold
[20:55:29] <cradek> well ok, I guess that did a reasonable thing
[21:03:01] <micges> it seems that 2.4 branch will be more open to minor functional changes than 2.3 branch?
[21:04:26] <cradek> especially if they are stabilizing/final bugfix type changes
[21:05:14] <micges> cool
[21:06:19] <cradek> hm, I should have probably said 'ask jepler'
[21:17:27] <CIA-81> EMC: 03cradek 07master * r128ce393cfd2 10/src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py): Merge branch 'touchy-rpmreadout'
[21:17:28] <CIA-81> EMC: 03cradek 07master * rc002e292777f 10/src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py): add a spindle speed readout on the manual tab
[21:17:28] <CIA-81> EMC: 03cradek 07v2.4_branch * re0faf4266880 10/src/emc/usr_intf/touchy/ (emc_interface.py touchy.glade touchy.py): Merge branch 'touchy-rpmreadout' into v2.4_branch
