Merge lp:~cern-kicad/kicad/bugfix_1275319 into lp:kicad/product

[Maciej Suminski]

[Dick Hollenbeck (dickelbeck)]

On 02/06/2014 08:17 AM, Maciej Sumiński wrote:
> Maciej Sumiński has proposed merging lp:~cern-kicad/kicad/bugfix_1275319 into lp:kicad.
>
> Requested reviews:
> kicad-product-committers (kicad-product-committers)
> Related bugs:
> Bug #1275319 in KiCad: "pcbnew OpenGL PNS router does not show track while routing"
> https://bugs.launchpad.net/kicad/+bug/1275319
>
> For more details, see:
> https://code.launchpad.net/~cern-kicad/kicad/bugfix_1275319/+merge/205166
>

on a 32 bit platform, a long and an int are both 32 bits.

I stopped reading the patch after I saw that. I don't like long where an "int" will
suffice, or where an int and a long are the same thing. long really should never be used.
 Because if you need a certain bitness, then there are datatypes which ensure that.

int64_t comes to mind.

The rest seems like mostly noise and renaming. Where is the actual fix? What lines,
maybe you can name two or 3 that fix the code.

Dick

[Dick Hollenbeck (dickelbeck)]

On 02/06/2014 11:53 AM, Dick Hollenbeck wrote:
> On 02/06/2014 08:17 AM, Maciej Sumiński wrote:
>> Maciej Sumiński has proposed merging lp:~cern-kicad/kicad/bugfix_1275319 into lp:kicad.
>>
>> Requested reviews:
>> kicad-product-committers (kicad-product-committers)
>> Related bugs:
>> Bug #1275319 in KiCad: "pcbnew OpenGL PNS router does not show track while routing"
>> https://bugs.launchpad.net/kicad/+bug/1275319
>>
>> For more details, see:
>> https://code.launchpad.net/~cern-kicad/kicad/bugfix_1275319/+merge/205166
>>
>
>
> on a 32 bit platform, a long and an int are both 32 bits.
>
> I stopped reading the patch after I saw that. I don't like long where an "int" will
> suffice, or where an int and a long are the same thing. long really should never be used.
> Because if you need a certain bitness, then there are datatypes which ensure that.
>
> int64_t comes to mind.
>
>
> The rest seems like mostly noise and renaming. Where is the actual fix? What lines,
> maybe you can name two or 3 that fix the code.
>
> Dick
>

I do not mind the renaming and the clean up, just the long.

(But amidst the renaming, was unable to see the fix.)

Go for clean up where ever you can! Just recognize what that means :)

[lp:~cern-kicad/kicad/bugfix_1275319]

4659. By Maciej Suminski on 2014-02-06

Reverted changes introduced by the revision 4655.

[Maciej Suminski (orsonmmz)]

Hi Dick,

Sorry for the fuss, I have reverted the commit you find wrong. To explain myself: it was done, as the C++ standard says that int is at least 16 bits long, but if you say that we are safe, then I fully trust you.
The most important parts are commits 4658 and then 4656. The bug was caused by the fact, that I have added too many PCB_VISIBLE elements. As they are saved [kicad_plugin.cpp:650] as a 32-bit number, some of visibility settings were truncated.
After loading a PCB and its settings, it turned out that if you have turned off 'Pads Back' in the Render tab - it influenced the GP_OVERLAY visibility and in the end many items drawn by the GAL were not visible. Even worse is the fact that you cannot enable its visibility by checking 'Pads Back' again - as in the application, internally everything is fine and visiblity settings are not in conflict. The bad thing happens in the PCB_EDIT_FRAME::syncLayerVisibilities() function - it iterates over all the PCB_VISIBLE elements calling

    bool BOARD_DESIGN_SETTINGS::IsElementVisible( int aElementCategory ) const
    {
        return ( m_VisibleElements & ( 1 << aElementCategory ) );
    }

that goes out of int boundaries for aElementCategory > 31.
In order to retain the currently used .kicad_pcb format, I decided to move the netname layers to separate group. They do not need to be saved, as they are directly related to copper layers.

Regards,
Orson

[Dick Hollenbeck (dickelbeck)]

On 02/06/2014 03:18 PM, Maciej Sumiński wrote:
> Hi Dick,
>
> Sorry for the fuss, I have reverted the commit you find wrong. To explain myself: it was done, as the C++ standard says that int is at least 16 bits long, but if you say that we are safe, then I fully trust you.
> The most important parts are commits 4658 and then 4656. The bug was caused by the fact, that I have added too many PCB_VISIBLE elements. As they are saved [kicad_plugin.cpp:650] as a 32-bit number, some of visibility settings were truncated.
> After loading a PCB and its settings, it turned out that if you have turned off 'Pads Back' in the Render tab - it influenced the GP_OVERLAY visibility and in the end many items drawn by the GAL were not visible. Even worse is the fact that you cannot enable its visibility by checking 'Pads Back' again - as in the application, internally everything is fine and visiblity settings are not in conflict. The bad thing happens in the PCB_EDIT_FRAME::syncLayerVisibilities() function - it iterates over all the PCB_VISIBLE elements calling
>
> bool BOARD_DESIGN_SETTINGS::IsElementVisible( int aElementCategory ) const
> {
> return ( m_VisibleElements & ( 1 << aElementCategory ) );
> }
>
> that goes out of int boundaries for aElementCategory > 31.
> In order to retain the currently used .kicad_pcb format, I decided to move the netname layers to separate group. They do not need to be saved, as they are directly related to copper layers.
>
> Regards,
> Orson
>

long is bad. That's all I really said. I don't ever use, ever. Except when I have to to
make some 1980's C function call.

If you want 64 bits on any platform, and I think you did, then the thing to use is int64_t
but hide it the best you can.

This means don't expose any more in the *public* API than you have to to client code.

The implementation can use it fine.

Here's what I would have done, simply make the bit map hold 64 bits, the easiest way to do
that is go to int64_t.

aElementCategory can remain int, it is simply a bit number, but caller does not know that.

bool BOARD_DESIGN_SETTINGS::IsElementVisible( int aElementCategory ) const
{
     return ( m_VisibleElements & ( int64_t(1) << aElementCategory ) );
}

and make m_VisibleElements int64_t also in the class.

