AANS#31514 Versie 4.02: Betere rotatie reset na aanzetten werkplek symbolen

svn path=/Slnkdwf/trunk/; revision=24695
This commit is contained in:
Jos Groot Lipman
2015-04-06 12:49:57 +00:00
parent 0e37d774d2
commit 796afbab55
4 changed files with 6 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
// DWFFile.cpp : Implementation of CDWFFile
#include "stdafx.h"
#include "assert.h"
//#include "assert.h"
#include "DWFFile.h"
#include "myEPlotSection.h"

View File

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

View File

@@ -108,7 +108,7 @@ CSLNKSymbolDefinition::~CSLNKSymbolDefinition(void)
// Algoritm: search google for Bounding Octagon
// http://geometryalgorithms.com/Archive/algorithm_0107/algorithm_0107.htm
// (v2: bounding convex hull waarschijnlijk overkill)
#include <assert.h>
//#include <assert.h>
WT_Result CSLNKSymbolDefinition::calculateBoundary (CSLNKContourImpl &BoundingContour, WT_Transform *tm/*=null*/)
{
WT_Result result;

View File

@@ -793,6 +793,7 @@ bool CWhipFile::GenerateSymbolLabels(myWT_File &my_file)
WT_Font myfont;
myfont.font_name() = m_FontName;
myfont.height() = fontheight;
myfont.rotation() = 0;
my_file.desired_rendition().font() = my_file.rendition().font() = myfont;
myfont.serialize(my_file); // Vertrouw niets. Expliciete serialize. Zie @@@
@@ -899,6 +900,7 @@ bool CWhipFile::GenerateLabels(WT_File &my_planfile, myWT_File &my_file, double
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.rotation() = 0;
f.serialize(my_file); // Op de default zetten.
my_file.desired_rendition().font() = my_file.rendition().font() = f;
@@ -909,6 +911,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.rotation() = 0;
my_file.desired_rendition().font() = my_file.rendition().font() = myfont;
myfont.serialize(my_file); // Vertrouw niets. Expliciete serialize. Zie @@@