mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 21:40:52 -05:00 
			
		
		
		
	Use PY2SDR signalMeters to replace Qwt Thermos.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3824 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									4bda372088
								
							
						
					
					
						commit
						0d842cac29
					
				@ -159,6 +159,10 @@ MainWindow::MainWindow(QWidget *parent) :
 | 
			
		||||
 | 
			
		||||
//  ui->xThermo->setFillBrush(Qt::green);
 | 
			
		||||
//  ui->yThermo->setFillBrush(Qt::magenta);
 | 
			
		||||
  xSignalMeter = new SignalMeter(ui->xMeterFrame);
 | 
			
		||||
  xSignalMeter->resize(50, 160);
 | 
			
		||||
  ySignalMeter = new SignalMeter(ui->yMeterFrame);
 | 
			
		||||
  ySignalMeter->resize(50, 160);
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
  while(true) {
 | 
			
		||||
 | 
			
		||||
@ -9,6 +9,7 @@
 | 
			
		||||
#include "getfile.h"
 | 
			
		||||
#include "soundin.h"
 | 
			
		||||
#include "soundout.h"
 | 
			
		||||
#include "signalmeter.h"
 | 
			
		||||
#include "commons.h"
 | 
			
		||||
#include "sleep.h"
 | 
			
		||||
#include <QtConcurrent/QtConcurrent>
 | 
			
		||||
@ -247,6 +248,10 @@ private:
 | 
			
		||||
 | 
			
		||||
    QHash<QString,bool> m_worked;
 | 
			
		||||
 | 
			
		||||
    SignalMeter *xSignalMeter;
 | 
			
		||||
    SignalMeter *ySignalMeter;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    SoundInThread soundInThread;             //Instantiate the audio threads
 | 
			
		||||
    SoundOutThread soundOutThread;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -225,21 +225,22 @@ p, li { white-space: pre-wrap; }
 | 
			
		||||
      <item>
 | 
			
		||||
       <layout class="QHBoxLayout" name="horizontalLayout_5">
 | 
			
		||||
        <item>
 | 
			
		||||
         <widget class="QLabel" name="label">
 | 
			
		||||
          <property name="sizePolicy">
 | 
			
		||||
           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
 | 
			
		||||
            <horstretch>0</horstretch>
 | 
			
		||||
            <verstretch>0</verstretch>
 | 
			
		||||
           </sizepolicy>
 | 
			
		||||
         <widget class="QFrame" name="xMeterFrame">
 | 
			
		||||
          <property name="frameShape">
 | 
			
		||||
           <enum>QFrame::StyledPanel</enum>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="maximumSize">
 | 
			
		||||
           <size>
 | 
			
		||||
            <width>16777215</width>
 | 
			
		||||
            <height>26</height>
 | 
			
		||||
           </size>
 | 
			
		||||
          <property name="frameShadow">
 | 
			
		||||
           <enum>QFrame::Raised</enum>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="text">
 | 
			
		||||
           <string>dB</string>
 | 
			
		||||
         </widget>
 | 
			
		||||
        </item>
 | 
			
		||||
        <item>
 | 
			
		||||
         <widget class="QFrame" name="yMeterFrame">
 | 
			
		||||
          <property name="frameShape">
 | 
			
		||||
           <enum>QFrame::StyledPanel</enum>
 | 
			
		||||
          </property>
 | 
			
		||||
          <property name="frameShadow">
 | 
			
		||||
           <enum>QFrame::Raised</enum>
 | 
			
		||||
          </property>
 | 
			
		||||
         </widget>
 | 
			
		||||
        </item>
 | 
			
		||||
 | 
			
		||||
@ -39,7 +39,7 @@ SOURCES += main.cpp mainwindow.cpp plotter.cpp about.cpp \
 | 
			
		||||
    soundin.cpp soundout.cpp devsetup.cpp \
 | 
			
		||||
    widegraph.cpp getfile.cpp messages.cpp bandmap.cpp \
 | 
			
		||||
    astro.cpp displaytext.cpp getdev.cpp \
 | 
			
		||||
    txtune.cpp
 | 
			
		||||
    txtune.cpp meterwidget.cpp signalmeter.cpp
 | 
			
		||||
 | 
			
		||||
win32 {
 | 
			
		||||
SOURCES += killbyname.cpp     set570.cpp
 | 
			
		||||
@ -48,7 +48,7 @@ SOURCES += killbyname.cpp     set570.cpp
 | 
			
		||||
HEADERS  += mainwindow.h plotter.h soundin.h soundout.h \
 | 
			
		||||
            about.h devsetup.h widegraph.h getfile.h messages.h \
 | 
			
		||||
            bandmap.h commons.h sleep.h astro.h displaytext.h \
 | 
			
		||||
    txtune.h
 | 
			
		||||
            txtune.h meterwidget.h signalmeter.h
 | 
			
		||||
 | 
			
		||||
FORMS    += mainwindow.ui about.ui devsetup.ui widegraph.ui \
 | 
			
		||||
    messages.ui bandmap.ui astro.ui \
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user