Then you have to doctor the Load() and Save() functions in a "machine width independent"
way. That means a special way of handling the int64_t sprintf() call, and a way to get
back the int64_t from ascii.

snprintf() I think is *implemented* by mingw maintainers on windows, whereas sprintf() is
implemented by mvscrt.dll. Fortunately OUTPUTSTREAM::Print() uses snprintf(). So you can
simply find the correct format string for int64_t and be done quickly.

If possible, we want a machine width independent (i.e. mingw and gcc) format string for
int64_t. It might even be a macro.

Google __PRI64_PREFIX

and look at /usr/include/inttypes.h

The source fle which uses __PRI64_PREFIX may have to define

__STDC_FORMAT_MACROS

and include inttypes.h

I find this file on my shiny new mingw 4.8.2 cross compiler also.

Maybe you already have a solution. I'm just saying what I would have done.

...

[Maciej Suminski (orsonmmz)]

It is not my intention to increase the number of bits in m_VisibleElements - I prefer to leave it as it is now, particularly that it is saved as a 32-bit number in .kicad_pcb files and I would like to preserve compatibility (so if older versions expect 32-bit number there - let them have it and do not crash/do weird things on load of PCBs holding 64 bits for elements visiblity). Saving netnames layers visibility is not really crucial, it can be restored basing on visibility settings of appropriate copper layers.
The change from int to long resulted only from the fact that in the back of my head I remember that int is guaranteed to be 16 bits, so maybe on some platforms the code would not run as expected. But as it works on the major platforms then I simply do not insist on changing that.
Anyway - the patch fixes the problem even when m_VisibleElements stays as integer, so what do you think about the rest of the changes?

Regards,
Orson

[Dick Hollenbeck (dickelbeck)]

On 02/06/2014 04:26 PM, Maciej Sumiński wrote:

> It is not my intention to increase the number of bits in m_VisibleElements - I prefer
> to leave it as it is now, particularly that it is saved as a 32-bit number in
> .kicad_pcb files and I would like to preserve compatibility (so if older versions
> expect 32-bit number there

Note, that if we were always bound to allow older versions of KiCad to load newer files,
then it would be impossible to add new features which needed saving on disk.

I value new features far more. We can all stop writing code and wasting time on a mailing
list if we are not to write features requiring file format changes. It would essentially
mean that we could only make improvements which do not require change.

The pay is too low already. If you can find a way to make improvements without also
making changes, then I am in the wrong universe.

> - let them have it and do not crash/do weird things on load
> of PCBs holding 64 bits for elements visiblity).

Not really an issue, if you parse an ASCII 64 bit number into a 32 bit binary integer, in
old code, the lower 32 bits are likely preserved. So in this case you might have been OK.
 If not, folks can stick with their old software and old BOARDs.

> Saving netnames layers visibility is
> not really crucial, it can be restored basing on visibility settings of appropriate
> copper layers.

I like the feature! And I like the 33rd feature which I want to save to disk, whatever it is.

I would like to save it to disk, and have it be BOARD centric, not project centric.

Eventually we'll hit some kind of wall, if not here, now, then sometime.
Saving a bit map as an ASCII integer is only one possibility anyways. There are numerous
alternatives for expansion:

a) save a 64 bit integer in ASCII.

b) use s-expressions to name each bit.

c) An arbitrartily long ASCII binary number
0000_1011_1110_0011....

This can extend far off the page if needed.

Parsing that would be pretty easy, the underscore saves a human some counting. At some
point you quietly switch to a bitmap of arbitrary length. But since you've hidden the
implementation from the client code, that is nobody's damn business.

d) blah blah blah

> The change from int to long resulted only from the fact that in the back of my head I
> remember that int is guaranteed to be 16 bits,

Fully incomprehensible. I don't know where 16 bits even enters into it. Find a computer
that uses 16 bits and you've found one that should not be running KiCad.

The lesson here is that "long" is

a) not necessarily longer than int, and

b) not known until you pick a machine and a compiler. So you don't get 64 bitness if
thats what you need.

> so maybe on some platforms the code
> would not run as expected. But as it works on the major platforms then I simply do not
> insist on changing that.

int64_t is 64 bits, guaranteed.

Anyway - the patch fixes the problem even when
> m_VisibleElements stays as integer, so what do you think about the rest of the
> changes?

I have not looked at it, I can if nobody else want's to. The original patch came to me
via email.

> Regards, Orson

[Dick Hollenbeck (dickelbeck)]

http://stackoverflow.com/questions/17002969/how-to-convert-string-to-int64-t

[Lorenzo Marcantonio (l-marcantonio)]

On Thu, Feb 06, 2014 at 05:54:21PM -0000, Dick Hollenbeck wrote:
> I stopped reading the patch after I saw that. I don't like long where an "int" will
> suffice, or where an int and a long are the same thing. long really should never be used.
> Because if you need a certain bitness, then there are datatypes which ensure that.

Markup on calendar :D I fully agree with Dick :P

> int64_t comes to mind.

I confirm that int64_t and uint64_t fully fit the bill. I'm using them
for the extended layer supports. Doing bi-architecture printf and scanf
is another thing, sadly...

--
Lorenzo Marcantonio
Logos Srl

[Maciej Suminski (orsonmmz)]

On 02/06/2014 11:48 PM, Dick Hollenbeck wrote:
> On 02/06/2014 04:26 PM, Maciej Sumiński wrote:
>
>> It is not my intention to increase the number of bits in m_VisibleElements - I prefer
>> to leave it as it is now, particularly that it is saved as a 32-bit number in
>> .kicad_pcb files and I would like to preserve compatibility (so if older versions
>> expect 32-bit number there
>
> Note, that if we were always bound to allow older versions of KiCad to load newer files,
> then it would be impossible to add new features which needed saving on disk.
>
> I value new features far more. We can all stop writing code and wasting time on a mailing
> list if we are not to write features requiring file format changes. It would essentially
> mean that we could only make improvements which do not require change.
>
> The pay is too low already. If you can find a way to make improvements without also
> making changes, then I am in the wrong universe.

Sure, I am aware that to improve you need to change, but not always the
file format. In this case, one cannot even benefit from saving the
visibility settings for netname layers, as they are turned on/off
together with copper layers. To take advantage of that, we need to add
some checkboxes first.
We could put in a document all the changes that we want to introduce to
the file format and then change it every e.g. 6 months according to the
paper. In this way, users will not be bothered by so frequent file
format changes. Especially that the majority seems to be using the
stable version, so they would not be able to open files done with the
newest product (and getting the freshest product is still beyond
capabilities of many users).

>> - let them have it and do not crash/do weird things on load
>> of PCBs holding 64 bits for elements visiblity).
>
>
> Not really an issue, if you parse an ASCII 64 bit number into a 32 bit binary integer, in
> old code, the lower 32 bits are likely preserved. So in this case you might have been OK.
> If not, folks can stick with their old software and old BOARDs.

