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

v2.60 Layer cleaning, Contouritems, Layeritems

Browse Source 
svn path=/Slnkdwf/trunk/; revision=12509
This commit is contained in:
Jos Groot Lipman
2011-09-06 10:21:18 +00:00
parent 166e945ab4
commit ebdaac3f4f
4 changed files with 98 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SlnkDWFImpl/Whip2DCImpl.cpp
View File

@@ -756,22 +756,34 @@ WT_Result CWhip2DCImpl::my_process_linePattern (WT_Line_Pattern & linePattern, W
WT_Result CWhip2DCImpl::my_process_layer (WT_Layer & layer, WT_File & file)
{
CWhip2DCState *m_State = (CWhip2DCState *)file.heuristics().user_data();
CString layer_name(layer.layer_name().ascii());
file.rendition().layer() = layer;
if (layer.layer_name().length()>0) // Anders zittie alleen maar in de weg
WT_Layer *ll;
if (layer_name != "") // Anders zittie alleen maar in de weg
{ // Dat doet de default_process 'fout'
// Overbodige lagen negeren we:
if (layer_name == m_State->m_activeLayerName)
return WT_Result::Success;
file.layer_list().add_layer(layer);
ll = &layer;
m_State->m_Layernames.Add(layer.layer_name().ascii());
}
WT_Integer32 layer_num = layer.layer_num();
WT_Layer *ll = file.layer_list().find_layer_from_index(layer_num);
if (ll&&ll->layer_name().ascii())
else
{
WT_Integer32 layer_num = layer.layer_num();
ll = file.layer_list().find_layer_from_index(layer_num);
}
if (ll)
{
m_State->m_activeLayerName = ll->layer_name().ascii();
//myTRACE("\n my_output_file.desired_rendition().layer() = layer %s;", layer.layer_name().ascii());
CAtlREMatchContext<> mcUrl;
if ( m_State->reLayers.Match(ll->layer_name().ascii(), &mcUrl))
if ( m_State->reLayers.Match(m_State->m_activeLayerName, &mcUrl))
{
//myTRACE(".. does match!");
m_State->bLayerVisible = TRUE;
@@ -783,7 +795,7 @@ WT_Result CWhip2DCImpl::my_process_layer (WT_Layer & layer, WT_File & file)
}
// myTRACE("\nLayer %s .. does not match", ll->layer_name().ascii());
m_State->bIsSymbolLayer = (ll->layer_name() == "SLNK Symbols");
m_State->bIsSymbolLayer = (m_State->m_activeLayerName == "SLNK Symbols");
//myDoTRACE("\nLayer %s %d", ll->layer_name().ascii(), m_State->bIsSymbolLayer);
}
else

1
SlnkDWFImpl/Whip2DCState.h
View File

@@ -52,6 +52,7 @@ public:
CAtlRegExp<> reLayers; // Welke layers moeten aan
BOOL bLayerVisible; // Current Layer visible?
BOOL bIsSymbolLayer;
CString m_activeLayerName;
CAtlArray<CString> m_Layernames;
CAtlArray<CFoundText> m_FoundTexts;