Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / forms / dlgoptionsdrawing.cpp

diff --git a/src/forms/dlgoptionsdrawing.cpp b/src/forms/dlgoptionsdrawing.cpp
index 2ac2a87d178944ab25dcb09702036c92ebc242fb..4715e72a992bfae49ed94ab216d260ce850c9d8b 100644 (file)
--- a/src/forms/dlgoptionsdrawing.cpp
+++ b/src/forms/dlgoptionsdrawing.cpp
@@ -16,7 +16,7 @@
 
 #include "dlgoptionsdrawing.h"
 
-#include "rs.h"
+#include "enums.h"
 #include "debug.h"
 #include "filterdxf.h"
 #include "drawing.h"
@@ -44,8 +44,8 @@ DlgOptionsDrawing::DlgOptionsDrawing(QWidget * parent/*= 0*/, Qt::WindowFlags fl
 
        // Main drawing unit:
        for(int i=RS2::None; i<RS2::LastUnit; i++)
-//             ui.cbUnit->insertItem(RS_Units::unitToString((RS2::Unit)i));
-               ui.cbUnit->addItem(RS_Units::unitToString((RS2::Unit)i));
+//             ui.cbUnit->insertItem(Units::unitToString((RS2::Unit)i));
+               ui.cbUnit->addItem(Units::unitToString((RS2::Unit)i));
 
        // init units combobox:
        QStringList unitList;
@@ -69,8 +69,8 @@ DlgOptionsDrawing::DlgOptionsDrawing(QWidget * parent/*= 0*/, Qt::WindowFlags fl
 
        // Paper format:
        for(int i=RS2::Custom; i<=RS2::NPageSize; i++)
-//             ui.cbPaperFormat->insertItem(RS_Units::paperFormatToString((RS2::PaperFormat)i));
-               ui.cbPaperFormat->addItem(RS_Units::paperFormatToString((RS2::PaperFormat)i));
+//             ui.cbPaperFormat->insertItem(Units::paperFormatToString((RS2::PaperFormat)i));
+               ui.cbPaperFormat->addItem(Units::paperFormatToString((RS2::PaperFormat)i));
 
        // Encodings:
        /*
@@ -138,9 +138,9 @@ void DlgOptionsDrawing::setGraphic(Drawing * g)
 
        // main drawing unit:
        int insunits = graphic->getVariableInt("$INSUNITS", 0);
-//     ui.cbUnit->setCurrentText(RS_Units::unitToString(RS_FilterDXF::numberToUnit(insunits)));
+//     ui.cbUnit->setCurrentText(Units::unitToString(FilterDXF::numberToUnit(insunits)));
        ui.cbUnit->setItemText(ui.cbUnit->currentIndex(),
-               RS_Units::unitToString(RS_FilterDXF::numberToUnit(insunits)));
+               Units::unitToString(FilterDXF::numberToUnit(insunits)));
 
        // units / length format:
        int lunits = graphic->getVariableInt("$LUNITS", 2);
@@ -167,7 +167,7 @@ void DlgOptionsDrawing::setGraphic(Drawing * g)
        // paper format:
        bool landscape;
        RS2::PaperFormat format = graphic->getPaperFormat(&landscape);
-       RS_DEBUG->print("DlgOptionsDrawing::setGraphic: paper format is: %d", (int)format);
+       DEBUG->print("DlgOptionsDrawing::setGraphic: paper format is: %d", (int)format);
 //     ui.cbPaperFormat->setCurrentItem((int)format);
        ui.cbPaperFormat->setCurrentIndex((int)format);
 
@@ -197,27 +197,27 @@ void DlgOptionsDrawing::setGraphic(Drawing * g)
        // dimension text height:
        RS2::Unit unit = (RS2::Unit)ui.cbUnit->currentIndex();
 
-       double dimtxt = graphic->getVariableDouble("$DIMTXT", RS_Units::convert(2.5, RS2::Millimeter, unit));
+       double dimtxt = graphic->getVariableDouble("$DIMTXT", Units::convert(2.5, RS2::Millimeter, unit));
 //     ui.cbDimTextHeight->setCurrentText(QString("%1").arg(dimtxt));
        ui.cbDimTextHeight->setItemText(ui.cbDimTextHeight->currentIndex(), QString("%1").arg(dimtxt));
 
        // dimension extension line extension:
-       double dimexe = graphic->getVariableDouble("$DIMEXE", RS_Units::convert(1.25, RS2::Millimeter, unit));
+       double dimexe = graphic->getVariableDouble("$DIMEXE", Units::convert(1.25, RS2::Millimeter, unit));
 //     ui.cbDimExe->setCurrentText(QString("%1").arg(dimexe));
        ui.cbDimExe->setItemText(ui.cbDimExe->currentIndex(), QString("%1").arg(dimexe));
 
        // dimension extension line offset:
-       double dimexo = graphic->getVariableDouble("$DIMEXO", RS_Units::convert(0.625, RS2::Millimeter, unit));
+       double dimexo = graphic->getVariableDouble("$DIMEXO", Units::convert(0.625, RS2::Millimeter, unit));
 //     ui.cbDimExo->setCurrentText(QString("%1").arg(dimexo));
        ui.cbDimExo->setItemText(ui.cbDimExo->currentIndex(), QString("%1").arg(dimexo));
 
        // dimension line gap:
-       double dimgap = graphic->getVariableDouble("$DIMGAP", RS_Units::convert(0.625, RS2::Millimeter, unit));
+       double dimgap = graphic->getVariableDouble("$DIMGAP", Units::convert(0.625, RS2::Millimeter, unit));
 //     ui.cbDimGap->setCurrentText(QString("%1").arg(dimgap));
        ui.cbDimGap->setItemText(ui.cbDimGap->currentIndex(), QString("%1").arg(dimgap));
 
        // dimension arrow size:
-       double dimasz = graphic->getVariableDouble("$DIMASZ", RS_Units::convert(2.5, RS2::Millimeter, unit));
+       double dimasz = graphic->getVariableDouble("$DIMASZ", Units::convert(2.5, RS2::Millimeter, unit));
 //     ui.cbDimAsz->setCurrentText(QString("%1").arg(dimasz));
        ui.cbDimAsz->setItemText(ui.cbDimAsz->currentIndex(), QString("%1").arg(dimasz));
 
@@ -226,13 +226,13 @@ void DlgOptionsDrawing::setGraphic(Drawing * g)
 //     ui.cbSplineSegs->setCurrentText(QString("%1").arg(splinesegs));
        ui.cbSplineSegs->setItemText(ui.cbSplineSegs->currentIndex(), QString("%1").arg(splinesegs));
 
-       RS_DEBUG->print("DlgOptionsDrawing::setGraphic: splinesegs is: %d", splinesegs);
+       DEBUG->print("DlgOptionsDrawing::setGraphic: splinesegs is: %d", splinesegs);
 
        // encoding:
        /*
        QString encoding = graphic->getVariableString("$DWGCODEPAGE",
                                                                                                "ANSI_1252");
-       encoding=RS_System::getEncoding(encoding);
+       encoding=System::getEncoding(encoding);
        cbEncoding->setCurrentText(encoding);
        */
 
@@ -250,7 +250,7 @@ void DlgOptionsDrawing::validate()
 
        if (f == RS2::Engineering || f == RS2::Architectural)
        {
-               if (RS_Units::stringToUnit(ui.cbUnit->currentText()) != RS2::Inch)
+               if (Units::stringToUnit(ui.cbUnit->currentText()) != RS2::Inch)
                {
                        QMessageBox::warning( this, tr("Options"),
                                tr("For the length formats 'Engineering' and 'Architectural', the unit must be set to Inch."), QMessageBox::Ok, Qt::NoButton);
@@ -279,8 +279,8 @@ void DlgOptionsDrawing::validate()
                // custom paper size:
                if ((RS2::PaperFormat)ui.cbPaperFormat->currentIndex() == RS2::Custom)
                {
-                       graphic->setPaperSize(Vector(RS_Math::eval(ui.lePaperWidth->text()),
-                               RS_Math::eval(ui.lePaperHeight->text())));
+                       graphic->setPaperSize(Vector(Math::eval(ui.lePaperWidth->text()),
+                               Math::eval(ui.lePaperHeight->text())));
                }
 
                // grid:
@@ -305,16 +305,16 @@ void DlgOptionsDrawing::validate()
                graphic->addVariable("$GRIDUNIT", spacing, 10);
 
                // dim:
-               graphic->addVariable("$DIMTXT", RS_Math::eval(ui.cbDimTextHeight->currentText()), 40);
-               graphic->addVariable("$DIMEXE", RS_Math::eval(ui.cbDimExe->currentText()), 40);
-               graphic->addVariable("$DIMEXO", RS_Math::eval(ui.cbDimExo->currentText()), 40);
-               graphic->addVariable("$DIMGAP", RS_Math::eval(ui.cbDimGap->currentText()), 40);
-               graphic->addVariable("$DIMASZ", RS_Math::eval(ui.cbDimAsz->currentText()), 40);
+               graphic->addVariable("$DIMTXT", Math::eval(ui.cbDimTextHeight->currentText()), 40);
+               graphic->addVariable("$DIMEXE", Math::eval(ui.cbDimExe->currentText()), 40);
+               graphic->addVariable("$DIMEXO", Math::eval(ui.cbDimExo->currentText()), 40);
+               graphic->addVariable("$DIMGAP", Math::eval(ui.cbDimGap->currentText()), 40);
+               graphic->addVariable("$DIMASZ", Math::eval(ui.cbDimAsz->currentText()), 40);
 
                // splines:
-               graphic->addVariable("$SPLINESEGS", (int)RS_Math::eval(ui.cbSplineSegs->currentText()), 70);
+               graphic->addVariable("$SPLINESEGS", (int)Math::eval(ui.cbSplineSegs->currentText()), 70);
 
-               RS_DEBUG->print("DlgOptionsDrawing::validate: splinesegs is: %s",
+               DEBUG->print("DlgOptionsDrawing::validate: splinesegs is: %s",
                        ui.cbSplineSegs->currentText().toLatin1().data());
 
                // update all dimension and spline entities in the graphic to match the new settings:
@@ -394,7 +394,7 @@ void DlgOptionsDrawing::updateLengthPrecision()
                break;
 
        default:
-               RS_DEBUG->print(RS_Debug::D_ERROR,
+               DEBUG->print(Debug::D_ERROR,
                        "DlgOptionsDrawing::updateLengthPrecision: error");
                break;
        }
@@ -479,13 +479,13 @@ void DlgOptionsDrawing::updateAnglePrecision()
 void DlgOptionsDrawing::updatePreview()
 {
        QString prev;
-       prev = RS_Units::formatLinear(14.43112351,
+       prev = Units::formatLinear(14.43112351,
                (RS2::Unit)ui.cbUnit->currentIndex(),
                (RS2::LinearFormat)(ui.cbLengthFormat->currentIndex()),
                ui.cbLengthPrecision->currentIndex());
        ui.lLinear->setText(prev);
 
-       prev = RS_Units::formatAngle(0.5327714,
+       prev = Units::formatAngle(0.5327714,
                (RS2::AngleFormat)ui.cbAngleFormat->currentIndex(),
                ui.cbAnglePrecision->currentIndex());
        ui.lAngular->setText(prev);
@@ -509,7 +509,7 @@ void DlgOptionsDrawing::updatePaperSize()
        }
        else
        {
-               Vector s = RS_Units::paperFormatToSize(format);
+               Vector s = Units::paperFormatToSize(format);
                ui.lePaperWidth->setText(QString("%1").arg(s.x));
                ui.lePaperHeight->setText(QString("%1").arg(s.y));
        }
@@ -532,7 +532,7 @@ void DlgOptionsDrawing::updatePaperSize()
 void DlgOptionsDrawing::updateUnitLabels()
 {
        RS2::Unit u = (RS2::Unit)ui.cbUnit->currentIndex();
-       QString sign = RS_Units::unitToSign(u);
+       QString sign = Units::unitToSign(u);
        ui.lDimUnit1->setText(sign);
        ui.lDimUnit2->setText(sign);
        ui.lDimUnit3->setText(sign);