Ok, I checked the code and it probably will not crash. parseHex() calls
strtol(), so depending on the platform (and size of long int) you will
get either the least significant 32 bits (good; that works for x86_64)
or LONG_MAX or LONG_MIN (i686) - to me it looks like a bug.

>> Saving netnames layers visibility is
>> not really crucial, it can be restored basing on visibility settings of appropriate
>> copper layers.
>
> I like the feature! And I like the 33rd feature which I want to save to disk, whatever it is.
>
> I would like to save it to disk, and have it be BOARD centric, not project centric.
>
> Eventually we'll hit some kind of wall, if not here, now, then sometime.
> Saving a bit map as an ASCII integer is only one possibility anyways. There are numerous
> alternatives for expansion:
>
> a) save a 64 bit integer in ASCII.
>
> b) use s-expressions to name each bit.
>
> c) An arbitrartily long ASCII binary number
> 0000_1011_1110_0011....
>
> This can extend far off the page if needed.
>
> Parsing that would be pretty easy, the underscore saves a human some counting. At some
> point you qu...

[Dick Hollenbeck (dickelbeck)]

>
> Sincerely, my main concern is to fix the bug. I have already learned a
> lesson and reverted the commit that you have found improper. Is there
> anything else that I could do to have the branch merged?

Yep, move this out of the header file, into a *.cpp file please.
I think it is being instantiated in ALL compilation units in which it is visible, when
doing a DEBUG build. You only need it in ONE compilation unit for it to do its duty.

+#ifndef NDEBUG
+struct static_check {
+ static_check()
+ {
+ // Long (the type used for saving visibility settings) is only 32 bits guaranteed,
+ // be sure that we do not cross the limit
+ assert( END_PCB_VISIBLE_LIST <= 32 );
+ };
+};
+static static_check check;
+#endif

After than change, I approve the patch and somebody else can feel free to commit it as far
as I am concerned.

Sorry, I am too busy.

Dick

[Dick Hollenbeck (dickelbeck)]

On 02/07/2014 02:45 AM, Maciej Sumiński wrote:
> On 02/06/2014 11:48 PM, Dick Hollenbeck wrote:
>> On 02/06/2014 04:26 PM, Maciej Sumiński wrote:
>>
>>> It is not my intention to increase the number of bits in m_VisibleElements - I prefer
>>> to leave it as it is now, particularly that it is saved as a 32-bit number in
>>> .kicad_pcb files and I would like to preserve compatibility (so if older versions
>>> expect 32-bit number there
>>
>> Note, that if we were always bound to allow older versions of KiCad to load newer files,
>> then it would be impossible to add new features which needed saving on disk.
>>
>> I value new features far more. We can all stop writing code and wasting time on a mailing
>> list if we are not to write features requiring file format changes. It would essentially
>> mean that we could only make improvements which do not require change.
>>
>> The pay is too low already. If you can find a way to make improvements without also
>> making changes, then I am in the wrong universe.
>
> Sure, I am aware that to improve you need to change, but not always the
> file format. In this case, one cannot even benefit from saving the
> visibility settings for netname layers, as they are turned on/off
> together with copper layers. To take advantage of that, we need to add
> some checkboxes first.
> We could put in a document all the changes that we want to introduce to
> the file format and then change it every e.g. 6 months according to the
> paper. In this way, users will not be bothered by so frequent file
> format changes. Especially that the majority seems to be using the
> stable version, so they would not be able to open files done with the
> newest product (and getting the freshest product is still beyond
> capabilities of many users).

Orson,

I am very impressed with your skill set, and I think that your time on the project is
extremely valuable to its future longevity. You have my profound respect and hopes for
the future. You are one of the bright spots in the project moving forward.

Your employer is paying for your time. I am paying for my time.

Therefore, my time is more important than anything, and I am insanely intolerant of it
being wasted or disrespected. But it also gives you a view of the lens from which I see
things.

You think our users are the most important thing. I think our developers are the most
important thing.

Note that I run a company. In that world, the users are the most important thing.

Here, in open source, you've got squat without developers.

>>
>> The lesson here is that "long" is
>>
>> a) not necessarily longer than int, and
>>
>> b) not known until you pick a machine and a compiler. So you don't get 64 bitness if
>> thats what you need.
>
> But it is not what I needed - as I said, it was only to assure 32 bits
> size.

int is 32 bits (at least) or the whole wx graphics realm would not work, nor would you
be able to support our internal units of nanometers. You are new to the project, but
anyone with 3 years here would know we needed 32 bit ints for wxInt to work for us.
wxPoint, etc. We did all the math, looked at every one of the 4 billion possibilities, etc....

[lp:~cern-kicad/kicad/bugfix_1275319]

4660. By Maciej Suminski on 2014-02-07

Moved PCB_VISIBLE size check to .cpp.

[Maciej Suminski (orsonmmz)]

