Moving PageLayout editor to GAL canvas and modern toolset.

common/plotters/common_plot_functions.cpp

@@ -1,8 +1,3 @@
-/**
- * @file common_plot_functions.cpp
- * @brief Kicad: Common plotting functions
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -30,11 +25,11 @@
 #include <fctsys.h>
 #include <base_struct.h>
 #include <plotter.h>
-#include <worksheet.h>
+#include <worksheet_painter.h>
 #include <base_screen.h>
 #include <draw_graphic_text.h>
 #include <title_block.h>
-#include "worksheet_shape_builder.h"
+#include "ws_draw_item.h"
 #include "worksheet_dataitem.h"
 #include <wx/filename.h>
 
@@ -44,35 +39,20 @@ wxString GetDefaultPlotExtension( PlotFormat aFormat )
 {
     switch( aFormat )
     {
-    case PLOT_FORMAT_DXF:
-        return DXF_PLOTTER::GetDefaultFileExtension();
-
-    case PLOT_FORMAT_POST:
-        return PS_PLOTTER::GetDefaultFileExtension();
-
-    case PLOT_FORMAT_PDF:
-        return PDF_PLOTTER::GetDefaultFileExtension();
-
-    case PLOT_FORMAT_HPGL:
-        return HPGL_PLOTTER::GetDefaultFileExtension();
-
-    case PLOT_FORMAT_GERBER:
-        return GERBER_PLOTTER::GetDefaultFileExtension();
-
-    case PLOT_FORMAT_SVG:
-        return SVG_PLOTTER::GetDefaultFileExtension();
-
-    default:
-        wxASSERT( false );
-        return wxEmptyString;
+    case PLOT_FORMAT_DXF:    return DXF_PLOTTER::GetDefaultFileExtension();
+    case PLOT_FORMAT_POST:   return PS_PLOTTER::GetDefaultFileExtension();
+    case PLOT_FORMAT_PDF:    return PDF_PLOTTER::GetDefaultFileExtension();
+    case PLOT_FORMAT_HPGL:   return HPGL_PLOTTER::GetDefaultFileExtension();
+    case PLOT_FORMAT_GERBER: return GERBER_PLOTTER::GetDefaultFileExtension();
+    case PLOT_FORMAT_SVG:    return SVG_PLOTTER::GetDefaultFileExtension();
+    default:                 wxASSERT( false ); return wxEmptyString;
     }
 }
 
 
 
 void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock,
-                    const PAGE_INFO& aPageInfo,
-                    int aSheetNumber, int aNumberOfSheets,
+                    const PAGE_INFO& aPageInfo, int aSheetNumber, int aNumberOfSheets,
                     const wxString &aSheetDesc, const wxString &aFilename )
 {
     /* Note: Page sizes values are given in mils
@@ -87,7 +67,7 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock,
     wxFileName fn( aFilename );
 
     // Prepare plot parameters
-    drawList.SetPenSize(PLOTTER::USE_DEFAULT_LINE_WIDTH );
+    drawList.SetDefaultPenSize( PLOTTER::USE_DEFAULT_LINE_WIDTH );
     drawList.SetMilsToIUfactor( iusPerMil );
     drawList.SetSheetNumber( aSheetNumber );
     drawList.SetSheetCount( aNumberOfSheets );
@@ -95,18 +75,16 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock,
     drawList.SetSheetName( aSheetDesc );
 
 
-    drawList.BuildWorkSheetGraphicList( aPageInfo,
-                            aTitleBlock, plotColor, plotColor );
+    drawList.BuildWorkSheetGraphicList( aPageInfo, aTitleBlock );
 
     // Draw item list
-    for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item;
-         item = drawList.GetNext() )
+    for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item; item = drawList.GetNext() )
     {
         plotter->SetCurrentLineWidth( PLOTTER::USE_DEFAULT_LINE_WIDTH );
 
-        switch( item->GetType() )
+        switch( item->Type() )
         {
-        case WS_DRAW_ITEM_BASE::wsg_line:
+        case WSG_LINE_T:
             {
                 WS_DRAW_ITEM_LINE* line = (WS_DRAW_ITEM_LINE*) item;
                 plotter->SetCurrentLineWidth( line->GetPenWidth() );
@@ -115,51 +93,48 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock,
             }
             break;
 
-        case WS_DRAW_ITEM_BASE::wsg_rect:
+        case WSG_RECT_T:
             {
                 WS_DRAW_ITEM_RECT* rect = (WS_DRAW_ITEM_RECT*) item;
-                plotter->Rect( rect->GetStart(),
-                               rect->GetEnd(),
-                               NO_FILL,
-                               rect->GetPenWidth() );
+                plotter->Rect( rect->GetStart(), rect->GetEnd(), NO_FILL, rect->GetPenWidth() );
             }
             break;
 
-        case WS_DRAW_ITEM_BASE::wsg_text:
+        case WSG_TEXT_T:
             {
                 WS_DRAW_ITEM_TEXT* text = (WS_DRAW_ITEM_TEXT*) item;
-                plotter->Text( text->GetTextPos(), text->GetColor(),
-                               text->GetShownText(), text->GetTextAngle(),
-                               text->GetTextSize(),
+                plotter->Text( text->GetTextPos(), plotColor, text->GetShownText(),
+                               text->GetTextAngle(), text->GetTextSize(),
                                text->GetHorizJustify(), text->GetVertJustify(),
-                               text->GetPenWidth(),
-                               text->IsItalic(), text->IsBold(),
+                               text->GetPenWidth(), text->IsItalic(), text->IsBold(),
                                text->IsMultilineAllowed() );
             }
             break;
 
-        case WS_DRAW_ITEM_BASE::wsg_poly:
+        case WSG_POLY_T:
             {
                 WS_DRAW_ITEM_POLYGON* poly = (WS_DRAW_ITEM_POLYGON*) item;
-                plotter->PlotPoly( poly->m_Corners,
-                                   poly->IsFilled() ? FILLED_SHAPE : NO_FILL,
+                plotter->PlotPoly( poly->m_Corners, poly->IsFilled() ? FILLED_SHAPE : NO_FILL,
                                    poly->GetPenWidth() );
             }
             break;
 
-        case WS_DRAW_ITEM_BASE::wsg_bitmap:
+        case WSG_BITMAP_T:
             {
-                WS_DRAW_ITEM_BITMAP* bm = (WS_DRAW_ITEM_BITMAP*) item;
+                WS_DRAW_ITEM_BITMAP* drawItem = (WS_DRAW_ITEM_BITMAP*) item;
+                auto*                bitmap = (WORKSHEET_DATAITEM_BITMAP*) drawItem->GetPeer();
 
-                WORKSHEET_DATAITEM_BITMAP* parent = (WORKSHEET_DATAITEM_BITMAP*)bm->GetParent();
-
-                if( parent->m_ImageBitmap == NULL )
+                if( bitmap->m_ImageBitmap == NULL )
                     break;
 
-                parent->m_ImageBitmap->PlotImage( plotter, bm->GetPosition(),
-                               plotColor, PLOTTER::USE_DEFAULT_LINE_WIDTH );
+                bitmap->m_ImageBitmap->PlotImage( plotter, drawItem->GetPosition(), plotColor,
+                                                  PLOTTER::USE_DEFAULT_LINE_WIDTH );
             }
             break;
+
+        default:
+            wxFAIL_MSG( "PlotWorkSheet(): Unknown worksheet item." );
+            break;
         }
     }
 }