haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3d-viewer: draw dimension graphics 

Fixes: lp:1406754
* https://bugs.launchpad.net/kicad/+bug/1406754
This commit is contained in:
Forrest Voight 2017-02-01 08:52:17 -05:00 committed by Chris Pavlina
parent 4d3054599b
commit bce04c930d
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3d-viewer/3d_canvas/cinfo3d_visu.h
View File

@ -46,6 +46,7 @@
#include <wxBasePcbFrame.h>
#include <class_pcb_text.h>
#include <class_drawsegment.h>
#include <class_dimension.h>
#include <class_zone.h>
#include <class_module.h>
#include <reporter.h>
@ -455,6 +456,11 @@ class CINFO3D_VISU
LAYER_ID aLayerId,
int aClearanceValue );
void AddShapeWithClearanceToContainer( const DIMENSION *aDimension,
CGENERICCONTAINER2D *aDstContainer,
LAYER_ID aLayerId,
int aClearanceValue );
void AddSolidAreasShapesToContainer( const ZONE_CONTAINER *aZoneContainer,
CGENERICCONTAINER2D *aDstContainer,
LAYER_ID aLayerId );

49
3d-viewer/3d_canvas/create_layer_items.cpp
View File

@ -51,6 +51,7 @@
#include <convert_basic_shapes_to_polygon.h>
#include <trigo.h>
#include <drawtxt.h>
#include <utility>
#include <vector>
@ -138,6 +139,40 @@ void CINFO3D_VISU::AddShapeWithClearanceToContainer( const TEXTE_PCB* aTextPCB,
}
void CINFO3D_VISU::AddShapeWithClearanceToContainer( const DIMENSION* aDimension,
CGENERICCONTAINER2D *aDstContainer,
LAYER_ID aLayerId,
int aClearanceValue )
{
AddShapeWithClearanceToContainer(&aDimension->Text(), aDstContainer, aLayerId, aClearanceValue);
const int linewidth = aDimension->GetWidth() + (2 * aClearanceValue);
std::pair<wxPoint const *, wxPoint const *> segs[] = {
{&aDimension->m_crossBarO, &aDimension->m_crossBarF},
{&aDimension->m_featureLineGO, &aDimension->m_featureLineGF},
{&aDimension->m_featureLineDO, &aDimension->m_featureLineDF},
{&aDimension->m_crossBarF, &aDimension->m_arrowD1F},
{&aDimension->m_crossBarF, &aDimension->m_arrowD2F},
{&aDimension->m_crossBarO, &aDimension->m_arrowG1F},
{&aDimension->m_crossBarO, &aDimension->m_arrowG2F}};
for( auto const & ii : segs )
{
const SFVEC2F start3DU( ii.first->x * m_biuTo3Dunits,
-ii.first->y * m_biuTo3Dunits );
const SFVEC2F end3DU ( ii.second->x * m_biuTo3Dunits,
-ii.second->y * m_biuTo3Dunits );
aDstContainer->Add( new CROUNDSEGMENT2D( start3DU,
end3DU,
linewidth * m_biuTo3Dunits,
*aDimension ) );
}
}
// Based on
// void MODULE::TransformGraphicShapesWithClearanceToPolygonSet
// board_items_to_polygon_shape_transform.cpp#L204
@ -1676,6 +1711,13 @@ void CINFO3D_VISU::createLayers( REPORTER *aStatusTextReporter )
0 );
break;
case PCB_DIMENSION_T:
AddShapeWithClearanceToContainer( (DIMENSION*) item,
layerContainer,
curr_layer_id,
0 );
break;
default:
wxLogTrace( m_logTrace,
wxT( "createLayers: item type: %d not implemented" ),
@ -1967,6 +2009,13 @@ void CINFO3D_VISU::createLayers( REPORTER *aStatusTextReporter )
0 );
break;
case PCB_DIMENSION_T:
AddShapeWithClearanceToContainer( (DIMENSION*) item,
layerContainer,
curr_layer_id,
0 );
break;
default:
break;
}