Skip to content

Commit 0fa5b7e

Browse files
committed
Licenses and cleanup plus a 64-bit deb package for installing if you
don't want to build yourself.
1 parent 8f04caa commit 0fa5b7e

File tree

8 files changed

+115
-6
lines changed

8 files changed

+115
-6
lines changed

main.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
/*
2+
*
3+
* This program is Copyright (c) 2015 by Al Williams [email protected]
4+
* All rights reserved.
5+
*
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 2 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
19+
120
#include "mainwindow.h"
221
#include <QApplication>
322

mainwindow.cpp

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
/*
2+
*
3+
* This program is Copyright (c) 2015 by Al Williams [email protected]
4+
* All rights reserved.
5+
*
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 2 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
19+
20+
121
#include "mainwindow.h"
222
#include "ui_mainwindow.h"
323
#include <QMessageBox>
@@ -12,8 +32,7 @@
1232

1333
// TODO: Read scales
1434
// TODO: The plot example UI probably doesn't work well with a keyboard
15-
// TODO: My goal is remove everything out of here having to do with direct command
16-
// TODO: Export has a strange data point at the end all of a sudden
35+
1736

1837

1938
MainWindow::MainWindow(QWidget *parent) :

mlogger.cpp

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
*
3+
* This program is Copyright (c) 2015 by Al Williams [email protected]
4+
* All rights reserved.
5+
*
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 2 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
119
#include "mlogger.h"
220
#include <QSemaphore>
321
#include <QDateTime>
@@ -21,9 +39,7 @@ void MLogger::run()
2139
int i,j;
2240
while (repeat!=0)
2341
{
24-
int dbg=sample.available();
2542
sample.acquire();
26-
dbg=sample.available();
2743
if (file->exists()) header=false;
2844
if (!file->isOpen()&&!file->open(QIODevice::Append|QIODevice::Text))
2945
{

packages/qrigol_0.1_amd64.deb

106 KB
Binary file not shown.

plotdialog.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
*
3+
* This program is Copyright (c) 2015 by Al Williams [email protected]
4+
* All rights reserved.
5+
*
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 2 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
119
#include "plotdialog.h"
220
#include "ui_plotdialog.h"
321
#include <QSettings>

qrigol.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ OTHER_FILES += \
4848
screenshots/screenshot_202.png \
4949
screenshots/screenshot_203.png \
5050
screenshots/screenshot_204.png \
51-
screenshots/screenshot_205.png
51+
screenshots/screenshot_205.png \
52+
packages/qrigol_0.1_amd64.deb
5253

5354
RESOURCES += \
5455
resources.qrc

rigolcomm.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
*
3+
* This program is Copyright (c) 2015 by Al Williams [email protected]
4+
* All rights reserved.
5+
*
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 2 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
119
#include "rigolcomm.h"
220
#include <stdio.h>
321
#include <fcntl.h>

scopedata.cpp

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
/*
2+
*
3+
* This program is Copyright (c) 2015 by Al Williams [email protected]
4+
* All rights reserved.
5+
*
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 2 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
*/
119
#include "scopedata.h"
220
#include <QMessageBox>
321
#include <QFileDialog>
@@ -137,7 +155,7 @@ int ScopeData::prepExport(bool c1, bool c2)
137155

138156
int ScopeData::fillExportBuffer(bool c1, bool c2,bool raw)
139157
{
140-
int asize,wsize;
158+
int asize,wsize=0;
141159
// Now we can really compute the size
142160
command(":WAV:POIN:MODE MAX");
143161
command(":ACQ:MEMD?");

0 commit comments

Comments
 (0)