On 02/07/2014 09:00 PM, Dick Hollenbeck wrote:
> On 02/07/2014 02:45 AM, Maciej Sumiński wrote:
>> On 02/06/2014 11:48 PM, Dick Hollenbeck wrote:
>>> On 02/06/2014 04:26 PM, Maciej Sumiński wrote:
>>>
>>>> It is not my intention to increase the number of bits in m_VisibleElements - I prefer
>>>> to leave it as it is now, particularly that it is saved as a 32-bit number in
>>>> .kicad_pcb files and I would like to preserve compatibility (so if older versions
>>>> expect 32-bit number there
>>>
>>> Note, that if we were always bound to allow older versions of KiCad to load newer files,
>>> then it would be impossible to add new features which needed saving on disk.
>>>
>>> I value new features far more. We can all stop writing code and wasting time on a mailing
>>> list if we are not to write features requiring file format changes. It would essentially
>>> mean that we could only make improvements which do not require change.
>>>
>>> The pay is too low already. If you can find a way to make improvements without also
>>> making changes, then I am in the wrong universe.
>>
>> Sure, I am aware that to improve you need to change, but not always the
>> file format. In this case, one cannot even benefit from saving the
>> visibility settings for netname layers, as they are turned on/off
>> together with copper layers. To take advantage of that, we need to add
>> some checkboxes first.
>> We could put in a document all the changes that we want to introduce to
>> the file format and then change it every e.g. 6 months according to the
>> paper. In this way, users will not be bothered by so frequent file
>> format changes. Especially that the majority seems to be using the
>> stable version, so they would not be able to open files done with the
>> newest product (and getting the freshest product is still beyond
>> capabilities of many users).
>
>
> Orson,
>
> I am very impressed with your skill set, and I think that your time on the project is
> extremely valuable to its future longevity. You have my profound respect and hopes for
> the future. You are one of the bright spots in the project moving forward.
>
> Your employer is paying for your time. I am paying for my time.
>
> Therefore, my time is more important than anything, and I am insanely intolerant of it
> being wasted or disrespected. But it also gives you a view of the lens from which I see
> things.
>
> You think our users are the most important thing. I think our developers are the most
> important thing.
>
> Note that I run a company. In that world, the users are the most important thing.
>
> Here, in open source, you've got squat without developers.

Thank you for the words of appreciation. I can only imagine that running
a company is far from recreation and sometimes I really wonder how do
you manage to still find time for KiCad development.
I believe that in the open source world users and developers are equally
valuable, they just have different roles. And I know that development
costs much more time than filling out bug reports (if user decides to
give any feedback at all), but without having users you lose the
sensation of contribution and (sometimes) gratitude from users...

[Lorenzo Marcantonio (l-marcantonio)]

On Fri, Feb 07, 2014 at 08:00:46PM -0000, Dick Hollenbeck wrote:
> >>> It is not my intention to increase the number of bits in m_VisibleElements - I prefer
> >>> to leave it as it is now, particularly that it is saved as a 32-bit number in
> >>> .kicad_pcb files and I would like to preserve compatibility (so if older versions
> >>> expect 32-bit number there

My 2 eurocents:

1) I agree that it's granted that int is 32 or 64 bits on a PC. IIRC
the standard says that 'int is the most efficient integer for the
machine' (in fact for many RISC machines short or chars are hell on
earth... some DSPs even say that a char is 16 bits: have fun with
sizeof). So that predates even 1995, up to the first 32 bit C compilers with
dos extenders on the 386, circa 1990...

Another (more important IMHO) thing against long is that on the x86_64
ABI it's actually 128 bit which is overkill for most applications. And
needs 8 bytes and multiple precision arithmetic, AFAIK. So it's
not a noise issue for me since I am a typedef lover anyway :D

2) the 'correct' solution would be saving the visibility list as a list,
like the layers. Slightly more than a nuisance (I hope), we just need
someone implementing that.

> >> The lesson here is that "long" is
> >>
> >> a) not necessarily longer than int, and

ISO says so anyway, long is "at least" big as an int (and int is at
least 16 bits, but we can rely on it being at least 32). Unless you want
to port kicad to your favourite 16 bit micro, obviously.

> >> b) not known until you pick a machine and a compiler. So you don't get 64 bitness if
> >> thats what you need.

cmake/autoconf does that. stdint.h does it even better.

--
Lorenzo Marcantonio
Logos Srl

[Dick Hollenbeck (dickelbeck)]

