Apply patch from tormodvolden.

Message grammar typos and console logs on windows.
Kst-plot · Sep 14, 2019 · 129d647 · 129d647
1 parent 1096bd5
commit 129d647
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 59 deletions.
diff --git a/build-kst b/build-kst
diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp
@@ -65,49 +65,49 @@ namespace Kst {
 "      --Letter                 Print to Letter sized paper.\n"
 "      --A4                     Print to A4 sized paper.\n"
 "      --png <filename>         Render to a png image, and exit.\n"
-"      --pngHeight <height>     Height of png image (pixels)\n"
-"      --pngWidth <width>       Width of png image (pixels)\n"
+"      --pngHeight <height>     Height of png image (pixels).\n"
+"      --pngWidth <width>       Width of png image (pixels).\n"
 "File Options:\n"
-"      -f <startframe>          default: 'end' counts from end.\n"
+"      -f <startframe>          default: 'end' counts from end\n"
 "      -n <numframes>           default: 'end' reads to end of file\n"
 "      -s <frames per sample>   default: 0 (read every sample)\n"
-"      -a                       apply averaging filter: requires -s\n\n"
-"Ascii File Options - for ascii files only: these are all stick\n"
+"      -a                       Apply averaging filter (requires -s).\n\n"
+"Ascii File Options - for ascii files only: These are all sticky\n"
 "      --asciiDataStart <Line>  Data starts here. Files start at line 1.\n"
 "      --asciiFieldNames <Line> Field names are in this row.\n"
-"      --asciiNoFieldNames      Fields are named for their data column\n"
-"      --asciiReadUnits <Line>  Read units from line <Line>\n"
-"      --asciiNoUnits       Do not read units\n"
-"      --asciiSpaceDelim        Columns are Space/tab delimited\n"
-"      --asciiDelim <char>      Columns are dlimited with <char>\n"
-"      --asciiFixedWidth <w>    Columns have width <w>\n"
-"      --asciiNoFixedWidth      Columns are delimited, not fixed width\n"
-"      --asciiDecimalDot        Use a . as a decimal separator (ie, 10.1)\n"
-"      --asciiDecimalComma      Use a , as a decimal separator (ie, 10,1)\n"
+"      --asciiNoFieldNames      Fields are named for their data column.\n"
+"      --asciiReadUnits <Line>  Read units from line <Line>.\n"
+"      --asciiNoUnits       Do not read units.\n"
+"      --asciiSpaceDelim        Columns are Space/Tab delimited.\n"
+"      --asciiDelim <char>      Columns are delimited with <char>.\n"
+"      --asciiFixedWidth <w>    Columns have width <w>.\n"
+"      --asciiNoFixedWidth      Columns are delimited, not fixed width.\n"
+"      --asciiDecimalDot        Use a . as a decimal separator (e.g. 10.1).\n"
+"      --asciiDecimalComma      Use a , as a decimal separator (e.g. 10,1).\n"
 "Position:\n"
 "      -P <plot name>:          Place curves in one plot.\n"
 "      -A                       Place future curves in individual plots.\n"
-"      -m <columns>             Layout plots in columns\n"
+"      -m <columns>             Layout plots in columns.\n"
 "      -T <tab name>            Place future curves a new tab.\n"
 "Appearance\n"
-"      -d:                      use points for the next curve\n"
-"      -l:                      use lines for the next curve\n"
-"      -b:                      use bargraph for the next curve\n"
+"      -d:                      Use points for the next curve.\n"
+"      -l:                      Use lines for the next curve.\n"
+"      -b:                      Use bargraph for the next curve.\n"
 "      --xlabel <X Label>       Set X label of all future plots.\n"
 "      --ylabel <Y Label>       Set Y label of all future plots.\n"
 "      --xlabelauto             AutoSet X label of all future plots.\n"
 "      --ylabelauto             AutoSet Y label of all future plots.\n"
 "Data Object Modifiers\n"
 "      -x <field>:              Create vector and use as X vector for curves.\n"
 "      -e <field>:              Create vector and use as Y-error vector for next -y.\n"
-"      -r <rate>:               sample rate (spectra & spectograms).\n"
+"      -r <rate>:               sample rate (spectra & spectrograms)\n"
 "Data Objects:\n"
-"      -y <field>               plot an XY curve of field.\n"
-"      -p <field>               plot the spectrum of field.\n"
-"      -h <field>               plot a histogram of field.\n"
-"      -z <field>               plot an image of matrix field.\n"
+"      -y <field>               Plot an XY curve of field.\n"
+"      -p <field>               Plot the spectrum of field.\n"
+"      -h <field>               Plot a histogram of field.\n"
+"      -z <field>               Plot an image of matrix field.\n"
 "Misc:\n"
-"      --serverName=<server name> Set the server name for pyKst scrips connecting with this session.\n"
+"      --serverName=<server name> Set the server name for pyKst scripts connecting with this session.\n"
 "\n"
 "****************\n"
 "*** Examples ***\n"
@@ -142,18 +142,17 @@ namespace Kst {
 static void printText(const QString& text, const QString& detailText = QString(), const QString& t = QString())
 {
 #ifdef Q_OS_WIN
-  // No console on Windows.
+  // Not always console on Windows.
   QMessageBox box(QMessageBox::Information, "Kst", text + t);
   if (!detailText.isEmpty()) {
     box.setDetailedText(detailText);
   }
   box.exec();
-#else
+#endif
   QString displayText = QString(text) + QString(detailText) + t;
 
   fprintf(stderr,"%s\n", qPrintable(displayText));
   //qWarning("%s", qPrintable(displayText));
-#endif
 }