Widthscale en alpha van labels goed zetten

svn path=/Slnkdwf/trunk/; revision=30296

SlnkDWFCom/SLNKDWF.vcxproj

@@ -281,13 +281,13 @@
       <AdditionalDependencies>SLNKDWFStaticRW.lib;Secur32.lib;bblib.lib;qrcode.lib;w3dtk.1.7.1555.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(DWFTKPATH)\lib\x64\static\release\vc14.0;.\CxImage\;..\lib\x64\release\;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\SLNKDWF.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <ImportLibrary>$(OutDir)SLNKDWF.lib</ImportLibrary>
       <OutputFile>$(OutDir)$(TargetName)x64$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
     <PostBuildEvent />
     <PostBuildEvent>

SlnkDWFCom/WhipFile.cpp

@@ -923,7 +923,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.width_scale() = DEFAULT_WIDTH_SCALE; // 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 @@@

SlnkDWFImpl/SLNKContourImpl.cpp

@@ -360,12 +360,12 @@ void CSLNKContourImpl::SerializeLabel(WT_File &my_file,
 		// Net niet 100% kleuren om te zorgen dat bij achtergrond
 		// zwart/wit toggle deze kleuren niet mee togglen
 		if (isDarkRGB(DCclr))
-			my_file.desired_rendition().color() = WT_Color(254,254,254,0);
+			my_file.desired_rendition().color() = WT_Color(254,254,254);
 		else
-			my_file.desired_rendition().color() = WT_Color(1,1,1,0);
+			my_file.desired_rendition().color() = WT_Color(1,1,1);
 	}
 	else
-		my_file.desired_rendition().color() = WT_Color(255,255,255,0); //Teksten wit
+		my_file.desired_rendition().color() = WT_Color(255,255,255); //Teksten wit
 
 	CString tok(m_ShowLabel); // strtok seems to modify
 	tok.Replace("~", "\n"); // We ondersteunen ook ~ als newline
@@ -579,7 +579,7 @@ CSize CSLNKContourImpl::DrawOneLabel(WT_File &my_file,
 				CStringW s(token);
 				txt.set(s.GetLength(), s);
 			}
-			
+
 			// Corrigeren van m_LabelRotation
 			double radian = - m_LabelRotation / 180.0 * PI;
 			int rdx = myRound(horoffset  * cos(radian) - tot_height * sin(radian));
@@ -592,7 +592,7 @@ CSize CSLNKContourImpl::DrawOneLabel(WT_File &my_file,
 			my_file.desired_rendition().font().style().set_italic(false);
 			my_file.desired_rendition().font().style().set_bold(false);
 			my_file.desired_rendition().font().style().set_underlined(false);
-			my_file.desired_rendition().color() = WT_Color(255,255,255,0); //Teksten wit TODO: (contrasteren met background)
+			my_file.desired_rendition().color() = WT_Color(255,255,255); //Teksten wit TODO: (contrasteren met background)
 			my_file.desired_rendition().font().height() = l_fontheight;
 		}
 		else

historie.txt

@@ -1,6 +1,8 @@
-V4.14 11-08-2016
+V4.14 15-8-2016
  - Ook BMP formaat plaatjes ondersteunen
- - Crypto/b64_random en hex_random toegevoegd
+ - Crypto/b64_random en hex_random toegevoegd. De b64 is filename/url safe
+ - Contourlabels niet meer transparent
+ - Contourlabels widthfactor weer goede default default
 
 V4.13 11-08-2016
  - Bij Vectorworks dwfs beter oppervlakte uitrekenen