On 02/07/2014 02:27 PM, Maciej Sumiński wrote:
> On 02/07/2014 09:00 PM, Dick Hollenbeck wrote:
>> On 02/07/2014 02:45 AM, Maciej Sumiński wrote:
>>> On 02/06/2014 11:48 PM, Dick Hollenbeck wrote:
>>>> On 02/06/2014 04:26 PM, Maciej Sumiński wrote:
>>>>
>>>>> It is not my intention to increase the number of bits in m_VisibleElements - I prefer
>>>>> to leave it as it is now, particularly that it is saved as a 32-bit number in
>>>>> .kicad_pcb files and I would like to preserve compatibility (so if older versions
>>>>> expect 32-bit number there
>>>>
>>>> Note, that if we were always bound to allow older versions of KiCad to load newer files,
>>>> then it would be impossible to add new features which needed saving on disk.
>>>>
>>>> I value new features far more. We can all stop writing code and wasting time on a mailing
>>>> list if we are not to write features requiring file format changes. It would essentially
>>>> mean that we could only make improvements which do not require change.
>>>>
>>>> The pay is too low already. If you can find a way to make improvements without also
>>>> making changes, then I am in the wrong universe.
>>>
>>> Sure, I am aware that to improve you need to change, but not always the
>>> file format. In this case, one cannot even benefit from saving the
>>> visibility settings for netname layers, as they are turned on/off
>>> together with copper layers. To take advantage of that, we need to add
>>> some checkboxes first.
>>> We could put in a document all the changes that we want to introduce to
>>> the file format and then change it every e.g. 6 months according to the
>>> paper. In this way, users will not be bothered by so frequent file
>>> format changes. Especially that the majority seems to be using the
>>> stable version, so they would not be able to open files done with the
>>> newest product (and getting the freshest product is still beyond
>>> capabilities of many users).
>>
>>
>> Orson,
>>
>> I am very impressed with your skill set, and I think that your time on the project is
>> extremely valuable to its future longevity. You have my profound respect and hopes for
>> the future. You are one of the bright spots in the project moving forward.
>>
>> Your employer is paying for your time. I am paying for my time.
>>
>> Therefore, my time is more important than anything, and I am insanely intolerant of it
>> being wasted or disrespected. But it also gives you a view of the lens from which I see
>> things.
>>
>> You think our users are the most important thing. I think our developers are the most
>> important thing.
>>
>> Note that I run a company. In that world, the users are the most important thing.
>>
>> Here, in open source, you've got squat without developers.
>
> Thank you for the words of appreciation. I can only imagine that running
> a company is far from recreation and sometimes I really wonder how do
> you manage to still find time for KiCad development.
> I believe that in the open source world users and developers are equally
> valuable, they just have different roles. And I know that development
> costs much more time than filling out bug reports (if user decides to
> give any fee...

[Maciej Suminski (orsonmmz)]

That is quite interesting point of view, that is hard to argue with.
Getting back to the problem - is there anything that I should correct or could I have the patch merged? Now it is just the fix and some code cleaning. I bet that someone will again report the bug later.

Regards,
Orson

=== modified file 'include/class_board_design_settings.h'
--- include/class_board_design_settings.h	2013-08-28 16:14:39 +0000
+++ include/class_board_design_settings.h	2014-02-07 20:17:03 +0000
@@ -119,23 +119,25 @@
      * Function IsElementVisible
      * tests whether a given element category is visible. Keep this as an
      * inline function.
-     * @param aPCB_VISIBLE is from the enum by the same name
+     * @param aElementCategory is from the enum by the same name
      * @return bool - true if the element is visible.
      * @see enum PCB_VISIBLE
      */
-    bool IsElementVisible( int aPCB_VISIBLE ) const
+    bool IsElementVisible( int aElementCategory ) const
     {
-        return bool( m_VisibleElements & (1 << aPCB_VISIBLE) );
+        assert( aElementCategory >= 0 && aElementCategory < END_PCB_VISIBLE_LIST );
+
+        return ( m_VisibleElements & ( 1 << aElementCategory ) );
     }
 
     /**
      * Function SetElementVisibility
      * changes the visibility of an element category
-     * @param aPCB_VISIBLE is from the enum by the same name
+     * @param aElementCategory is from the enum by the same name
      * @param aNewState = The new visibility state of the element category
      * @see enum PCB_VISIBLE
      */
-    void SetElementVisibility( int aPCB_VISIBLE, bool aNewState );
+    void SetElementVisibility( int aElementCategory, bool aNewState );
 
     /**
      * Function GetEnabledLayers
 
=== modified file 'include/layers_id_colors_and_visibility.h'
--- include/layers_id_colors_and_visibility.h	2013-11-06 17:17:42 +0000
+++ include/layers_id_colors_and_visibility.h	2014-02-07 20:17:03 +0000
@@ -239,8 +239,21 @@
     PADS_HOLES_VISIBLE,
     VIAS_HOLES_VISIBLE,
 
-    // Netname layers
-    LAYER_1_NETNAMES_VISIBLE,   // Bottom layer
+    WORKSHEET,                  ///< worksheet frame
+    GP_OVERLAY,                 ///< general purpose overlay
+
+    END_PCB_VISIBLE_LIST        // sentinel
+};
+
+/**
+ * Enum NETNAMES_VISIBLE
+ * is a set of layers specific for displaying net names.
+ * Their visiblity is not supposed to be saved in a board file,
+ * they are only to be used by the GAL.
+ */
+enum NETNAMES_VISIBLE
+{
+    LAYER_1_NETNAMES_VISIBLE,   // bottom layer
     LAYER_2_NETNAMES_VISIBLE,
     LAYER_3_NETNAMES_VISIBLE,
     LAYER_4_NETNAMES_VISIBLE,
@@ -255,25 +268,22 @@
     LAYER_13_NETNAMES_VISIBLE,
     LAYER_14_NETNAMES_VISIBLE,
     LAYER_15_NETNAMES_VISIBLE,
-    LAYER_16_NETNAMES_VISIBLE,  // Top layer
+    LAYER_16_NETNAMES_VISIBLE,  // top layer
+
     PAD_FR_NETNAMES_VISIBLE,
     PAD_BK_NETNAMES_VISIBLE,
     PADS_NETNAMES_VISIBLE,
 
-    WORKSHEET,
-    GP_OVERLAY,                 // General purpose overlay
-
-    END_PCB_VISIBLE_LIST  // sentinel
+    END_NETNAMES_VISIBLE_LIST   // sentinel
 };
 
-#define FIRST_NETNAME_LAYER     ITEM_GAL_LAYER( LAYER_1_NETNAMES_VISIBLE )
-#define LAST_NETNAME_LAYER      ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE )
-
 /// macro for obtaining layer number for specific item (eg. pad or text)
-#define ITEM_GAL_LAYER(layer)	(NB_LAYERS + layer)
+#define ITEM_GAL_LAYER(layer)       (NB_LAYERS + layer)
+
+#define NETNAMES_GAL_LAYER(layer)   (NB_LAYERS + END_PCB_VISIBLE_LIST + layer )
 
 /// number of *all* layers including PCB and item layers
-#define TOTAL_LAYER_COUNT	    128 //(NB_LAYERS + END_PCB_VISIBLE_LIST)
+#define TOTAL_LAYER_COUNT	        (NB_LAYERS + END_PCB_VISIBLE_LIST + END_NETNAMES_VISIBLE_LIST)
 
 /**
  * Function IsValidLayer
@@ -390,30 +400,28 @@
 inline LAYER_NUM GetNetnameLayer( LAYER_NUM aLayer )
 {
     if( IsCopperLayer( aLayer ) )
-    {
-        // Compute the offset in description layers
-        return FIRST_NETNAME_LAYER + ( aLayer - FIRST_COPPER_LAYER );
-    }
+        return NETNAMES_GAL_LAYER( aLayer );
     else if( aLayer == ITEM_GAL_LAYER( PADS_VISIBLE ) )
-        return ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE );
+        return NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE );
     else if( aLayer == ITEM_GAL_LAYER( PAD_FR_VISIBLE ) )
-            return ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE );
+        return NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE );
     else if( aLayer == ITEM_GAL_LAYER( PAD_BK_VISIBLE ) )
-            return ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE );
+        return NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE );
 
     // Fallback
     return COMMENT_N;
 }
 
 /**
- * Function IsCopperLayer
+ * Function IsNetnameLayer
  * tests whether a layer is a netname layer
  * @param aLayer = Layer to test
  * @return true if aLayer is a valid netname layer
  */
 inline bool IsNetnameLayer( LAYER_NUM aLayer )
 {
-    return aLayer >= FIRST_NETNAME_LAYER && aLayer <= LAST_NETNAME_LAYER;
+    return aLayer >= NETNAMES_GAL_LAYER( LAYER_1_NETNAMES_VISIBLE ) &&
+           aLayer < NETNAMES_GAL_LAYER( END_NETNAMES_VISIBLE_LIST );
 }
 
 #endif // _LAYERS_ID_AND_VISIBILITY_H_
 
=== modified file 'pcbnew/basepcbframe.cpp'
--- pcbnew/basepcbframe.cpp	2013-12-26 22:36:43 +0000
+++ pcbnew/basepcbframe.cpp	2014-02-07 20:17:03 +0000
@@ -75,7 +75,7 @@
 const LAYER_NUM PCB_BASE_FRAME::GAL_LAYER_ORDER[] =
 {
     ITEM_GAL_LAYER( GP_OVERLAY ),
-    ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
+    NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
     DRAW_N, COMMENT_N, ECO1_N, ECO2_N, EDGE_N,
     UNUSED_LAYER_29, UNUSED_LAYER_30, UNUSED_LAYER_31,
     ITEM_GAL_LAYER( MOD_TEXT_FR_VISIBLE ),
@@ -85,25 +85,25 @@
     ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ),
     ITEM_GAL_LAYER( VIAS_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ),
 
-    ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_FR_VISIBLE ), SOLDERMASK_N_FRONT,
-    ITEM_GAL_LAYER( LAYER_16_NETNAMES_VISIBLE ), LAYER_N_FRONT,
+    NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_FR_VISIBLE ), SOLDERMASK_N_FRONT,
+    NETNAMES_GAL_LAYER( LAYER_16_NETNAMES_VISIBLE ), LAYER_N_FRONT,
     SILKSCREEN_N_FRONT, SOLDERPASTE_N_FRONT, ADHESIVE_N_FRONT,
