Fixed hatch dialog, added snap/preview to circle tools.

[architektonas] / src / widgets / linetypebox.cpp

diff --git a/src/widgets/linetypebox.cpp b/src/widgets/linetypebox.cpp
index 7240616095ae66772ed9f75d40bc0f4fbee74d78..4b0075c005863a5415d7bb041733a33c79ec483a 100644 (file)
--- a/src/widgets/linetypebox.cpp
+++ b/src/widgets/linetypebox.cpp
@@ -16,13 +16,13 @@
 
 #include "linetypebox.h"
 
-#include "rs_debug.h"
+#include "debug.h"
 
 /**
  * Default Constructor. You must call init manually if you choose
  * to use this constructor.
  */
-QG_LineTypeBox::QG_LineTypeBox(QWidget * parent, const char */*name*/): QComboBox(parent)
+LineTypeBox::LineTypeBox(QWidget * parent, const char */*name*/): QComboBox(parent)
 {
        showByLayer = false;
        showUnchanged = false;
@@ -35,7 +35,7 @@ QG_LineTypeBox::QG_LineTypeBox(QWidget * parent, const char */*name*/): QComboBo
  *
  * @param showByLayer true: Show attribute ByLayer, ByBlock.
  */
-QG_LineTypeBox::QG_LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * parent,
+LineTypeBox::LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * parent,
        const char */*name*/): QComboBox(parent)
 {
        unchanged = false;
@@ -45,7 +45,7 @@ QG_LineTypeBox::QG_LineTypeBox(bool showByLayer, bool showUnchanged, QWidget * p
 /**
  * Destructor
  */
-QG_LineTypeBox::~QG_LineTypeBox()
+LineTypeBox::~LineTypeBox()
 {
 }
 
@@ -55,7 +55,7 @@ QG_LineTypeBox::~QG_LineTypeBox()
  *
  * @param showByLayer true: Show attribute ByLayer, ByBlock.
  */
-void QG_LineTypeBox::init(bool showByLayer, bool showUnchanged)
+void LineTypeBox::init(bool showByLayer, bool showUnchanged)
 {
        this->showByLayer = showByLayer;
        this->showUnchanged = showUnchanged;
@@ -119,7 +119,7 @@ void QG_LineTypeBox::init(bool showByLayer, bool showUnchanged)
        slotLineTypeChanged(currentIndex());
 }
 
-RS2::LineType QG_LineTypeBox::getLineType()
+RS2::LineType LineTypeBox::getLineType()
 {
        return currentLineType;
 }
@@ -127,9 +127,9 @@ RS2::LineType QG_LineTypeBox::getLineType()
 /**
  * Sets the currently selected linetype item to the given linetype.
  */
-void QG_LineTypeBox::setLineType(RS2::LineType t)
+void LineTypeBox::setLineType(RS2::LineType t)
 {
-       RS_DEBUG->print("QG_LineTypeBox::setLineType %d\n", (int)t);
+       DEBUG->print("LineTypeBox::setLineType %d\n", (int)t);
 
        int offset = (int)showByLayer * 2 + (int)showUnchanged;
 
@@ -139,14 +139,14 @@ void QG_LineTypeBox::setLineType(RS2::LineType t)
                if (showByLayer)
                        setCurrentIndex(0 + (int)showUnchanged);
                else
-                       RS_DEBUG->print(RS_Debug::D_WARNING, "QG_LineTypeBox::setLineType: "
+                       DEBUG->print(Debug::D_WARNING, "LineTypeBox::setLineType: "
                                "Combobox doesn't support linetype BYLAYER");
                break;
        case RS2::LineByBlock:
                if (showByLayer)
                        setCurrentIndex(1 + (int)showUnchanged);
                else
-                       RS_DEBUG->print(RS_Debug::D_WARNING, "QG_LineTypeBox::setLineType: "
+                       DEBUG->print(Debug::D_WARNING, "LineTypeBox::setLineType: "
                                "Combobox doesn't support linetype BYBLOCK");
                break;
 
@@ -226,7 +226,7 @@ void QG_LineTypeBox::setLineType(RS2::LineType t)
  *
  * @todo needs an update, but not used currently
  */
-void QG_LineTypeBox::setLayerLineType(RS2::LineType t)
+void LineTypeBox::setLayerLineType(RS2::LineType t)
 {
        if (showByLayer)
        {
@@ -269,7 +269,7 @@ void QG_LineTypeBox::setLayerLineType(RS2::LineType t)
        }
 }
 
-bool QG_LineTypeBox::isUnchanged()
+bool LineTypeBox::isUnchanged()
 {
        return unchanged;
 }
@@ -280,9 +280,9 @@ bool QG_LineTypeBox::isUnchanged()
  * offers a dialog to the user that allows him/ her to
  * choose an individual linetype.
  */
-void QG_LineTypeBox::slotLineTypeChanged(int index)
+void LineTypeBox::slotLineTypeChanged(int index)
 {
-       RS_DEBUG->print("QG_LineTypeBox::slotLineTypeChanged %d\n", index);
+       DEBUG->print("LineTypeBox::slotLineTypeChanged %d\n", index);
 
        unchanged = false;
 
@@ -312,7 +312,7 @@ void QG_LineTypeBox::slotLineTypeChanged(int index)
        else
                currentLineType = (RS2::LineType)(index - (int)showByLayer * 2 - (int)showUnchanged);
 
-       RS_DEBUG->print("Current linetype is (%d): %d\n", index, currentLineType);
+       DEBUG->print("Current linetype is (%d): %d\n", index, currentLineType);
 
        emit lineTypeChanged(currentLineType);
 }