#include "drawing.h"
#include "settings.h"
-#include "rs_units.h"
+#include "units.h"
CoordinateWidget::CoordinateWidget(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
QWidget(parent, flags)//, actionHandler(NULL), cadToolBar(NULL)
ui.lCoord1b->setText("");
ui.lCoord2b->setText("");
- int fsize;
#ifdef __APPLE__
- fsize = 9;
+ int fsize = 9;
#else
- fsize = 7;
+ int fsize = 7;
#endif
settings.beginGroup("Appearance");
fsize = settings.value("StatusBarFontSize", fsize).toInt();
settings.endGroup();
- ui.lCoord1->setFont(QFont("Helvetica", fsize));
- ui.lCoord1b->setFont(QFont("Helvetica", fsize));
- ui.lCoord2->setFont(QFont("Helvetica", fsize));
- ui.lCoord2b->setFont(QFont("Helvetica", fsize));
+// ui.lCoord1->setFont(QFont("Helvetica", fsize));
+// ui.lCoord1b->setFont(QFont("Helvetica", fsize));
+// ui.lCoord2->setFont(QFont("Helvetica", fsize));
+// ui.lCoord2b->setFont(QFont("Helvetica", fsize));
+ ui.lCoord1->setFont(QFont("Verdana", fsize));
+ ui.lCoord1b->setFont(QFont("Verdana", fsize));
+ ui.lCoord2->setFont(QFont("Verdana", fsize));
+ ui.lCoord2b->setFont(QFont("Verdana", fsize));
graphic = NULL;
prec = 4;
void CoordinateWidget::setCoordinates(double x, double y, double rx, double ry, bool updateFormat)
{
- if (graphic != NULL)
+ if (!graphic)
+ return;
+
+ if (updateFormat)
{
- if (updateFormat)
- {
- format = graphic->getLinearFormat();
- prec = graphic->getLinearPrecision();
- aformat = graphic->getAngleFormat();
- aprec = graphic->getAnglePrecision();
- }
-
- // abs / rel coordinates:
- QString absX = RS_Units::formatLinear(x, graphic->getUnit(), format, prec);
- QString absY = RS_Units::formatLinear(y, graphic->getUnit(), format, prec);
- QString relX = RS_Units::formatLinear(rx, graphic->getUnit(), format, prec);
- QString relY = RS_Units::formatLinear(ry, graphic->getUnit(), format, prec);
-
- ui.lCoord1->setText(absX + " , " + absY);
- ui.lCoord2->setText(relX + " , " + relY);
-
- // polar coordinates:
- Vector v;
- v = Vector(x, y);
- QString str;
- QString rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
- QString aStr = RS_Units::formatAngle(v.angle(), aformat, aprec);
-
- str = rStr + " < " + aStr;
- ui.lCoord1b->setText(str);
-
- v = Vector(rx, ry);
- rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
- aStr = RS_Units::formatAngle(v.angle(), aformat, aprec);
- str = rStr + " < " + aStr;
- ui.lCoord2b->setText(str);
+ format = graphic->getLinearFormat();
+ prec = graphic->getLinearPrecision();
+ aformat = graphic->getAngleFormat();
+ aprec = graphic->getAnglePrecision();
}
+
+ // abs / rel coordinates:
+ QString absX = RS_Units::formatLinear(x, graphic->getUnit(), format, prec);
+ QString absY = RS_Units::formatLinear(y, graphic->getUnit(), format, prec);
+ QString relX = RS_Units::formatLinear(rx, graphic->getUnit(), format, prec);
+ QString relY = RS_Units::formatLinear(ry, graphic->getUnit(), format, prec);
+
+ ui.lCoord1->setText(absX + ", " + absY);
+ ui.lCoord2->setText(relX + ", " + relY);
+
+ // polar coordinates:
+ Vector v = Vector(x, y);
+ QString rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
+ QString aStr = RS_Units::formatAngle(v.angle(), aformat, aprec);
+
+ // U+2221 = Measured angle
+ QString str = rStr + " " + QChar(0x2221) + aStr;
+ ui.lCoord1b->setText(str);
+
+ v = Vector(rx, ry);
+ rStr = RS_Units::formatLinear(v.magnitude(), graphic->getUnit(), format, prec);
+ aStr = RS_Units::formatAngle(v.angle(), aformat, aprec);
+ str = rStr + " " + QChar(0x2221) + aStr;
+ ui.lCoord2b->setText(str);
}