-    ITEM_GAL_LAYER( LAYER_15_NETNAMES_VISIBLE ), LAYER_N_15,
-    ITEM_GAL_LAYER( LAYER_14_NETNAMES_VISIBLE ), LAYER_N_14,
-    ITEM_GAL_LAYER( LAYER_13_NETNAMES_VISIBLE ), LAYER_N_13,
-    ITEM_GAL_LAYER( LAYER_12_NETNAMES_VISIBLE ), LAYER_N_12,
-    ITEM_GAL_LAYER( LAYER_11_NETNAMES_VISIBLE ), LAYER_N_11,
-    ITEM_GAL_LAYER( LAYER_10_NETNAMES_VISIBLE ), LAYER_N_10,
-    ITEM_GAL_LAYER( LAYER_9_NETNAMES_VISIBLE ), LAYER_N_9,
-    ITEM_GAL_LAYER( LAYER_8_NETNAMES_VISIBLE ), LAYER_N_8,
-    ITEM_GAL_LAYER( LAYER_7_NETNAMES_VISIBLE ), LAYER_N_7,
-    ITEM_GAL_LAYER( LAYER_6_NETNAMES_VISIBLE ), LAYER_N_6,
-    ITEM_GAL_LAYER( LAYER_5_NETNAMES_VISIBLE ), LAYER_N_5,
-    ITEM_GAL_LAYER( LAYER_4_NETNAMES_VISIBLE ), LAYER_N_4,
-    ITEM_GAL_LAYER( LAYER_3_NETNAMES_VISIBLE ), LAYER_N_3,
-    ITEM_GAL_LAYER( LAYER_2_NETNAMES_VISIBLE ), LAYER_N_2,
-    ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_BK_VISIBLE ), SOLDERMASK_N_BACK,
-    ITEM_GAL_LAYER( LAYER_1_NETNAMES_VISIBLE ), LAYER_N_BACK,
+    NETNAMES_GAL_LAYER( LAYER_15_NETNAMES_VISIBLE ), LAYER_N_15,
+    NETNAMES_GAL_LAYER( LAYER_14_NETNAMES_VISIBLE ), LAYER_N_14,
+    NETNAMES_GAL_LAYER( LAYER_13_NETNAMES_VISIBLE ), LAYER_N_13,
+    NETNAMES_GAL_LAYER( LAYER_12_NETNAMES_VISIBLE ), LAYER_N_12,
+    NETNAMES_GAL_LAYER( LAYER_11_NETNAMES_VISIBLE ), LAYER_N_11,
+    NETNAMES_GAL_LAYER( LAYER_10_NETNAMES_VISIBLE ), LAYER_N_10,
+    NETNAMES_GAL_LAYER( LAYER_9_NETNAMES_VISIBLE ), LAYER_N_9,
+    NETNAMES_GAL_LAYER( LAYER_8_NETNAMES_VISIBLE ), LAYER_N_8,
+    NETNAMES_GAL_LAYER( LAYER_7_NETNAMES_VISIBLE ), LAYER_N_7,
+    NETNAMES_GAL_LAYER( LAYER_6_NETNAMES_VISIBLE ), LAYER_N_6,
+    NETNAMES_GAL_LAYER( LAYER_5_NETNAMES_VISIBLE ), LAYER_N_5,
+    NETNAMES_GAL_LAYER( LAYER_4_NETNAMES_VISIBLE ), LAYER_N_4,
+    NETNAMES_GAL_LAYER( LAYER_3_NETNAMES_VISIBLE ), LAYER_N_3,
+    NETNAMES_GAL_LAYER( LAYER_2_NETNAMES_VISIBLE ), LAYER_N_2,
+    NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_BK_VISIBLE ), SOLDERMASK_N_BACK,
+    NETNAMES_GAL_LAYER( LAYER_1_NETNAMES_VISIBLE ), LAYER_N_BACK,
 
     ADHESIVE_N_BACK, SOLDERPASTE_N_BACK, SILKSCREEN_N_BACK,
     ITEM_GAL_LAYER( MOD_TEXT_BK_VISIBLE ),
@@ -793,14 +793,14 @@
     // Some more required layers settings
     view->SetRequired( ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE ), ITEM_GAL_LAYER( VIAS_VISIBLE ) );
     view->SetRequired( ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ) );
-    view->SetRequired( ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ) );
+    view->SetRequired( NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ) );
 
