Added 'fix now' button

NIA · Jun 18, 2014 · 495ea01 · 495ea01
1 parent 366e607
commit 495ea01
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 49 deletions.
diff --git a/mainwindow.ui b/mainwindow.ui
@@ -483,6 +483,13 @@
               </property>
              </widget>
             </item>
+            <item row="1" column="1">
+             <widget class="QPushButton" name="fixNowBtn">
+              <property name="text">
+               <string>Fix now</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>

diff --git a/seismoreg_ru.ts b/seismoreg_ru.ts
@@ -109,12 +109,12 @@
         <translation type="obsolete">Число точек</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="543"/>
+        <location filename="mainwindow.ui" line="550"/>
         <source>Connect</source>
         <translation>Подключить</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="559"/>
+        <location filename="mainwindow.ui" line="566"/>
         <source>Disconnect</source>
         <translation>Отключить</translation>
     </message>
@@ -123,12 +123,12 @@
         <translation type="obsolete">Приём данных</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="791"/>
+        <location filename="mainwindow.ui" line="798"/>
         <source>Start</source>
         <translation>Запуск</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="778"/>
+        <location filename="mainwindow.ui" line="785"/>
         <source>Start time</source>
         <translation>Время начала</translation>
     </message>
@@ -155,7 +155,7 @@
     </message>
     <message>
         <location filename="mainwindow.ui" line="342"/>
-        <location filename="src/mainwindow.cpp" line="357"/>
+        <location filename="src/mainwindow.cpp" line="359"/>
         <source>Filename format help</source>
         <translation>Справка по формату имени файла</translation>
     </message>
@@ -165,23 +165,23 @@
         <translation>?</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="572"/>
+        <location filename="mainwindow.ui" line="579"/>
         <source>Time elapsed</source>
         <translation>Прошло времени</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="588"/>
+        <location filename="mainwindow.ui" line="595"/>
         <source>Samples received</source>
         <translation>Получено данных</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="801"/>
+        <location filename="mainwindow.ui" line="808"/>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="530"/>
-        <location filename="mainwindow.ui" line="765"/>
+        <location filename="mainwindow.ui" line="537"/>
+        <location filename="mainwindow.ui" line="772"/>
         <source>H:mm:ss</source>
         <translation>HH:mm:ss</translation>
     </message>
@@ -201,13 +201,13 @@
         <translation>Частота выборки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="646"/>
-        <location filename="mainwindow.ui" line="737"/>
+        <location filename="mainwindow.ui" line="653"/>
+        <location filename="mainwindow.ui" line="744"/>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="685"/>
+        <location filename="mainwindow.ui" line="692"/>
         <source>Awaiting writing</source>
         <translation>Ожидают записи</translation>
     </message>
@@ -271,147 +271,152 @@
         <translation> с.</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="604"/>
+        <location filename="mainwindow.ui" line="489"/>
+        <source>Fix now</source>
+        <translation>Фиксировать</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="611"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="620"/>
+        <location filename="mainwindow.ui" line="627"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="636"/>
+        <location filename="mainwindow.ui" line="643"/>
         <source>Longitude</source>
         <translation>Долгота</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="701"/>
+        <location filename="mainwindow.ui" line="708"/>
         <source>Latitude</source>
         <translation>Широта</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="834"/>
+        <location filename="mainwindow.ui" line="841"/>
         <source>Ready</source>
         <translation>ЭВМ готова</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="863"/>
+        <location filename="mainwindow.ui" line="870"/>
         <source>Working</source>
         <translation>Программа работает</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="895"/>
+        <location filename="mainwindow.ui" line="902"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="901"/>
+        <location filename="mainwindow.ui" line="908"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="909"/>
+        <location filename="mainwindow.ui" line="916"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="916"/>
+        <location filename="mainwindow.ui" line="923"/>
         <source>Plot</source>
         <translation>График</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="953"/>
+        <location filename="mainwindow.ui" line="960"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="956"/>
+        <location filename="mainwindow.ui" line="963"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="968"/>
+        <location filename="mainwindow.ui" line="975"/>
         <source>Show table</source>
         <translation>Показать таблицу</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="971"/>
+        <location filename="mainwindow.ui" line="978"/>
         <source>Alt+1</source>
         <translation>Alt+1</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="986"/>
+        <location filename="mainwindow.ui" line="993"/>
         <source>Show settings</source>
         <translation>Показать настройки</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="989"/>
+        <location filename="mainwindow.ui" line="996"/>
         <source>Alt+2</source>
         <translation>Alt+2</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1004"/>
+        <location filename="mainwindow.ui" line="1011"/>
         <source>Show stats</source>
         <translation>Показать статистику</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1007"/>
+        <location filename="mainwindow.ui" line="1014"/>
         <source>Alt+3</source>
         <translation>Alt+3</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1016"/>
+        <location filename="mainwindow.ui" line="1023"/>
         <source>ADC port settings</source>
         <translation>Настройки порта АЦП</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1025"/>
+        <location filename="mainwindow.ui" line="1032"/>
         <source>GPS port settings</source>
         <translation>Настройки порта GPS</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1034"/>
+        <location filename="mainwindow.ui" line="1041"/>
         <source>Zoom in</source>
         <translation>Увеличить масштаб</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1037"/>
+        <location filename="mainwindow.ui" line="1044"/>
         <source>Ctrl+=</source>
         <translation>Ctrl+=</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1046"/>
+        <location filename="mainwindow.ui" line="1053"/>
         <source>Zoom out</source>
         <translation>Уменьшить масштаб</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1049"/>
+        <location filename="mainwindow.ui" line="1056"/>
         <source>Ctrl+-</source>
         <translation>Ctrl+-</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1058"/>
