[Therion] XTherion modifications

2016-02-19 Thread Владимир Георгиев
Well, I didn't mean that Martin and Stacho have forgotten about Therion.
The mods were initially for my own usage, but since its an open source
project I thought the authors would not mind me sharing them.

Wookey
"DOSify", got it :)
Now that you mentioned it, my git client replaces Unix with Win line
endings. This is reverted when the commit is pushed to the repo, but not
when I manually send the files by email :)
Will keep it in mind when I send files.

Vladimir

On Fri, Feb 19, 2016 at 9:57 PM, Martin Sluka  wrote:

> Hi all,
>
> as I may say, Martin B. and Stacho are still alive, bus very busy. I spoke
> with Martin B. few minutes ago. Therion is not only on Stacho's computer,
> but on Martin B.'s too. So don't worry.
>
> They are testing Github repo too.
>
> Martin B. told me, that after they'll finish a project for their work they
> will prepare new release.
>
> So don't lose hope, please.
>
> :)
>
> m.s.
>
>
> ___
> Therion mailing list
> Therion at speleo.sk
> http://mailman.speleo.sk/mailman/listinfo/therion
>
>
-- next part --
An HTML attachment was scrubbed...
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/96442f7a/attachment.html>


[Therion] XTherion modifications

2016-02-19 Thread Martin Sluka
Hi all,

as I may say, Martin B. and Stacho are still alive, bus very busy. I spoke with 
Martin B. few minutes ago. Therion is not only on Stacho's computer, but on 
Martin B.'s too. So don't worry.

They are testing Github repo too.

Martin B. told me, that after they'll finish a project for their work they will 
prepare new release. 

So don't lose hope, please.

:)

m.s.
-- next part --
An HTML attachment was scrubbed...
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/be034658/attachment.html>


[Therion] XTherion modifications

2016-02-19 Thread Владимир Георгиев
On Fri, Feb 19, 2016 at 5:23 PM, Wookey  wrote:

> In practice the rest of the world uses this list and the distro
> packaging and every so often those patches get pulled back into the
> master repo.
>

​Well, in general I think a VCS would be nice, but it's up to you or the
authors or whoever else maintains the code. There are many public free
services like github, etc. I currently placed it in a private git on
Assembla. Can make a public one too.


OK. You changed what I think is the default line size too
> set xth(gui,me,line,cpsize) 3
> is that an important part of this change or just something you prefer?
>
​Not very important. I changed the line point, and Bezier​

​line control point sizes. Actually they were already available in the Ini
file before my changes, but I haven't noticed them.
I'll see if there is a wiki about the xtherion.ini​ settings. If not I will
see if I can make one about some of them.


> So I merged your code into the debian package. You had managed to
> 'dosify' me_cmds2.tcl which made a massive patch, but I've fixed that
> (and quite a lot of trailing whitespace).
> Patch attached to save anyone else the work.
> I'm building the package now and will upload soon if everything works.
>

​Don't know that you mean by "dosify" :)
Indeed there was some whitespace in most of the files. I didn't remove it
exactly to avoid making a large patch/commit.

About building the packages, I actually tried building xtherion only, not
the whole Therion. But I suppose that xtherion should not affect the rest
of the build process.

Vladimir
-- next part --
An HTML attachment was scrubbed...
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/4b0d903f/attachment.html>


[Therion] XTherion modifications

2016-02-19 Thread Владимир Георгиев
Yes, the colors could use some tweaking depending on how people use the map
editor. And likely on their monitor.
I work mostly with Topodroid, which exports a Therion drawing directly and
I don't have an image at the background. But still some editing is needed
usually with Therion.

Adding the orientation should not be a problem. It can probably either show
the arrows all the time without needing to select the points, or show
something smaller. I'll check it in a few days.

Vladimir


On Fri, Feb 19, 2016 at 4:16 PM, Footleg  wrote:

> I've taken a quick look, and this is really (REALLY!) useful. Just messed
> with the colours, not the other enhancements. I already changed the colour
> of rock lines from snow4 to yellow by editing (and uncommenting) that line
> in the ini file. I could not tell my rock lines from my survey lines
> rendered in the background sketch imported from PocketTopo. Some of the
> other colours are maybe a little too dark so I will experiment more to
> brighten them up and see what I think works best as I am sketching.
>
> The triangles for station points have another advantage over just changing
> their colour. I can now see the black circles for the stations positions in
> the background sketch imported from PocketTopo. Previously the blue circles
> of the stations points completely hid the black circles they were placed on
> top of.
>
> If you could add something to the points which have an orientation set to
> show the orientation (without having to select them as currently) that
> would be another step forwards.
>
> Great stuff, thank you!
>
-- next part --
An HTML attachment was scrubbed...
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/2ca3ffce/attachment.html>


[Therion] XTherion modifications

2016-02-19 Thread Wookey
+++ Владимир Георгиев [2016-02-19 19:11 +0200]:
> 
> On Fri, Feb 19, 2016 at 5:23 PM, Wookey  wrote:

> So I merged your code into the debian package. You had managed to
> 'dosify' me_cmds2.tcl which made a massive patch, but I've fixed that
> (and quite a lot of trailing whitespace).
> Patch attached to save anyone else the work.
> I'm building the package now and will upload soon if everything works.
> 
> 
> ​Don't know that you mean by "dosify" :)