-    view->SetRequired( ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
+    view->SetRequired( NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
     view->SetRequired( ADHESIVE_N_FRONT, ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
     view->SetRequired( SOLDERPASTE_N_FRONT, ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
     view->SetRequired( SOLDERMASK_N_FRONT, ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
 
-    view->SetRequired( ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
+    view->SetRequired( NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
     view->SetRequired( ADHESIVE_N_BACK, ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
     view->SetRequired( SOLDERPASTE_N_BACK, ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
     view->SetRequired( SOLDERMASK_N_BACK, ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
 
=== modified file 'pcbnew/class_board_design_settings.cpp'
--- pcbnew/class_board_design_settings.cpp	2013-08-28 16:14:39 +0000
+++ pcbnew/class_board_design_settings.cpp	2014-02-07 20:17:03 +0000
@@ -243,3 +243,16 @@
     // update m_CopperLayerCount to ensure its consistency with m_EnabledLayers
     m_CopperLayerCount = LayerMaskCountSet( aMask & ALL_CU_LAYERS);
 }
+
+
+#ifndef NDEBUG
+struct static_check {
+   static_check()
+   {
+       // Int (the type used for saving visibility settings) is only 32 bits guaranteed,
+       // be sure that we do not cross the limit
+       assert( END_PCB_VISIBLE_LIST <= 32 );
+   };
+};
+static static_check check;
+#endif
 
=== modified file 'pcbnew/class_pad.cpp'
--- pcbnew/class_pad.cpp	2014-01-26 14:20:58 +0000
+++ pcbnew/class_pad.cpp	2014-02-07 20:17:03 +0000
@@ -841,7 +841,7 @@
     {
         // Multi layer pad
         aLayers[aCount++] = ITEM_GAL_LAYER( PADS_VISIBLE );
-        aLayers[aCount++] = ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE );
+        aLayers[aCount++] = NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE );
         aLayers[aCount++] = SOLDERMASK_N_FRONT;
         aLayers[aCount++] = SOLDERMASK_N_BACK;
         aLayers[aCount++] = SOLDERPASTE_N_FRONT;
@@ -850,14 +850,14 @@
     else if( IsOnLayer( LAYER_N_FRONT ) )
     {
         aLayers[aCount++] = ITEM_GAL_LAYER( PAD_FR_VISIBLE );
-        aLayers[aCount++] = ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE );
+        aLayers[aCount++] = NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE );
         aLayers[aCount++] = SOLDERMASK_N_FRONT;
         aLayers[aCount++] = SOLDERPASTE_N_FRONT;
     }
     else if( IsOnLayer( LAYER_N_BACK ) )
     {
         aLayers[aCount++] = ITEM_GAL_LAYER( PAD_BK_VISIBLE );
-        aLayers[aCount++] = ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE );
+        aLayers[aCount++] = NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE );
         aLayers[aCount++] = SOLDERMASK_N_BACK;
         aLayers[aCount++] = SOLDERPASTE_N_BACK;
     }
 
=== modified file 'pcbnew/class_track.cpp'
--- pcbnew/class_track.cpp	2013-12-29 11:01:54 +0000
+++ pcbnew/class_track.cpp	2014-02-07 20:17:03 +0000
@@ -763,9 +763,9 @@
 unsigned int TRACK::ViewGetLOD( int aLayer ) const
 {
     // Netnames will be shown only if zoom is appropriate
-    if( aLayer == GetNetnameLayer( GetLayer() ) )
+    if( IsNetnameLayer( aLayer ) )
     {
-        return ( 20000000 / m_Width );
+        return ( 20000000 / ( m_Width + 1 ) );
     }
 
     // Other layers are shown without any conditions
 
=== modified file 'pcbnew/pcb_painter.cpp'
--- pcbnew/pcb_painter.cpp	2014-01-26 14:20:58 +0000
+++ pcbnew/pcb_painter.cpp	2014-02-07 20:17:03 +0000
@@ -68,14 +68,14 @@
     }
 
     // Default colors for specific layers
-    m_layerColors[ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE )]         = COLOR4D( 0.5, 0.4, 0.0, 1.0 );
-    m_layerColors[ITEM_GAL_LAYER( PADS_HOLES_VISIBLE )]         = COLOR4D( 0.0, 0.5, 0.5, 1.0 );
-    m_layerColors[ITEM_GAL_LAYER( VIAS_VISIBLE )]               = COLOR4D( 0.7, 0.7, 0.7, 1.0 );
-    m_layerColors[ITEM_GAL_LAYER( PADS_VISIBLE )]               = COLOR4D( 0.7, 0.7, 0.7, 1.0 );
-    m_layerColors[ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE )]      = COLOR4D( 0.8, 0.8, 0.8, 0.7 );
-    m_layerColors[ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE )]    = COLOR4D( 0.8, 0.8, 0.8, 0.7 );
-    m_layerColors[ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE )]    = COLOR4D( 0.8, 0.8, 0.8, 0.7 );
-    m_layerColors[ITEM_GAL_LAYER( WORKSHEET )]                  = COLOR4D( 0.5, 0.0, 0.0, 1.0 );
+    m_layerColors[ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE )]             = COLOR4D( 0.5, 0.4, 0.0, 1.0 );
+    m_layerColors[ITEM_GAL_LAYER( PADS_HOLES_VISIBLE )]             = COLOR4D( 0.0, 0.5, 0.5, 1.0 );
+    m_layerColors[ITEM_GAL_LAYER( VIAS_VISIBLE )]                   = COLOR4D( 0.7, 0.7, 0.7, 1.0 );
+    m_layerColors[ITEM_GAL_LAYER( PADS_VISIBLE )]                   = COLOR4D( 0.7, 0.7, 0.7, 1.0 );
+    m_layerColors[NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE )]      = COLOR4D( 0.8, 0.8, 0.8, 0.7 );
+    m_layerColors[NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE )]    = COLOR4D( 0.8, 0.8, 0.8, 0.7 );
+    m_layerColors[NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE )]    = COLOR4D( 0.8, 0.8, 0.8, 0.7 );
+    m_layerColors[ITEM_GAL_LAYER( WORKSHEET )]                      = COLOR4D( 0.5, 0.0, 0.0, 1.0 );
 
     // Netnames for copper layers
     for( LAYER_NUM layer = FIRST_COPPER_LAYER; layer <= LAST_COPPER_LAYER; ++layer )
@@ -261,13 +261,14 @@
     VECTOR2D start( aTrack->GetStart() );
     VECTOR2D end( aTrack->GetEnd() );
     int      width = aTrack->GetWidth();
