CHG: plotting of clock

diff --git a/client/graph.c b/client/graph.c
index ab6ee7cbdbe2e2a5dce73b0302d8e618a6dc8a1d..7621056206fbef837e4c006b76c30179a70b848f 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -263,8 +263,8 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
                if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
                return 0;
        }
                if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
                return 0;
        }

-       
-       PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d | Best Starting Position: %d", *fc1, *fc2, *rf1, start);
+       if (verbose || g_debugMode)
+               PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d | Best Starting Position: %d", *fc1, *fc2, *rf1, start);

        SetGraphClock(*rf1, start);     
        return 1;
 }
        SetGraphClock(*rf1, start);     
        return 1;
 }

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index acd9d1203a247a982abcee01729c882e391db06e..b1e6b7a00346d436f110a377e067b6f7ce10ec55 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -315,7 +315,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
        //painter.setPen( QT_LIGHTBLUE ); painter.drawPath(cursorDPath);
 
        char str[200];
        //painter.setPen( QT_LIGHTBLUE ); painter.drawPath(cursorDPath);
 
        char str[200];

-       sprintf(str, "@%d   max=%d min=%d mean=%d n=%d/%d    dt=%d [%.3f] zoom=%.3f CursorA=%d [%d] CursorB=%d [%d]    GridX=%d GridY=%d (%s)",
+       sprintf(str, "@%d   max=%d min=%d mean=%d n=%d/%d    dt=%d [%.3f] zoom=%.3f CursorA=%d [%d] CursorB=%d [%d]  GridX=%d GridY=%d (%s)  [Clock RF/%d]",

                        GraphStart, yMax, yMin, yMean, n, GraphTraceLen,
                        CursorBPos - CursorAPos,
                        (CursorBPos - CursorAPos)/CursorScaleFactor,
                        GraphStart, yMax, yMin, yMean, n, GraphTraceLen,
                        CursorBPos - CursorAPos,
                        (CursorBPos - CursorAPos)/CursorScaleFactor,


@@ -326,11 +326,12 @@ void ProxWidget::paintEvent(QPaintEvent *event)
                        GraphBuffer[CursorBPos],
                        PlotGridXdefault,
                        PlotGridYdefault,
                        GraphBuffer[CursorBPos],
                        PlotGridXdefault,
                        PlotGridYdefault,

-                       GridLocked ? "Locked" : "Unlocked"
+                       GridLocked ? "Locked" : "Unlocked",
+                       PlotClock

                );
 
        painter.setPen( QT_WHITE );
                );
 
        painter.setPen( QT_WHITE );

-       painter.drawText(50, r.bottom() - 20, str);
+       painter.drawText(50, r.bottom() - 10, str);

 }
 
 ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
 }
 
 ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)


@@ -345,6 +346,7 @@ ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphP
        setAutoFillBackground(true);
        CursorAPos = 0;
        CursorBPos = 0;
        setAutoFillBackground(true);
        CursorAPos = 0;
        CursorBPos = 0;

+       PlotClock = 0;

 }
 
 void ProxWidget::closeEvent(QCloseEvent *event)
 }
 
 void ProxWidget::closeEvent(QCloseEvent *event)