admin/Slnkdwf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#28477 Versie 3.15: node_num teller iets netter opgelost

Browse Source 
svn path=/Slnkdwf/trunk/; revision=20588
This commit is contained in:
Jos Groot Lipman
2014-02-09 14:23:17 +00:00
parent 8bcc4f50e5
commit fe4815fdf3
7 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SlnkDWFImpl/SLNKContourImpl.cpp
View File

@@ -637,7 +637,7 @@ CSize CSLNKContourImpl::DrawOneLabel(WT_File &my_file,
Als solidOnly dan alleen als alpha==255 en een label (wel herkend)
****************************************************************************/
WT_Result CSLNKContourImpl::serialize(WT_File & file, WT_Integer32 node_num, BOOL solidOnly, BOOL forFind, double scale)
WT_Result CSLNKContourImpl::serialize(WT_File & file, WT_Integer32 &node_num, BOOL solidOnly, BOOL forFind, double scale)
{
if (!m_fromSymbol && m_contLabel == "" && !solidOnly) // Alleen bij tweede slag
{ // May very well be a textobject itself, just emit it
@@ -657,7 +657,7 @@ WT_Result CSLNKContourImpl::serialize(WT_File & file, WT_Integer32 node_num, BOO
(m_Color.rgba().m_rgb.a<255 && !solidOnly))
{
// Start a node for 'everything'. Dit is wat we concreet teruggeven bij klikken in de tekening
WT_Object_Node my_node(file, node_num, m_Key);
WT_Object_Node my_node(file, node_num++, m_Key);
file.desired_rendition().object_node() = my_node;
//char s[256];

2
SlnkDWFImpl/SLNKContourImpl.h
View File

@@ -45,7 +45,7 @@ public:
double m_LabelRotation; // Label rotation, around Centroid!
double m_Fontheight; // Font hoogte in mm
WT_Result serialize(WT_File & file, WT_Integer32 node_num, BOOL solidOnly, BOOL forFind, double scale);
WT_Result serialize(WT_File & file, WT_Integer32 &node_num, BOOL solidOnly, BOOL forFind, double scale);
static BOOL PointInPolygon(const WT_Logical_Point pt, const WT_Point_Set &ps);
static BOOL PointInPolygon(const CPoint pt, const CPoint *ps, int size);
static void EdgeAngle(const WT_Logical_Point pt, const WT_Point_Set &ps, double &EdgeAngle, double &EdgeDistance);