minor fixes
authorAlexey Chernobaev <achernobaev@dev.rtsoft.ru>
Mon, 26 Mar 2018 18:29:33 +0000 (21:29 +0300)
committerAlexey Chernobaev <achernobaev@dev.rtsoft.ru>
Mon, 26 Mar 2018 18:29:33 +0000 (21:29 +0300)
src/analyze/gui/chartwidgetqwtplot.cpp
src/analyze/gui/contextmenuqwt.cpp
src/analyze/gui/histogramwidgetqwtplot.cpp
src/analyze/gui/mainwindow.cpp

index 08cefeb53b9e885846ccd8935238f092afd79475..5d4dfde69f4452d4fce96744b7e198dc11c2a730 100644 (file)
@@ -58,7 +58,7 @@ protected:
             return {};
         }
         QwtText text;
-        text.setRenderFlags(text.renderFlags() & ~Qt::AlignHorizontal_Mask | Qt::AlignLeft);
+        text.setRenderFlags((text.renderFlags() & ~Qt::AlignHorizontal_Mask) | Qt::AlignLeft);
         text.setBorderRadius(6);
         QString tooltip;
         if (m_plot->getCurveTooltip(pos, tooltip))
index d8448032201185b1235165383b3dfa75f1de9265..db1e1c7a600cbf9b6e06e655cf5d37c2ab6b3ada 100644 (file)
@@ -174,6 +174,7 @@ void ContextMenuQwt::handleKeyPress(QKeyEvent *event)
             {
                 m_showVLinesAction->activate(QAction::Trigger);
             }
+            break;
         case Qt::Key_B:
             if (m_showCurveBordersAction)
             {
index 13a692e10d535dd62bc4938daa51702f90280456..d037725ba0e37d21f968637853a000de01ef8405 100644 (file)
@@ -160,7 +160,7 @@ protected:
             return {};
         }
         QwtText text("<p style='margin-left:4px'>" + s + "</p> ");
-        text.setRenderFlags(text.renderFlags() & ~Qt::AlignHorizontal_Mask | Qt::AlignLeft);
+        text.setRenderFlags((text.renderFlags() & ~Qt::AlignHorizontal_Mask) | Qt::AlignLeft);
         text.setColor(Qt::white);
 //        QColor c(Qt::darkGreen);
         QColor c(0, 0x60, 0);
index 2cbf6f529fb5b0cc8de3db106c7a1f91e4d4a848..9537d079eb8d660f41baa650f7dac0f8386e7f30 100644 (file)
@@ -732,7 +732,7 @@ void MainWindow::setupStacks()
 static void selectFile(QWidget *parent, QLineEdit *fileNameEdit)
 {
     QString fileName = QFileDialog::getOpenFileName(parent, "Select Data File",
-        "", "GZ (*.gz);; All files (*)");
+        "", "GZip files (*.gz);; All files (*)");
     if (!fileName.isEmpty())
     {
         fileNameEdit->setText(fileName);