- Use QLocale to print current values.

- Use QLocale to print integration results on GraphView.
- Hide mouse cursor in GraphView.
- Align "Anyanka" text in About window properly.
- Bump version to 0.1d.

diff --git a/globalinfo.cpp b/globalinfo.cpp
index ff95ccaa9c4fc151828a0f36355c5f4d5b5f9f3f..e2fcc8e45129a48dde0832db799ad24863deb9a4 100644 (file)
--- a/globalinfo.cpp
+++ b/globalinfo.cpp
@@ -24,4 +24,4 @@
 
 const int GlobalInfo::APP_VERSION_MAJ(0);
 const int GlobalInfo::APP_VERSION_MIN(1);
-const QString GlobalInfo::APP_VERSION_REV("c");
+const QString GlobalInfo::APP_VERSION_REV("d");

diff --git a/gui/aboutanyanka.ui b/gui/aboutanyanka.ui
index 4f92871a3ad645dbc9da4a406d75dd5d36110f70..19fae9aa05e01f7047b464d146467793638d85b6 100644 (file)
--- a/gui/aboutanyanka.ui
+++ b/gui/aboutanyanka.ui
@@ -16,9 +16,9 @@
   <widget class="QLabel" name="ql_appName">
    <property name="geometry">
     <rect>
-     <x>115</x>
+     <x>8</x>
      <y>13</y>
-     <width>121</width>
+     <width>345</width>
      <height>41</height>
     </rect>
    </property>
@@ -32,6 +32,9 @@
    <property name="text">
     <string>Anyanka</string>
    </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
   </widget>
   <widget class="QLabel" name="ql_version">
    <property name="geometry">

diff --git a/gui/graphview.cpp b/gui/graphview.cpp
index e0a43802fdbb7eaaf255326999618d045c4a80a4..d6da6d0981c3e270584e16c60092a9ffc516db11 100644 (file)
--- a/gui/graphview.cpp
+++ b/gui/graphview.cpp
@@ -26,6 +26,7 @@ GraphView::GraphView(QWidget *parent) :
   QLabel(parent)
 {
   setMouseTracking(true);
+  setCursor(Qt::BlankCursor);
 }
 
 void GraphView::leaveEvent(QEvent *)

diff --git a/gui/signalview.cpp b/gui/signalview.cpp
index b8fb01aecb1c89763125915b399361a1d6313255..9f1f4472aaa73997e24dfbe18ad1a7691387628b 100644 (file)
--- a/gui/signalview.cpp
+++ b/gui/signalview.cpp
@@ -352,8 +352,9 @@ void SignalView::resizeEvent(QResizeEvent* ev)
 
 void SignalView::onUpdateCurrentValues(double x, double y)
 {
-  ui->qle_xValue->setText(QString::number(x));
-  ui->qle_yValue->setText(QString::number(y));
+  QLocale l = QLocale::system();
+  ui->qle_xValue->setText(l.toString(x));
+  ui->qle_yValue->setText(l.toString(y));
 }
 
 void SignalView::onRemoveCurrentValues()

diff --git a/signalcontroller.cpp b/signalcontroller.cpp
index 65cfc96e5d8db15cdfa95d5e2014ef95e2e1c203..ee722cca846eacb8dc4e171df9cdb49f8f2e2e5c 100644 (file)
--- a/signalcontroller.cpp
+++ b/signalcontroller.cpp
@@ -102,6 +102,7 @@ void SignalController::drawIntegratedPeak(const std::shared_ptr<IntegratedPeak>
   int fromX, toX;
   double fromY, toY;
   bool valley;
+  QLocale l;
   if (peak->toIdx() < m_fromIdx || peak->fromIdx() > m_toIdx) /* Peak is not in view X-wise, skip it */
     return;
 
@@ -131,8 +132,9 @@ void SignalController::drawIntegratedPeak(const std::shared_ptr<IntegratedPeak>
   qDebug() << "Slope P" << peak->baselineSlope() << "Slope M" << (toY-fromY)/(toX-fromX);
   qDebug("---");*/
 
-  const QString peakTime = QString::number(peak->peakTime(), 'f', 4);
-  const QString peakArea = QString("A: ") + QString::number(peak->auc(), 'f', 4);
+  l = QLocale::system();
+  const QString peakTime = l.toString(peak->peakTime(), 'f', 4);
+  const QString peakArea = QString("A: ") + l.toString(peak->auc(), 'f', 4);
   if (peak->type() == IntegratedPeak::Type::PEAK)
     valley = false;
   else