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

[architektonas] / src / widgets / patternbox.cpp

diff --git a/src/widgets/patternbox.cpp b/src/widgets/patternbox.cpp
index 94f4d9375a839ecc7f0cfc8da4f022aa21106372..fe4e2498764874d8f1a2c7e22bda67695fbd0cfb 100644 (file)
--- a/src/widgets/patternbox.cpp
+++ b/src/widgets/patternbox.cpp
@@ -16,9 +16,9 @@
 
 #include "patternbox.h"
 
-#include "rs_pattern.h"
-#include "rs_patternlist.h"
-#include "rs_debug.h"
+#include "pattern.h"
+#include "patternlist.h"
+#include "debug.h"
 
 /**
  * Default Constructor. You must call init manually if you choose
@@ -36,17 +36,24 @@ PatternBox::~PatternBox()
 }
 
 /**
- * Initialisation (called manually and only once).
+ * Initialization (called manually and only once).
  */
 void PatternBox::init()
 {
        QStringList patterns;
 
-       for(RS_Pattern * f=RS_PATTERNLIST->firstPattern(); f!=NULL; f=RS_PATTERNLIST->nextPattern())
+       for(Pattern * f=PATTERNLIST->firstPattern(); f!=NULL; f=PATTERNLIST->nextPattern())
                patterns.append(f->getFileName());
 
+#if 0
+std::cout << "patterns size = " << patterns.size() << std::endl;
+
+for(int i=0; i<patterns.size(); i++)
+       std::cout << patterns.at(i).toLocal8Bit().constData() << std::endl;
+
+std::cout.flush();
+#endif
        patterns.sort();
-//     insertStringList(patterns);
        addItems(patterns);
 
        connect(this, SIGNAL(activated(int)), this, SLOT(slotPatternChanged(int)));
@@ -55,7 +62,7 @@ void PatternBox::init()
        slotPatternChanged(currentIndex());
 }
 
-RS_Pattern * PatternBox::getPattern()
+Pattern * PatternBox::getPattern()
 {
        return currentPattern;
 }
@@ -65,8 +72,7 @@ RS_Pattern * PatternBox::getPattern()
  */
 void PatternBox::setPattern(const QString & pName)
 {
-       RS_DEBUG->print("PatternBox::setPattern %s\n", pName.toLatin1().data());
-//     setCurrentText(pName);
+       DEBUG->print("PatternBox::setPattern %s\n", pName.toAscii().data());
        setItemText(currentIndex(), pName);
        slotPatternChanged(currentIndex());
 }
@@ -77,11 +83,11 @@ void PatternBox::setPattern(const QString & pName)
  */
 void PatternBox::slotPatternChanged(int index)
 {
-       RS_DEBUG->print("PatternBox::slotPatternChanged %d\n", index);
-       currentPattern = RS_PATTERNLIST->requestPattern(currentText());
+       DEBUG->print("PatternBox::slotPatternChanged %d\n", index);
+       currentPattern = PATTERNLIST->requestPattern(currentText());
 
-       if (currentPattern!=NULL)
-               RS_DEBUG->print("Current pattern is (%d): %s\n", index, currentPattern->getFileName().toLatin1().data());
+       if (currentPattern)
+               DEBUG->print("Current pattern is (%d): %s\n", index, currentPattern->getFileName().toAscii().data());
 
        emit patternChanged(currentPattern);
 }