+        <location filename="mainwindow.ui" line="1065"/>
         <source>Move up</source>
         <translation>Сдвинуть вверх</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1061"/>
+        <location filename="mainwindow.ui" line="1068"/>
         <source>Ctrl+Up</source>
         <translation>Ctrl+Вверх</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1070"/>
+        <location filename="mainwindow.ui" line="1077"/>
         <source>Move down</source>
         <translation>Сдвинуть вниз</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1073"/>
+        <location filename="mainwindow.ui" line="1080"/>
         <source>Ctrl+Down</source>
         <translation>Ctrl+Вниз</translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1082"/>
+        <location filename="mainwindow.ui" line="1089"/>
         <source>Reset zoom</source>
         <translation>Сбросить масштаб</translation>
     </message>
@@ -448,22 +453,22 @@
         <translation>Всего (MainWindow)</translation>
     </message>
     <message>
-        <location filename="src/mainwindow.cpp" line="283"/>
+        <location filename="src/mainwindow.cpp" line="285"/>
         <source>Received time update: %1UTC</source>
         <translation>Получено обновление времени: %1UTC</translation>
     </message>
     <message>
-        <location filename="src/mainwindow.cpp" line="291"/>
+        <location filename="src/mainwindow.cpp" line="293"/>
         <source>Received position update: %1, %2, %3m</source>
         <translation>Получено обновление позиции: %1, %2, %3м</translation>
     </message>
     <message>
-        <location filename="src/mainwindow.cpp" line="349"/>
+        <location filename="src/mainwindow.cpp" line="351"/>
         <source>Choose output directory for data files</source>
         <translation>Выберите директорию для записи файлов данных</translation>
     </message>
     <message>
-        <location filename="src/mainwindow.cpp" line="371"/>
+        <location filename="src/mainwindow.cpp" line="373"/>
         <source>Received %1 data items</source>
         <translation>Получено %1 данных</translation>
     </message>
@@ -804,7 +809,7 @@
 <context>
     <name>TimePlot</name>
     <message>
-        <location filename="src/gui/timeplot.cpp" line="209"/>
+        <location filename="src/gui/timeplot.cpp" line="220"/>
         <source>Unequal size of timestamps and items: %1 vs %2</source>
         <translation>Неравный размер отсчётов времени и данных: %1 и %2</translation>
     </message>

diff --git a/src/gui/timeplot.cpp b/src/gui/timeplot.cpp
@@ -101,6 +101,17 @@ void TimePlot::setFixedScaleYMin(double min) {
     setScaleY();
 }
 
+void TimePlot::fixCurrent() {
+    if ( ! fixedScale ) {
+        const QwtScaleDiv & scaleDiv = axisScaleDiv(yLeft);
+        fixedScaleMin = scaleDiv.lowerBound();
+        fixedScaleMax = scaleDiv.upperBound();
+        fixedScale = true;
+        setAxisAutoScale(yLeft, false);
+        emit zoomChanged(fixedScaleMin, fixedScaleMax);
+    }
+}
+
 void TimePlot::setScaleY() {
     // Fix errors if any:
     if (fixedScaleMax < fixedScaleMin) {

diff --git a/src/gui/timeplot.h b/src/gui/timeplot.h
@@ -85,6 +85,7 @@ public slots:
     double  fixedScaleYMax() { return fixedScaleMax; }
     void setFixedScaleYMin(double min);
     double  fixedScaleYMin() { return fixedScaleMin; }
+    void fixCurrent();
 
     // easier interface to Y scale:
     void zoomIn();

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -124,8 +124,6 @@ void MainWindow::setup() {
     initZoomAction(ui->actionMoveDown,  ui->downBtn);
     initZoomAction(ui->actionZoomReset, ui->resetZoomBtn);
     void (QSpinBox:: *valueChangedSignal)(int) = &QSpinBox::valueChanged; // resolve overloaded function
-    connect(ui->fixedScaleMax, valueChangedSignal, this, &MainWindow::setFixedScale);
-    connect(ui->fixedScaleMin, valueChangedSignal, this, &MainWindow::setFixedScale);
     for (TimePlot *plot:  plots) {
         connect(ui->fixedScale,      &QRadioButton::toggled, plot, &TimePlot::setFixedScaleY);
         connect(ui->fixedScaleMax,   valueChangedSignal,     plot, &TimePlot::setFixedScaleYMax);
@@ -136,12 +134,16 @@ void MainWindow::setup() {
         connect(ui->actionMoveUp,    &QAction::triggered,    plot, &TimePlot::moveUp);
         connect(ui->actionMoveDown,  &QAction::triggered,    plot, &TimePlot::moveDown);
         connect(ui->actionZoomReset, &QAction::triggered,    plot, &TimePlot::resetZoom);
+        connect(ui->fixNowBtn,       &QPushButton::clicked,  plot, &TimePlot::fixCurrent);
 
         plot->setFixedScaleYMax(settings.plotFixedScaleMax());
         plot->setFixedScaleYMin(settings.plotFixedScaleMin());
         plot->setFixedScaleY(settings.isPlotFixedScale());
         plot->setHistorySecs(settings.plotHistorySecs());
     }
+    connect(ui->fixedScaleMax, valueChangedSignal, this, &MainWindow::setFixedScale);
+    connect(ui->fixedScaleMin, valueChangedSignal, this, &MainWindow::setFixedScale);
+    connect(ui->fixNowBtn,  &QPushButton::clicked, this, &MainWindow::setFixedScale);
     // TODO: using plot[0] here is not quite great
     connect(plots[CHANNELS_NUM-1], &TimePlot::zoomChanged, this, &MainWindow::onZoomChanged);
     (settings.isPlotFixedScale() ? ui->fixedScale : ui->autoScale)->setChecked(true);