Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-02-02 13:52:55 +08:00
Code Issues Projects Releases Wiki Activity

any head file path ref mode changed

Browse Source
This commit is contained in:
dreamsourcelabTAI 2021-11-24 17:04:12 +08:00
parent 0c2b4cf430
commit 050b6023d5
61 changed files with 124 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DSView/pv/data/analogsnapshot.cpp
View File

@ -20,16 +20,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <algorithm> #include <algorithm>
#include "analogsnapshot.h" #include "analogsnapshot.h"
#include "../extdef.h"
using namespace std; using namespace std;

2
DSView/pv/data/decodermodel.h
View File

@ -23,7 +23,7 @@
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <pv/data/decode/rowdata.h> #include "decode/rowdata.h"
namespace pv { namespace pv {
namespace data { namespace data {

4
DSView/pv/data/dsosnapshot.cpp
View File

@ -19,16 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <algorithm> #include <algorithm>
#include "dsosnapshot.h" #include "dsosnapshot.h"
#include "../extdef.h"
using namespace std; using namespace std;

3
DSView/pv/data/groupsnapshot.cpp
View File

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -30,6 +28,7 @@
#include "logicsnapshot.h" #include "logicsnapshot.h"
#include "groupsnapshot.h" #include "groupsnapshot.h"
#include "../extdef.h"
using namespace std; using namespace std;

3
DSView/pv/data/logicsnapshot.cpp
View File

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <QDebug> #include <QDebug>
#include <assert.h> #include <assert.h>
@ -30,6 +28,7 @@
#include <math.h> #include <math.h>
#include "logicsnapshot.h" #include "logicsnapshot.h"
#include "../extdef.h"
using namespace std; using namespace std;

8
DSView/pv/data/spectrumstack.cpp
View File

@ -20,10 +20,10 @@
#include "spectrumstack.h" #include "spectrumstack.h"
#include <pv/data/dso.h> #include "dso.h"
#include <pv/data/dsosnapshot.h> #include "dsosnapshot.h"
#include <pv/sigsession.h> #include "../sigsession.h"
#include <pv/view/dsosignal.h> #include "../view/dsosignal.h"
#include <math.h> #include <math.h>
#define PI 3.1415 #define PI 3.1415

2
DSView/pv/device/devinst.cpp
View File

@ -25,7 +25,7 @@
#include "devinst.h" #include "devinst.h"
#include <pv/sigsession.h> #include "../sigsession.h"
namespace pv { namespace pv {
namespace device { namespace device {

1
DSView/pv/dialogs/about.h
View File

@ -27,7 +27,6 @@
#include <QLabel> #include <QLabel>
#include "dsdialog.h" #include "dsdialog.h"
#include <libsigrok4DSL/libsigrok.h>
namespace pv { namespace pv {
namespace dialogs { namespace dialogs {

2
DSView/pv/dialogs/calibration.h
View File

@ -31,7 +31,7 @@
#include <list> #include <list>
#include <pv/device/devinst.h> #include "../device/devinst.h"
#include "../toolbars/titlebar.h" #include "../toolbars/titlebar.h"
#include "dsdialog.h" #include "dsdialog.h"

2
DSView/pv/dialogs/deviceoptions.cpp
View File

@ -27,7 +27,7 @@
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include "dsmessagebox.h" #include "dsmessagebox.h"
#include <pv/prop/property.h> #include "../prop/property.h"
#include "../dsvdef.h" #include "../dsvdef.h"
using namespace boost; using namespace boost;

2
DSView/pv/dialogs/storeprogress.cpp
View File

@ -20,7 +20,7 @@
*/ */
#include "storeprogress.h" #include "storeprogress.h"
#include "pv/sigsession.h" #include "../sigsession.h"
#include <QGridLayout> #include <QGridLayout>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QTimer> #include <QTimer>

2
DSView/pv/dock/triggerdock.cpp
View File

@ -35,7 +35,7 @@
#include <QApplication> #include <QApplication>
#include <math.h> #include <math.h>
#include "libsigrok4DSL/libsigrok.h" #include <libsigrok4DSL/libsigrok.h>
namespace pv { namespace pv {
namespace dock { namespace dock {

0
DSView/extdef.h → DSView/pv/extdef.h
View File

2
DSView/pv/mainframe.cpp
View File

@ -46,7 +46,7 @@
#include "dsvdef.h" #include "dsvdef.h"
#include "config/appconfig.h" #include "config/appconfig.h"
#include "../ui/msgbox.h" #include "ui/msgbox.h"
#include <algorithm> #include <algorithm>

4
DSView/pv/mainwindow.cpp
View File

@ -87,10 +87,10 @@
#include <glib.h> #include <glib.h>
#include <list> #include <list>
#include <libusb.h> #include <libusb.h>
#include "../ui/msgbox.h" #include "ui/msgbox.h"
#include "config/appconfig.h" #include "config/appconfig.h"
#include "appcontrol.h" #include "appcontrol.h"
#include "../dsvdef.h" #include "dsvdef.h"
namespace pv { namespace pv {

3
DSView/pv/prop/binding/binding.cpp
View File

@ -23,8 +23,7 @@
#include <QFormLayout> #include <QFormLayout>
#include <pv/prop/property.h> #include "../property.h"
#include "binding.h" #include "binding.h"

12
DSView/pv/prop/binding/decoderoptions.cpp
View File

@ -26,12 +26,12 @@
#include <boost/none_t.hpp> #include <boost/none_t.hpp>
#include <pv/data/decoderstack.h> #include "../../data/decoderstack.h"
#include <pv/data/decode/decoder.h> #include "../../data/decode/decoder.h"
#include <pv/prop/double.h> #include "../double.h"
#include <pv/prop/enum.h> #include "../enum.h"
#include <pv/prop/int.h> #include "../int.h"
#include <pv/prop/string.h> #include "../string.h"
using namespace boost; using namespace boost;
using namespace std; using namespace std;

2
DSView/pv/prop/binding/deviceoptions.cpp
View File

@ -31,7 +31,7 @@
#include "../double.h" #include "../double.h"
#include "../enum.h" #include "../enum.h"
#include "../int.h" #include "../int.h"
#include "../config/appconfig.h" #include "../../config/appconfig.h"
using namespace boost; using namespace boost;
using namespace std; using namespace std;

8
DSView/pv/prop/binding/probeoptions.cpp
View File

@ -26,10 +26,10 @@
#include <QDebug> #include <QDebug>
#include <QObject> #include <QObject>
#include <stdint.h> #include <stdint.h>
#include <pv/prop/bool.h> #include "../bool.h"
#include <pv/prop/double.h> #include "../double.h"
#include <pv/prop/enum.h> #include "../enum.h"
#include <pv/prop/int.h> #include "../int.h"
#include "../../config/appconfig.h" #include "../../config/appconfig.h"

4
DSView/pv/toolbars/samplingbar.cpp
View File

@ -20,12 +20,10 @@
*/ */
#include "samplingbar.h" #include "samplingbar.h"
#include "../extdef.h"
#include <extdef.h>
#include <assert.h> #include <assert.h>
#include <libusb.h> #include <libusb.h>
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QLabel> #include <QLabel>

3
DSView/pv/view/analogsignal.cpp
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <QDebug> #include <QDebug>
#include <math.h> #include <math.h>
@ -29,6 +29,7 @@
#include "../data/analogsnapshot.h" #include "../data/analogsnapshot.h"
#include "../view/view.h" #include "../view/view.h"
#include "../device/devinst.h" #include "../device/devinst.h"
#include "../extdef.h"
using namespace std; using namespace std;

2
DSView/pv/view/cursor.cpp
View File

@ -35,7 +35,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <extdef.h> #include "../extdef.h"
namespace pv { namespace pv {
namespace view { namespace view {

2
DSView/pv/view/decodetrace.cpp
View File

@ -21,7 +21,7 @@
#include <libsigrokdecode4DSL/libsigrokdecode.h> #include <libsigrokdecode4DSL/libsigrokdecode.h>
#include <extdef.h> #include "../extdef.h"
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>

2
DSView/pv/view/decodetrace.h
View File

@ -30,7 +30,7 @@
#include <QSignalMapper> #include <QSignalMapper>
#include <QFormLayout> #include <QFormLayout>
#include <pv/prop/binding/decoderoptions.h> #include "../prop/binding/decoderoptions.h"
#include "../dialogs/dsdialog.h" #include "../dialogs/dsdialog.h"
struct srd_channel; struct srd_channel;

10
DSView/pv/view/dsosignal.cpp
View File

@ -19,13 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h> #include "../extdef.h"
#include <math.h>
#include "../../extdef.h"
#include "dsosignal.h" #include "dsosignal.h"
#include "pv/data/dso.h" #include "../data/dso.h"
#include "pv/data/dsosnapshot.h" #include "../data/dsosnapshot.h"
#include "view.h" #include "view.h"
#include "../sigsession.h" #include "../sigsession.h"
#include "../device/devinst.h" #include "../device/devinst.h"
@ -33,6 +30,7 @@
#include <QTimer> #include <QTimer>
#include <functional> #include <functional>
#include <QApplication> #include <QApplication>
#include <math.h>
using namespace std; using namespace std;

10
DSView/pv/view/groupsignal.cpp
View File

@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h> #include "../extdef.h"
#include <math.h>
#include "groupsignal.h" #include "groupsignal.h"
#include "pv/data/group.h" #include "../data/group.h"
#include "pv/data/groupsnapshot.h" #include "../data/groupsnapshot.h"
#include "view.h" #include "view.h"
#include <math.h>
using namespace std; using namespace std;
namespace pv { namespace pv {

2
DSView/pv/view/header.cpp
View File

@ -41,7 +41,7 @@
#include "decodetrace.h" #include "decodetrace.h"
#include "../sigsession.h" #include "../sigsession.h"
#include "../device/devinst.h" #include "../device/devinst.h"
#include "../../extdef.h" #include "../extdef.h"
#include "../dsvdef.h" #include "../dsvdef.h"

10
DSView/pv/view/lissajoustrace.cpp
View File

@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <math.h> #include <math.h>
#include "../../extdef.h"
#include "lissajoustrace.h"
#include "pv/data/dso.h"
#include "pv/data/dsosnapshot.h"
#include "view.h" #include "view.h"
#include "../extdef.h"
#include "lissajoustrace.h"
#include "../data/dso.h"
#include "../data/dsosnapshot.h"
#include "../sigsession.h" #include "../sigsession.h"
#include "../device/devinst.h" #include "../device/devinst.h"

9
DSView/pv/view/logicsignal.cpp
View File

@ -22,17 +22,14 @@
#include <libsigrokdecode4DSL/libsigrokdecode.h> #include <libsigrokdecode4DSL/libsigrokdecode.h>
#include <extdef.h>
#include <QDebug> #include <QDebug>
#include <math.h> #include <math.h>
#include "logicsignal.h" #include "logicsignal.h"
#include "view.h" #include "view.h"
#include "pv/data/logic.h" #include "../data/logic.h"
#include "pv/data/logicsnapshot.h" #include "../data/logicsnapshot.h"
#include "view.h" #include "view.h"
#include "../extdef.h"
using namespace boost; using namespace boost;
using namespace std; using namespace std;

4
DSView/pv/view/mathtrace.cpp
View File

@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <math.h> #include <math.h>
#include "../../extdef.h"
#include "mathtrace.h" #include "mathtrace.h"
#include "../data/dso.h" #include "../data/dso.h"
#include "../data/dsosnapshot.h" #include "../data/dsosnapshot.h"
@ -32,6 +31,7 @@
#include "../device/devinst.h" #include "../device/devinst.h"
#include "../view/dsosignal.h" #include "../view/dsosignal.h"
#include "../dsvdef.h" #include "../dsvdef.h"
#include "../extdef.h"
#include <QDebug> #include <QDebug>
#include <QTimer> #include <QTimer>

2
DSView/pv/view/ruler.cpp
View File

@ -28,7 +28,7 @@
#include "../sigsession.h" #include "../sigsession.h"
#include "../device/devinst.h" #include "../device/devinst.h"
#include "dsosignal.h" #include "dsosignal.h"
#include "../../extdef.h" #include "../extdef.h"
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>

4
DSView/pv/view/signal.cpp
View File

@ -20,14 +20,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <math.h> #include <math.h>
#include "signal.h" #include "signal.h"
#include "view.h" #include "view.h"
#include "../device/devinst.h" #include "../device/devinst.h"
#include "../extdef.h"
namespace pv { namespace pv {
namespace view { namespace view {

3
DSView/pv/view/spectrumtrace.cpp
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <algorithm> #include <algorithm>
#include <math.h> #include <math.h>
#include <QTextStream> #include <QTextStream>
@ -34,6 +34,7 @@
#include "../device/devinst.h" #include "../device/devinst.h"
#include "../data/spectrumstack.h" #include "../data/spectrumstack.h"
#include "../dsvdef.h" #include "../dsvdef.h"
#include "../extdef.h"
using namespace boost; using namespace boost;
using namespace std; using namespace std;

3
DSView/pv/view/trace.cpp
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#include <assert.h> #include <assert.h>
#include <math.h> #include <math.h>
#include <QFormLayout> #include <QFormLayout>
@ -31,6 +31,7 @@
#include "view.h" #include "view.h"
#include "../device/devinst.h" #include "../device/devinst.h"
#include "../sigsession.h" #include "../sigsession.h"
#include "../extdef.h"
namespace pv { namespace pv {

10
DSView/pv/view/view.cpp
View File

@ -42,11 +42,11 @@
#include "analogsignal.h" #include "analogsignal.h"
#include "../device/devinst.h" #include "../device/devinst.h"
#include "pv/sigsession.h" #include "../sigsession.h"
#include "pv/data/logic.h" #include "../data/logic.h"
#include "pv/data/logicsnapshot.h" #include "../data/logicsnapshot.h"
#include "pv/dialogs/calibration.h" #include "../dialogs/calibration.h"
#include "pv/dialogs/lissajousoptions.h" #include "../dialogs/lissajousoptions.h"
using namespace std; using namespace std;

3
DSView/pv/view/view.h
View File

@ -33,7 +33,7 @@
#include <QDateTime> #include <QDateTime>
#include <QSplitter> #include <QSplitter>
#include "../../extdef.h"
#include "../toolbars/samplingbar.h" #include "../toolbars/samplingbar.h"
#include "../data/signaldata.h" #include "../data/signaldata.h"
#include "../view/viewport.h" #include "../view/viewport.h"
@ -41,6 +41,7 @@
#include "xcursor.h" #include "xcursor.h"
#include "signal.h" #include "signal.h"
#include "viewstatus.h" #include "viewstatus.h"
#include "../extdef.h"
namespace pv { namespace pv {

2
DSView/pv/view/viewport.h
View File

@ -33,7 +33,7 @@
#include <QElapsedTimer> #include <QElapsedTimer>
#include "../view/view.h" #include "../view/view.h"
#include "../../extdef.h" #include "../extdef.h"
class QPainter; class QPainter;
class QPaintEvent; class QPaintEvent;

1
DSView/pv/view/viewstatus.h
View File

@ -28,7 +28,6 @@
#include <QPushButton> #include <QPushButton>
#include <QToolButton> #include <QToolButton>
#include <libsigrok4DSL/libsigrok.h> #include <libsigrok4DSL/libsigrok.h>
namespace pv { namespace pv {

4
DSView/test/data/analogsnapshot.cpp
View File

@ -18,14 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h>
#define __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS
#include <stdint.h> #include <stdint.h>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include "../../pv/data/analogsnapshot.h" #include "../../pv/data/analogsnapshot.h"
#include "../extdef.h"
using namespace std; using namespace std;

2
DSView/test/data/logicsnapshot.cpp
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <extdef.h> #include "../extdef.h"
#define __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS
#include <stdint.h> #include <stdint.h>

4
libsigrok4DSL/hardware/DSL/command.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include "command.h" #include "command.h"
#include "dsl.h" #include "dsl.h"

4
libsigrok4DSL/hardware/DSL/command.h
View File

@ -21,8 +21,8 @@
#define LIBDSL_HARDWARE_COMMAND_H #define LIBDSL_HARDWARE_COMMAND_H
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
/* Protocol commands */ /* Protocol commands */
#define CMD_CTL_WR 0xb0 #define CMD_CTL_WR 0xb0

4
libsigrok4DSL/hardware/DSL/dscope.c
View File

@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include "dsl.h" #include "dsl.h"
#include "command.h" #include "command.h"

4
libsigrok4DSL/hardware/DSL/dsl.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include "command.h" #include "command.h"
#include "dsl.h" #include "dsl.h"

4
libsigrok4DSL/hardware/DSL/dsl.h
View File

@ -22,8 +22,8 @@
#define LIBDSL_HARDWARE_DSL_H #define LIBDSL_HARDWARE_DSL_H
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include "command.h" #include "command.h"
#include <stdio.h> #include <stdio.h>

4
libsigrok4DSL/hardware/DSL/dslogic.c
View File

@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include "dsl.h" #include "dsl.h"
#include "command.h" #include "command.h"

4
libsigrok4DSL/hardware/common/ezusb.c
View File

@ -20,8 +20,8 @@
/* /*
* Helper functions for the Cypress EZ-USB / FX2 series chips. * Helper functions for the Cypress EZ-USB / FX2 series chips.
*/ */
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
//#include <libusb.h> //#include <libusb.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>

4
libsigrok4DSL/hardware/common/usb.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
//#include <libusb.h> //#include <libusb.h>

4
libsigrok4DSL/hardware/demo/demo.h
View File

@ -22,8 +22,8 @@
#define LIBDSL_HARDWARE_DEMO_H #define LIBDSL_HARDWARE_DEMO_H
#include <glib.h> #include <glib.h>
#include "libsigrok.h" #include "../../libsigrok.h"
#include "libsigrok-internal.h" #include "../../libsigrok-internal.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
libsigrok4DSL/input/in_binary.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

4
libsigrok4DSL/input/in_vcd.c
View File

@ -57,8 +57,8 @@
/* */ /* */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>

4
libsigrok4DSL/input/in_wav.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

4
libsigrok4DSL/input/input.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
/** /**
* @file * @file

6
libsigrok4DSL/output/csv.c
View File

@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "config.h" /* Needed for PACKAGE_STRING and others. */ #include "../config.h" /* Needed for PACKAGE_STRING and others. */
#define LOG_PREFIX "output/csv" #define LOG_PREFIX "output/csv"

4
libsigrok4DSL/output/gnuplot.c
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

4
libsigrok4DSL/output/output.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <string.h> #include <string.h>
/** @cond PRIVATE */ /** @cond PRIVATE */

4
libsigrok4DSL/output/srzip.c
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>

6
libsigrok4DSL/output/vcd.c
View File

@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libsigrok.h" #include "../libsigrok.h"
#include "libsigrok-internal.h" #include "../libsigrok-internal.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#include "config.h" /* Needed for PACKAGE and others. */ #include "../config.h" /* Needed for PACKAGE and others. */
#define LOG_PREFIX "output/vcd" #define LOG_PREFIX "output/vcd"

13
qtpro/DSView.pro
View File

@ -27,16 +27,14 @@ CONFIG += decoders
DEFINES += decoders DEFINES += decoders
unix:!macx { unix:!macx {
INCLUDEPATH += /usr/local/include/
INCLUDEPATH += /usr/include/glib-2.0 INCLUDEPATH += /usr/include/glib-2.0
INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
INCLUDEPATH += /usr/include/libusb-1.0 INCLUDEPATH += /usr/include/libusb-1.0
INCLUDEPATH += /usr/include/boost INCLUDEPATH += /usr/include/boost
INCLUDEPATH += /usr/include/python3.8 INCLUDEPATH += /usr/include/python3.8
INCLUDEPATH += .. INCLUDEPATH += ..
INCLUDEPATH += ../libsigrok4DSL #INCLUDEPATH += ../libsigrok4DSL
INCLUDEPATH += ../DSView #INCLUDEPATH += ../DSView
INCLUDEPATH += ../DSView/pv/dialogs
LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
@ -57,9 +55,8 @@ INCLUDEPATH += /usr/local/include/libusb-1.0
INCLUDEPATH += /usr/local/include/boost INCLUDEPATH += /usr/local/include/boost
INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
INCLUDEPATH += .. INCLUDEPATH += ..
INCLUDEPATH += ../libsigrok4DSL #INCLUDEPATH += ../libsigrok4DSL
INCLUDEPATH += ../DSView #INCLUDEPATH += ../DSView
INCLUDEPATH += ../DSView/pv/dialogs
#LIBS += -framework CoreFoundation #LIBS += -framework CoreFoundation
#LIBS += -framework CoreServices #LIBS += -framework CoreServices
@ -176,7 +173,7 @@ SOURCES += \
../DSView/pv/dstimer.cpp ../DSView/pv/dstimer.cpp
HEADERS += \ HEADERS += \
../DSView/extdef.h \ ../DSView/pv/extdef.h \
../DSView/config.h \ ../DSView/config.h \
../DSView/pv/sigsession.h \ ../DSView/pv/sigsession.h \
../DSView/pv/mainwindow.h \ ../DSView/pv/mainwindow.h \

2
qtpro/DSView.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.0, 2021-11-23T18:40:01. --> <!-- Written by QtCreator 4.11.0, 2021-11-24T15:20:06. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>