diff --git a/plotter.cpp b/plotter.cpp index cc4213c9..aa25da9e 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -45,7 +45,6 @@ CPlotter::CPlotter(QWidget *parent) : //CPlotter Constructor setAutoFillBackground(false); setAttribute(Qt::WA_OpaquePaintEvent, false); setAttribute(Qt::WA_NoSystemBackground, true); - setMouseTracking(true); } CPlotter::~CPlotter() { } // Destructor @@ -98,9 +97,11 @@ void CPlotter::paintEvent(QPaintEvent *) // paint painter.drawPixmap(0,30,m_WaterfallPixmap); painter.drawPixmap(0,m_h1,m_2DPixmap); int x = XfromFreq(m_rxFreq); - painter.drawPixmap(0,30,m_DialOverlayPixmap); - if(m_lastMouseX >= 0 && m_lastMouseX != x){ - painter.drawPixmap(m_lastMouseX, 0, m_HoverOverlayPixmap); + if (m_bars) { + painter.drawPixmap(0,30,m_DialOverlayPixmap); + if(m_lastMouseX >= 0 && m_lastMouseX != x){ + painter.drawPixmap(m_lastMouseX, 0, m_HoverOverlayPixmap); + } } m_paintEventBusy=false; @@ -364,15 +365,18 @@ void CPlotter::DrawOverlay() //DrawOverlay() painter0.drawLine(x1,29,x2,29); } QPainter overPainter(&m_DialOverlayPixmap); - if (!overPainter.isActive()) overPainter.begin(this); -// overPainter.initFrom(this); - overPainter.setCompositionMode(QPainter::CompositionMode_Source); - overPainter.fillRect(0, 0, m_Size.width(), m_h, Qt::transparent); + if (m_bars) { + if (!overPainter.isActive()) overPainter.begin(this); + overPainter.setCompositionMode(QPainter::CompositionMode_Source); + overPainter.fillRect(0, 0, m_Size.width(), m_h, Qt::transparent); + } if(m_mode.startsWith("FT") or m_mode.startsWith("JT") or m_mode=="T10") { x1=XfromFreq(m_rxFreq); x2=XfromFreq(m_rxFreq+bw); painter0.drawLine(x1,24,x1,30); painter0.drawLine(x1,28,x2,28); painter0.drawLine(x2,24,x2,30); - overPainter.setPen(Qt::green); - overPainter.drawLine(x1,0,x1,m_h); overPainter.drawLine(x2,0,x2,m_h); + if (m_bars) { + overPainter.setPen(Qt::green); + overPainter.drawLine(x1,0,x1,m_h); overPainter.drawLine(x2,0,x2,m_h); + } } if(m_mode.startsWith("FT") or m_mode.startsWith("JT") or m_mode=="T10" or m_mode.left(4)=="WSPR") { @@ -384,18 +388,21 @@ void CPlotter::DrawOverlay() //DrawOverlay() x1=XfromFreq(m_txFreq-0.5*bw); x2=XfromFreq(m_txFreq+0.5*bw); } painter0.drawLine(x1,17,x1,21); painter0.drawLine(x1,17,x2,17); painter0.drawLine(x2,17,x2,21); - overPainter.setPen(Qt::red); - overPainter.drawLine(x1,0,x1,m_h); overPainter.drawLine(x2,0,x2,m_h); + if (m_bars) { + overPainter.setPen(Qt::red); + overPainter.drawLine(x1,0,x1,m_h); overPainter.drawLine(x2,0,x2,m_h); + } } - int fwidth=XfromFreq(m_rxFreq+bw)-XfromFreq(m_rxFreq); QPainter hoverPainter(&m_HoverOverlayPixmap); - if (!hoverPainter.isActive()) hoverPainter.begin(this); -// hoverPainter.initFrom(this); - hoverPainter.setCompositionMode(QPainter::CompositionMode_Source); - hoverPainter.fillRect(0, 0, m_Size.width(), m_h, Qt::transparent); - hoverPainter.setPen(QPen(Qt::white)); - hoverPainter.drawLine(0, 30, 0, m_h); // first slot, left line hover - hoverPainter.drawLine(fwidth, 30, fwidth, m_h); // first slot, right line hover + if (m_bars) { + if (!hoverPainter.isActive()) hoverPainter.begin(this); + int fwidth=XfromFreq(m_rxFreq+bw)-XfromFreq(m_rxFreq); + hoverPainter.setCompositionMode(QPainter::CompositionMode_Source); + hoverPainter.fillRect(0, 0, m_Size.width(), m_h, Qt::transparent); + hoverPainter.setPen(QPen(Qt::white)); + hoverPainter.drawLine(0, 30, 0, m_h); // first slot, left line hover + hoverPainter.drawLine(fwidth, 30, fwidth, m_h); // first slot, right line hover + } if(m_mode=="JT9+JT65") { QPen pen2(Qt::blue, 3); //Mark the JT65 | JT9 divider @@ -591,6 +598,14 @@ void CPlotter::setNsps(double trperiod, int nsps) //setNsps update(); //trigger a new paintEvent} } +void CPlotter::setBars(bool b) +{ + setMouseTracking(b); + m_bars=b; + DrawOverlay(); + update(); +} + void CPlotter::setTxFreq(int n) { m_txFreq=n; DrawOverlay(); update(); } void CPlotter::setMode(QString mode) { m_mode=mode; } void CPlotter::setTopJT65(int n) { m_topJT65=n; } diff --git a/plotter.h b/plotter.h index 03ed5dd5..4175109b 100644 --- a/plotter.h +++ b/plotter.h @@ -81,6 +81,7 @@ public: void setColours(QVector const& cl); void setTimestamp(int n); void setScale(bool b); + void setBars(bool b); void setFlatten(bool b); void setTol(int n); void setRxBand(QString band); @@ -109,7 +110,7 @@ private: bool m_lockTxFreq; bool m_filter; bool m_houndFilter; - + bool m_bars; float m_fSpan; qint32 m_plotZero; diff --git a/translations/jtdx_ca_ES.ts b/translations/jtdx_ca_ES.ts index 116d50d6..081cb0ce 100644 --- a/translations/jtdx_ca_ES.ts +++ b/translations/jtdx_ca_ES.ts @@ -2936,7 +2936,7 @@ Error: %2 - %3 &Cancel·lar - + Cannot open "%1" for append: %2 No es pot obrir "%1" per afegir: %2 @@ -5641,177 +5641,182 @@ Error (%2): %3 Controls - + + Bars + + + + Compression factor for frequency scale Factor de compressió per escala de freqüència - + Bins/Pixel Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body> <p> Descodifica JT9 només per sobre d'aquesta freqüència </p> </body> </html> - + JT9 JT9 - + JT65 JT65 - - + + Position of timestamp above each interval line Posició de la marca de temps sobre cada línia d'interval - + Timestamp Data/Hora - + Off Apagat - + Left Esquerra - + Right Dreta - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body> <p> Freqüència a la vora esquerra de la cascada </p> </body> </html> - + Hz Hz - + Start Inici - + Number of FFTs averaged (controls waterfall scrolling rate) Número promig de FFT (control de la velocitat de desplaçament a la cascada) - + N Avg N Avg - + Palette Paleta - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body> <p> Introduïu la definició per a una nova paleta de colors. </p> </body> </html> - + Adjust... Ajustar... - + Select waterfall palette Selecciona la paleta de la cascada - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body> <p> Escala l'espectre per valor mig. </p> </body> </html> - + Scale Escala Escala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body> <p>Línia de base espectral plana en tot l'interval mostrat . </p> </body> </html> - + Flatten Aplanar - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body> <p> Seleccionar dades per a la visualització espectrall </p> </body> </html> - + Current Actual - + Cumulative Acumulatiu - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body> <p> Definiu la mida fraccional de l'espectre en aquesta finestra. </p> </body> </html> - + % % - + Spec Spec - + Waterfall gain Guany de la cascada - + Spectrum gain Guany d'espectre - - - - + + + + TextLabel Etiqueta de text - + Waterfall zero Cascada zero - + Spectrum zero Espectre zero diff --git a/translations/jtdx_da_DK.ts b/translations/jtdx_da_DK.ts index d694bbdf..f3bc309f 100644 --- a/translations/jtdx_da_DK.ts +++ b/translations/jtdx_da_DK.ts @@ -2934,7 +2934,7 @@ Fejl: %2 - %3 &Afbryd - + Cannot open "%1" for append: %2 Kan ikke åbne "%1" for tilføjelse:%2 @@ -5630,176 +5630,181 @@ Fejl (%2):%3 Kontroller - + + Bars + + + + Compression factor for frequency scale Kompressionsfaktor til frekvensskala - + Bins/Pixel Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Dekoder kun JT9 over denne frekvens</p></body></html> - + JT9 JT9 - + JT65 JT56 - - + + Position of timestamp above each interval line Position af tidsstempel over hver tidsinterval linje - + Timestamp Tidsstempel - + Off Off - + Left Venstre - + Right Højre - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body> <p> Frekvens ved venstre kant af vandfaldet </p> </body> </html> - + Hz Hz - + Start Start - + Number of FFTs averaged (controls waterfall scrolling rate) Antal gennemsnitlige FFT'er (kontrollerer vandfaldsrullehastighed) - + N Avg N Avg - + Palette Palette - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body> <p> Indtast definition for en ny farvepalet. </p> </body> </html> - + Adjust... Juster... - + Select waterfall palette Vælg vandfald palette - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body> <p> Skala spektrum efter medianværdi. </p> </body> </html> - + Scale Scale - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Kompesering af forstærkning over det fulde viste spektrum af Vandfaldet.</p></body></html> - + Flatten Midling - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body> <p> Vælg data til spektral visning </p> </body> </html> - + Current Currant - + Cumulative Akkumulerede - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body> <p> Indstil brøkstørrelse af spektret i dette vindue. </p> </body> </html> - + % % - + Spec Spec - + Waterfall gain Vandfald forstærkning - + Spectrum gain Spektrum forstærkning - - - - + + + + TextLabel Tekst Label - + Waterfall zero Vandfald Nul - + Spectrum zero Spectrum Nul diff --git a/translations/jtdx_en_US.ts b/translations/jtdx_en_US.ts index 72358030..9620b1bc 100644 --- a/translations/jtdx_en_US.ts +++ b/translations/jtdx_en_US.ts @@ -2912,7 +2912,7 @@ Error: %2 - %3 - + Cannot open "%1" for append: %2 @@ -5572,176 +5572,181 @@ Error(%2): %3 - + + Bars + + + + Compression factor for frequency scale - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line - + Timestamp - + Off - + Left - + Right - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> - + Hz - + Start - + Number of FFTs averaged (controls waterfall scrolling rate) - + N Avg - + Palette - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> - + Adjust... - + Select waterfall palette - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> - + Scale - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> - + Flatten - + <html><head/><body><p>Select data for spectral display</p></body></html> - + Current - + Cumulative - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> - + % - + Spec - + Waterfall gain - + Spectrum gain - - - - + + + + TextLabel - + Waterfall zero - + Spectrum zero diff --git a/translations/jtdx_es_ES.ts b/translations/jtdx_es_ES.ts index 57f8db41..c50fac6c 100644 --- a/translations/jtdx_es_ES.ts +++ b/translations/jtdx_es_ES.ts @@ -2933,7 +2933,7 @@ Error: %2 - %3 &Cancelar - + Cannot open "%1" for append: %2 No se puede abrir "%1" para añadir: %2 @@ -5637,177 +5637,182 @@ Error (%2): %3 Ajustes - + + Bars + + + + Compression factor for frequency scale Factor de compresión para escala de frecuencia - + Bins/Pixel Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body> <p> Decodifica JT9 solo por encima de esta frecuencia </p> </body> </html> - + JT9 JT9 - + JT65 JT65 - - + + Position of timestamp above each interval line Posición de la marca de tiempo sobre cada línea de intervalo - + Timestamp Fecha/Hora - + Off Nada - + Left Izquierda - + Right Derecha - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body> <p> Frecuencia en el borde izquierdo de la cascada </p> </body> </html> - + Hz Hz - + Start Inicio - + Number of FFTs averaged (controls waterfall scrolling rate) Número promedio de FFT (controla la velocidad de desplazamiento en cascada) - + N Avg N Por - + Palette Paleta - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body> <p> Ingrese la definición para una nueva paleta de colores. </p> </body> </html> - + Adjust... Ajustar... - + Select waterfall palette Seleccionar paleta de cascada - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body> <p> Escala el espectro por valor medio. </p> </body> </html> - + Scale Escala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body> <p>Línea de base espectral plana en todo el intervalo mostrado.. </p> </body> </html> - + Flatten Aplanar - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body> <p> Seleccionar datos para visualización espectral </p> </body> </html> - + Current Actual - + Cumulative Acumulativo - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body> <p> Establezca el tamaño fraccional del espectro en esta ventana. </p> </body> </html> - + % % - + Spec Spec - + Waterfall gain Ganancia en cascada - + Spectrum gain Ganancia de espectro - - - - + + + + TextLabel Etiqueta - + Waterfall zero Cascada cero - + Spectrum zero Espectro cero diff --git a/translations/jtdx_et_EE.ts b/translations/jtdx_et_EE.ts index 062bc0ec..8b4f1754 100644 --- a/translations/jtdx_et_EE.ts +++ b/translations/jtdx_et_EE.ts @@ -2939,7 +2939,7 @@ Viga: %2 - %3 Tü&hista - + Cannot open "%1" for append: %2 Ei avane "%1" lisamiseks: %2 @@ -5636,176 +5636,181 @@ Error(%2): %3 Menüü - + + Bars + + + + Compression factor for frequency scale Tihendus sagedusskaala jaoks - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Dekodeeri JT9 ainult sellest sagedusest kõrgemal</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line Aja asukoht iga perioodirea kohal - + Timestamp Ajajälg - + Off Väljas - + Left Vasakul - + Right Paremal - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>Sagedus joa vasakus servasl</p></body></html> - + Hz - + Start - + Number of FFTs averaged (controls waterfall scrolling rate) Keskmine FFT-de arv (juhib joa kerimiskiirust) - + N Avg N perioode - + Palette Värviskaala - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Sisestage uue värviskaala määratlus.</p></body></html> - + Adjust... Reguleeri... - + Select waterfall palette Valige joa värviskaala - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Skaala spekter keskmise järgi.</p></body></html> - + Scale Skaala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Spektrijoont näidatakse kogu kuvatava perioodi jooksull.</p></body></html> - + Flatten Tasandama - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>Valige andmed spektri kuvamiseks</p></body></html> - + Current Praegune - + Cumulative Kuhjunud - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>Määrake selles aknas spektri murdosa suurus.</p></body></html> - + % - + Spec Spec - + Waterfall gain Joa võimendus - + Spectrum gain Joa spektri võimendus - - - - + + + + TextLabel TekstLabel - + Waterfall zero Joa 0 asend - + Spectrum zero Spektri 0 asend diff --git a/translations/jtdx_fr_FR.ts b/translations/jtdx_fr_FR.ts index 976ec951..0a8e36de 100644 --- a/translations/jtdx_fr_FR.ts +++ b/translations/jtdx_fr_FR.ts @@ -2932,7 +2932,7 @@ Erreur : %2 - %3 &Annuler - + Cannot open "%1" for append: %2 Ne peut pas ouvrir "%1" pour l'annexe : %2 @@ -5628,176 +5628,181 @@ Erreur(%2) : %3 Contrôles - + + Bars + + + + Compression factor for frequency scale Facteur de compression pour l'échelle de fréquence - + Bins/Pixel Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><tête/>>corps><p>Décoder JT9 uniquement au-dessus de cette fréquence</p></corps></html> - + JT9 JT9 - + JT65 JT65 - - + + Position of timestamp above each interval line Position de l'horodatage au-dessus de chaque ligne d'intervalle - + Timestamp Horodate - + Off Arrêt - + Left Gauche - + Right Droite - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><tête/><corps><p>Fréquence au bord gauche de la chute d'eau</p></corps></html> - + Hz Hertz - + Start Départ - + Number of FFTs averaged (controls waterfall scrolling rate) Nombre de FFT moyennés (contrôle le taux de défilement des chutes d'eau) - + N Avg N Avg - + Palette Palette - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Entrer la définition pour une nouvelle palette de couleurs.</p></body></html> - + Adjust... Ajuster... - + Select waterfall palette Sélectionner la palette de cascades - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Scale spectrum by median value.</p></body></html> - + Scale Échelle - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html>>>tête/><corps><p>Base spectrale plate sur tout l'intervalle affiché.</p></corps></html> - + Flatten Aplanir - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><tête/>>corps><p>Sélectionner les données pour l'affichage spectral</p></corps></html> - + Current En cours - + Cumulative Cumulatif - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> html><head/><body><p>Définir la taille fractionnaire du spectre dans cette fenêtre.</p></body></html> - + % % - + Spec Spécif - + Waterfall gain Gain de la chute d'eau - + Spectrum gain Gain du spectre - - - - + + + + TextLabel Étiqu. de text - + Waterfall zero Chute d'eau zéro - + Spectrum zero Spectre zéro diff --git a/translations/jtdx_hr_HR.ts b/translations/jtdx_hr_HR.ts index fde44094..5964f324 100644 --- a/translations/jtdx_hr_HR.ts +++ b/translations/jtdx_hr_HR.ts @@ -2923,7 +2923,7 @@ Pogreška: %2 - %3 &Cancel - + Cannot open "%1" for append: %2 Nemoguće otvoriti "%1" da bi se dodao: %2 @@ -5622,176 +5622,181 @@ Greška(%2): %3 Kontrole - + + Bars + + + + Compression factor for frequency scale Faktor kompresije za frekvencijsku ljestvicu - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Dekodiraj JT9 osamo iznad ove frekvencije</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line Pozicija vremenske oznake iznad svakog intervala - + Timestamp Sekvenca - + Off Isključi - + Left Lijevo - + Right Desno - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>Frekvencija lijevog ruba vodopada</p></body></html> - + Hz - + Start Start - + Number of FFTs averaged (controls waterfall scrolling rate) - + N Avg - + Palette Paleta - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Unesite definiciju za novu paletu boja.</p></body></html> - + Adjust... Podesi... - + Select waterfall palette Odaberi paletu boja vodopada - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Spektar skale prema srednjoj vrijednosti.</p></body></html> - + Scale Skala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Izravnajte spektralnu bazu preko cijelog prikazanog intervala.</p></body></html> - + Flatten Poravnato - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>Odaberite podatke za spektralni prikaz</p></body></html> - + Current - + Cumulative - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>U ovom prozoru postavite frakcijsku veličinu spektra.</p></body></html> - + % - + Spec - + Waterfall gain Vodopad pojačanje - + Spectrum gain Spektar pojačanje - - - - + + + + TextLabel - + Waterfall zero Vodopad nula - + Spectrum zero Spectrum nula diff --git a/translations/jtdx_it_IT.ts b/translations/jtdx_it_IT.ts index 27cc5fc5..e6941317 100644 --- a/translations/jtdx_it_IT.ts +++ b/translations/jtdx_it_IT.ts @@ -2931,7 +2931,7 @@ Errore: %2 -%3 &Cancella - + Cannot open "%1" for append: %2 Impossibile aprire "%1" per appendere: %2 @@ -5628,176 +5628,181 @@ Errore (%2):%3 Controlli - + + Bars + + + + Compression factor for frequency scale Fattore di compressione della scala della frequenza - + Bins/Pixel Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p> Decodifica JT9 solo al di sopra di questa frequenza </p></body></html> - + JT9 JT9 - + JT65 JT65 - - + + Position of timestamp above each interval line Posizione dell'ora e della banda sopra alla linea del periodo di ricezione - + Timestamp Ora e Banda a: - + Off Spenta - + Left Sinistra - + Right Destra - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p> Inizio della visualizzazione della Frequenza</p></body></html> - + Hz Hz - + Start Avvio - + Number of FFTs averaged (controls waterfall scrolling rate) Numero medio di FFT (controlla la velocità di scorrimento dello spettro) - + N Avg N Medio - + Palette Tavolozza colori - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p> Cambia o crea le definizioni per la tavolozza di colori.</p></body></html> - + Adjust... Aggiusta... - + Select waterfall palette Seleziona la tavolozza colori dello spettro - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p> Scala lo spettro in base al valore medio. </p></body></html> - + Scale Scala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Appiattisce la linea di base dello spettro per l'intero intervallo visualizzato.</p></body></html> - + Flatten Fluttuante - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p> Seleziona i dati per la visualizzazione dello spettro </p></body></html> - + Current Corrente - + Cumulative Cumulativo - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p> Imposta la dimensione frazionaria dello spettro in questa finestra. </p></body></html> - + % % - + Spec Spec - + Waterfall gain Guadagno Spettro - + Spectrum gain Guadagno spettro - - - - + + + + TextLabel Testo Etichetta - + Waterfall zero Zero Spettro - + Spectrum zero Zero spettro diff --git a/translations/jtdx_ja_JP.ts b/translations/jtdx_ja_JP.ts index 864418ba..c3e9156b 100644 --- a/translations/jtdx_ja_JP.ts +++ b/translations/jtdx_ja_JP.ts @@ -2930,7 +2930,7 @@ Error: %2 - %3 - + Cannot open "%1" for append: %2 追加のために「%1」を開くことができません：%2 @@ -5595,176 +5595,181 @@ Error(%2): %3 ｺﾝﾄﾛｰﾙ - + Compression factor for frequency scale 周波数スケールの圧縮係数 - - + + Position of timestamp above each interval line 各間隔線上のタイムスタンプの位置 - + Timestamp タイム・スタンプ - + Off オフ - + Left 左 - + Right 右 - + Number of FFTs averaged (controls waterfall scrolling rate) 平均化されたFFTの数（ウォーターフォールのスクロール速度を制御） - + Bins/Pixel 区間／ピクセル - + + Bars + + + + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html> <head /> <body> <p>この周波数以上でのみJT9をデコード</p> </body> </html> - + JT9 - + JT65 - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html> <head /> <body> <p>ウオーターフォールの左端の周波数.</p></body></html> - + Hz - + Start 開始 - + N Avg - + Palette パレット - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html> <head /> <body> <p>新しいカラーパレットの定義を入力します。</p> </body> </html> - + Adjust... 調整… - + Select waterfall palette ウオーターフォールパレットを選ぶ - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html> <head /> <body> <p>中央値でスペクトルをスケーリングします。</p> </body> </html> - + Scale スケール - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html> <head /> <body> <p>表示されたすべての間隔でフラット化されたスペクトルベースライン。</p> </body> </html> - + Flatten 平坦化 - + <html><head/><body><p>Select data for spectral display</p></body></html> <html> <head /> <body> <p>スペクトル表示用のデータを選択</p> </body> </html> - + Current - + Cumulative - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html> <head /> <body> <p>このウィンドウでスペクトルの表示サイズを設定します。.</p></body></html> - + % - + Spec ｽﾍﾟｸﾄﾙ - + Waterfall gain ウオーターフォールゲイン - + Spectrum gain スペクトルゲイン - - - - + + + + TextLabel - + Waterfall zero ウオーターフォール ０ - + Spectrum zero スペクトル ０ diff --git a/translations/jtdx_lv_LV.ts b/translations/jtdx_lv_LV.ts index 64886381..3387168c 100644 --- a/translations/jtdx_lv_LV.ts +++ b/translations/jtdx_lv_LV.ts @@ -2922,7 +2922,7 @@ Error: %2 - %3 - + Cannot open "%1" for append: %2 Nevar atvērt "%1" lai pievienotu: %2" @@ -5582,176 +5582,181 @@ Error(%2): %3 - + + Bars + + + + Compression factor for frequency scale - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> - + JT9 JT9 - + JT65 JT65 - - + + Position of timestamp above each interval line - + Timestamp - + Off - + Left Kreisais - + Right Labais - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> - + Hz Hz - + Start Sākt - + Number of FFTs averaged (controls waterfall scrolling rate) - + N Avg - + Palette - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> - + Adjust... - + Select waterfall palette - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> - + Scale - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> - + Flatten - + <html><head/><body><p>Select data for spectral display</p></body></html> - + Current - + Cumulative - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> - + % - + Spec - + Waterfall gain - + Spectrum gain - - - - + + + + TextLabel - + Waterfall zero - + Spectrum zero diff --git a/translations/jtdx_pl_PL.ts b/translations/jtdx_pl_PL.ts index 2ad69fcd..89922010 100644 --- a/translations/jtdx_pl_PL.ts +++ b/translations/jtdx_pl_PL.ts @@ -2931,7 +2931,7 @@ Błąd: %2 - %3 &Anuluj - + Cannot open "%1" for append: %2 Nie można otworzyć "%1" dla dopisania: %2 @@ -5626,176 +5626,181 @@ Error(%2): %3 Sterowanie - + + Bars + + + + Compression factor for frequency scale Współczynnik kompresji dla skali częstotliwości - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Dekoduj JT9 tylko powyżej tej częstotliwości</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line Położenie znacznika czasu powyżej każdej liniki interwału - + Timestamp Znacznik czasu - + Off Wyłączony - + Left Z lewej - + Right Z prawej - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>Częstotliwość na lewym krańcu wodospadu</p></body></html> - + Hz - + Start - + Number of FFTs averaged (controls waterfall scrolling rate) Ilość uśrednionych FFTs (określa szybkość przewijania wodospadu) - + N Avg - + Palette Paleta - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Wprowadź definicje dla nowej palety kolorów.</p></body></html> - + Adjust... Dostosuj... - + Select waterfall palette Wybierz paletę wodospadu - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Wyskaluj spektrum na środkową wartość.</p></body></html> - + Scale Skala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Spłaszcz linię odniesiena widma nad całym widocznym interwałem.</p></body></html> - + Flatten Spłaszcz - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>Wybierz dane do wyświetlania widma</p></body></html> - + Current Bieżący - + Cumulative Skumulowany - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>Ustaw nieznaczną wielkość spektrum w tym oknie.</p></body></html> - + % - + Spec - + Waterfall gain Wzmocnienie wodospadu - + Spectrum gain Wzmocnienie spektrum - - - - + + + + TextLabel Etykieta tekstu - + Waterfall zero Zero wodospadu - + Spectrum zero Zero spektrum diff --git a/translations/jtdx_pt_BR.ts b/translations/jtdx_pt_BR.ts index 50fddce9..f128bf43 100644 --- a/translations/jtdx_pt_BR.ts +++ b/translations/jtdx_pt_BR.ts @@ -2919,7 +2919,7 @@ Error: %2 - %3 &Cancelar - + Cannot open "%1" for append: %2 Não foi possivel abrir "%1" para adicionar: %2 @@ -5614,176 +5614,181 @@ Erro (%2):%3 Controles - + + Bars + + + + Compression factor for frequency scale Fator de compressão para escala da frequência - + Bins/Pixel Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Decodifique JT9 somente acima desta frequência</p></body></html> - + JT9 JT9 - + JT65 JT65 - - + + Position of timestamp above each interval line Posição do registro de data e hora acima de cada linha de intervalo - + Timestamp Data/Hora - + Off Desligado - + Left Esquerda - + Right Direita - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>Frequência á esquerda da cascata</p></body></html> - + Hz Hz - + Start Iniciar - + Number of FFTs averaged (controls waterfall scrolling rate) Número médio de FFTs (controla a taxa de rolagem em cascata) - + N Avg N Avg - + Palette Paleta - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Digite a definição para uma nova paleta de cores.</p></body></html> - + Adjust... Ajuste... - + Select waterfall palette Selecionar paleta cascata - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Escala de espectro por valor médio.</p></body></html> - + Scale Escala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Achate a linha de base espectral durante todo o intervalo exibido.</p></body></html> - + Flatten Plano - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>Selecionar dados para exibição espectral</p></body></html> - + Current Atual - + Cumulative Cumulativo - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>Defina o tamanho fracionário do espectro nesta janela.</p></body></html> - + % % - + Spec Spec - + Waterfall gain Ganho da cascata - + Spectrum gain Ganho do espectro - - - - + + + + TextLabel EtiquetaTexto - + Waterfall zero Cascata zero - + Spectrum zero Espectro zero diff --git a/translations/jtdx_pt_PT.ts b/translations/jtdx_pt_PT.ts index f94bf49f..8bd0cdbf 100644 --- a/translations/jtdx_pt_PT.ts +++ b/translations/jtdx_pt_PT.ts @@ -2919,7 +2919,7 @@ Error: %2 - %3 &Cancelar - + Cannot open "%1" for append: %2 Não foi possivel abrir "%1" para adicionar: %2 @@ -5612,176 +5612,181 @@ Erro (%2):%3 Controles - + + Bars + + + + Compression factor for frequency scale Factor de compressão para escala da frequência - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Decodifique JT9 somente acima desta frequência</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line Posição do registro de data e hora acima de cada linha de intervalo - + Timestamp Data/Hora - + Off Desligado - + Left Esquerda - + Right Direita - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>Frequência á esquerda da cascata</p></body></html> - + Hz - + Start Iniciar - + Number of FFTs averaged (controls waterfall scrolling rate) Número médio de FFTs (controla a taxa de rolagem em cascata) - + N Avg - + Palette Paleta - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Digite a definição para uma nova paleta de cores.</p></body></html> - + Adjust... Ajuste... - + Select waterfall palette Selecionar paleta cascata - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Escala de espectro por valor mediano.</p></body></html> - + Scale Escala - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Achate a linha de base espectral durante todo o intervalo exibido.</p></body></html> - + Flatten Plano - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>Selecionar dados para exibição espectral</p></body></html> - + Current Actual - + Cumulative Cumulativo - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>Defina o tamanho fracionário do espectro nesta janela.</p></body></html> - + % - + Spec - + Waterfall gain Ganho da cascata - + Spectrum gain Ganho do espectro - - - - + + + + TextLabel - + Waterfall zero Cascata zero - + Spectrum zero Espectro zero diff --git a/translations/jtdx_ru_RU.ts b/translations/jtdx_ru_RU.ts index 8835dcbc..96bfefde 100644 --- a/translations/jtdx_ru_RU.ts +++ b/translations/jtdx_ru_RU.ts @@ -308,7 +308,7 @@ Format: where? - каким образом? + страна? @@ -2931,7 +2931,7 @@ Error: %2 - %3 О&тменить - + Cannot open "%1" for append: %2 Невозможно открыть "%1" для добавления: %2 @@ -2943,14 +2943,10 @@ Error: %2 - %3 JTDX - - <html><head/><body><p>Avg: accumulated average DT of decoded signals on current band. Lag: it is decoder lag calculated relatively to beginning of next interval, negative values mean there is spare time available to increase decoding depth, positive values is decoder's lag into TX or next interval meaning there may be no enough CPU resources for selected decoding depth to provide reliable signal transmission. /xx: number of decoded messages in last interval.</p></body></html> - <html><head/><body><p>Avg: накопленный средний DT декодированных сигналов на текущем диапазоне. Lag: это задержка декодера, вычисленная относительно начала следующего интервала, отрицательные значения означают, что имеется свободное время для увеличения глубины декодирования, положительные значения - задержка работы декодера еще и в TX или даже в следующий интервал, означающая недостаточность ресурсов ЦП для выбранной глубины декодирования. /xx: количество декодированных сообщений за последний интервал.</p></body></html> - <html><head/><body><p>Avg: accumulated average DT of decoded signals on current band.</p><p>Lag: it is decoder lag calculated relatively to beginning of next interval, negative values mean there is spare time available to increase decoding depth, positive values is decoder's lag into TX or next interval meaning there may be no enough CPU resources for selected decoding depth to provide reliable signal transmission.</p><p></p><p>Lag depends on CPU performance, noise conditions, band fullness and other programs using computer, it can be decreased by reducing waterfall bandwidth. If Lag is constantly negative then CPU handling well interval decoding and you can try to make decoding more aggressive to get more decodes.</p><p>FT8: if Lag is 0 .. 0.4 then you can still use Autoseq 3/7 (autoselect will trigger change of TX message early enough to transmit full message). If Lag > 0.4 then you should try to decrease decoding aggressivity. If still Lag > 0.4 then Autoseq 2/6 should be used as responding to incoming call will be partially damaged at transmission in AutoSeq 3/7. If constantly Lag > 2 then your CPU is unsuitable to operate in FT8 with current decoder settings. Sure You can monitor as SWL.</p><p>/xx: number of decoded messages in last interval.</p></body></html> - + <html><head/><body><p>Avg: накопленный средний DT декодированных сигналов на текущем диапазоне.</p><p> Lag: это задержка декодирования, вычисленная относительно начала следующего интервала, отрицательные значения означают, что имеется запас доступного времени для увеличения глубины декодирования, положительные значения означают что декодирование заходит в интервал передачи либо следующий приемный интервал, ресурсов процессора недостаточно для выбранной глубины декодирования для обеспечения стабильной передачи сообщений во время QSO.</p><p></p><p>Задержка зависит от производительности процессора, характера шума, загруженности диапазона и работы других программ использующих ресурсы процессора, может быть снижена уменьшением полосы частот на водопаде программы. Если задержка постоянно отрицательная то процессор отлично справляется с декдированием интервала и можно увеличить глубину декодирования для получения большего количества декодированных сообщений.</p><p>FT8: если задержка находится в диапазоне 0..0.4 секунды то все еще можно использовать режим AutoSeq3/7 (функционал автовыбора при необходимости сменит TX сообщение достаточно рано чтобы передать его полностью). Если задержка более 0.4 секунды то необходимо уменьшить глубину декодирования. Если задержка все еще более 0.4 секунды то придется использовать AutoSeq2/6, так как в режиме 3/7 ответ на входящий вызов будет частично потерян при передаче. Если задержка постоянно больше двух секунд то процессор непригоден для работы в эфире в FT8, при этом все еще можно провести QSO используя функционал частотного фильтра в JTDX либо использовать программу для мониторинга диапазона</p><p> /xx: количество декодированных сообщений в последнем интервале.</p></body></html> @@ -5634,176 +5630,181 @@ Error(%2): %3 Управл. - + + Bars + + + + Compression factor for frequency scale Коэффициент сжатия для частотной шкалы - + Bins/Pixel - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>Декодировать JT9 только выше этой частоты</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line Положение отметки времени над каждой интервальной линией - + Timestamp Отметка - + Off - + Left Слева - + Right Справа - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>Частота на левом краю водопада</p></body></html> - + Hz Гц - + Start Старт - + Number of FFTs averaged (controls waterfall scrolling rate) Количество усредненных FFT (контролирует скорость прокрутки водопада) - + N Avg - + Palette Палитра - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>Введите определение новой цветовой палитры.</p></body></html> - + Adjust... Настройка... - + Select waterfall palette Выберите палитру водопада - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>Шкала спектра по медианному значению.</p></body></html> - + Scale Шкала - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>Сгладить спектральную базовую линию по всему отображаемому интервалу.</p></body></html> - + Flatten Сглаживание - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>Выбор данных для спектрального отображения</p></body></html> - + Current Текущий - + Cumulative Накопительный - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>Установите в этом окне дробный размер спектра.</p></body></html> - + % - + Spec Спец - + Waterfall gain Яркость водопада - + Spectrum gain Уровень спектра - - - - + + + + TextLabel - + Waterfall zero Контрастность водопада - + Spectrum zero Ноль спектра diff --git a/translations/jtdx_zh_CN.ts b/translations/jtdx_zh_CN.ts index 2186913e..6cda0884 100644 --- a/translations/jtdx_zh_CN.ts +++ b/translations/jtdx_zh_CN.ts @@ -2931,7 +2931,7 @@ Error: %2 - %3 取消&C - + Cannot open "%1" for append: %2 无法打开 "%1" 对于附加: %2 @@ -5625,176 +5625,181 @@ Error(%2): %3 控件列 - + + Bars + + + + Compression factor for frequency scale 频率刻度的压缩系数 - + Bins/Pixel 点/像素 - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>仅在此频率以上解码 JT9</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line 每个间隔线上方的时间戳位置 - + Timestamp 时间戳 - + Off 取消 - + Left 左边 - + Right 右边 - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>波段在瀑布左边缘显示</p></body></html> - + Hz - + Start 开始 - + Number of FFTs averaged (controls waterfall scrolling rate) FFT 平均数（控制瀑布滚动速率） - + N Avg N 平均 - + Palette 调色板 - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>输入新调色板的定义.</p></body></html> - + Adjust... 调整... - + Select waterfall palette 选择瀑布调色板 - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>按中值划分的比例.</p></body></html> - + Scale 比例 - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>在完整显示的间隔内平展频谱基线.</p></body></html> - + Flatten 平坦化 - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>选择用于频谱显示的数据</p></body></html> - + Current 当前 - + Cumulative 累积 - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>在此窗口中设置频谱的大小.</p></body></html> - + % - + Spec 佔高 - + Waterfall gain 瀑布增益 - + Spectrum gain 频谱增益 - - - - + + + + TextLabel - + Waterfall zero 瀑布零度 - + Spectrum zero 频谱零度 diff --git a/translations/jtdx_zh_HK.ts b/translations/jtdx_zh_HK.ts index 80b8ded9..43771432 100644 --- a/translations/jtdx_zh_HK.ts +++ b/translations/jtdx_zh_HK.ts @@ -2931,7 +2931,7 @@ Error: %2 - %3 取消&C - + Cannot open "%1" for append: %2 無法開啟 "%1" 對於附加: %2 @@ -5625,176 +5625,181 @@ Error(%2): %3 控件列 - + + Bars + + + + Compression factor for frequency scale 頻率刻度的壓縮系數 - + Bins/Pixel 點/像素 - + <html><head/><body><p>Decode JT9 only above this frequency</p></body></html> <html><head/><body><p>僅在此頻率以上解碼 JT9</p></body></html> - + JT9 - + JT65 - - + + Position of timestamp above each interval line 每個間隔線上方的時間戳位置 - + Timestamp 時間戳 - + Off 取消 - + Left 左邊 - + Right 右邊 - + <html><head/><body><p>Frequency at left edge of waterfall</p></body></html> <html><head/><body><p>波段在瀑布左邊緣顯示</p></body></html> - + Hz - + Start 開始 - + Number of FFTs averaged (controls waterfall scrolling rate) FFT 平均數（控制瀑布滾動速率） - + N Avg N 平均 - + Palette 調色板 - + <html><head/><body><p>Enter definition for a new color palette.</p></body></html> <html><head/><body><p>輸入新調色板的定義.</p></body></html> - + Adjust... 調整... - + Select waterfall palette 選擇瀑布調色板 - + <html><head/><body><p>Scale spectrum by median value.</p></body></html> <html><head/><body><p>按中值劃分的比例.</p></body></html> - + Scale 比例 - + <html><head/><body><p>Flatten spectral baseline over the full displayed interval.</p></body></html> <html><head/><body><p>在完整顯示的間隔內平展頻譜基線.</p></body></html> - + Flatten 平坦化 - + <html><head/><body><p>Select data for spectral display</p></body></html> <html><head/><body><p>選擇用於頻譜顯示的數據</p></body></html> - + Current 當前 - + Cumulative 累積 - + <html><head/><body><p>Set fractional size of spectrum in this window.</p></body></html> <html><head/><body><p>在此窗口中設置頻譜的大小.</p></body></html> - + % - + Spec 佔高 - + Waterfall gain 瀑布增益 - + Spectrum gain 頻譜增益 - - - - + + + + TextLabel - + Waterfall zero 瀑布零度 - + Spectrum zero 頻譜零度 diff --git a/widegraph.cpp b/widegraph.cpp index c015ecb6..ec4c5b88 100644 --- a/widegraph.cpp +++ b/widegraph.cpp @@ -36,6 +36,7 @@ WideGraph::WideGraph(QSettings * settings, JTDXDateTime * jtdxtime, QWidget *par ui->widePlot->setMaximumHeight(800); ui->widePlot->setCurrent(false); ui->cbControls->setCursor(Qt::ArrowCursor); + ui->cbBars->setCursor(Qt::ArrowCursor); connect(ui->widePlot, SIGNAL(freezeDecode1(int)),this, SLOT(wideFreezeDecode(int))); @@ -89,6 +90,10 @@ WideGraph::WideGraph(QSettings * settings, JTDXDateTime * jtdxtime, QWidget *par if(ststamp == "0" || ststamp == "1" || ststamp == "2") m_timestamp = itstamp; ui->timestampComboBox->setCurrentIndex(m_timestamp); ui->widePlot->setTimestamp(m_timestamp); + m_bars=m_settings->value("Bars",true).toBool(); + ui->cbBars->setChecked(m_bars); + ui->widePlot->setBars(m_bars); + m_bScale=m_settings->value("Scale",true).toBool(); ui->cbScale->setChecked(m_bScale); ui->widePlot->setScale(m_bScale); @@ -136,6 +141,7 @@ WideGraph::WideGraph(QSettings * settings, JTDXDateTime * jtdxtime, QWidget *par setRxRange (m_fMin); ui->controls_widget->setVisible(!m_settings->value("HideControls",false).toBool()); ui->cbControls->setChecked(!m_settings->value("HideControls",false).toBool()); + m_settings->endGroup(); saveSettings (); // update config with defaults @@ -189,6 +195,7 @@ void WideGraph::saveSettings() //saveS m_settings->setValue ("Scale",m_bScale); m_settings->setValue ("Flatten",m_bFlatten); m_settings->setValue ("HideControls", ui->controls_widget->isHidden ()); + m_settings->setValue ("Bars", m_bars); m_settings->endGroup (); } @@ -480,6 +487,12 @@ void WideGraph::on_cbControls_toggled(bool b) ui->controls_widget->setVisible(b); } +void WideGraph::on_cbBars_toggled(bool b) +{ + m_bars = b; + ui->widePlot->setBars(m_bars); +} + void WideGraph::on_adjust_palette_push_button_clicked (bool) //Adjust Palette { try diff --git a/widegraph.h b/widegraph.h index 0f9212f1..6c2dc7aa 100644 --- a/widegraph.h +++ b/widegraph.h @@ -80,6 +80,7 @@ private slots: void on_cbScale_toggled(bool b); void on_cbFlatten_toggled(bool b); void on_cbControls_toggled(bool b); + void on_cbBars_toggled(bool b); void on_adjust_palette_push_button_clicked (bool); void on_gainSlider_valueChanged(int value); void on_zeroSlider_valueChanged(int value); @@ -108,6 +109,7 @@ private: qint32 m_topJT65; qint32 m_timestamp; + bool m_bars; bool m_lockTxFreq; bool m_filter; bool m_bScale; diff --git a/widegraph.ui b/widegraph.ui index b07fd4e3..c8fbd8fb 100644 --- a/widegraph.ui +++ b/widegraph.ui @@ -66,7 +66,7 @@ 9 10 - 60 + 65 17 @@ -86,6 +86,31 @@ true + + + + 80 + 10 + 50 + 17 + + + + + 65 + 16777215 + + + + true + + + Bars + + + true + +