-    int      netNumber = aTrack->GetNet();
     COLOR4D  color;
 
     if( m_pcbSettings->m_netNamesOnTracks && IsNetnameLayer( aLayer ) )
     {
+        int netCode = aTrack->GetNet();
+
         // If there is a net name - display it on the track
-        if( netNumber > 0 )
+        if( netCode > 0 )
         {
             VECTOR2D line = ( end - start );
             double length = line.EuclideanNorm();
@@ -276,11 +277,11 @@
             if( length < 10 * width )
                 return;
 
-            NETINFO_ITEM* net = ( (BOARD*) aTrack->GetParent() )->FindNet( netNumber );
+            NETINFO_ITEM* net = ( (BOARD*) aTrack->GetParent() )->FindNet( netCode );
             if( !net )
                 return;
 
-            std::wstring netName = std::wstring( net->GetShortNetname().wc_str() );
+            wxString netName = net->GetShortNetname();
             VECTOR2D textPosition = start + line / 2.0;     // center of the track
             double textOrientation = -atan( line.y / line.x );
             double textSize = std::min( static_cast<double>( width ), length / netName.length() );
@@ -304,7 +305,7 @@
             m_gal->StrokeText( netName, textPosition, textOrientation );
         }
     }
-    else if( IsCopperLayer( aLayer ))
+    else if( IsCopperLayer( aLayer ) )
     {
         // Draw a regular track
         color = m_pcbSettings->GetColor( aTrack, aLayer );
 
=== modified file 'pcbnew/pcb_painter.h'
--- pcbnew/pcb_painter.h	2013-11-01 09:06:50 +0000
+++ pcbnew/pcb_painter.h	2014-02-07 20:17:03 +0000
@@ -114,6 +114,7 @@
     ///> Colors for all layers (darkened)
     COLOR4D m_layerColorsDark[TOTAL_LAYER_COUNT];
 
+    ///> Flag determining if items on a given layer should be drawn as an outline or a full item
     bool    m_sketchModeSelect[TOTAL_LAYER_COUNT];
 
     ///> Flag determining if pad numbers should be visible
 
=== modified file 'pcbnew/pcbframe.cpp'
--- pcbnew/pcbframe.cpp	2014-01-28 01:29:26 +0000
+++ pcbnew/pcbframe.cpp	2014-02-07 20:17:03 +0000
@@ -916,7 +916,7 @@
         LAYER_NUM layers[] = {
                 GetNetnameLayer( aLayer ), ITEM_GAL_LAYER( VIAS_VISIBLE ),
                 ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ),
-                ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
+                ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
                 ITEM_GAL_LAYER( GP_OVERLAY ), ITEM_GAL_LAYER( RATSNEST_VISIBLE )
         };
 
@@ -927,12 +927,12 @@
         if( aLayer == FIRST_COPPER_LAYER )
         {
             rSettings->SetActiveLayer( ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
-            rSettings->SetActiveLayer( ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ) );
+            rSettings->SetActiveLayer( NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ) );
         }
         else if( aLayer == LAST_COPPER_LAYER )
         {
             rSettings->SetActiveLayer( ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
-            rSettings->SetActiveLayer( ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ) );
+            rSettings->SetActiveLayer( NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ) );
         }
     }
 
@@ -956,7 +956,7 @@
         LAYER_NUM layers[] = {
                 GetNetnameLayer( aLayer ), ITEM_GAL_LAYER( VIAS_VISIBLE ),
                 ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ),
-                ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
+                ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), NETNAMES_GAL_LAYER( PADS_NETNAMES_VISIBLE ),
                 ITEM_GAL_LAYER( GP_OVERLAY ), ITEM_GAL_LAYER( RATSNEST_VISIBLE ), DRAW_N
         };
 
@@ -969,12 +969,12 @@
         if( aLayer == FIRST_COPPER_LAYER )
         {
             view->SetTopLayer( ITEM_GAL_LAYER( PAD_BK_VISIBLE ) );
-            view->SetTopLayer( ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ) );
+            view->SetTopLayer( NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ) );
         }
         else if( aLayer == LAST_COPPER_LAYER )
         {
             view->SetTopLayer( ITEM_GAL_LAYER( PAD_FR_VISIBLE ) );
-            view->SetTopLayer( ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ) );
+            view->SetTopLayer( NETNAMES_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE ) );
         }
     }
 
@@ -1014,10 +1014,15 @@
     m_Layers->SyncLayerVisibilities();
 
     KIGFX::VIEW* view = GetGalCanvas()->GetView();
+
     // Load layer & elements visibility settings
     for( LAYER_NUM i = 0; i < NB_LAYERS; ++i )
     {
         view->SetLayerVisible( i, m_Pcb->IsLayerVisible( i ) );
+
+        // Synchronize netname layers as well
+        if( IsCopperLayer( i ) )
+            view->SetLayerVisible( GetNetnameLayer( i ), m_Pcb->IsLayerVisible( i ) );
     }
 
     for( LAYER_NUM i = 0; i < END_PCB_VISIBLE_LIST; ++i )
@@ -1026,12 +1031,10 @@
     }
 
     // Enable some layers that are GAL specific
-    for( LAYER_NUM i = FIRST_NETNAME_LAYER; i < LAST_NETNAME_LAYER; ++i )
-    {
-        view->SetLayerVisible( i, true );
-    }
     view->SetLayerVisible( ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), true );
     view->SetLayerVisible( ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE ), true );
+    view->SetLayerVisible( ITEM_GAL_LAYER( WORKSHEET ), true );
+    view->SetLayerVisible( ITEM_GAL_LAYER( GP_OVERLAY ), true );
 }
 
 
 
=== modified file 'pcbnew/router/router_preview_item.cpp'
--- pcbnew/router/router_preview_item.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/router_preview_item.cpp	2014-02-07 20:17:03 +0000
@@ -36,6 +36,7 @@
 {
     m_Flags = 0;
     m_parent = aParent;
+    m_layer = DRAW_N;
 
     if( aItem )
         Update( aItem );
 
=== modified file 'pcbnew/router/router_preview_item.h'
--- pcbnew/router/router_preview_item.h	2013-10-14 14:13:35 +0000
+++ pcbnew/router/router_preview_item.h	2014-02-07 20:17:03 +0000
@@ -73,7 +73,7 @@
 
     virtual void ViewGetLayers( int aLayers[], int& aCount ) const
     {
-        aLayers[0] = GP_OVERLAY;
+        aLayers[0] = m_layer;
         aCount = 1;
     }