2018-10-13 18:37:28 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
2019-01-24 17:23:57 +00:00
|
|
|
* Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
|
2023-08-18 17:38:23 +00:00
|
|
|
* Copyright (C) 2019-2023 KiCad Developers, see AUTHORS.txt for contributors.
|
2018-10-13 18:37:28 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, you may find one here:
|
|
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
2018-11-01 09:47:41 +00:00
|
|
|
// The DXF reader lib (libdxfrw) comes from dxflib project used in QCAD
|
|
|
|
// See http://www.ribbonsoft.com
|
2019-04-03 15:29:17 +00:00
|
|
|
// Each time a dxf entity is read, a "call back" function is called
|
2018-11-01 09:47:41 +00:00
|
|
|
// like void DXF_IMPORT_PLUGIN::addLine( const DL_LineData& data ) when a line is read.
|
2018-10-13 18:37:28 +00:00
|
|
|
// this function just add the BOARD entity from dxf parameters (start and end point ...)
|
|
|
|
|
|
|
|
|
|
|
|
#include "dxf_import_plugin.h"
|
|
|
|
#include <wx/arrstr.h>
|
|
|
|
#include <wx/regex.h>
|
2022-12-20 22:21:20 +00:00
|
|
|
#include <geometry/ellipse.h>
|
|
|
|
#include <bezier_curves.h>
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
#include <trigo.h>
|
|
|
|
#include <macros.h>
|
2020-11-29 16:29:58 +00:00
|
|
|
#include <cmath> // isnan
|
2020-11-12 20:19:22 +00:00
|
|
|
#include <board.h>
|
2018-10-13 18:37:28 +00:00
|
|
|
#include "common.h"
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
|
|
|
|
/*
|
2020-11-23 22:26:52 +00:00
|
|
|
* Important notes
|
|
|
|
* 1. All output coordinates of this importer are in mm
|
|
|
|
* 2. DXFs have a concept of world (WCS) and object coordinates (OCS)
|
|
|
|
3. The following objects are world coordinates:
|
|
|
|
- Line
|
|
|
|
- Point
|
|
|
|
- Polyline (3D)
|
|
|
|
- Vertex (3D)
|
|
|
|
- Polymesh
|
|
|
|
- Polyface
|
|
|
|
- Viewport
|
|
|
|
4. The following entities are object coordinates
|
|
|
|
- Circle
|
|
|
|
- Arc
|
|
|
|
- Solid
|
|
|
|
- Trace
|
|
|
|
- Attrib
|
|
|
|
- Shape
|
|
|
|
- Insert
|
|
|
|
- Polyline (2D)
|
|
|
|
- Vertex (2D)
|
|
|
|
- LWPolyline
|
|
|
|
- Hatch
|
|
|
|
- Image
|
|
|
|
- Text
|
2021-06-09 19:32:58 +00:00
|
|
|
* 5. Object coordinates must be run through the arbitrary axis
|
2020-11-23 22:26:52 +00:00
|
|
|
* translation even though they are 2D drawings and most of the time
|
2021-06-09 19:32:58 +00:00
|
|
|
* the import is fine. Sometimes, against all logic, CAD tools like
|
2020-11-23 22:26:52 +00:00
|
|
|
* SolidWorks may randomly insert circles "mirror" that must be unflipped
|
|
|
|
* by following the object to world conversion
|
|
|
|
* 6. Blocks are virtual groups, blocks must be placed by a INSERT entity
|
|
|
|
* 7. Blocks may be repeated multiple times
|
2020-11-24 05:55:28 +00:00
|
|
|
* 8. There is no sane way to make text look perfect like the original CAD.
|
|
|
|
* DXF simply does mpt secifying text/font enough to make it portable.
|
|
|
|
* We however make do try to get it somewhat close/visually appealing.
|
2021-01-09 23:56:25 +00:00
|
|
|
* 9. We silently drop the z coordinate on 3d polylines
|
2018-11-05 16:04:05 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
// minimum bulge value before resorting to a line segment;
|
|
|
|
// the value 0.0218 is equivalent to about 5 degrees arc,
|
|
|
|
#define MIN_BULGE 0.0218
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
#define SCALE_FACTOR(x) (x)
|
|
|
|
|
2020-11-23 22:26:52 +00:00
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
DXF_IMPORT_PLUGIN::DXF_IMPORT_PLUGIN() : DL_CreationAdapter()
|
|
|
|
{
|
|
|
|
m_xOffset = 0.0; // X coord offset for conversion (in mm)
|
|
|
|
m_yOffset = 0.0; // Y coord offset for conversion (in mm)
|
|
|
|
m_version = 0; // the dxf version, not yet used
|
|
|
|
m_defaultThickness = 0.2; // default thickness (in mm)
|
|
|
|
m_brdLayer = Dwgs_User; // The default import layer
|
2020-11-14 22:00:12 +00:00
|
|
|
m_importAsFPShapes = true;
|
2018-11-05 16:04:05 +00:00
|
|
|
m_minX = m_minY = std::numeric_limits<double>::max();
|
|
|
|
m_maxX = m_maxY = std::numeric_limits<double>::min();
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::DEFAULT;
|
2021-06-22 11:34:15 +00:00
|
|
|
m_importCoordinatePrecision = 4; // initial value per dxf spec
|
|
|
|
m_importAnglePrecision = 0; // initial value per dxf spec
|
2020-11-20 12:18:38 +00:00
|
|
|
|
|
|
|
// placeholder layer so we can fallback to something later
|
|
|
|
std::unique_ptr<DXF_IMPORT_LAYER> layer0 =
|
|
|
|
std::make_unique<DXF_IMPORT_LAYER>( "", DXF_IMPORT_LINEWEIGHT_BY_LW_DEFAULT );
|
|
|
|
m_layers.push_back( std::move( layer0 ) );
|
2020-11-23 12:47:23 +00:00
|
|
|
|
|
|
|
m_currentBlock = nullptr;
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
DXF_IMPORT_PLUGIN::~DXF_IMPORT_PLUGIN()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool DXF_IMPORT_PLUGIN::Load( const wxString& aFileName )
|
|
|
|
{
|
2022-04-02 03:13:38 +00:00
|
|
|
try
|
|
|
|
{
|
|
|
|
return ImportDxfFile( aFileName );
|
|
|
|
}
|
|
|
|
catch( const std::bad_alloc& )
|
|
|
|
{
|
2022-04-02 13:57:30 +00:00
|
|
|
m_layers.clear();
|
|
|
|
m_blocks.clear();
|
|
|
|
m_styles.clear();
|
|
|
|
|
|
|
|
m_internalImporter.ClearShapes();
|
|
|
|
|
2022-04-02 03:13:38 +00:00
|
|
|
reportMsg( _( "Memory was exhausted trying to load the DXF, it may be too large." ) );
|
|
|
|
return false;
|
|
|
|
}
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-08-18 17:38:23 +00:00
|
|
|
bool DXF_IMPORT_PLUGIN::LoadFromMemory( const wxMemoryBuffer& aMemBuffer )
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
return ImportDxfFile( aMemBuffer );
|
|
|
|
}
|
|
|
|
catch( const std::bad_alloc& )
|
|
|
|
{
|
|
|
|
m_layers.clear();
|
|
|
|
m_blocks.clear();
|
|
|
|
m_styles.clear();
|
|
|
|
|
|
|
|
m_internalImporter.ClearShapes();
|
|
|
|
|
|
|
|
reportMsg( _( "Memory was exhausted trying to load the DXF, it may be too large." ) );
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
bool DXF_IMPORT_PLUGIN::Import()
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2018-11-01 09:47:41 +00:00
|
|
|
wxCHECK( m_importer, false );
|
|
|
|
m_internalImporter.ImportTo( *m_importer );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::GetImageWidth() const
|
|
|
|
{
|
2018-10-13 18:37:28 +00:00
|
|
|
return m_maxX - m_minX;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::GetImageHeight() const
|
|
|
|
{
|
2018-10-13 18:37:28 +00:00
|
|
|
return m_maxY - m_minY;
|
|
|
|
}
|
|
|
|
|
2019-04-03 15:29:17 +00:00
|
|
|
|
2023-08-18 18:27:48 +00:00
|
|
|
BOX2D DXF_IMPORT_PLUGIN::GetImageBBox() const
|
|
|
|
{
|
|
|
|
BOX2D bbox;
|
|
|
|
bbox.SetOrigin( m_minX, m_minY );
|
|
|
|
bbox.SetEnd( m_maxX, m_maxY );
|
|
|
|
|
|
|
|
return bbox;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-04-03 15:29:17 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::SetImporter( GRAPHICS_IMPORTER* aImporter )
|
|
|
|
{
|
|
|
|
GRAPHICS_IMPORT_PLUGIN::SetImporter( aImporter );
|
|
|
|
|
|
|
|
if( m_importer )
|
|
|
|
SetDefaultLineWidthMM( m_importer->GetLineWidthMM() );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::mapX( double aDxfCoordX )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2020-11-22 03:11:24 +00:00
|
|
|
return SCALE_FACTOR( m_xOffset + ( aDxfCoordX * getCurrentUnitScale() ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::mapY( double aDxfCoordY )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2020-11-22 03:11:24 +00:00
|
|
|
return SCALE_FACTOR( m_yOffset - ( aDxfCoordY * getCurrentUnitScale() ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::mapDim( double aDxfValue )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2020-11-22 03:11:24 +00:00
|
|
|
return SCALE_FACTOR( aDxfValue * getCurrentUnitScale() );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool DXF_IMPORT_PLUGIN::ImportDxfFile( const wxString& aFile )
|
|
|
|
{
|
|
|
|
DL_Dxf dxf_reader;
|
|
|
|
|
2018-12-07 09:07:43 +00:00
|
|
|
// wxFopen takes care of unicode filenames across platforms
|
2022-02-05 13:25:43 +00:00
|
|
|
FILE* fp = wxFopen( aFile, wxT( "rt" ) );
|
2018-12-07 09:07:43 +00:00
|
|
|
|
|
|
|
if( fp == nullptr )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Note the dxf reader takes care of switching to "C" locale before reading the file
|
|
|
|
// and will close the file after reading
|
|
|
|
bool success = dxf_reader.in( fp, this );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-08-18 17:38:23 +00:00
|
|
|
bool DXF_IMPORT_PLUGIN::ImportDxfFile( const wxMemoryBuffer& aMemBuffer )
|
|
|
|
{
|
|
|
|
DL_Dxf dxf_reader;
|
|
|
|
|
|
|
|
std::string str( reinterpret_cast<char*>( aMemBuffer.GetData() ), aMemBuffer.GetDataLen() );
|
|
|
|
|
|
|
|
// Note the dxf reader takes care of switching to "C" locale before reading the file
|
|
|
|
// and will close the file after reading
|
|
|
|
bool success = dxf_reader.in( str, this );
|
|
|
|
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-03-24 04:29:00 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::reportMsg( const wxString& aMessage )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
|
|
|
// Add message to keep trace of not handled dxf entities
|
|
|
|
m_messages += aMessage;
|
|
|
|
m_messages += '\n';
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addSpline( const DL_SplineData& aData )
|
|
|
|
{
|
|
|
|
// Called when starting reading a spline
|
|
|
|
m_curr_entity.Clear();
|
|
|
|
m_curr_entity.m_EntityParseStatus = 1;
|
|
|
|
m_curr_entity.m_EntityFlag = aData.flags;
|
|
|
|
m_curr_entity.m_EntityType = DL_ENTITY_SPLINE;
|
|
|
|
m_curr_entity.m_SplineDegree = aData.degree;
|
|
|
|
m_curr_entity.m_SplineTangentStartX = aData.tangentStartX;
|
|
|
|
m_curr_entity.m_SplineTangentStartY = aData.tangentStartY;
|
|
|
|
m_curr_entity.m_SplineTangentEndX = aData.tangentEndX;
|
|
|
|
m_curr_entity.m_SplineTangentEndY = aData.tangentEndY;
|
|
|
|
m_curr_entity.m_SplineKnotsCount = aData.nKnots;
|
|
|
|
m_curr_entity.m_SplineControlCount = aData.nControl;
|
|
|
|
m_curr_entity.m_SplineFitCount = aData.nFit;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addControlPoint( const DL_ControlPointData& aData )
|
|
|
|
{
|
|
|
|
// Called for every spline control point, when reading a spline entity
|
2019-12-05 15:41:21 +00:00
|
|
|
m_curr_entity.m_SplineControlPointList.emplace_back( aData.x , aData.y,
|
|
|
|
aData.w );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
2019-04-03 15:29:17 +00:00
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addFitPoint( const DL_FitPointData& aData )
|
|
|
|
{
|
|
|
|
// Called for every spline fit point, when reading a spline entity
|
2018-11-05 16:04:05 +00:00
|
|
|
// we store only the X,Y coord values in a VECTOR2D
|
2019-12-05 15:41:21 +00:00
|
|
|
m_curr_entity.m_SplineFitPointList.emplace_back( aData.x, aData.y );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addKnot( const DL_KnotData& aData)
|
|
|
|
{
|
|
|
|
// Called for every spline knot value, when reading a spline entity
|
|
|
|
m_curr_entity.m_SplineKnotsList.push_back( aData.k );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addLayer( const DL_LayerData& aData )
|
|
|
|
{
|
|
|
|
wxString name = wxString::FromUTF8( aData.name.c_str() );
|
2020-11-20 12:18:38 +00:00
|
|
|
|
|
|
|
int lw = attributes.getWidth();
|
|
|
|
|
|
|
|
if( lw == DXF_IMPORT_LINEWEIGHT_BY_LAYER )
|
|
|
|
{
|
|
|
|
lw = DXF_IMPORT_LINEWEIGHT_BY_LW_DEFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::unique_ptr<DXF_IMPORT_LAYER> layer = std::make_unique<DXF_IMPORT_LAYER>( name, lw );
|
|
|
|
|
|
|
|
m_layers.push_back( std::move( layer ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addLinetype( const DL_LinetypeData& data )
|
|
|
|
{
|
|
|
|
#if 0
|
2023-09-09 04:10:57 +00:00
|
|
|
wxString name = From_UTF8( data.name.c_str() );
|
|
|
|
wxString description = From_UTF8( data.description.c_str() );
|
2018-10-13 18:37:28 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-11-20 12:18:38 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::lineWeightToWidth( int lw, DXF_IMPORT_LAYER* aLayer )
|
|
|
|
{
|
|
|
|
if( lw == DXF_IMPORT_LINEWEIGHT_BY_LAYER && aLayer != nullptr )
|
|
|
|
{
|
|
|
|
lw = aLayer->m_lineWeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
// All lineweights >= 0 are always in 100ths of mm
|
|
|
|
double mm = m_defaultThickness;
|
2021-12-08 00:22:38 +00:00
|
|
|
|
2020-11-20 12:18:38 +00:00
|
|
|
if( lw >= 0 )
|
|
|
|
{
|
|
|
|
mm = lw / 100.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return SCALE_FACTOR( mm );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
DXF_IMPORT_LAYER* DXF_IMPORT_PLUGIN::getImportLayer( const std::string& aLayerName )
|
|
|
|
{
|
|
|
|
DXF_IMPORT_LAYER* layer = m_layers.front().get();
|
|
|
|
wxString layerName = wxString::FromUTF8( aLayerName.c_str() );
|
|
|
|
|
|
|
|
if( !layerName.IsEmpty() )
|
|
|
|
{
|
|
|
|
auto resultIt = std::find_if( m_layers.begin(), m_layers.end(),
|
2020-11-23 14:59:00 +00:00
|
|
|
[layerName]( const auto& it )
|
|
|
|
{
|
|
|
|
return it->m_layerName == layerName;
|
|
|
|
} );
|
2020-11-20 12:18:38 +00:00
|
|
|
|
|
|
|
if( resultIt != m_layers.end() )
|
|
|
|
layer = resultIt->get();
|
|
|
|
}
|
|
|
|
|
|
|
|
return layer;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
DXF_IMPORT_BLOCK* DXF_IMPORT_PLUGIN::getImportBlock( const std::string& aBlockName )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2020-11-23 14:59:00 +00:00
|
|
|
DXF_IMPORT_BLOCK* block = nullptr;
|
|
|
|
wxString blockName = wxString::FromUTF8( aBlockName.c_str() );
|
|
|
|
|
|
|
|
if( !blockName.IsEmpty() )
|
|
|
|
{
|
|
|
|
auto resultIt = std::find_if( m_blocks.begin(), m_blocks.end(),
|
|
|
|
[blockName]( const auto& it )
|
|
|
|
{
|
|
|
|
return it->m_name == blockName;
|
|
|
|
} );
|
|
|
|
|
|
|
|
if( resultIt != m_blocks.end() )
|
|
|
|
block = resultIt->get();
|
|
|
|
}
|
|
|
|
|
|
|
|
return block;
|
|
|
|
}
|
2019-10-23 10:25:21 +00:00
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
|
2020-11-24 05:55:28 +00:00
|
|
|
DXF_IMPORT_STYLE* DXF_IMPORT_PLUGIN::getImportStyle( const std::string& aStyleName )
|
|
|
|
{
|
|
|
|
DXF_IMPORT_STYLE* style = nullptr;
|
|
|
|
wxString styleName = wxString::FromUTF8( aStyleName.c_str() );
|
|
|
|
|
|
|
|
if( !styleName.IsEmpty() )
|
|
|
|
{
|
|
|
|
auto resultIt = std::find_if( m_styles.begin(), m_styles.end(),
|
|
|
|
[styleName]( const auto& it ) { return it->m_name == styleName; } );
|
|
|
|
|
|
|
|
if( resultIt != m_styles.end() )
|
|
|
|
style = resultIt->get();
|
|
|
|
}
|
|
|
|
|
|
|
|
return style;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addLine( const DL_LineData& aData )
|
|
|
|
{
|
2020-11-20 12:18:38 +00:00
|
|
|
DXF_IMPORT_LAYER* layer = getImportLayer( attributes.getLayer() );
|
|
|
|
double lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
|
|
|
|
|
2018-11-01 09:47:41 +00:00
|
|
|
VECTOR2D start( mapX( aData.x1 ), mapY( aData.y1 ) );
|
|
|
|
VECTOR2D end( mapX( aData.x2 ), mapY( aData.y2 ) );
|
2018-11-05 16:04:05 +00:00
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
2020-11-23 16:18:02 +00:00
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddLine( start, end, lineWidth );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
updateImageLimits( start );
|
|
|
|
updateImageLimits( end );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addPolyline(const DL_PolylineData& aData )
|
|
|
|
{
|
|
|
|
// Convert DXF Polylines into a series of KiCad Lines and Arcs.
|
|
|
|
// A Polyline (as opposed to a LWPolyline) may be a 3D line or
|
|
|
|
// even a 3D Mesh. The only type of Polyline which is guaranteed
|
|
|
|
// to import correctly is a 2D Polyline in X and Y, which is what
|
|
|
|
// we assume of all Polylines. The width used is the width of the Polyline.
|
|
|
|
// per-vertex line widths, if present, are ignored.
|
|
|
|
m_curr_entity.Clear();
|
|
|
|
m_curr_entity.m_EntityParseStatus = 1;
|
|
|
|
m_curr_entity.m_EntityFlag = aData.flags;
|
|
|
|
m_curr_entity.m_EntityType = DL_ENTITY_POLYLINE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addVertex( const DL_VertexData& aData )
|
|
|
|
{
|
|
|
|
if( m_curr_entity.m_EntityParseStatus == 0 )
|
|
|
|
return; // Error
|
|
|
|
|
2020-11-20 12:18:38 +00:00
|
|
|
DXF_IMPORT_LAYER* layer = getImportLayer( attributes.getLayer() );
|
2021-10-25 15:39:09 +00:00
|
|
|
double lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
|
|
|
|
|
|
|
|
/* support for per-vertex-encoded linewidth (Cadence uses it) */
|
2021-12-08 00:22:38 +00:00
|
|
|
/* linewidths are scaled by 100 in DXF */
|
2021-10-25 15:39:09 +00:00
|
|
|
if( aData.startWidth > 0.0 )
|
2021-12-08 00:22:38 +00:00
|
|
|
lineWidth = aData.startWidth / 100.0;
|
2021-10-25 15:39:09 +00:00
|
|
|
else if ( aData.endWidth > 0.0 )
|
2021-12-08 00:22:38 +00:00
|
|
|
lineWidth = aData.endWidth / 100.0;
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
const DL_VertexData* vertex = &aData;
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
2020-11-23 22:26:52 +00:00
|
|
|
VECTOR3D vertexCoords = ocsToWcs( arbAxis, VECTOR3D( vertex->x, vertex->y, vertex->z ) );
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
if( m_curr_entity.m_EntityParseStatus == 1 ) // This is the first vertex of an entity
|
|
|
|
{
|
2020-11-23 22:26:52 +00:00
|
|
|
m_curr_entity.m_LastCoordinate.x = mapX( vertexCoords.x );
|
|
|
|
m_curr_entity.m_LastCoordinate.y = mapY( vertexCoords.y );
|
2018-10-13 18:37:28 +00:00
|
|
|
m_curr_entity.m_PolylineStart = m_curr_entity.m_LastCoordinate;
|
|
|
|
m_curr_entity.m_BulgeVertex = vertex->bulge;
|
|
|
|
m_curr_entity.m_EntityParseStatus = 2;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-11-23 22:26:52 +00:00
|
|
|
VECTOR2D seg_end( mapX( vertexCoords.x ), mapY( vertexCoords.y ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
if( std::abs( m_curr_entity.m_BulgeVertex ) < MIN_BULGE )
|
|
|
|
insertLine( m_curr_entity.m_LastCoordinate, seg_end, lineWidth );
|
|
|
|
else
|
2019-04-03 15:29:17 +00:00
|
|
|
insertArc( m_curr_entity.m_LastCoordinate, seg_end, m_curr_entity.m_BulgeVertex,
|
|
|
|
lineWidth );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
m_curr_entity.m_LastCoordinate = seg_end;
|
|
|
|
m_curr_entity.m_BulgeVertex = vertex->bulge;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::endEntity()
|
|
|
|
{
|
2020-11-20 12:18:38 +00:00
|
|
|
DXF_IMPORT_LAYER* layer = getImportLayer( attributes.getLayer() );
|
|
|
|
double lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
if( m_curr_entity.m_EntityType == DL_ENTITY_POLYLINE ||
|
|
|
|
m_curr_entity.m_EntityType == DL_ENTITY_LWPOLYLINE )
|
|
|
|
{
|
|
|
|
// Polyline flags bit 0 indicates closed (1) or open (0) polyline
|
|
|
|
if( m_curr_entity.m_EntityFlag & 1 )
|
|
|
|
{
|
|
|
|
if( std::abs( m_curr_entity.m_BulgeVertex ) < MIN_BULGE )
|
2019-04-03 15:29:17 +00:00
|
|
|
insertLine( m_curr_entity.m_LastCoordinate, m_curr_entity.m_PolylineStart,
|
|
|
|
lineWidth );
|
2018-10-13 18:37:28 +00:00
|
|
|
else
|
|
|
|
insertArc( m_curr_entity.m_LastCoordinate, m_curr_entity.m_PolylineStart,
|
|
|
|
m_curr_entity.m_BulgeVertex, lineWidth );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( m_curr_entity.m_EntityType == DL_ENTITY_SPLINE )
|
|
|
|
{
|
|
|
|
insertSpline( lineWidth );
|
|
|
|
}
|
|
|
|
|
|
|
|
m_curr_entity.Clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-10-23 10:25:21 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addBlock( const DL_BlockData& aData )
|
|
|
|
{
|
2020-11-23 12:47:23 +00:00
|
|
|
wxString name = wxString::FromUTF8( aData.name.c_str() );
|
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
std::unique_ptr<DXF_IMPORT_BLOCK> block =
|
|
|
|
std::make_unique<DXF_IMPORT_BLOCK>( name, aData.bpx, aData.bpy );
|
2020-11-23 12:47:23 +00:00
|
|
|
|
|
|
|
m_blocks.push_back( std::move( block ) );
|
|
|
|
|
|
|
|
m_currentBlock = m_blocks.back().get();
|
2019-10-23 10:25:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::endBlock()
|
|
|
|
{
|
2020-11-23 12:47:23 +00:00
|
|
|
m_currentBlock = nullptr;
|
2019-10-23 10:25:21 +00:00
|
|
|
}
|
|
|
|
|
2020-11-23 12:47:23 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addInsert( const DL_InsertData& aData )
|
|
|
|
{
|
2020-11-23 14:59:00 +00:00
|
|
|
DXF_IMPORT_BLOCK* block = getImportBlock( aData.name );
|
|
|
|
|
|
|
|
if( block == nullptr )
|
|
|
|
return;
|
2020-11-23 12:47:23 +00:00
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
2023-01-05 02:22:36 +00:00
|
|
|
|
|
|
|
MATRIX3x3D rot;
|
|
|
|
rot.SetRotation( aData.angle );
|
|
|
|
|
|
|
|
MATRIX3x3D scale;
|
|
|
|
scale.SetScale( VECTOR2D( aData.sx, aData.sy ) );
|
|
|
|
|
|
|
|
MATRIX3x3D trans = ( arbAxis * rot ) * scale;
|
2020-11-23 22:26:52 +00:00
|
|
|
VECTOR3D insertCoords = ocsToWcs( arbAxis, VECTOR3D( aData.ipx, aData.ipy, aData.ipz ) );
|
|
|
|
|
|
|
|
VECTOR2D translation( mapX( insertCoords.x ), mapY( insertCoords.y ) );
|
2020-11-26 03:13:12 +00:00
|
|
|
translation -= VECTOR2D( mapX( block->m_baseX ), mapY( block->m_baseY ) );
|
2020-11-23 22:26:52 +00:00
|
|
|
|
2020-11-23 16:18:02 +00:00
|
|
|
for( auto& shape : block->m_buffer.GetShapes() )
|
2020-11-23 14:59:00 +00:00
|
|
|
{
|
|
|
|
std::unique_ptr<IMPORTED_SHAPE> newShape = shape->clone();
|
|
|
|
|
2023-01-05 02:22:36 +00:00
|
|
|
newShape->Transform( trans, translation );
|
2020-11-23 14:59:00 +00:00
|
|
|
|
|
|
|
m_internalImporter.AddShape( newShape );
|
|
|
|
}
|
2020-11-23 12:47:23 +00:00
|
|
|
}
|
2019-10-23 10:25:21 +00:00
|
|
|
|
2020-11-23 22:26:52 +00:00
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addCircle( const DL_CircleData& aData )
|
|
|
|
{
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
2020-11-23 22:26:52 +00:00
|
|
|
VECTOR3D centerCoords = ocsToWcs( arbAxis, VECTOR3D( aData.cx, aData.cy, aData.cz ) );
|
|
|
|
|
|
|
|
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
|
2020-11-20 12:18:38 +00:00
|
|
|
DXF_IMPORT_LAYER* layer = getImportLayer( attributes.getLayer() );
|
|
|
|
double lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
|
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
2020-11-23 16:18:02 +00:00
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddCircle( center, mapDim( aData.radius ), lineWidth, false );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
VECTOR2D radiusDelta( mapDim( aData.radius ), mapDim( aData.radius ) );
|
|
|
|
|
|
|
|
updateImageLimits( center + radiusDelta );
|
|
|
|
updateImageLimits( center - radiusDelta );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addArc( const DL_ArcData& aData )
|
|
|
|
{
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
|
|
|
VECTOR3D centerCoords = ocsToWcs( arbAxis, VECTOR3D( aData.cx, aData.cy, aData.cz ) );
|
2020-11-23 22:26:52 +00:00
|
|
|
|
2018-11-01 09:47:41 +00:00
|
|
|
// Init arc centre:
|
2020-11-23 22:26:52 +00:00
|
|
|
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2019-01-22 18:59:43 +00:00
|
|
|
// aData.anglex is in degrees.
|
2022-01-20 23:08:48 +00:00
|
|
|
EDA_ANGLE startangle( aData.angle1, DEGREES_T );
|
|
|
|
EDA_ANGLE endangle( aData.angle2, DEGREES_T );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2023-08-27 12:16:34 +00:00
|
|
|
if( ( arbAxis.GetScale().x < 0 ) != ( arbAxis.GetScale().y < 0 ) )
|
|
|
|
{
|
|
|
|
startangle = ANGLE_180 - startangle;
|
|
|
|
endangle = ANGLE_180 - endangle;
|
|
|
|
std::swap( startangle, endangle );
|
|
|
|
}
|
|
|
|
|
2019-01-22 18:59:43 +00:00
|
|
|
// Init arc start point
|
|
|
|
VECTOR2D startPoint( aData.radius, 0.0 );
|
2022-01-20 23:08:48 +00:00
|
|
|
RotatePoint( startPoint, -startangle );
|
|
|
|
VECTOR2D arcStart( mapX( startPoint.x + centerCoords.x ),
|
|
|
|
mapY( startPoint.y + centerCoords.y ) );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
// calculate arc angle (arcs are CCW, and should be < 0 in Pcbnew)
|
2022-01-20 23:08:48 +00:00
|
|
|
EDA_ANGLE angle = -( endangle - startangle );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2022-01-20 23:08:48 +00:00
|
|
|
if( angle > ANGLE_0 )
|
|
|
|
angle -= ANGLE_360;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2020-11-20 12:18:38 +00:00
|
|
|
DXF_IMPORT_LAYER* layer = getImportLayer( attributes.getLayer() );
|
|
|
|
double lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
|
2020-11-23 14:59:00 +00:00
|
|
|
|
2022-01-20 23:08:48 +00:00
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse = m_currentBlock ? &m_currentBlock->m_buffer
|
|
|
|
: &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddArc( center, arcStart, angle, lineWidth );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
VECTOR2D radiusDelta( mapDim( aData.radius ), mapDim( aData.radius ) );
|
|
|
|
|
|
|
|
updateImageLimits( center + radiusDelta );
|
|
|
|
updateImageLimits( center - radiusDelta );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-12-20 22:21:20 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseData& aData )
|
|
|
|
{
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
|
|
|
VECTOR3D centerCoords = ocsToWcs( arbAxis, VECTOR3D( aData.cx, aData.cy, aData.cz ) );
|
|
|
|
VECTOR3D majorCoords = ocsToWcs( arbAxis, VECTOR3D( aData.mx, aData.my, aData.mz ) );
|
2022-12-20 22:21:20 +00:00
|
|
|
|
|
|
|
// DXF ellipses store the minor axis length as a ratio to the major axis.
|
|
|
|
// The major coords are relative to the center point.
|
|
|
|
// For now, we assume ellipses in the XY plane.
|
|
|
|
|
|
|
|
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
|
|
|
|
VECTOR2D major( mapX( majorCoords.x ), mapY( majorCoords.y ) );
|
|
|
|
|
|
|
|
// DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees)
|
|
|
|
// The arcs wind CCW as in KiCad. The end angle must be greater than the start angle, and if
|
|
|
|
// the extrusion direction is negative, the arc winding is CW instead! Note that this is a
|
|
|
|
// simplification that assumes the DXF is representing a 2D drawing, and would need to be
|
|
|
|
// revisited if we want to import true 3D drawings and "flatten" them to the 2D KiCad plane
|
|
|
|
// internally.
|
|
|
|
EDA_ANGLE startAngle( aData.angle1, RADIANS_T );
|
|
|
|
EDA_ANGLE endAngle( aData.angle2, RADIANS_T );
|
|
|
|
|
|
|
|
if( startAngle > endAngle )
|
|
|
|
endAngle += ANGLE_360;
|
|
|
|
|
2023-08-27 15:36:12 +00:00
|
|
|
// Angles are relative to major axis
|
|
|
|
startAngle -= EDA_ANGLE( major );
|
|
|
|
endAngle -= EDA_ANGLE( major );
|
2022-12-20 22:21:20 +00:00
|
|
|
|
|
|
|
if( aData.ratio == 1.0 )
|
|
|
|
{
|
|
|
|
double radius = major.EuclideanNorm();
|
|
|
|
|
|
|
|
if( startAngle == endAngle )
|
|
|
|
{
|
|
|
|
DL_CircleData circle( aData.cx, aData.cy, aData.cz, radius );
|
|
|
|
addCircle( circle );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
DL_ArcData arc( aData.cx, aData.cy, aData.cz, radius,
|
|
|
|
startAngle.AsDegrees(), endAngle.AsDegrees() );
|
|
|
|
addArc( arc );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-08-27 15:36:12 +00:00
|
|
|
// TODO: testcases for negative extrusion vector; handle it here
|
|
|
|
|
2022-12-20 22:21:20 +00:00
|
|
|
std::vector<BEZIER<double>> splines;
|
|
|
|
ELLIPSE<double> ellipse( center, major, aData.ratio, startAngle, endAngle );
|
|
|
|
|
|
|
|
TransformEllipseToBeziers( ellipse, splines );
|
|
|
|
|
|
|
|
DXF_IMPORT_LAYER* layer = getImportLayer( attributes.getLayer() );
|
|
|
|
double lineWidth = lineWeightToWidth( attributes.getWidth(), layer );
|
|
|
|
|
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse = m_currentBlock ? &m_currentBlock->m_buffer
|
|
|
|
: &m_internalImporter;
|
|
|
|
|
|
|
|
for( const BEZIER<double>& b : splines )
|
|
|
|
bufferToUse->AddSpline( b.Start, b.C1, b.C2, b.End, lineWidth );
|
|
|
|
|
|
|
|
// Naive bounding
|
|
|
|
updateImageLimits( center + major );
|
|
|
|
updateImageLimits( center - major );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addText( const DL_TextData& aData )
|
|
|
|
{
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
2020-11-23 22:26:52 +00:00
|
|
|
VECTOR3D refPointCoords = ocsToWcs( arbAxis, VECTOR3D( aData.ipx, aData.ipy, aData.ipz ) );
|
2020-11-29 16:29:58 +00:00
|
|
|
VECTOR3D secPointCoords = ocsToWcs( arbAxis, VECTOR3D( std::isnan( aData.apx ) ? 0 : aData.apx,
|
|
|
|
std::isnan( aData.apy ) ? 0 : aData.apy,
|
|
|
|
std::isnan( aData.apz ) ? 0 : aData.apz ) );
|
2020-11-23 22:26:52 +00:00
|
|
|
|
|
|
|
VECTOR2D refPoint( mapX( refPointCoords.x ), mapY( refPointCoords.y ) );
|
|
|
|
VECTOR2D secPoint( mapX( secPointCoords.x ), mapY( secPointCoords.y ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
if( aData.vJustification != 0 || aData.hJustification != 0 || aData.hJustification == 4 )
|
|
|
|
{
|
|
|
|
if( aData.hJustification != 3 && aData.hJustification != 5 )
|
|
|
|
{
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D tmp = secPoint;
|
2018-11-01 09:47:41 +00:00
|
|
|
secPoint = refPoint;
|
|
|
|
refPoint = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
wxString text = toNativeString( wxString::FromUTF8( aData.text.c_str() ) );
|
|
|
|
|
2020-11-24 05:55:28 +00:00
|
|
|
DXF_IMPORT_STYLE* style = getImportStyle( aData.style.c_str() );
|
|
|
|
|
2018-11-01 09:47:41 +00:00
|
|
|
double textHeight = mapDim( aData.height );
|
2020-11-24 05:55:28 +00:00
|
|
|
// The 0.9 factor gives a better height/width base ratio with our font
|
2018-11-01 09:47:41 +00:00
|
|
|
double charWidth = textHeight * 0.9;
|
2020-11-24 05:55:28 +00:00
|
|
|
|
|
|
|
if( style != nullptr )
|
|
|
|
charWidth *= style->m_widthFactor;
|
|
|
|
|
2018-12-04 19:01:47 +00:00
|
|
|
double textWidth = charWidth * text.length(); // Rough approximation
|
|
|
|
double textThickness = textHeight/8.0; // Use a reasonable line thickness for this text
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
VECTOR2D bottomLeft(0.0, 0.0);
|
|
|
|
VECTOR2D bottomRight(0.0, 0.0);
|
|
|
|
VECTOR2D topLeft(0.0, 0.0);
|
|
|
|
VECTOR2D topRight(0.0, 0.0);
|
|
|
|
|
2021-12-28 22:13:54 +00:00
|
|
|
GR_TEXT_H_ALIGN_T hJustify = GR_TEXT_H_ALIGN_LEFT;
|
|
|
|
GR_TEXT_V_ALIGN_T vJustify = GR_TEXT_V_ALIGN_BOTTOM;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
switch( aData.vJustification )
|
|
|
|
{
|
|
|
|
case 0: //DRW_Text::VBaseLine:
|
|
|
|
case 1: //DRW_Text::VBottom:
|
2021-12-28 22:13:54 +00:00
|
|
|
vJustify = GR_TEXT_V_ALIGN_BOTTOM;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
topLeft.y = textHeight;
|
|
|
|
topRight.y = textHeight;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: //DRW_Text::VMiddle:
|
2021-12-28 22:13:54 +00:00
|
|
|
vJustify = GR_TEXT_V_ALIGN_CENTER;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomRight.y = -textHeight / 2.0;
|
|
|
|
bottomLeft.y = -textHeight / 2.0;
|
|
|
|
topLeft.y = textHeight / 2.0;
|
|
|
|
topRight.y = textHeight / 2.0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 3: //DRW_Text::VTop:
|
2021-12-28 22:13:54 +00:00
|
|
|
vJustify = GR_TEXT_V_ALIGN_TOP;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.y = -textHeight;
|
|
|
|
bottomRight.y = -textHeight;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch( aData.hJustification )
|
|
|
|
{
|
|
|
|
case 0: //DRW_Text::HLeft:
|
|
|
|
case 3: //DRW_Text::HAligned: // no equivalent options in text pcb.
|
|
|
|
case 5: //DRW_Text::HFit: // no equivalent options in text pcb.
|
2021-12-28 22:13:54 +00:00
|
|
|
hJustify = GR_TEXT_H_ALIGN_LEFT;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomRight.x = textWidth;
|
|
|
|
topRight.x = textWidth;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1: //DRW_Text::HCenter:
|
|
|
|
case 4: //DRW_Text::HMiddle: // no equivalent options in text pcb.
|
2021-12-28 22:13:54 +00:00
|
|
|
hJustify = GR_TEXT_H_ALIGN_CENTER;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.x = -textWidth / 2.0;
|
|
|
|
topLeft.x = -textWidth / 2.0;
|
|
|
|
bottomRight.x = textWidth / 2.0;
|
|
|
|
topRight.x = textWidth / 2.0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: //DRW_Text::HRight:
|
2021-12-28 22:13:54 +00:00
|
|
|
hJustify = GR_TEXT_H_ALIGN_RIGHT;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.x = -textWidth;
|
|
|
|
topLeft.x = -textWidth;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
wxString sty = wxString::FromUTF8( aData.style.c_str() );
|
|
|
|
sty = sty.ToLower();
|
|
|
|
|
|
|
|
if( aData.textgen == 2 )
|
|
|
|
{
|
|
|
|
// Text dir = left to right;
|
|
|
|
} else if( aData.textgen == 4 )
|
|
|
|
{
|
|
|
|
// Text dir = top to bottom;
|
|
|
|
} else
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-01-22 18:59:43 +00:00
|
|
|
// dxf_lib imports text angle in radians (although there are no comment about that.
|
|
|
|
// So, for the moment, convert this angle to degrees
|
|
|
|
double angle_degree = aData.angle * 180 / M_PI;
|
|
|
|
// We also need the angle in radians. so convert angle_degree to radians
|
|
|
|
// regardless the aData.angle unit
|
|
|
|
double angleInRads = angle_degree * M_PI / 180.0;
|
2018-11-01 09:47:41 +00:00
|
|
|
double cosine = cos(angleInRads);
|
|
|
|
double sine = sin(angleInRads);
|
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
2020-11-23 16:18:02 +00:00
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddText( refPoint, text, textHeight, charWidth, textThickness, angle_degree,
|
|
|
|
hJustify, vJustify );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
// Calculate the boundary box and update the image limits:
|
|
|
|
bottomLeft.x = bottomLeft.x * cosine - bottomLeft.y * sine;
|
|
|
|
bottomLeft.y = bottomLeft.x * sine + bottomLeft.y * cosine;
|
|
|
|
|
|
|
|
bottomRight.x = bottomRight.x * cosine - bottomRight.y * sine;
|
|
|
|
bottomRight.y = bottomRight.x * sine + bottomRight.y * cosine;
|
|
|
|
|
|
|
|
topLeft.x = topLeft.x * cosine - topLeft.y * sine;
|
|
|
|
topLeft.y = topLeft.x * sine + topLeft.y * cosine;
|
|
|
|
|
|
|
|
topRight.x = topRight.x * cosine - topRight.y * sine;
|
|
|
|
topRight.y = topRight.x * sine + topRight.y * cosine;
|
|
|
|
|
|
|
|
bottomLeft += refPoint;
|
|
|
|
bottomRight += refPoint;
|
|
|
|
topLeft += refPoint;
|
|
|
|
topRight += refPoint;
|
|
|
|
|
|
|
|
updateImageLimits( bottomLeft );
|
|
|
|
updateImageLimits( bottomRight );
|
|
|
|
updateImageLimits( topLeft );
|
|
|
|
updateImageLimits( topRight );
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addMText( const DL_MTextData& aData )
|
|
|
|
{
|
2018-11-01 09:47:41 +00:00
|
|
|
wxString text = toNativeString( wxString::FromUTF8( aData.text.c_str() ) );
|
|
|
|
wxString attrib, tmp;
|
|
|
|
|
2020-11-24 05:55:28 +00:00
|
|
|
DXF_IMPORT_STYLE* style = getImportStyle( aData.style.c_str() );
|
|
|
|
|
2018-11-01 09:47:41 +00:00
|
|
|
double textHeight = mapDim( aData.height );
|
2020-11-24 05:55:28 +00:00
|
|
|
|
|
|
|
// The 0.9 factor gives a better height/width base ratio with our font
|
2018-11-01 09:47:41 +00:00
|
|
|
double charWidth = textHeight * 0.9;
|
2020-11-24 05:55:28 +00:00
|
|
|
if( style != nullptr )
|
|
|
|
charWidth *= style->m_widthFactor;
|
|
|
|
|
2018-12-04 19:01:47 +00:00
|
|
|
double textWidth = charWidth * text.length(); // Rough approximation
|
|
|
|
double textThickness = textHeight/8.0; // Use a reasonable line thickness for this text
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D bottomLeft(0.0, 0.0);
|
|
|
|
VECTOR2D bottomRight(0.0, 0.0);
|
|
|
|
VECTOR2D topLeft(0.0, 0.0);
|
|
|
|
VECTOR2D topRight(0.0, 0.0);
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2019-04-03 15:29:17 +00:00
|
|
|
/* Some texts start by '\' and have formatting chars (font name, font option...)
|
2018-11-01 09:47:41 +00:00
|
|
|
* ending with ';'
|
|
|
|
* Here are some mtext formatting codes:
|
|
|
|
* Format code Purpose
|
|
|
|
* \0...\o Turns overline on and off
|
|
|
|
* \L...\l Turns underline on and off
|
|
|
|
* \~ Inserts a nonbreaking space
|
|
|
|
\\ Inserts a backslash
|
|
|
|
\\\{...\} Inserts an opening and closing brace
|
|
|
|
\\ \File name; Changes to the specified font file
|
|
|
|
\\ \Hvalue; Changes to the text height specified in drawing units
|
|
|
|
\\ \Hvaluex; Changes the text height to a multiple of the current text height
|
|
|
|
\\ \S...^...; Stacks the subsequent text at the \, #, or ^ symbol
|
|
|
|
\\ \Tvalue; Adjusts the space between characters, from.75 to 4 times
|
2019-04-03 15:29:17 +00:00
|
|
|
\\ \Qangle; Changes oblique angle
|
2018-11-01 09:47:41 +00:00
|
|
|
\\ \Wvalue; Changes width factor to produce wide text
|
|
|
|
\\ \A Sets the alignment value; valid values: 0, 1, 2 (bottom, center, top) while( text.StartsWith( wxT("\\") ) )
|
|
|
|
*/
|
|
|
|
while( text.StartsWith( wxT( "\\" ) ) )
|
|
|
|
{
|
|
|
|
attrib << text.BeforeFirst( ';' );
|
|
|
|
tmp = text.AfterFirst( ';' );
|
|
|
|
text = tmp;
|
|
|
|
}
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
|
|
|
VECTOR3D textposCoords = ocsToWcs( arbAxis, VECTOR3D( aData.ipx, aData.ipy, aData.ipz ) );
|
2020-11-23 22:26:52 +00:00
|
|
|
|
|
|
|
VECTOR2D textpos( mapX( textposCoords.x ), mapY( textposCoords.y ) );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
// Initialize text justifications:
|
2021-12-28 22:13:54 +00:00
|
|
|
GR_TEXT_H_ALIGN_T hJustify = GR_TEXT_H_ALIGN_LEFT;
|
|
|
|
GR_TEXT_V_ALIGN_T vJustify = GR_TEXT_V_ALIGN_BOTTOM;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
if( aData.attachmentPoint <= 3 )
|
|
|
|
{
|
2021-12-28 22:13:54 +00:00
|
|
|
vJustify = GR_TEXT_V_ALIGN_TOP;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.y = -textHeight;
|
|
|
|
bottomRight.y = -textHeight;
|
|
|
|
}
|
|
|
|
else if( aData.attachmentPoint <= 6 )
|
|
|
|
{
|
2021-12-28 22:13:54 +00:00
|
|
|
vJustify = GR_TEXT_V_ALIGN_CENTER;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomRight.y = -textHeight / 2.0;
|
|
|
|
bottomLeft.y = -textHeight / 2.0;
|
|
|
|
topLeft.y = textHeight / 2.0;
|
|
|
|
topRight.y = textHeight / 2.0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2021-12-28 22:13:54 +00:00
|
|
|
vJustify = GR_TEXT_V_ALIGN_BOTTOM;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
topLeft.y = textHeight;
|
|
|
|
topRight.y = textHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( aData.attachmentPoint % 3 == 1 )
|
|
|
|
{
|
2021-12-28 22:13:54 +00:00
|
|
|
hJustify = GR_TEXT_H_ALIGN_LEFT;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomRight.x = textWidth;
|
|
|
|
topRight.x = textWidth;
|
|
|
|
}
|
|
|
|
else if( aData.attachmentPoint % 3 == 2 )
|
|
|
|
{
|
2021-12-28 22:13:54 +00:00
|
|
|
hJustify = GR_TEXT_H_ALIGN_CENTER;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.x = -textWidth / 2.0;
|
|
|
|
topLeft.x = -textWidth / 2.0;
|
|
|
|
bottomRight.x = textWidth / 2.0;
|
|
|
|
topRight.x = textWidth / 2.0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2021-12-28 22:13:54 +00:00
|
|
|
hJustify = GR_TEXT_H_ALIGN_RIGHT;
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.x = -textWidth;
|
|
|
|
topLeft.x = -textWidth;
|
|
|
|
}
|
|
|
|
|
2019-04-03 15:29:17 +00:00
|
|
|
#if 0 // These setting have no meaning in Pcbnew
|
2018-11-01 09:47:41 +00:00
|
|
|
if( data.alignH == 1 )
|
|
|
|
{
|
|
|
|
// Text is left to right;
|
|
|
|
}
|
|
|
|
else if( data.alignH == 3 )
|
|
|
|
{
|
|
|
|
// Text is top to bottom;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// use ByStyle;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( aData.alignV == 1 )
|
|
|
|
{
|
|
|
|
// use AtLeast;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// useExact;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-01-22 18:59:43 +00:00
|
|
|
// dxf_lib imports text angle in radians (although there are no comment about that.
|
|
|
|
// So, for the moment, convert this angle to degrees
|
|
|
|
double angle_degree = aData.angle * 180/M_PI;
|
|
|
|
// We also need the angle in radians. so convert angle_degree to radians
|
|
|
|
// regardless the aData.angle unit
|
|
|
|
double angleInRads = angle_degree * M_PI / 180.0;
|
2018-11-01 09:47:41 +00:00
|
|
|
double cosine = cos(angleInRads);
|
|
|
|
double sine = sin(angleInRads);
|
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
|
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
2020-11-23 16:18:02 +00:00
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddText( textpos, text, textHeight, charWidth,
|
|
|
|
textThickness, angle_degree, hJustify, vJustify );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
bottomLeft.x = bottomLeft.x * cosine - bottomLeft.y * sine;
|
|
|
|
bottomLeft.y = bottomLeft.x * sine + bottomLeft.y * cosine;
|
|
|
|
|
|
|
|
bottomRight.x = bottomRight.x * cosine - bottomRight.y * sine;
|
|
|
|
bottomRight.y = bottomRight.x * sine + bottomRight.y * cosine;
|
|
|
|
|
|
|
|
topLeft.x = topLeft.x * cosine - topLeft.y * sine;
|
|
|
|
topLeft.y = topLeft.x * sine + topLeft.y * cosine;
|
|
|
|
|
|
|
|
topRight.x = topRight.x * cosine - topRight.y * sine;
|
|
|
|
topRight.y = topRight.x * sine + topRight.y * cosine;
|
|
|
|
|
|
|
|
bottomLeft += textpos;
|
|
|
|
bottomRight += textpos;
|
|
|
|
topLeft += textpos;
|
|
|
|
topRight += textpos;
|
|
|
|
|
|
|
|
updateImageLimits( bottomLeft );
|
|
|
|
updateImageLimits( bottomRight );
|
|
|
|
updateImageLimits( topLeft );
|
|
|
|
updateImageLimits( topRight );
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-11-22 03:11:24 +00:00
|
|
|
double DXF_IMPORT_PLUGIN::getCurrentUnitScale()
|
|
|
|
{
|
|
|
|
double scale = 1.0;
|
|
|
|
switch( m_currentUnit )
|
|
|
|
{
|
|
|
|
case DXF_IMPORT_UNITS::INCHES:
|
|
|
|
scale = 25.4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::FEET:
|
|
|
|
scale = 304.8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::MILLIMETERS:
|
|
|
|
scale = 1.0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::CENTIMETERS:
|
|
|
|
scale = 10.0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::METERS:
|
|
|
|
scale = 1000.0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::MICROINCHES:
|
|
|
|
scale = 2.54e-5;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::MILS:
|
|
|
|
scale = 0.0254;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::YARDS:
|
|
|
|
scale = 914.4;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::ANGSTROMS:
|
|
|
|
scale = 1.0e-7;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::NANOMETERS:
|
|
|
|
scale = 1.0e-6;
|
|
|
|
break;
|
|
|
|
|
2020-11-22 20:44:57 +00:00
|
|
|
case DXF_IMPORT_UNITS::MICRONS:
|
2020-11-22 03:11:24 +00:00
|
|
|
scale = 1.0e-3;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DXF_IMPORT_UNITS::DECIMETERS:
|
|
|
|
scale = 100.0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
// use the default of 1.0 for:
|
|
|
|
// 0: Unspecified Units
|
|
|
|
// 3: miles
|
|
|
|
// 7: kilometers
|
|
|
|
// 15: decameters
|
|
|
|
// 16: hectometers
|
|
|
|
// 17: gigameters
|
|
|
|
// 18: AU
|
|
|
|
// 19: lightyears
|
|
|
|
// 20: parsecs
|
|
|
|
scale = 1.0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return scale;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::setVariableInt( const std::string& key, int value, int code )
|
|
|
|
{
|
|
|
|
// Called for every int variable in the DXF file (e.g. "$INSUNITS").
|
|
|
|
|
|
|
|
if( key == "$DWGCODEPAGE" )
|
|
|
|
{
|
|
|
|
m_codePage = value;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2021-06-22 11:34:15 +00:00
|
|
|
if( key == "$AUPREC" )
|
|
|
|
{
|
|
|
|
m_importAnglePrecision = value;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( key == "$LUPREC" )
|
|
|
|
{
|
|
|
|
m_importCoordinatePrecision = value;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
if( key == "$INSUNITS" ) // Drawing units
|
|
|
|
{
|
|
|
|
switch( value )
|
|
|
|
{
|
|
|
|
case 1: // inches
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::INCHES;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 2: // feet
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::FEET;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 4: // mm
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::MILLIMETERS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 5: // centimeters
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::CENTIMETERS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 6: // meters
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::METERS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 8: // microinches
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::MICROINCHES;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 9: // mils
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::MILS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 10: // yards
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::YARDS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 11: // Angstroms
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::ANGSTROMS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 12: // nanometers
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::NANOMETERS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 13: // micrometers
|
2020-11-22 20:44:57 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::MICRONS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 14: // decimeters
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::DECIMETERS;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
// use the default of 1.0 for:
|
|
|
|
// 0: Unspecified Units
|
|
|
|
// 3: miles
|
|
|
|
// 7: kilometers
|
|
|
|
// 15: decameters
|
|
|
|
// 16: hectometers
|
|
|
|
// 17: gigameters
|
|
|
|
// 18: AU
|
|
|
|
// 19: lightyears
|
|
|
|
// 20: parsecs
|
2020-11-22 03:11:24 +00:00
|
|
|
m_currentUnit = DXF_IMPORT_UNITS::DEFAULT;
|
2018-10-13 18:37:28 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::setVariableString( const std::string& key, const std::string& value,
|
|
|
|
int code )
|
|
|
|
{
|
|
|
|
// Called for every string variable in the DXF file (e.g. "$ACADVER").
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wxString DXF_IMPORT_PLUGIN::toDxfString( const wxString& aStr )
|
|
|
|
{
|
|
|
|
wxString res;
|
|
|
|
int j = 0;
|
|
|
|
|
|
|
|
for( unsigned i = 0; i<aStr.length(); ++i )
|
|
|
|
{
|
|
|
|
int c = aStr[i];
|
|
|
|
|
|
|
|
if( c > 175 || c < 11 )
|
|
|
|
{
|
|
|
|
res.append( aStr.Mid( j, i - j ) );
|
|
|
|
j = i;
|
|
|
|
|
|
|
|
switch( c )
|
|
|
|
{
|
|
|
|
case 0x0A:
|
|
|
|
res += wxT( "\\P" );
|
|
|
|
break;
|
|
|
|
|
|
|
|
// diameter:
|
2021-01-31 21:15:50 +00:00
|
|
|
#ifdef _WIN32
|
2018-10-13 18:37:28 +00:00
|
|
|
// windows, as always, is special.
|
|
|
|
case 0x00D8:
|
|
|
|
#else
|
|
|
|
case 0x2205:
|
|
|
|
#endif
|
|
|
|
res += wxT( "%%C" );
|
|
|
|
break;
|
|
|
|
|
|
|
|
// degree:
|
|
|
|
case 0x00B0:
|
|
|
|
res += wxT( "%%D" );
|
|
|
|
break;
|
|
|
|
|
|
|
|
// plus/minus
|
|
|
|
case 0x00B1:
|
|
|
|
res += wxT( "%%P" );
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
j--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res.append( aStr.Mid( j ) );
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wxString DXF_IMPORT_PLUGIN::toNativeString( const wxString& aData )
|
|
|
|
{
|
|
|
|
wxString res;
|
|
|
|
|
|
|
|
// Ignore font tags:
|
|
|
|
int j = 0;
|
|
|
|
|
|
|
|
for( unsigned i = 0; i < aData.length(); ++i )
|
|
|
|
{
|
|
|
|
if( aData[ i ] == 0x7B ) // is '{' ?
|
|
|
|
{
|
|
|
|
if( aData[ i + 1 ] == 0x5c && aData[ i + 2 ] == 0x66 ) // is "\f" ?
|
|
|
|
{
|
|
|
|
// found font tag, append parsed part
|
|
|
|
res.append( aData.Mid( j, i - j ) );
|
|
|
|
|
|
|
|
// skip to ';'
|
|
|
|
for( unsigned k = i + 3; k < aData.length(); ++k )
|
|
|
|
{
|
|
|
|
if( aData[ k ] == 0x3B )
|
|
|
|
{
|
|
|
|
i = j = ++k;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// add to '}'
|
|
|
|
for( unsigned k = i; k < aData.length(); ++k )
|
|
|
|
{
|
|
|
|
if( aData[ k ] == 0x7D )
|
|
|
|
{
|
|
|
|
res.append( aData.Mid( i, k - i ) );
|
|
|
|
i = j = ++k;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
res.append( aData.Mid( j ) );
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
wxRegEx regexp;
|
|
|
|
// Line feed:
|
|
|
|
regexp.Compile( wxT( "\\\\P" ) );
|
|
|
|
regexp.Replace( &res, wxT( "\n" ) );
|
|
|
|
|
|
|
|
// Space:
|
|
|
|
regexp.Compile( wxT( "\\\\~" ) );
|
|
|
|
regexp.Replace( &res, wxT( " " ) );
|
|
|
|
|
|
|
|
// diameter:
|
|
|
|
regexp.Compile( wxT( "%%[cC]" ) );
|
|
|
|
#ifdef __WINDOWS__
|
|
|
|
// windows, as always, is special.
|
|
|
|
regexp.Replace( &res, wxChar( 0xD8 ) );
|
|
|
|
#else
|
|
|
|
// Empty_set, diameter is 0x2300
|
|
|
|
regexp.Replace( &res, wxChar( 0x2205 ) );
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// degree:
|
|
|
|
regexp.Compile( wxT( "%%[dD]" ) );
|
|
|
|
regexp.Replace( &res, wxChar( 0x00B0 ) );
|
|
|
|
// plus/minus
|
|
|
|
regexp.Compile( wxT( "%%[pP]" ) );
|
|
|
|
regexp.Replace( &res, wxChar( 0x00B1 ) );
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::addTextStyle( const DL_StyleData& aData )
|
|
|
|
{
|
2020-11-24 05:55:28 +00:00
|
|
|
wxString name = wxString::FromUTF8( aData.name.c_str() );
|
|
|
|
|
|
|
|
std::unique_ptr<DXF_IMPORT_STYLE> style =
|
|
|
|
std::make_unique<DXF_IMPORT_STYLE>( name, aData.fixedTextHeight, aData.widthFactor, aData.bold, aData.italic );
|
|
|
|
|
|
|
|
m_styles.push_back( std::move( style ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-09-12 23:38:22 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::addPoint( const DL_PointData& aData )
|
|
|
|
{
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D arbAxis = getArbitraryAxis( getExtrusion() );
|
|
|
|
VECTOR3D centerCoords = ocsToWcs( arbAxis, VECTOR3D( aData.x, aData.y, aData.z ) );
|
2021-09-12 23:38:22 +00:00
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
|
2021-09-12 23:38:22 +00:00
|
|
|
|
|
|
|
// we emulate points with filled circles
|
|
|
|
// set the linewidth to something that even small circles look good with
|
|
|
|
// thickness is optional for dxf points
|
|
|
|
// note: we had to modify the dxf library to grab the attribute for thickness
|
|
|
|
double lineWidth = 0.0001;
|
|
|
|
double thickness = mapDim( std::max( aData.thickness, 0.01 ) );
|
|
|
|
|
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
|
|
|
bufferToUse->AddCircle( center, thickness, lineWidth, true );
|
|
|
|
|
|
|
|
VECTOR2D radiusDelta( SCALE_FACTOR( thickness ), SCALE_FACTOR( thickness ) );
|
|
|
|
|
|
|
|
updateImageLimits( center + radiusDelta );
|
|
|
|
updateImageLimits( center - radiusDelta );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::insertLine( const VECTOR2D& aSegStart,
|
2021-10-25 15:36:04 +00:00
|
|
|
const VECTOR2D& aSegEnd, double aWidth )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D origin( SCALE_FACTOR( aSegStart.x ), SCALE_FACTOR( aSegStart.y ) );
|
|
|
|
VECTOR2D end( SCALE_FACTOR( aSegEnd.x ), SCALE_FACTOR( aSegEnd.y ) );
|
2020-11-23 14:59:00 +00:00
|
|
|
|
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
2020-11-23 16:18:02 +00:00
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddLine( origin, end, aWidth );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
updateImageLimits( origin );
|
|
|
|
updateImageLimits( end );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::insertArc( const VECTOR2D& aSegStart, const VECTOR2D& aSegEnd,
|
2021-10-25 15:36:04 +00:00
|
|
|
double aBulge, double aWidth )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D segment_startpoint( SCALE_FACTOR( aSegStart.x ), SCALE_FACTOR( aSegStart.y ) );
|
|
|
|
VECTOR2D segment_endpoint( SCALE_FACTOR( aSegEnd.x ), SCALE_FACTOR( aSegEnd.y ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
// ensure aBulge represents an angle from +/- ( 0 .. approx 359.8 deg )
|
|
|
|
if( aBulge < -2000.0 )
|
|
|
|
aBulge = -2000.0;
|
|
|
|
else if( aBulge > 2000.0 )
|
|
|
|
aBulge = 2000.0;
|
|
|
|
|
|
|
|
double ang = 4.0 * atan( aBulge );
|
|
|
|
|
|
|
|
// reflect the Y values to put everything in a RHCS
|
2018-11-01 09:47:41 +00:00
|
|
|
VECTOR2D sp( aSegStart.x, -aSegStart.y );
|
|
|
|
VECTOR2D ep( aSegEnd.x, -aSegEnd.y );
|
2018-10-13 18:37:28 +00:00
|
|
|
// angle from end->start
|
|
|
|
double offAng = atan2( ep.y - sp.y, ep.x - sp.x );
|
|
|
|
// length of subtended segment = 1/2 distance between the 2 points
|
|
|
|
double d = 0.5 * sqrt( (sp.x - ep.x) * (sp.x - ep.x) + (sp.y - ep.y) * (sp.y - ep.y) );
|
|
|
|
// midpoint of the subtended segment
|
|
|
|
double xm = ( sp.x + ep.x ) * 0.5;
|
|
|
|
double ym = ( sp.y + ep.y ) * 0.5;
|
|
|
|
double radius = d / sin( ang * 0.5 );
|
|
|
|
|
|
|
|
if( radius < 0.0 )
|
|
|
|
radius = -radius;
|
|
|
|
|
|
|
|
// calculate the height of the triangle with base d and hypotenuse r
|
|
|
|
double dh2 = radius * radius - d * d;
|
|
|
|
|
|
|
|
// this should only ever happen due to rounding errors when r == d
|
|
|
|
if( dh2 < 0.0 )
|
|
|
|
dh2 = 0.0;
|
|
|
|
|
|
|
|
double h = sqrt( dh2 );
|
|
|
|
|
|
|
|
if( ang < 0.0 )
|
|
|
|
offAng -= M_PI_2;
|
|
|
|
else
|
|
|
|
offAng += M_PI_2;
|
|
|
|
|
|
|
|
// for angles greater than 180 deg we need to flip the
|
|
|
|
// direction in which the arc center is found relative
|
|
|
|
// to the midpoint of the subtended segment.
|
|
|
|
if( ang < -M_PI )
|
|
|
|
offAng += M_PI;
|
|
|
|
else if( ang > M_PI )
|
|
|
|
offAng -= M_PI;
|
|
|
|
|
|
|
|
// center point
|
|
|
|
double cx = h * cos( offAng ) + xm;
|
|
|
|
double cy = h * sin( offAng ) + ym;
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D center( SCALE_FACTOR( cx ), SCALE_FACTOR( -cy ) );
|
2018-11-01 09:47:41 +00:00
|
|
|
VECTOR2D arc_start;
|
2022-01-20 23:08:48 +00:00
|
|
|
EDA_ANGLE angle( ang, RADIANS_T );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
if( ang < 0.0 )
|
|
|
|
{
|
2018-11-05 16:04:05 +00:00
|
|
|
arc_start = VECTOR2D( SCALE_FACTOR( ep.x ), SCALE_FACTOR( -ep.y ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2018-11-05 16:04:05 +00:00
|
|
|
arc_start = VECTOR2D( SCALE_FACTOR( sp.x ), SCALE_FACTOR( -sp.y ) );
|
2018-11-01 09:47:41 +00:00
|
|
|
angle = -angle;
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
|
2022-01-20 23:08:48 +00:00
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse = m_currentBlock ? &m_currentBlock->m_buffer
|
|
|
|
: &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddArc( center, arc_start, angle, aWidth );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D radiusDelta( SCALE_FACTOR( radius ), SCALE_FACTOR( radius ) );
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
updateImageLimits( center + radiusDelta );
|
|
|
|
updateImageLimits( center - radiusDelta );
|
2018-10-13 18:37:28 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2022-12-07 03:28:09 +00:00
|
|
|
#include "tinysplinecxx.h"
|
2018-10-13 18:37:28 +00:00
|
|
|
|
2021-10-25 15:36:04 +00:00
|
|
|
void DXF_IMPORT_PLUGIN::insertSpline( double aWidth )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
|
|
|
#if 0 // Debug only
|
|
|
|
wxLogMessage("spl deg %d kn %d ctr %d fit %d",
|
|
|
|
m_curr_entity.m_SplineDegree,
|
|
|
|
m_curr_entity.m_SplineKnotsList.size(),
|
|
|
|
m_curr_entity.m_SplineControlPointList.size(),
|
|
|
|
m_curr_entity.m_SplineFitPointList.size() );
|
|
|
|
#endif
|
|
|
|
|
|
|
|
unsigned imax = m_curr_entity.m_SplineControlPointList.size();
|
|
|
|
|
|
|
|
if( imax < 2 ) // malformed spline
|
|
|
|
return;
|
|
|
|
|
|
|
|
#if 0 // set to 1 to approximate the spline by segments between 2 control points
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D startpoint( mapX( m_curr_entity.m_SplineControlPointList[0].m_x ),
|
2019-04-03 15:29:17 +00:00
|
|
|
mapY( m_curr_entity.m_SplineControlPointList[0].m_y ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
for( unsigned int ii = 1; ii < imax; ++ii )
|
|
|
|
{
|
2018-11-05 16:04:05 +00:00
|
|
|
VECTOR2D endpoint( mapX( m_curr_entity.m_SplineControlPointList[ii].m_x ),
|
|
|
|
mapY( m_curr_entity.m_SplineControlPointList[ii].m_y ) );
|
2018-10-13 18:37:28 +00:00
|
|
|
|
|
|
|
if( startpoint != endpoint )
|
|
|
|
{
|
2020-02-03 09:39:29 +00:00
|
|
|
m_internalImporter.AddLine( startpoint, endpoint, aWidth );
|
2018-11-05 16:04:05 +00:00
|
|
|
|
|
|
|
updateImageLimits( startpoint );
|
|
|
|
updateImageLimits( endpoint );
|
|
|
|
|
2018-10-13 18:37:28 +00:00
|
|
|
startpoint = endpoint;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else // Use bezier curves, supported by pcbnew, to approximate the spline
|
|
|
|
std::vector<double> ctrlp;
|
|
|
|
|
|
|
|
for( unsigned ii = 0; ii < imax; ++ii )
|
|
|
|
{
|
|
|
|
ctrlp.push_back( m_curr_entity.m_SplineControlPointList[ii].m_x );
|
|
|
|
ctrlp.push_back( m_curr_entity.m_SplineControlPointList[ii].m_y );
|
|
|
|
}
|
|
|
|
|
2021-03-24 04:29:00 +00:00
|
|
|
std::vector<double> coords;
|
2022-12-07 04:23:50 +00:00
|
|
|
tinyspline::BSpline beziers;
|
2021-03-24 04:29:00 +00:00
|
|
|
try
|
|
|
|
{
|
|
|
|
tinyspline::BSpline dxfspline( m_curr_entity.m_SplineControlPointList.size(),
|
|
|
|
/* coord dim */ 2, m_curr_entity.m_SplineDegree );
|
|
|
|
|
2022-12-07 03:28:09 +00:00
|
|
|
dxfspline.setControlPoints( ctrlp );
|
2021-03-24 04:29:00 +00:00
|
|
|
dxfspline.setKnots( m_curr_entity.m_SplineKnotsList );
|
2022-12-07 04:23:50 +00:00
|
|
|
beziers = tinyspline::BSpline( dxfspline.toBeziers() );
|
2021-03-24 04:29:00 +00:00
|
|
|
|
2022-12-07 03:28:09 +00:00
|
|
|
coords = beziers.controlPoints();
|
2021-03-24 04:29:00 +00:00
|
|
|
}
|
|
|
|
catch( const std::runtime_error& ) //tinyspline throws everything including data validation as runtime errors
|
|
|
|
{
|
|
|
|
// invalid spline definition, drop this block
|
|
|
|
reportMsg( _( "Invalid spline definition encountered" ) );
|
|
|
|
return;
|
|
|
|
}
|
2018-10-13 18:37:28 +00:00
|
|
|
|
2022-12-07 04:23:50 +00:00
|
|
|
size_t order = beziers.order();
|
|
|
|
size_t dim = beziers.dimension();
|
|
|
|
size_t numBeziers = ( coords.size() / dim ) / order;
|
2018-10-13 18:37:28 +00:00
|
|
|
|
2022-12-07 04:23:50 +00:00
|
|
|
for( size_t i = 0; i < numBeziers; i++ )
|
2018-10-13 18:37:28 +00:00
|
|
|
{
|
2022-12-07 04:23:50 +00:00
|
|
|
size_t ii = i * dim * order;
|
|
|
|
VECTOR2D start( mapX( coords[ ii ] ), mapY( coords[ ii + 1 ] ) );
|
2020-02-03 09:39:29 +00:00
|
|
|
|
2022-12-07 04:23:50 +00:00
|
|
|
VECTOR2D bezierControl1( mapX( coords[ii + 2] ), mapY( coords[ii + 3] ) );
|
|
|
|
|
|
|
|
// not sure why this happens, but it seems to sometimes slip degree on the final bezier
|
|
|
|
VECTOR2D bezierControl2;
|
|
|
|
if( ii + 4 >= coords.size() )
|
|
|
|
{
|
|
|
|
bezierControl2 = bezierControl1;
|
|
|
|
}
|
2020-02-03 09:39:29 +00:00
|
|
|
else
|
2022-12-07 04:23:50 +00:00
|
|
|
{
|
|
|
|
bezierControl2 = VECTOR2D( mapX( coords[ii + 4] ), mapY( coords[ii + 5] ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
VECTOR2D end;
|
|
|
|
if( ii + 6 >= coords.size() )
|
|
|
|
{
|
2020-02-03 09:39:29 +00:00
|
|
|
end = bezierControl2;
|
2022-12-07 04:23:50 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
end = VECTOR2D( mapX( coords[ii + 6] ), mapY( coords[ii + 7] ) );
|
|
|
|
}
|
2020-02-03 09:39:29 +00:00
|
|
|
|
2020-11-23 14:59:00 +00:00
|
|
|
GRAPHICS_IMPORTER_BUFFER* bufferToUse =
|
2020-11-23 16:18:02 +00:00
|
|
|
( m_currentBlock != nullptr ) ? &m_currentBlock->m_buffer : &m_internalImporter;
|
2020-11-23 14:59:00 +00:00
|
|
|
bufferToUse->AddSpline( start, bezierControl1, bezierControl2, end, aWidth );
|
2018-10-13 18:37:28 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2018-11-01 09:47:41 +00:00
|
|
|
|
|
|
|
void DXF_IMPORT_PLUGIN::updateImageLimits( const VECTOR2D& aPoint )
|
|
|
|
{
|
|
|
|
m_minX = std::min( aPoint.x, m_minX );
|
|
|
|
m_maxX = std::max( aPoint.x, m_maxX );
|
|
|
|
|
|
|
|
m_minY = std::min( aPoint.y, m_minY );
|
|
|
|
m_maxY = std::max( aPoint.y, m_maxY );
|
|
|
|
}
|
2020-11-23 22:26:52 +00:00
|
|
|
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3D DXF_IMPORT_PLUGIN::getArbitraryAxis( DL_Extrusion* aData )
|
2020-11-23 22:26:52 +00:00
|
|
|
{
|
|
|
|
VECTOR3D arbZ, arbX, arbY;
|
|
|
|
|
|
|
|
double direction[3];
|
|
|
|
aData->getDirection( direction );
|
|
|
|
|
|
|
|
arbZ = VECTOR3D( direction[0], direction[1], direction[2] ).Normalize();
|
|
|
|
|
|
|
|
if( ( abs( arbZ.x ) < ( 1.0 / 64.0 ) ) && ( abs( arbZ.y ) < ( 1.0 / 64.0 ) ) )
|
|
|
|
{
|
|
|
|
arbX = VECTOR3D( 0, 1, 0 ).Cross( arbZ ).Normalize();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
arbX = VECTOR3D( 0, 0, 1 ).Cross( arbZ ).Normalize();
|
|
|
|
}
|
|
|
|
|
|
|
|
arbY = arbZ.Cross( arbX ).Normalize();
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
return MATRIX3x3D{ arbX, arbY, arbZ };
|
2020-11-23 22:26:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
VECTOR3D DXF_IMPORT_PLUGIN::wcsToOcs( const MATRIX3x3D& arbitraryAxis, VECTOR3D point )
|
2020-11-23 22:26:52 +00:00
|
|
|
{
|
2023-01-05 01:42:56 +00:00
|
|
|
return arbitraryAxis * point;
|
2020-11-23 22:26:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
VECTOR3D DXF_IMPORT_PLUGIN::ocsToWcs( const MATRIX3x3D& arbitraryAxis, VECTOR3D point )
|
2020-11-23 22:26:52 +00:00
|
|
|
{
|
|
|
|
VECTOR3D worldX = wcsToOcs( arbitraryAxis, VECTOR3D( 1, 0, 0 ) );
|
|
|
|
VECTOR3D worldY = wcsToOcs( arbitraryAxis, VECTOR3D( 0, 1, 0 ) );
|
|
|
|
VECTOR3D worldZ = wcsToOcs( arbitraryAxis, VECTOR3D( 0, 0, 1 ) );
|
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
MATRIX3x3 world( worldX, worldY, worldZ );
|
2020-11-23 22:26:52 +00:00
|
|
|
|
2023-01-05 01:42:56 +00:00
|
|
|
return world * point;
|
2021-10-25 15:36:04 +00:00
|
|
|
}
|