renamed an signal
This commit is contained in:
+3
-6
@@ -181,6 +181,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
//Automatically create the connection window so it can be updated even if we never opened it.
|
//Automatically create the connection window so it can be updated even if we never opened it.
|
||||||
connectionWindow = new ConnectionWindow(model);
|
connectionWindow = new ConnectionWindow(model);
|
||||||
connect(connectionWindow, SIGNAL(updateConnectionSettings(QString,QString,int,int)), this, SLOT(updateConnectionSettings(QString,QString,int,int)));
|
connect(connectionWindow, SIGNAL(updateConnectionSettings(QString,QString,int,int)), this, SLOT(updateConnectionSettings(QString,QString,int,int)));
|
||||||
|
connect(this, SIGNAL(suspendCapturing(bool)), connectionWindow, SLOT(setSuspendAll(bool)));
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
@@ -713,15 +714,11 @@ void MainWindow::toggleCapture()
|
|||||||
{
|
{
|
||||||
allowCapture = !allowCapture;
|
allowCapture = !allowCapture;
|
||||||
if (allowCapture)
|
if (allowCapture)
|
||||||
{
|
|
||||||
ui->btnCaptureToggle->setText("Suspend Capturing");
|
ui->btnCaptureToggle->setText("Suspend Capturing");
|
||||||
emit startFrameCapturing();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
ui->btnCaptureToggle->setText("Restart Capturing");
|
ui->btnCaptureToggle->setText("Restart Capturing");
|
||||||
emit stopFrameCapturing();
|
|
||||||
}
|
emit suspendCapturing(!allowCapture);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::connectionSucceeded(int baud0, int baud1)
|
void MainWindow::connectionSucceeded(int baud0, int baud1)
|
||||||
|
|||||||
+1
-2
@@ -92,8 +92,7 @@ public slots:
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void sendCANFrame(const CANFrame *, int);
|
void sendCANFrame(const CANFrame *, int);
|
||||||
void stopFrameCapturing();
|
void suspendCapturing(bool);
|
||||||
void startFrameCapturing();
|
|
||||||
|
|
||||||
//-1 = frames cleared, -2 = a new file has been loaded (so all frames are different), otherwise # of new frames
|
//-1 = frames cleared, -2 = a new file has been loaded (so all frames are different), otherwise # of new frames
|
||||||
void framesUpdated(int numFrames); //something has updated the frame list
|
void framesUpdated(int numFrames); //something has updated the frame list
|
||||||
|
|||||||
Reference in New Issue
Block a user