Fix incorrect object naming, keep hidden layers hidden when printing.

diff --git a/src/applicationwindow.cpp b/src/applicationwindow.cpp
index b91177de80d0454b718c94bd51ce39ddf5d559a2..56b9735a70139d879ff9568cbe00a1bf27a7401e 100644 (file)
--- a/src/applicationwindow.cpp
+++ b/src/applicationwindow.cpp
@@ -318,7 +318,10 @@ void ApplicationWindow::HandlePrintRequest(QPrinter * printer)
 
        // Do object rendering...
        for(int i=0; i<Global::numLayers; i++)
-               drawing->RenderObjects(&painter, drawing->document.objects, i);
+       {
+               if (Global::layerHidden[i] == false)
+                       drawing->RenderObjects(&painter, drawing->document.objects, i);
+       }
 
        // Restore vars
        Global::origin = originSave;

diff --git a/src/structs.cpp b/src/structs.cpp
index 883e934e20e0d5629b7f664649721ecd8fbdf78f..26a70f74752e8529a9ff090a1d604fce9324ab22 100644 (file)
--- a/src/structs.cpp
+++ b/src/structs.cpp
@@ -16,7 +16,7 @@
 #include "mathconstants.h"
 
 const char objName[OTCount][16] = {
-       "None", "Line", "Circle", "Ellipse", "Arc", "Polygon", "Dimension",
+       "None", "Line", "Circle", "Ellipse", "Arc", "Dimension",
        "Spline", "Text", "Container"
 };
 const char dimName[DTCount][32] = {