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

TUDE#14307 Spikes

Browse Source 
svn path=/Slnkdwf/trunk/; revision=12490
This commit is contained in:
Jos Groot Lipman
2008-07-03 12:07:58 +00:00
parent 9f4dfbfafb
commit 8e82108253
6 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SlnkDWFCom/SLNKDWFVersion.h
View File

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

9
SlnkDWFCom/SLNKSymbolDefImpl.cpp
View File

@@ -429,6 +429,15 @@ WT_Result CSLNKSymbolDefinition::serialize(WT_File & file, WT_Color pColor, BOOL
// Zou toch wel erg complex worden. Werkt ook maar matig
break;
}
if (obj->object_id() == WT_Object::Line_Weight_ID)
{ // Lineweight wordt door de DWF kit niet getransformeerd
// daarom doen we dat maar zelf. (Origineel ongemoeid laten)
double mul = file.heuristics().transform().m_x_scale; // x en y zijn toch gelijk
WT_Line_Weight wl;
wl.weight_value() = myRound(((WT_Line_Weight *)obj)->weight_value() * mul);
wl.serialize(file);
break;
}
if (obj->object_id() == WT_Object::Color_ID)
{ // Misschien een zwart-wit toggle doorvoeren? Of zelfs highlight?
// m_iEPlotSection->get_PaperColor()

4
SlnkDWFCom/SLNKdwf.rc
View File

@@ -71,11 +71,11 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Dijkoraad IT"
VALUE "CompanyName", "SG|facilitor"
VALUE "FileDescription", "Superlink DWF "
VALUE "FileVersion", SLNK_BUILDVERSION "\0"
VALUE "InternalName", "SLNKDWF.dll"
VALUE "LegalCopyright", "(c) Dijkoraad IT 2005-2008. All rights reserved."
VALUE "LegalCopyright", "(c) SG|facilitor 2005-2008. All rights reserved."
VALUE "OriginalFilename", "SLNKDWF.dll"
VALUE "ProductName", "Superlink"
VALUE "ProductVersion", SLNK_BUILDVERSION "\0"

10
SlnkDWFCom/WhipFile.cpp
View File

@@ -629,7 +629,7 @@ bool CWhipFile::GenerateSymbols(myWT_File &my_file)
{
double scale = m_State.m_contunits.application_to_dwf_transform()(0,0);
// TODO: Echt uniek layernum (en URL num) bepalen
my_file.desired_rendition().layer() = WT_Layer(my_file, 100000, "SLNK Symbols");
my_file.desired_rendition().layer() = WT_Layer(my_file, 65530, "SLNK Symbols");
for (size_t i=0; i<m_State.m_SLNKSymbols.GetCount(); i++)
{
@@ -668,7 +668,7 @@ bool CWhipFile::GenerateSymbolLabels(myWT_File &my_file)
clr.serialize(my_file); // Vertrouw niets. Expliciete serialize. Zie @@@
// TODO: Echt uniek layernum (en URL num) bepalen
my_file.desired_rendition().layer() = WT_Layer(my_file, 100001, "SLNK Symbol Labels");
my_file.desired_rendition().layer() = WT_Layer(my_file, 65531, "SLNK Symbol Labels");
for (size_t i=0; i<m_State.m_SLNKSymbols.GetCount(); i++)
{
CSLNKSymbolImpl *symbol= m_State.m_SLNKSymbols[i];
@@ -709,7 +709,9 @@ bool CWhipFile::GenerateContouren(WT_File &my_planfile, myWT_File &my_file,
WT_Object_Node current_node = my_file.desired_rendition().object_node();
// TODO: Echt uniek layernum (en URL num) bepalen
my_file.desired_rendition().layer() = WT_Layer(my_file, 100002, "SLNK Contours");
my_file.desired_rendition().layer() = WT_Layer(my_file, 65532, "SLNK Contours");
// Beide 'slagen' forceren (FSN#14349)
my_file.desired_rendition().layer().serialize(my_file);
for (size_t i=0; i<m_State.m_SLNKContouren.GetCount(); i++)
{
@@ -737,7 +739,7 @@ bool CWhipFile::GenerateLabels(WT_File &my_planfile, myWT_File &my_file, double
WT_Color keepColor = my_planfile.rendition().color();
// TODO: Echt uniek layernum (en URL num) bepalen
my_file.desired_rendition().layer() = WT_Layer(my_file, 100003, "SLNK Labels");
my_file.desired_rendition().layer() = WT_Layer(my_file, 65533, "SLNK Labels");
// Zet een DC op om bij 'Center' de afmetingen van de tekst te kunnen bepalen
int fontheight= myRound(m_FontHeight * scale);

2
SlnkDWFImpl/DWFFileImpl.cpp
View File

@@ -177,7 +177,7 @@ bool CDWFFileImpl::Save()
try
{
m_oWriter->write( L"Dijkoraad IT", L"SLNKDWF", SLNK_BUILDVERSION, // <== Wij
m_oWriter->write( L"SG|facilitor", L"SLNKDWF", SLNK_BUILDVERSION, // <== Wij
L"Autodesk, Inc", _DWFTK_VERSION_STRING ); // <== Zij
}
catch (DWFException& ex)

14
SlnkDWFImpl/Whip2DCImpl.cpp
View File

@@ -631,7 +631,7 @@ WT_Result CWhip2DCImpl::read_dwf_for_extracting_Objects(myWT_File &my_input_file
{
int pos = my_input_file.file_pos();
size_t sz = my_input_file.size();
if (!m_progress_action(m_progress_param, sz==0?0:double(pos)/sz))
if (!m_progress_action(m_progress_param, (sz==0)?0:double(pos)/sz))
return WT_Result::User_Requested_Abort;
}
@@ -1161,12 +1161,20 @@ WT_Result CWhip2DCImpl::my_process_polytriangle (WT_Polytriangle & polytriangle,
// Polygon(m_State->myDC, vertexList, polytriangle.count());
// return WT_Result::Success;
//HPEN pOld = (HPEN)SelectObject(m_State->myDC, m_State->m_penExt);
// Die is veel sneller en dunner en heeft geen last van Miter/overshooting spikes
HPEN ThinPen = CreatePen(PS_SOLID, 0, GetTextColor(m_State->myDC));
HPEN pOld = (HPEN)SelectObject(m_State->myDC, ThinPen);
//Het volgende is een alternatief voor ThinPen
//FLOAT oldMiter;
//SetMiterLimit(m_State->myDC, 1.0, &oldMiter);
for (int i = 0; i < polytriangle.count()-2; i++)
{
Polygon(m_State->myDC, vertexList+i, 3);
}
//SelectObject(m_State->myDC, pOld);
//SetMiterLimit(m_State->myDC, oldMiter, NULL);
SelectObject(m_State->myDC, pOld);
DeleteObject(ThinPen);
return WT_Result::Success;
}