FSN#33565 Versie 4.12 bugje in width_scale labels verwijderd

svn path=/Slnkdwf/trunk/; revision=26209
This commit is contained in:
Jos Groot Lipman
2015-09-07 15:58:01 +00:00
parent 41fc5beaf5
commit 6a380b99b3
2 changed files with 4 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
// Zorg dat versies alfabetisch altijd op elkaar volgen!
#define SLNK_MAJOR_VERSION 4
#define SLNK_MINOR_VERSION 11
#define SLNK_MINOR_VERSION 12
#define SLNK_BUILD_VERSION 0
// Define resource strings

View File

@@ -794,6 +794,7 @@ bool CWhipFile::GenerateSymbolLabels(myWT_File &my_file)
myfont.font_name() = m_FontName;
myfont.height() = fontheight;
myfont.rotation() = 0;
myfont.width_scale() = 0;
my_file.desired_rendition().font() = my_file.rendition().font() = myfont;
myfont.serialize(my_file); // Vertrouw niets. Expliciete serialize. Zie @@@
@@ -899,7 +900,7 @@ bool CWhipFile::GenerateLabels(WT_File &my_planfile, myWT_File &my_file, double
// TODO: Echt uniek layernum (en URL num) bepalen
my_file.desired_rendition().layer() = WT_Layer(my_file, 65533, "SLNK Labels");
WT_Font f;
f.width_scale(); // Triggert FONT_WIDTH_SCALE_BIT bitje zetten
f.width_scale() = 0; // Triggert FONT_WIDTH_SCALE_BIT bitje zetten
f.rotation() = 0;
f.serialize(my_file); // Op de default zetten.
my_file.desired_rendition().font() = my_file.rendition().font() = f;
@@ -911,6 +912,7 @@ bool CWhipFile::GenerateLabels(WT_File &my_planfile, myWT_File &my_file, double
WT_Font myfont;
myfont.font_name() = m_FontName;
myfont.height() = fontheight;
myfont.width_scale() = 0; // Triggert FONT_WIDTH_SCALE_BIT bitje zetten
myfont.rotation() = 0;
my_file.desired_rendition().font() = my_file.rendition().font() = myfont;
myfont.serialize(my_file); // Vertrouw niets. Expliciete serialize. Zie @@@