Changed all the lineends from 0x0A (unix linefeeds) to 0x0D,0x0A (DOS
linefeeds) (which makes every line different). Normally this is a
problem with editors silently converting your files, but sometimes
also VCSes. Not helped by the fact that some files from upstream are
'mixed line-ends', which can confuse editors.

> Indeed there was some whitespace in most of the files. I didn't remove it
> exactly to avoid making a large patch/commit.

Right, but you (well, your editor, no doubt) added some more :-)

The debian package has a huge whitespace patch to fix this irritation,
but Stacho has not merged it upstream yet :-(

> About building the packages, I actually tried building xtherion only, not the
> whole Therion. But I suppose that xtherion should not affect the rest of the
> build process.

No, it's not your fault. I recall this being an issue already. Therion
build-depends on itself, so it builds OK if it's already installed on the
build machine (and the library catalogue hasn't changed between what's
installed and what's building), but not in a clean environment. Which
means I don't understand how the current debian builds are building at
all (because they should be done in just such an environement)

I was going to fix it properly by generating the catalogue in a less
crufty way, but have clearly not got round to it.

Wookey
-- 
Principal hats:  Linaro, Debian, Wookware, ARM
http://wookware.org/
-- next part --
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/dfc601f4/attachment.sig>


[Therion] XTherion modifications

2016-02-19 Thread Wookey
+++ Wookey [2016-02-19 15:23 +]:
> 
> I'm building the package now and will upload soon if everything works.

It didn't. Therion tries to run itself to build the librarydata file
(which will never work in a cross-build and is a bad plan) and it's
not working in a normal clean build either right now. I'm not sure why
that's now failing (builds used to work). And I'm off on hols for 3
weeks in a mo, so this will have to wait. Sorry.

make library
make[2]: Entering directory '/«PKGBUILDDIR»'
./therion --print-library-src thlibrarydata.thcfg > thlibrarydata.log
/bin/sh: 1: ./therion: not found
make[2]: *** [library] Error 127
Makefile:179: recipe for target 'library' failed
make[2]: Leaving directory '/«PKGBUILDDIR»'
make[1]: *** [thlibrarydata.cxx] Error 2

Wookey
-- 
Principal hats:  Linaro, Debian, Wookware, ARM
http://wookware.org/
-- next part --
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/010bebd6/attachment.sig>


[Therion] XTherion modifications

2016-02-19 Thread Footleg
I've taken a quick look, and this is really (REALLY!) useful. Just messed
with the colours, not the other enhancements. I already changed the colour
of rock lines from snow4 to yellow by editing (and uncommenting) that line
in the ini file. I could not tell my rock lines from my survey lines
rendered in the background sketch imported from PocketTopo. Some of the
other colours are maybe a little too dark so I will experiment more to
brighten them up and see what I think works best as I am sketching.

The triangles for station points have another advantage over just changing
their colour. I can now see the black circles for the stations positions in
the background sketch imported from PocketTopo. Previously the blue circles
of the stations points completely hid the black circles they were placed on
top of.

If you could add something to the points which have an orientation set to
show the orientation (without having to select them as currently) that
would be another step forwards.

Great stuff, thank you!

Footleg

On Wed, Feb 17, 2016 at 11:50 AM Владимир Георгиев 

wrote:

> Hi all
>
> There are some modifications that I made to the XTherion and would be
> interested if someone can test them and share their opinion. They were
> quickly patched up and I am no TCL developer so there might be a bug or two.
>
> Initially I needed to have an XTherion shortcut to delete a line point so
> I started looking through the source. I added Ctrl+Shift+D for deleting a
> line point, Ctrl+Up/Down for zooming in and out in the map editor.
>
> The all blue items in the map editor were harder to use so I tried to
> colorize them. E.g. walls to be "brick red", pits are magenta, rock borders
> dark gray, slope is yellow, etc. The non-selected scrap is light gray.
> The station point I made orange and a triangle instead of a circle so it
> is more visible.
> I will probably add other colors after I work with the editor more.
>
> I have attached a couple of screenshots of how it looks, the xtherion
> source and the "compiled" xtherion tcl app.
>
> Btw, where does the source live, besides the zip archive on the site? Is
> there a source control repo somewhere that people can contribute to?
> For experimenting with the colors I used a private git repo. I admit I
> haven't checked the licensing for the code.
>
> Here are the colors that I changed and added them to the INI file.
> #set xth(gui,me,activefill) red
> #set xth(gui,me,pasivefill) green
> #set xth(gui,me,controlfill) blue
> #set xth(gui,me,highlightfill) cyan
> #set xth(gui,me,unselectedfill) lightgray
> #set xth(gui,me,wallcolor) brown
> #set xth(gui,me,pitcolor) magenta
> #set xth(gui,me,slopecolor) gold
> #set xth(gui,me,rockcolor) snow4
> #set xth(gui,me,bordercolor) turquoise
> #set xth(gui,me,stationcolor) darkorange
>
>
> Best
> Vladimir
> ___
> Therion mailing list
> Therion at speleo.sk
> http://mailman.speleo.sk/mailman/listinfo/therion
>
-- next part --
An HTML attachment was scrubbed...
URL: 
<http://mailman.speleo.sk/pipermail/therion/attachments/20160219/d0ea4b6e/attachment.html>