diff --git a/.gitignore b/.gitignore index e0dda138fd..b137d8f7fe 100644 --- a/.gitignore +++ b/.gitignore @@ -47,12 +47,8 @@ core/include/core/scopy-core_export.h common/include/common/scopy-common_config.h common/include/common/scopy-common_export.h gr-util/include/gr-util/scopy-gr-util_export.h -gui/gr-gui/include/gr-gui/scopy-gr-gui_export.h -gui/gr-gui/include/gr-gui/scopy-gr-gui_config.h gui/include/gui/scopy-gui_export.h gui/include/gui/scopy-gui_config.h -gui/sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_export.h -gui/sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_config.h iio-widgets/include/iio-widgets/scopy-iio-widgets_export.h iioutil/include/iioutil/scopy-iioutil_export.h pluginbase/include/pluginbase/scopy-pluginbase_config.h diff --git a/ci/macOS/package_darwin.sh b/ci/macOS/package_darwin.sh index 923c457cb3..4e77257282 100755 --- a/ci/macOS/package_darwin.sh +++ b/ci/macOS/package_darwin.sh @@ -5,7 +5,9 @@ source $REPO_SRC/ci/macOS/macos_config.sh pushd $BUILDDIR -SCOPYLIBS=$(find $BUILDDIR -name "*.dylib" -d 2 -type f) +SCOPYLIBS="$(find $BUILDDIR -name "*.dylib" -d 2 -type f) +$(find $BUILDDIR/plugins/m2k/m2k-gui -name "*.dylib" -type f)" + SCOPYPLUGINS=$(find $BUILDDIR/Scopy.app/Contents/MacOs/plugins/plugins -name "*.dylib" -type f) echo "### Copy DLLs to Frameworks folder" diff --git a/ci/windows/build_and_create_installer.sh b/ci/windows/build_and_create_installer.sh index be8819c8a7..d7bc87d54b 100644 --- a/ci/windows/build_and_create_installer.sh +++ b/ci/windows/build_and_create_installer.sh @@ -29,8 +29,9 @@ EMU_BUILD_FOLDER=$WORKDIR/iio-emu/build PLUGINBASE_DLL=$BUILD_FOLDER/pluginbase CORE_DLL=$BUILD_FOLDER/core GUI_DLL=$BUILD_FOLDER/gui -SIGROK_GUI_DLL=$BUILD_FOLDER/gui/sigrok-gui -GR_GUI_DLL=$BUILD_FOLDER/gui/gr-gui +M2K_GUI_DLL=$BUILD_FOLDER/plugins/m2k/m2k-gui +SIGROK_GUI_DLL=$BUILD_FOLDER/plugins/m2k/m2k-gui +GR_GUI_DLL=$BUILD_FOLDER/plugins/m2k/m2k-gui IIOUTIL_DLL=$BUILD_FOLDER/iioutil COMMON_DLL=$BUILD_FOLDER/common IIO_WIDGETS_DLL=$BUILD_FOLDER/iio-widgets @@ -92,6 +93,7 @@ deploy_app(){ cp $CORE_DLL/libscopy-core.dll $DEST_FOLDER cp $GUI_DLL/libscopy-gui.dll $DEST_FOLDER cp $IIOUTIL_DLL/libscopy-iioutil.dll $DEST_FOLDER + cp $M2K_GUI_DLL/libscopy-m2k-gui.dll $DEST_FOLDER cp $SIGROK_GUI_DLL/libscopy-sigrok-gui.dll $DEST_FOLDER cp $GR_GUI_DLL/libscopy-gr-gui.dll $DEST_FOLDER cp $COMMON_DLL/libscopy-common.dll $DEST_FOLDER diff --git a/gr-util/include/gr-util/grtimeplotaddon.h b/gr-util/include/gr-util/grtimeplotaddon.h index 93e01d15fe..7dc34e7f3e 100644 --- a/gr-util/include/gr-util/grtimeplotaddon.h +++ b/gr-util/include/gr-util/grtimeplotaddon.h @@ -13,7 +13,6 @@ #include #include -#include #include #include #include diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 9e925211ee..3aa038180a 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -87,16 +87,6 @@ endif() set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Xml Svg REQUIRED) -option(SCOPY_ENABLE_GR_GUI "Build gnuradio addons for scopy-gui" ON) -option(SCOPY_ENABLE_SIGROK_GUI "Build sigrok addons for scopy-gui" ON) -if(SCOPY_ENABLE_GR_GUI) - add_subdirectory(gr-gui) - set(SCOPY_HAVE_GR_GUI ON) -endif() -if(SCOPY_ENABLE_SIGROK_GUI) - add_subdirectory(sigrok-gui) - set(SCOPY_HAVE_SIGROK_GUI ON) -endif() add_definitions(-DBOOST_ALL_DYN_LINK) find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED) @@ -119,10 +109,7 @@ target_include_directories( target_include_directories( ${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/ - ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/widgets - scopy-common - scopy-pluginbase - scopy-sigrok-gui + ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/widgets scopy-common scopy-pluginbase ) target_include_directories( diff --git a/gui/include/gui/basicscaledraw.h b/gui/include/gui/basicscaledraw.h new file mode 100644 index 0000000000..271a2df293 --- /dev/null +++ b/gui/include/gui/basicscaledraw.h @@ -0,0 +1,50 @@ +#ifndef BASICSCALEDRAW_H +#define BASICSCALEDRAW_H + +#include "scopy-gui_export.h" +#include +#include +#include "plot_utils.hpp" + +namespace scopy { +/* + * BasicScaleDraw class overrides the way the major values are being displayed. + */ +class SCOPY_GUI_EXPORT BasicScaleDraw : public QwtScaleDraw +{ +public: + BasicScaleDraw(const QString &unit_type = ""); + BasicScaleDraw(PrefixFormatter *, const QString &); + QwtText label(double) const; + + void setFloatPrecision(unsigned int numDigits); + unsigned int getFloatPrecison() const; + + void setUnitType(const QString &unit); + QString getUnitType() const; + + void setColor(QColor color); + + void setDisplayScale(double value); + void setFormatter(PrefixFormatter *formatter); + + void enableDeltaLabel(bool enable); + void setUnitsEnabled(bool enable); + +protected: + virtual void draw(QPainter *, const QPalette &) const; + +private: + int m_floatPrecision; + QString m_unit; + PrefixFormatter *m_formatter; + QColor m_color; + double m_displayScale; + mutable unsigned int m_nrTicks; + mutable bool m_shouldDrawMiddleDelta; + bool m_delta; + bool m_unitsEn; +}; +} // namespace scopy + +#endif // BASICSCALEDRAW_H diff --git a/gui/include/gui/edgelessplot.h b/gui/include/gui/edgelessplot.h new file mode 100644 index 0000000000..092bdcc7fe --- /dev/null +++ b/gui/include/gui/edgelessplot.h @@ -0,0 +1,31 @@ +#ifndef EDGELESSPLOT_H +#define EDGELESSPLOT_H + +#include "scopy-gui_export.h" + +#include +#include + +namespace scopy { +/* + * EdgelessPlotScaleItem class ensures that the first and last major ticks are ignored + */ +class SCOPY_GUI_EXPORT EdgelessPlotScaleItem : public QwtPlotScaleItem +{ +public: + explicit EdgelessPlotScaleItem(QwtScaleDraw::Alignment = QwtScaleDraw::BottomScale, const double pos = 0.0); + virtual void updateScaleDiv(const QwtScaleDiv &, const QwtScaleDiv &); +}; + +/* + * EdgelessPlotGrid class ensures that the first and last major ticks are ignored + */ +class SCOPY_GUI_EXPORT EdgelessPlotGrid : public QwtPlotGrid +{ +public: + explicit EdgelessPlotGrid(); + virtual void updateScaleDiv(const QwtScaleDiv &, const QwtScaleDiv &); +}; +} // namespace scopy + +#endif // EDGELESSPLOT_H diff --git a/gui/include/gui/filemanager.h b/gui/include/gui/filemanager.h index 72f25e931f..6081254315 100644 --- a/gui/include/gui/filemanager.h +++ b/gui/include/gui/filemanager.h @@ -22,7 +22,6 @@ #define FILEMANAGER_H #include "scopy-gui_export.h" - #include #include #include @@ -100,14 +99,14 @@ class SCOPY_GUI_EXPORT FileManager QStringList additionalInformation; }; -class ScopyFileHeader +class SCOPY_GUI_EXPORT ScopyFileHeader { public: static bool hasValidHeader(QVector> data); static QStringList getHeader(); }; -class FileManagerException : public std::runtime_error +class SCOPY_GUI_EXPORT FileManagerException : public std::runtime_error { public: FileManagerException(const char *msg) diff --git a/gui/include/gui/plotaxis.h b/gui/include/gui/plotaxis.h index dcf82cdbd8..23ace66af3 100644 --- a/gui/include/gui/plotaxis.h +++ b/gui/include/gui/plotaxis.h @@ -4,13 +4,13 @@ #include "osc_scale_engine.h" #include "plotaxishandle.h" #include "plotwidget.h" +#include "plot_utils.hpp" +#include "basicscaledraw.h" #include "scopy-gui_export.h" #include #include -#include - namespace scopy { class SCOPY_GUI_EXPORT PlotAxis : public QObject { @@ -36,7 +36,7 @@ class SCOPY_GUI_EXPORT PlotAxis : public QObject QwtPlotZoomer *zoomer() const; OscScaleEngine *scaleEngine() const; - OscScaleDraw *scaleDraw() const; + BasicScaleDraw *scaleDraw() const; double divs() const; @@ -67,7 +67,7 @@ public Q_SLOTS: PlotWidget *m_plotWidget; QwtPlot *m_plot; int m_position; - OscScaleDraw *m_scaleDraw; + BasicScaleDraw *m_scaleDraw; OscScaleEngine *m_scaleEngine; QString m_units; PrefixFormatter *m_formatter; diff --git a/gui/include/gui/polarplotwidget.h b/gui/include/gui/polarplotwidget.h index 018df58061..b25ef082a7 100644 --- a/gui/include/gui/polarplotwidget.h +++ b/gui/include/gui/polarplotwidget.h @@ -5,7 +5,6 @@ #include #include -#include #include #include #include diff --git a/gui/src/basicscaledraw.cpp b/gui/src/basicscaledraw.cpp new file mode 100644 index 0000000000..5fe5532cc5 --- /dev/null +++ b/gui/src/basicscaledraw.cpp @@ -0,0 +1,218 @@ +#include "basicscaledraw.h" +#include "qlocale.h" + +#include +#include +#include +#include +#include + +using namespace scopy; + +BasicScaleDraw::BasicScaleDraw(const QString &unit) + : QwtScaleDraw() + , m_floatPrecision(3) + , m_unit(unit) + , m_formatter(NULL) + , m_color(Qt::gray) + , m_displayScale(1) + , m_shouldDrawMiddleDelta(false) + , m_nrTicks(0) + , m_delta(false) +{ + enableComponent(QwtAbstractScaleDraw::Backbone, false); + enableComponent(QwtAbstractScaleDraw::Ticks, false); +} + +BasicScaleDraw::BasicScaleDraw(PrefixFormatter *formatter, const QString &unit) + : BasicScaleDraw(unit) +{ + m_formatter = formatter; +} + +void BasicScaleDraw::setFloatPrecision(unsigned int numDigits) { m_floatPrecision = numDigits; } + +unsigned int BasicScaleDraw::getFloatPrecison() const { return m_floatPrecision; } + +void BasicScaleDraw::setUnitType(const QString &unit) +{ + if(m_unit != unit) { + m_unit = unit; + + // Trigger a new redraw of scale labels since there's a new unit that needs to be redrawn + invalidateCache(); + } +} + +QString BasicScaleDraw::getUnitType() const { return m_unit; } + +void BasicScaleDraw::setColor(QColor color) { m_color = color; } + +void BasicScaleDraw::setDisplayScale(double value) { m_displayScale = value; } + +void BasicScaleDraw::setFormatter(PrefixFormatter *formatter) { m_formatter = formatter; } + +void BasicScaleDraw::enableDeltaLabel(bool enable) +{ + if(enable != m_delta) { + m_delta = enable; + + // Trigger a new redraw of the scale + invalidateCache(); + } +} + +void BasicScaleDraw::setUnitsEnabled(bool enable) { m_unitsEn = enable; } + +void BasicScaleDraw::draw(QPainter *painter, const QPalette &palette) const +{ + int nrMajorTicks = scaleDiv().ticks(QwtScaleDiv::MajorTick).size(); + + m_nrTicks = nrMajorTicks; + + QList ticks = scaleDiv().ticks(QwtScaleDiv::MajorTick); + QList labels; + + for(int i = 0; i < ticks.size(); ++i) { + QRect bounds = boundingLabelRect(painter->font(), ticks[i]); + int half = painter->font().pointSize() / 4; + + if(orientation() == Qt::Horizontal) + bounds.adjust(-half, 0, half, 0); + else + bounds.adjust(0, -half / 2, 0, half / 2); + + labels.append(bounds); + } + + bool overlap = false; + + int midLabelPos = nrMajorTicks / 2; + + do { + overlap = false; + for(int i = 1; i < labels.size(); ++i) { + QRect last_rectangle = labels.at(i - 1); + QRect current_rectangle = labels.at(i); + + if(current_rectangle.intersects(last_rectangle)) { + overlap = true; + break; + } + } + + if(overlap) { + if(m_delta) { + // If the middle delta label is to be drawn we are sure that + // ticks.size() is an odd number + int center = midLabelPos; + for(int i = center - 1; i >= 0; i -= 2) { + // Remove the tick and make sure to update the center + // label position + ticks.removeAt(i); + labels.removeAt(i); + --center; + } + for(int j = center + 1; j < ticks.size(); j += 1) { + ticks.removeAt(j); + labels.removeAt(j); + } + } else { + for(int i = 1; i < ticks.size(); ++i) { + ticks.removeAt(i); + labels.removeAt(i); + } + } + } + + } while(overlap); + + double delta = -INFINITY; + + if(m_delta && m_nrTicks > midLabelPos) { + delta = scaleDiv().ticks(QwtScaleDiv::MajorTick)[midLabelPos]; + drawLabel(painter, delta); + } + + for(const auto &tick : qAsConst(ticks)) { + if(tick != delta) { + drawLabel(painter, tick); + } + } +} + +QwtText BasicScaleDraw::label(double value) const +{ + QString prefix; + double scale = 1.0; + QString sign = ""; + int bonusPrecision = 0; + bool center = false; + + double lower = scaleDiv().interval().minValue(); + double upper = scaleDiv().interval().maxValue(); + double diff = upper - lower; + double step = diff / (m_nrTicks ? (m_nrTicks - 1) : 1); + + int mid = (m_nrTicks / 2 + 1); + + if(m_delta) { + int current = 0; + while(value > (lower + current * step)) + current++; + int position = current + 1; + + if(position == mid) { + // center label with extra precision + center = true; + bonusPrecision = 1; + } else if(position < mid) { + sign = "-"; + // negative delta label + value = step * (mid - position); + } else if(position > mid) { + sign = "+"; + // positive delta label + value = step * (position - mid); + } + } + + value *= m_displayScale; + + QwtText text; + if(m_unitsEn) { + if(m_formatter) { + m_formatter->getFormatAttributes(value, prefix, scale); + } + + if(orientation() == Qt::Vertical) { + double absVal = value > 0 ? value : -value; + if(absVal > 1e-2 && prefix == "m") { + scale = 1.0; + prefix = ""; + } else if(absVal > 1e-5 && prefix == "μ") { + scale = 1e-3; + prefix = "m"; + } else if(absVal > 1e-8 && prefix == "n") { + scale = 1e-6; + prefix = "μ"; + } else if(absVal > 1e-11 && prefix == "p") { + scale = 1e-9; + prefix = "n"; + } + } + + text = QwtText(sign + QLocale().toString(value / scale, 'f', m_floatPrecision + bonusPrecision) + ' ' + + prefix + m_unit); + } else { + text = QwtText(sign + QLocale().toString(value / scale, 'f', m_floatPrecision + bonusPrecision)); + } + + if(m_color != Qt::gray) + text.setColor(m_color); + if(center) { + text.setColor(QColor(255, 255, 255)); + } + + return text; +} diff --git a/gui/src/edgelessplot.cpp b/gui/src/edgelessplot.cpp new file mode 100644 index 0000000000..5d52571dca --- /dev/null +++ b/gui/src/edgelessplot.cpp @@ -0,0 +1,48 @@ +#include "edgelessplot.h" + +using namespace scopy; + +static QwtScaleDiv getEdgelessScaleDiv(const QwtScaleDiv &from_scaleDiv); + +static QwtScaleDiv getEdgelessScaleDiv(const QwtScaleDiv &from_scaleDiv) +{ + double lowerBound; + double upperBound; + QList minorTicks; + QList mediumTicks; + QList majorTicks; + + lowerBound = from_scaleDiv.lowerBound(); + upperBound = from_scaleDiv.upperBound(); + minorTicks = from_scaleDiv.ticks(QwtScaleDiv::MinorTick); + mediumTicks = from_scaleDiv.ticks(QwtScaleDiv::MediumTick); + majorTicks = from_scaleDiv.ticks(QwtScaleDiv::MajorTick); + if(majorTicks.size() >= 2) { + majorTicks.erase(majorTicks.begin()); + majorTicks.erase(majorTicks.end() - 1); + } + return QwtScaleDiv(lowerBound, upperBound, minorTicks, mediumTicks, majorTicks); +} +/* + * EdgelessPlotScaleItem class implementation + */ +EdgelessPlotScaleItem::EdgelessPlotScaleItem(QwtScaleDraw::Alignment alignment, const double pos) + : QwtPlotScaleItem(alignment, pos) +{} + +void EdgelessPlotScaleItem::updateScaleDiv(const QwtScaleDiv &xScaleDiv, const QwtScaleDiv &yScaleDiv) +{ + QwtPlotScaleItem::updateScaleDiv(getEdgelessScaleDiv(xScaleDiv), getEdgelessScaleDiv(yScaleDiv)); +} + +/* + * EdgelessPlotGrid class implementation + */ +EdgelessPlotGrid::EdgelessPlotGrid() + : QwtPlotGrid() +{} + +void EdgelessPlotGrid::updateScaleDiv(const QwtScaleDiv &xScaleDiv, const QwtScaleDiv &yScaleDiv) +{ + QwtPlotGrid::updateScaleDiv(getEdgelessScaleDiv(xScaleDiv), getEdgelessScaleDiv(yScaleDiv)); +} diff --git a/gui/src/plotaxis.cpp b/gui/src/plotaxis.cpp index 0e0b41df79..c48fcdfec2 100644 --- a/gui/src/plotaxis.cpp +++ b/gui/src/plotaxis.cpp @@ -2,6 +2,8 @@ #include #include +#include +#include using namespace scopy; PlotAxis::PlotAxis(int position, PlotWidget *p, QPen pen, QObject *parent) @@ -25,7 +27,7 @@ PlotAxis::PlotAxis(int position, PlotWidget *p, QPen pen, QObject *parent) m_formatter = new MetricPrefixFormatter(); m_formatter->setTrimZeroes(true); m_formatter->setTwoDecimalMode(true); - m_scaleDraw = new OscScaleDraw(m_formatter, m_units); + m_scaleDraw = new BasicScaleDraw(m_formatter, m_units); m_scaleDraw->setColor(pen.color()); m_plot->setAxisScaleDraw(m_axisId, m_scaleDraw); @@ -131,7 +133,7 @@ void PlotAxis::setMax(double newMax) emit maxChanged(newMax); } -OscScaleDraw *PlotAxis::scaleDraw() const { return m_scaleDraw; } +BasicScaleDraw *PlotAxis::scaleDraw() const { return m_scaleDraw; } OscScaleEngine *PlotAxis::scaleEngine() const { return m_scaleEngine; } diff --git a/gui/src/plotaxishandle.cpp b/gui/src/plotaxishandle.cpp index 92a76bf885..334b10b014 100644 --- a/gui/src/plotaxishandle.cpp +++ b/gui/src/plotaxishandle.cpp @@ -1,5 +1,6 @@ #include "plotaxishandle.h" #include "plotaxis.h" +#include using namespace scopy; diff --git a/gui/src/plotchannel.cpp b/gui/src/plotchannel.cpp index 917d0b9bd2..dfbd53c5ad 100644 --- a/gui/src/plotchannel.cpp +++ b/gui/src/plotchannel.cpp @@ -1,6 +1,7 @@ #include "plotchannel.h" #include "plotaxis.h" #include +#include using namespace scopy; diff --git a/gui/src/plottracker.cpp b/gui/src/plottracker.cpp index c69787403c..3780a3410d 100644 --- a/gui/src/plottracker.cpp +++ b/gui/src/plottracker.cpp @@ -1,5 +1,6 @@ #include "plottracker.hpp" #include "plotaxis.h" +#include using namespace scopy; diff --git a/gui/src/plotwidget.cpp b/gui/src/plotwidget.cpp index 06b66f53c1..2cf7d12ce2 100644 --- a/gui/src/plotwidget.cpp +++ b/gui/src/plotwidget.cpp @@ -1,6 +1,6 @@ #include "plotwidget.h" -#include "DisplayPlot.h" +#include "edgelessplot.h" #include "plotaxis.h" #include @@ -15,9 +15,9 @@ #include #include #include +#include +#include -#include -#include #include #include diff --git a/gui/src/polarplotwidget.cpp b/gui/src/polarplotwidget.cpp index c83c38c34c..8a722c450c 100644 --- a/gui/src/polarplotwidget.cpp +++ b/gui/src/polarplotwidget.cpp @@ -1,7 +1,6 @@ #include "polarplotwidget.h" #include -#include using namespace scopy; diff --git a/gui/src/widgets/plotbufferpreviewer.cpp b/gui/src/widgets/plotbufferpreviewer.cpp index af0b6c5d5c..b42968b2d5 100644 --- a/gui/src/widgets/plotbufferpreviewer.cpp +++ b/gui/src/widgets/plotbufferpreviewer.cpp @@ -1,5 +1,6 @@ #include "plotbufferpreviewer.h" #include "plotaxis.h" +#include using namespace scopy; diff --git a/plugins/debugger/src/debuggerinstrument.cpp b/plugins/debugger/src/debuggerinstrument.cpp index 35602aac9f..cb775d2bdf 100644 --- a/plugins/debugger/src/debuggerinstrument.cpp +++ b/plugins/debugger/src/debuggerinstrument.cpp @@ -26,7 +26,6 @@ #include #include -#include #include using namespace scopy; @@ -37,7 +36,6 @@ DebuggerInstrument::DebuggerInstrument(struct iio_context *ctx, QJSEngine *engin : QWidget(parent) , ui(new Ui::DebuggerInstrument) , eng(engine) - , m_toolView(nullptr) { ui->setupUi(this); m_debugController.setIioContext(ctx); diff --git a/plugins/debugger/src/debuggerinstrument.h b/plugins/debugger/src/debuggerinstrument.h index 37b1836e82..64627935fc 100644 --- a/plugins/debugger/src/debuggerinstrument.h +++ b/plugins/debugger/src/debuggerinstrument.h @@ -23,8 +23,6 @@ #include -#include - /* Qt includes */ #include #include @@ -75,7 +73,6 @@ private Q_SLOTS: private: Ui::DebuggerInstrument *ui; QPushButton *menuRunButton; - scopy::gui::ToolView *m_toolView; QWidget *m_widget; QJSEngine *eng; diff --git a/plugins/iiodebug/include/iiodebug/detailsview.h b/plugins/iiodebug/include/iiodebug/detailsview.h index 740bcf124d..5c164ab384 100644 --- a/plugins/iiodebug/include/iiodebug/detailsview.h +++ b/plugins/iiodebug/include/iiodebug/detailsview.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "iiostandarditem.h" #include "guidetailsview.h" #include "clidetailsview.h" diff --git a/plugins/iiodebug/include/iiodebug/guidetailsview.h b/plugins/iiodebug/include/iiodebug/guidetailsview.h index 53835a259b..83dc9d5f15 100644 --- a/plugins/iiodebug/include/iiodebug/guidetailsview.h +++ b/plugins/iiodebug/include/iiodebug/guidetailsview.h @@ -6,7 +6,6 @@ #include #include #include "iiostandarditem.h" -#include namespace scopy::iiodebugplugin { class GuiDetailsView : public QWidget @@ -20,8 +19,7 @@ class GuiDetailsView : public QWidget private: IIOStandardItem *m_currentItem; - gui::SubsectionSeparator *m_attrSeparator; - gui::SubsectionSeparator *m_detailsSeparator; + MenuCollapseSection *m_detailsSeparator; QScrollArea *m_scrollArea; QWidget *m_scrollAreaContents; QList m_currentWidgets; diff --git a/plugins/iiodebug/src/guidetailsview.cpp b/plugins/iiodebug/src/guidetailsview.cpp index 8a809d010c..a6d2536d98 100644 --- a/plugins/iiodebug/src/guidetailsview.cpp +++ b/plugins/iiodebug/src/guidetailsview.cpp @@ -4,8 +4,6 @@ using namespace scopy::iiodebugplugin; GuiDetailsView::GuiDetailsView(QWidget *parent) : QWidget(parent) - , m_attrSeparator(new gui::SubsectionSeparator(this)) - , m_detailsSeparator(new gui::SubsectionSeparator(this)) , m_scrollArea(new QScrollArea(this)) , m_scrollAreaContents(new QWidget(this)) { @@ -21,17 +19,19 @@ void GuiDetailsView::setupUi() m_scrollAreaContents->setObjectName("DetailsViewScrollAreaContents"); m_scrollAreaContents->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - m_scrollArea->setWidget(m_scrollAreaContents); m_scrollArea->setWidgetResizable(true); + m_scrollArea->setWidget(m_scrollAreaContents); - m_attrSeparator->setLabel("Attributes"); - m_attrSeparator->getContentWidget()->layout()->addWidget(m_scrollArea); - m_attrSeparator->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); + MenuCollapseSection *attrSection = new MenuCollapseSection("Attributes", MenuCollapseSection::MHCW_ONOFF, this); + attrSection->contentLayout()->setSpacing(10); + attrSection->contentLayout()->setMargin(0); + attrSection->contentLayout()->addWidget(m_scrollArea); + attrSection->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); - m_detailsSeparator->setLabel("General info"); + m_detailsSeparator = new MenuCollapseSection("General info", MenuCollapseSection::MHCW_ONOFF, this); m_detailsSeparator->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - layout()->addWidget(m_attrSeparator); + layout()->addWidget(attrSection); layout()->addWidget(m_detailsSeparator); } @@ -43,6 +43,7 @@ void GuiDetailsView::setIIOStandardItem(IIOStandardItem *item) for(auto widget : iioWidgets) { widget->show(); m_currentWidgets.append(widget); + widget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); m_scrollAreaContents->layout()->addWidget(widget); } @@ -51,10 +52,13 @@ void GuiDetailsView::setIIOStandardItem(IIOStandardItem *item) auto label = new QLabel(detail); label->show(); m_detailsList.append(label); - m_detailsSeparator->getContentWidget()->layout()->addWidget(label); + m_detailsSeparator->contentLayout()->addWidget(label); } - m_detailsSeparator->setLabel(m_currentItem->typeString() + " info"); + QLabel *detailsLabel = dynamic_cast(m_detailsSeparator->header()->layout()->itemAt(0)->widget()); + if(detailsLabel) { + detailsLabel->setText(m_currentItem->typeString() + " info"); + } } void GuiDetailsView::clearWidgets() @@ -66,9 +70,9 @@ void GuiDetailsView::clearWidgets() } m_currentWidgets.clear(); - while((child = m_detailsSeparator->getContentWidget()->layout()->takeAt(0)) != nullptr) { + while((child = m_detailsSeparator->contentLayout()->takeAt(0)) != nullptr) { child->widget()->hide(); - m_detailsSeparator->getContentWidget()->layout()->removeWidget(child->widget()); + m_detailsSeparator->contentLayout()->removeWidget(child->widget()); } m_detailsList.clear(); } diff --git a/plugins/m2k/CMakeLists.txt b/plugins/m2k/CMakeLists.txt index e4a7689db1..60fc4ce8df 100644 --- a/plugins/m2k/CMakeLists.txt +++ b/plugins/m2k/CMakeLists.txt @@ -40,6 +40,7 @@ file( src/old/*.c src/old/*.h ) + file(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp) file(GLOB UI_LIST ui/*.ui ui/patterns/*.ui) @@ -47,6 +48,7 @@ set(ENABLE_TESTING ON) if(ENABLE_TESTING) add_subdirectory(test) endif() +add_subdirectory(m2k-gui) set(PROJECT_SOURCES ${SRC_LIST} ${OLD_SCOPY_FILES} ${HEADER_LIST} ${UI_LIST}) @@ -80,11 +82,12 @@ generate_export_header( ) target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_include_directories( ${PROJECT_NAME} PRIVATE Qt::Widgets Qt::Core - scopy-gui + scopy-m2k-gui scopy-pluginbase scopy-common ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE} @@ -104,6 +107,7 @@ target_link_libraries( scopy-pluginbase scopy-iioutil scopy-gui + scopy-m2k-gui scopy-gr-gui scopy-sigrok-gui libm2k::libm2k diff --git a/plugins/m2k/m2k-gui/.gitignore b/plugins/m2k/m2k-gui/.gitignore new file mode 100644 index 0000000000..c89d1f2d71 --- /dev/null +++ b/plugins/m2k/m2k-gui/.gitignore @@ -0,0 +1,6 @@ +include/m2k-gui/scopy-m2k-gui_export.h +include/m2k-gui/scopy-m2k-gui_config.h +gr-gui/include/gr-gui/scopy-gr-gui_export.h +gr-gui/include/gr-gui/scopy-gr-gui_config.h +sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_export.h +sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_config.h diff --git a/plugins/m2k/m2k-gui/CMakeLists.txt b/plugins/m2k/m2k-gui/CMakeLists.txt new file mode 100644 index 0000000000..5a8aabe5be --- /dev/null +++ b/plugins/m2k/m2k-gui/CMakeLists.txt @@ -0,0 +1,128 @@ +cmake_minimum_required(VERSION 3.9) +set(SCOPY_MODULE m2k-gui) +project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX) + +include(GenerateExportHeader) + +# TODO: split stylesheet/resources and add here TODO: export header files correctly + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui) +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +else() + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +endif() + +set(CMAKE_CXX_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE) + +file(GLOB SRC_LIST src/*.cpp src/*.cc) +file(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp) +file(GLOB UI_LIST ui/*.ui) +if(ENABLE_TESTING) + add_subdirectory(test) +endif() + +if(ANDROID) + find_library(QWT_LIBRARIES REQUIRED NAMES qwt_${ANDROID_ABI}) +else() + set(QWT_QT_VERSION qt5) + find_path( + QWT_INCLUDE_DIRS + NAMES qwt_global.h + HINTS ${CMAKE_INSTALL_PREFIX}/include + /include + /usr/local/include + /usr/include + /opt/local/include + /sw/include/usr/local/lib/qwt.framework/Headers + PATH_SUFFIXES + qwt-${QWT_QT_VERSION} + qwt + qwt6 + qwt5 + ${QWT_QT_VERSION}/qwt + REQUIRED + ) + + find_library( + QWT_LIBRARIES + NAMES qwt + HINTS ${CMAKE_INSTALL_PREFIX}/lib + /usr/lib + /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/local/lib + /opt/local/lib64 + REQUIRED + ) + message("QWT LIBRARIES: " ${QWT_LIBRARIES}) + +endif() + +set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST}) + +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Xml Svg REQUIRED) +option(SCOPY_ENABLE_GR_GUI "Build gnuradio addons for scopy-gui" ON) +option(SCOPY_ENABLE_SIGROK_GUI "Build sigrok addons for scopy-gui" ON) +if(SCOPY_ENABLE_GR_GUI) + add_subdirectory(gr-gui) + set(SCOPY_HAVE_GR_GUI ON) +endif() +if(SCOPY_ENABLE_SIGROK_GUI) + add_subdirectory(sigrok-gui) + set(SCOPY_HAVE_SIGROK_GUI ON) +endif() + +add_definitions(-DBOOST_ALL_DYN_LINK) +find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED) + +message(STATUS "Building " ${PROJECT_NAME}) +add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES}) + +generate_export_header( + ${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h +) +configure_file( + include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h.cmakein + ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h @ONLY +) + +target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) +target_include_directories( + ${PROJECT_NAME} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/ + scopy-common + scopy-pluginbase + scopy-gui + scopy-sigrok-gui +) + +target_include_directories( + ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE} ${QWT_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) + +target_link_libraries( + ${PROJECT_NAME} + PUBLIC Qt${QT_VERSION_MAJOR}::Widgets + Qt${QT_VERSION_MAJOR}::Xml + Qt${QT_VERSION_MAJOR}::Svg + ${QWT_LIBRARIES} + ${Boost_LIBRARIES} + scopy-common + scopy-pluginbase + scopy-gui +) + +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SCOPY_DLL_PATH} RUNTIME DESTINATION ${SCOPY_DLL_PATH}) diff --git a/gui/gr-gui/CMakeLists.txt b/plugins/m2k/m2k-gui/gr-gui/CMakeLists.txt similarity index 95% rename from gui/gr-gui/CMakeLists.txt rename to plugins/m2k/m2k-gui/gr-gui/CMakeLists.txt index facfe8c7aa..9720ae28b6 100644 --- a/gui/gr-gui/CMakeLists.txt +++ b/plugins/m2k/m2k-gui/gr-gui/CMakeLists.txt @@ -57,7 +57,7 @@ generate_export_header( ) target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}include/${SCOPY_MODULE}/ scopy-gui) + target_include_directories( ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE} ${QWT_INCLUDE_DIRS} ) @@ -67,6 +67,7 @@ target_link_libraries( PUBLIC ${QWT_LIBRARIES} Qt${QT_VERSION_MAJOR}::Widgets scopy-gui + scopy-m2k-gui gnuradio::gnuradio-runtime gnuradio::gnuradio-analog gnuradio::gnuradio-blocks diff --git a/gui/gr-gui/include/gr-gui/drop_untill_tag_arives.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/drop_untill_tag_arives.h similarity index 100% rename from gui/gr-gui/include/gr-gui/drop_untill_tag_arives.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/drop_untill_tag_arives.h diff --git a/gui/gr-gui/include/gr-gui/histogram_sink_f.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/histogram_sink_f.h similarity index 100% rename from gui/gr-gui/include/gr-gui/histogram_sink_f.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/histogram_sink_f.h diff --git a/gui/gr-gui/include/gr-gui/histogram_sink_f_impl.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/histogram_sink_f_impl.h similarity index 98% rename from gui/gr-gui/include/gr-gui/histogram_sink_f_impl.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/histogram_sink_f_impl.h index feb0d7db59..55e012b48b 100644 --- a/gui/gr-gui/include/gr-gui/histogram_sink_f_impl.h +++ b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/histogram_sink_f_impl.h @@ -42,7 +42,7 @@ #ifndef M2K_HISTOGRAM_SINK_F_IMPL_H #define M2K_HISTOGRAM_SINK_F_IMPL_H -#include "HistogramDisplayPlot.h" +#include "m2k-gui/HistogramDisplayPlot.h" #include "histogram_sink_f.h" #include diff --git a/gui/gr-gui/include/gr-gui/math.hpp b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/math.hpp similarity index 100% rename from gui/gr-gui/include/gr-gui/math.hpp rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/math.hpp diff --git a/gui/gr-gui/include/gr-gui/scope_sink_f.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/scope_sink_f.h similarity index 100% rename from gui/gr-gui/include/gr-gui/scope_sink_f.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/scope_sink_f.h diff --git a/gui/gr-gui/include/gr-gui/scope_sink_f_impl.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/scope_sink_f_impl.h similarity index 100% rename from gui/gr-gui/include/gr-gui/scope_sink_f_impl.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/scope_sink_f_impl.h diff --git a/gui/gr-gui/include/gr-gui/scopy-gr-gui_config.h.cmakein b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/scopy-gr-gui_config.h.cmakein similarity index 100% rename from gui/gr-gui/include/gr-gui/scopy-gr-gui_config.h.cmakein rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/scopy-gr-gui_config.h.cmakein diff --git a/gui/gr-gui/include/gr-gui/waterfall_sink.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/waterfall_sink.h similarity index 100% rename from gui/gr-gui/include/gr-gui/waterfall_sink.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/waterfall_sink.h diff --git a/gui/gr-gui/include/gr-gui/waterfall_sink_impl.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/waterfall_sink_impl.h similarity index 100% rename from gui/gr-gui/include/gr-gui/waterfall_sink_impl.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/waterfall_sink_impl.h diff --git a/gui/gr-gui/include/gr-gui/xy_sink_c.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/xy_sink_c.h similarity index 100% rename from gui/gr-gui/include/gr-gui/xy_sink_c.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/xy_sink_c.h diff --git a/gui/gr-gui/include/gr-gui/xy_sink_c_impl.h b/plugins/m2k/m2k-gui/gr-gui/include/gr-gui/xy_sink_c_impl.h similarity index 100% rename from gui/gr-gui/include/gr-gui/xy_sink_c_impl.h rename to plugins/m2k/m2k-gui/gr-gui/include/gr-gui/xy_sink_c_impl.h diff --git a/gui/gr-gui/src/drop_untill_tag_arives.cpp b/plugins/m2k/m2k-gui/gr-gui/src/drop_untill_tag_arives.cpp similarity index 100% rename from gui/gr-gui/src/drop_untill_tag_arives.cpp rename to plugins/m2k/m2k-gui/gr-gui/src/drop_untill_tag_arives.cpp diff --git a/gui/gr-gui/src/histogram_sink_f_impl.cc b/plugins/m2k/m2k-gui/gr-gui/src/histogram_sink_f_impl.cc similarity index 100% rename from gui/gr-gui/src/histogram_sink_f_impl.cc rename to plugins/m2k/m2k-gui/gr-gui/src/histogram_sink_f_impl.cc diff --git a/gui/gr-gui/src/math.cpp b/plugins/m2k/m2k-gui/gr-gui/src/math.cpp similarity index 100% rename from gui/gr-gui/src/math.cpp rename to plugins/m2k/m2k-gui/gr-gui/src/math.cpp diff --git a/gui/gr-gui/src/scope_sink_f_impl.cc b/plugins/m2k/m2k-gui/gr-gui/src/scope_sink_f_impl.cc similarity index 100% rename from gui/gr-gui/src/scope_sink_f_impl.cc rename to plugins/m2k/m2k-gui/gr-gui/src/scope_sink_f_impl.cc diff --git a/gui/gr-gui/src/waterfall_sink_impl.cc b/plugins/m2k/m2k-gui/gr-gui/src/waterfall_sink_impl.cc similarity index 99% rename from gui/gr-gui/src/waterfall_sink_impl.cc rename to plugins/m2k/m2k-gui/gr-gui/src/waterfall_sink_impl.cc index 1353cb658b..e8db373626 100644 --- a/gui/gr-gui/src/waterfall_sink_impl.cc +++ b/plugins/m2k/m2k-gui/gr-gui/src/waterfall_sink_impl.cc @@ -31,7 +31,7 @@ #include #endif -#include "spectrumUpdateEvents.h" +#include #include "trigger_mode.h" #include "waterfall_sink_impl.h" diff --git a/gui/gr-gui/src/xy_sink_c_impl.cc b/plugins/m2k/m2k-gui/gr-gui/src/xy_sink_c_impl.cc similarity index 100% rename from gui/gr-gui/src/xy_sink_c_impl.cc rename to plugins/m2k/m2k-gui/gr-gui/src/xy_sink_c_impl.cc diff --git a/gui/gr-gui/test/CMakeLists.txt b/plugins/m2k/m2k-gui/gr-gui/test/CMakeLists.txt similarity index 100% rename from gui/gr-gui/test/CMakeLists.txt rename to plugins/m2k/m2k-gui/gr-gui/test/CMakeLists.txt diff --git a/gui/gr-gui/ui/math.ui b/plugins/m2k/m2k-gui/gr-gui/ui/math.ui similarity index 100% rename from gui/gr-gui/ui/math.ui rename to plugins/m2k/m2k-gui/gr-gui/ui/math.ui diff --git a/gui/include/gui/BasicPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/BasicPlot.h similarity index 90% rename from gui/include/gui/BasicPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/BasicPlot.h index 073ba3beed..59f8b5cca9 100644 --- a/gui/include/gui/BasicPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/BasicPlot.h @@ -2,6 +2,7 @@ #define BASICPLOT_H /*Qwt includes*/ +#include "scopy-m2k-gui_export.h" #include #include #include @@ -16,14 +17,13 @@ #include /*Own includes */ -#include +#include "movingaverage.h" //#define IMMEDIATE_PAINT -#include "scopy-gui_export.h" namespace scopy { -class SCOPY_GUI_EXPORT BasicPlot : public QwtPlot +class SCOPY_M2K_GUI_EXPORT BasicPlot : public QwtPlot { Q_OBJECT public: diff --git a/gui/include/gui/ComboBoxLineEdit.h b/plugins/m2k/m2k-gui/include/m2k-gui/ComboBoxLineEdit.h similarity index 92% rename from gui/include/gui/ComboBoxLineEdit.h rename to plugins/m2k/m2k-gui/include/m2k-gui/ComboBoxLineEdit.h index 16a58c66b3..c656a35f98 100644 --- a/gui/include/gui/ComboBoxLineEdit.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/ComboBoxLineEdit.h @@ -20,11 +20,12 @@ #ifndef ComboBoxLineEdit_H #define ComboBoxLineEdit_H +#include "scopy-m2k-gui_export.h" #include #include namespace scopy { -class ComboBoxLineEdit : public QLineEdit +class SCOPY_M2K_GUI_EXPORT ComboBoxLineEdit : public QLineEdit { Q_OBJECT public: diff --git a/gui/include/gui/ConstellationDisplayPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/ConstellationDisplayPlot.h similarity index 96% rename from gui/include/gui/ConstellationDisplayPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/ConstellationDisplayPlot.h index 5eb905c939..ccc0245503 100644 --- a/gui/include/gui/ConstellationDisplayPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/ConstellationDisplayPlot.h @@ -42,8 +42,9 @@ #ifndef M2K_CONSTELLATION_DISPLAY_PLOT_H #define M2K_CONSTELLATION_DISPLAY_PLOT_H +#include "scopy-m2k-gui_export.h" #include "DisplayPlot.h" -#include "scopy-gui_export.h" + #include "spectrumUpdateEvents.h" #include @@ -55,7 +56,7 @@ namespace scopy { * \brief QWidget for displaying constellaton (I&Q) plots. * \ingroup qtgui_blk */ -class SCOPY_GUI_EXPORT ConstellationDisplayPlot : public DisplayPlot +class SCOPY_M2K_GUI_EXPORT ConstellationDisplayPlot : public DisplayPlot { Q_OBJECT diff --git a/gui/include/gui/DisplayPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/DisplayPlot.h similarity index 96% rename from gui/include/gui/DisplayPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/DisplayPlot.h index 4a5a50f88f..7e57f9f27a 100644 --- a/gui/include/gui/DisplayPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/DisplayPlot.h @@ -42,6 +42,7 @@ #ifndef M2K_DISPLAY_PLOT_H #define M2K_DISPLAY_PLOT_H +#include "scopy-m2k-gui_export.h" #include "cursor_readouts.h" #include "extendingplotzoomer.h" #include "handles_area.hpp" @@ -51,7 +52,7 @@ #include "plotpickerwrapper.h" #include "printableplot.h" #include "qwt_utils.h" -#include "scopy-gui_export.h" + #include "symbol_controller.h" #include @@ -90,7 +91,7 @@ namespace scopy { class PlotAxisConfiguration; -class SCOPY_GUI_EXPORT ScaleDivisions : public QObject +class SCOPY_M2K_GUI_EXPORT ScaleDivisions : public QObject { Q_OBJECT @@ -216,7 +217,7 @@ struct cursorReadoutsText * \brief QWidget base plot to build QTGUI plotting tools. * \ingroup qtgui_blk */ -class SCOPY_GUI_EXPORT DisplayPlot : public PrintablePlot +class SCOPY_M2K_GUI_EXPORT DisplayPlot : public PrintablePlot { Q_OBJECT @@ -367,7 +368,7 @@ class SCOPY_GUI_EXPORT DisplayPlot : public PrintablePlot bool usingLeftAxisScales(); // Make sure to create your won PlotNewData method in the derived - // class: + // class SCOPY_M2K_GUI_EXPORT: // void PlotNewData(...); QwtPlotZoomer *getZoomer() const; void setZoomerParams(bool bounded, int maxStackDepth); @@ -703,9 +704,9 @@ protected Q_SLOTS: }; /* - * OscScaleDraw class overrides the way the major values are being displayed. + * OscScaleDraw class SCOPY_M2K_GUI_EXPORT overrides the way the major values are being displayed. */ -class SCOPY_GUI_EXPORT OscScaleDraw : public QwtScaleDraw +class SCOPY_M2K_GUI_EXPORT OscScaleDraw : public QwtScaleDraw { public: OscScaleDraw(const QString &unit_type = ""); @@ -741,7 +742,7 @@ class SCOPY_GUI_EXPORT OscScaleDraw : public QwtScaleDraw bool m_unitsEn; }; -class SCOPY_GUI_EXPORT OscPlotZoomer : public ExtendingPlotZoomer +class SCOPY_M2K_GUI_EXPORT OscPlotZoomer : public ExtendingPlotZoomer { Q_OBJECT public: @@ -763,9 +764,9 @@ class SCOPY_GUI_EXPORT OscPlotZoomer : public ExtendingPlotZoomer }; /* - * PlotAxisConfiguration class holds a group of settings of an axis + * PlotAxisConfiguration class SCOPY_M2K_GUI_EXPORT holds a group of settings of an axis */ -class SCOPY_GUI_EXPORT PlotAxisConfiguration +class SCOPY_M2K_GUI_EXPORT PlotAxisConfiguration { public: PlotAxisConfiguration(int axisPos, int axisIdx, DisplayPlot *plot); @@ -796,9 +797,9 @@ class SCOPY_GUI_EXPORT PlotAxisConfiguration }; /* - * EdgelessPlotScaleItem class ensures that the first and last major ticks are ignored + * EdgelessPlotScaleItem class SCOPY_M2K_GUI_EXPORT ensures that the first and last major ticks are ignored */ -class SCOPY_GUI_EXPORT EdgelessPlotScaleItem : public QwtPlotScaleItem +class SCOPY_M2K_GUI_EXPORT EdgelessPlotScaleItem : public QwtPlotScaleItem { public: explicit EdgelessPlotScaleItem(QwtScaleDraw::Alignment = QwtScaleDraw::BottomScale, const double pos = 0.0); @@ -806,9 +807,9 @@ class SCOPY_GUI_EXPORT EdgelessPlotScaleItem : public QwtPlotScaleItem }; /* - * EdgelessPlotGrid class ensures that the first and last major ticks are ignored + * EdgelessPlotGrid class SCOPY_M2K_GUI_EXPORT ensures that the first and last major ticks are ignored */ -class SCOPY_GUI_EXPORT EdgelessPlotGrid : public QwtPlotGrid +class SCOPY_M2K_GUI_EXPORT EdgelessPlotGrid : public QwtPlotGrid { public: explicit EdgelessPlotGrid(); diff --git a/gui/include/gui/FftDisplayPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/FftDisplayPlot.h similarity index 98% rename from gui/include/gui/FftDisplayPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/FftDisplayPlot.h index 6020a71c66..c0ba7caef2 100644 --- a/gui/include/gui/FftDisplayPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/FftDisplayPlot.h @@ -21,11 +21,12 @@ #ifndef FFT_DISPLAY_PLOT_H #define FFT_DISPLAY_PLOT_H +#include "scopy-m2k-gui_export.h" #include "DisplayPlot.h" #include "cursor_readouts.h" #include "handles_area.hpp" #include "plot_line_handle.h" -#include "scopy-gui_export.h" + #include "spectrum_marker.hpp" #include "symbol_controller.h" @@ -54,7 +55,7 @@ struct marker_data QString label; }; -class SCOPY_GUI_EXPORT FftDisplayPlot : public DisplayPlot +class SCOPY_M2K_GUI_EXPORT FftDisplayPlot : public DisplayPlot { Q_OBJECT diff --git a/gui/include/gui/HistogramDisplayPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/HistogramDisplayPlot.h similarity index 94% rename from gui/include/gui/HistogramDisplayPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/HistogramDisplayPlot.h index 81fb35ef7e..bf6b7763fa 100644 --- a/gui/include/gui/HistogramDisplayPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/HistogramDisplayPlot.h @@ -41,8 +41,9 @@ #ifndef M2K_HISTOGRAM_DISPLAY_PLOT_H #define M2K_HISTOGRAM_DISPLAY_PLOT_H +#include "scopy-m2k-gui_export.h" #include "DisplayPlot.h" -#include "scopy-gui_export.h" + #include "spectrumUpdateEvents.h" #include @@ -53,7 +54,7 @@ namespace scopy { -class SCOPY_GUI_EXPORT HistogramScaleDraw : public QwtScaleDraw +class SCOPY_M2K_GUI_EXPORT HistogramScaleDraw : public QwtScaleDraw { public: HistogramScaleDraw(); @@ -66,7 +67,7 @@ class SCOPY_GUI_EXPORT HistogramScaleDraw : public QwtScaleDraw QColor m_color; }; -class Histogram : public QwtPlotHistogram +class SCOPY_M2K_GUI_EXPORT Histogram : public QwtPlotHistogram { public: Histogram(const QString &title, const QColor &color); @@ -83,7 +84,7 @@ class Histogram : public QwtPlotHistogram * \brief QWidget for displaying time domain plots. * \ingroup qtgui_blk */ -class SCOPY_GUI_EXPORT HistogramDisplayPlot : public DisplayPlot +class SCOPY_M2K_GUI_EXPORT HistogramDisplayPlot : public DisplayPlot { Q_OBJECT diff --git a/gui/include/gui/TimeDomainDisplayPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/TimeDomainDisplayPlot.h similarity index 98% rename from gui/include/gui/TimeDomainDisplayPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/TimeDomainDisplayPlot.h index 3ee20db09b..7eefdced35 100644 --- a/gui/include/gui/TimeDomainDisplayPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/TimeDomainDisplayPlot.h @@ -42,8 +42,9 @@ #ifndef M2K_TIME_DOMAIN_DISPLAY_PLOT_H #define M2K_TIME_DOMAIN_DISPLAY_PLOT_H +#include "scopy-m2k-gui_export.h" #include "DisplayPlot.h" -#include "scopy-gui_export.h" + #include "spectrumUpdateEvents.h" #include @@ -52,7 +53,7 @@ namespace scopy { -class SCOPY_GUI_EXPORT Sink +class SCOPY_M2K_GUI_EXPORT Sink { public: Sink(const std::string &name, unsigned int numChannels, unsigned long long channelsDataLength) @@ -73,7 +74,7 @@ class SCOPY_GUI_EXPORT Sink unsigned long long d_channelsDataLength; }; -class SCOPY_GUI_EXPORT SinkManager +class SCOPY_M2K_GUI_EXPORT SinkManager { public: SinkManager(); @@ -94,7 +95,7 @@ class SCOPY_GUI_EXPORT SinkManager * \brief QWidget for displaying time domain plots. * \ingroup qtgui_blk */ -class SCOPY_GUI_EXPORT TimeDomainDisplayPlot : public DisplayPlot +class SCOPY_M2K_GUI_EXPORT TimeDomainDisplayPlot : public DisplayPlot { Q_OBJECT diff --git a/gui/include/gui/WaterfallDisplayPlot.h b/plugins/m2k/m2k-gui/include/m2k-gui/WaterfallDisplayPlot.h similarity index 97% rename from gui/include/gui/WaterfallDisplayPlot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/WaterfallDisplayPlot.h index 09769cdac7..638ea17924 100644 --- a/gui/include/gui/WaterfallDisplayPlot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/WaterfallDisplayPlot.h @@ -30,11 +30,12 @@ #ifndef WATERFALL_DISPLAY_PLOT_H #define WATERFALL_DISPLAY_PLOT_H +#include "scopy-m2k-gui_export.h" #include "DisplayPlot.h" #include //#include "spectrum_analyzer.hpp" -#include "scopy-gui_export.h" + #include "waterfallGlobalData.h" #include @@ -56,7 +57,7 @@ typedef QwtInterval QwtDoubleInterval; #endif -class SCOPY_GUI_EXPORT ColorMap_DefaultDark : public QwtLinearColorMap +class SCOPY_M2K_GUI_EXPORT ColorMap_DefaultDark : public QwtLinearColorMap { public: ColorMap_DefaultDark() @@ -79,7 +80,7 @@ enum * \ingroup qtgui_blk */ namespace scopy { -class SCOPY_GUI_EXPORT WaterfallDisplayPlot : public DisplayPlot +class SCOPY_M2K_GUI_EXPORT WaterfallDisplayPlot : public DisplayPlot { friend class SpectrumAnalyzer_API; Q_OBJECT diff --git a/gui/include/gui/autoScaler.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/autoScaler.hpp similarity index 94% rename from gui/include/gui/autoScaler.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/autoScaler.hpp index 165a707844..dcd59e2741 100644 --- a/gui/include/gui/autoScaler.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/autoScaler.hpp @@ -21,14 +21,13 @@ #ifndef AUTO_SCALER_HPP #define AUTO_SCALER_HPP -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include namespace scopy { -class SCOPY_GUI_EXPORT AutoScaler : public QObject +class SCOPY_M2K_GUI_EXPORT AutoScaler : public QObject { Q_OBJECT; diff --git a/gui/include/gui/average.h b/plugins/m2k/m2k-gui/include/m2k-gui/average.h similarity index 81% rename from gui/include/gui/average.h rename to plugins/m2k/m2k-gui/include/m2k-gui/average.h index d04d606906..fcf2c0a08e 100644 --- a/gui/include/gui/average.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/average.h @@ -21,13 +21,12 @@ #ifndef AVERAGE_H #define AVERAGE_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include namespace scopy { -class SCOPY_GUI_EXPORT SpectrumAverage +class SCOPY_M2K_GUI_EXPORT SpectrumAverage { public: SpectrumAverage(unsigned int data_width, unsigned int history, bool history_en); @@ -47,7 +46,7 @@ class SCOPY_GUI_EXPORT SpectrumAverage double *m_average; }; -class SCOPY_GUI_EXPORT AverageHistoryOne : public SpectrumAverage +class SCOPY_M2K_GUI_EXPORT AverageHistoryOne : public SpectrumAverage { public: AverageHistoryOne(unsigned int data_width, unsigned history); @@ -57,7 +56,7 @@ class SCOPY_GUI_EXPORT AverageHistoryOne : public SpectrumAverage bool m_anyDataPushed; }; -class SCOPY_GUI_EXPORT AverageHistoryN : public SpectrumAverage +class SCOPY_M2K_GUI_EXPORT AverageHistoryN : public SpectrumAverage { public: AverageHistoryN(unsigned int data_width, unsigned int history); @@ -77,35 +76,35 @@ class SCOPY_GUI_EXPORT AverageHistoryN : public SpectrumAverage void setHistory(unsigned int) override; }; -class SCOPY_GUI_EXPORT PeakHoldContinuous : public AverageHistoryOne +class SCOPY_M2K_GUI_EXPORT PeakHoldContinuous : public AverageHistoryOne { public: PeakHoldContinuous(unsigned int data_width, unsigned int history); virtual void pushNewData(double *data); }; -class SCOPY_GUI_EXPORT MinHoldContinuous : public AverageHistoryOne +class SCOPY_M2K_GUI_EXPORT MinHoldContinuous : public AverageHistoryOne { public: MinHoldContinuous(unsigned int data_width, unsigned int history); virtual void pushNewData(double *data); }; -class SCOPY_GUI_EXPORT ExponentialRMS : public AverageHistoryOne +class SCOPY_M2K_GUI_EXPORT ExponentialRMS : public AverageHistoryOne { public: ExponentialRMS(unsigned int data_width, unsigned int history); virtual void pushNewData(double *data); }; -class SCOPY_GUI_EXPORT ExponentialAverage : public AverageHistoryOne +class SCOPY_M2K_GUI_EXPORT ExponentialAverage : public AverageHistoryOne { public: ExponentialAverage(unsigned int data_width, unsigned int history); virtual void pushNewData(double *data); }; -class SCOPY_GUI_EXPORT LinearRMSOne : public AverageHistoryOne +class SCOPY_M2K_GUI_EXPORT LinearRMSOne : public AverageHistoryOne { public: LinearRMSOne(unsigned int data_width, unsigned int history); @@ -117,7 +116,7 @@ class SCOPY_GUI_EXPORT LinearRMSOne : public AverageHistoryOne unsigned int m_inserted_count; }; -class SCOPY_GUI_EXPORT LinearAverageOne : public AverageHistoryOne +class SCOPY_M2K_GUI_EXPORT LinearAverageOne : public AverageHistoryOne { public: LinearAverageOne(unsigned int data_width, unsigned int history); @@ -129,7 +128,7 @@ class SCOPY_GUI_EXPORT LinearAverageOne : public AverageHistoryOne unsigned int m_inserted_count; }; -class SCOPY_GUI_EXPORT PeakHold : public AverageHistoryN +class SCOPY_M2K_GUI_EXPORT PeakHold : public AverageHistoryN { public: PeakHold(unsigned int data_width, unsigned int history); @@ -139,7 +138,7 @@ class SCOPY_GUI_EXPORT PeakHold : public AverageHistoryN double getPeakFromHistoryColumn(unsigned int col); }; -class SCOPY_GUI_EXPORT MinHold : public AverageHistoryN +class SCOPY_M2K_GUI_EXPORT MinHold : public AverageHistoryN { public: MinHold(unsigned int data_width, unsigned int history); @@ -149,7 +148,7 @@ class SCOPY_GUI_EXPORT MinHold : public AverageHistoryN double getMinFromHistoryColumn(unsigned int col); }; -class SCOPY_GUI_EXPORT LinearRMS : public AverageHistoryN +class SCOPY_M2K_GUI_EXPORT LinearRMS : public AverageHistoryN { public: LinearRMS(unsigned int data_width, unsigned int history); @@ -162,7 +161,7 @@ class SCOPY_GUI_EXPORT LinearRMS : public AverageHistoryN double *m_sqr_sums; }; -class SCOPY_GUI_EXPORT LinearAverage : public AverageHistoryN +class SCOPY_M2K_GUI_EXPORT LinearAverage : public AverageHistoryN { public: LinearAverage(unsigned int data_width, unsigned int history); diff --git a/gui/include/gui/channel_manager.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/channel_manager.hpp similarity index 94% rename from gui/include/gui/channel_manager.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/channel_manager.hpp index 8e2ad4b1cc..0c7c643add 100644 --- a/gui/include/gui/channel_manager.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/channel_manager.hpp @@ -1,9 +1,9 @@ #ifndef CHANNEL_MANAGER_HPP #define CHANNEL_MANAGER_HPP +#include "scopy-m2k-gui_export.h" #include "channel_widget.hpp" #include "customPushButton.h" -#include "scopy-gui_export.h" #include #include @@ -11,7 +11,7 @@ #include namespace scopy { -namespace gui { +namespace m2kgui { enum class ChannelsPositionEnum { @@ -19,7 +19,7 @@ enum class ChannelsPositionEnum HORIZONTAL }; -class SCOPY_GUI_EXPORT ChannelManager : public QWidget +class SCOPY_M2K_GUI_EXPORT ChannelManager : public QWidget { Q_OBJECT @@ -84,7 +84,7 @@ public Q_SLOTS: int m_minChannelWidth; int m_selectedChannel; }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // CHANNEL_MANAGER_HPP diff --git a/gui/include/gui/channel_widget.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/channel_widget.hpp similarity index 96% rename from gui/include/gui/channel_widget.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/channel_widget.hpp index 80ebaab85f..4b496ff9ae 100644 --- a/gui/include/gui/channel_widget.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/channel_widget.hpp @@ -20,8 +20,7 @@ #ifndef CHANNEL_WIDGET_HPP #define CHANNEL_WIDGET_HPP -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include @@ -33,7 +32,7 @@ class Channel; namespace scopy { -class SCOPY_GUI_EXPORT ChannelWidget : public QWidget +class SCOPY_M2K_GUI_EXPORT ChannelWidget : public QWidget { Q_OBJECT diff --git a/gui/include/gui/checkbox_delegate.h b/plugins/m2k/m2k-gui/include/m2k-gui/checkbox_delegate.h similarity index 92% rename from gui/include/gui/checkbox_delegate.h rename to plugins/m2k/m2k-gui/include/m2k-gui/checkbox_delegate.h index 6d2562e201..74b9e33786 100644 --- a/gui/include/gui/checkbox_delegate.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/checkbox_delegate.h @@ -21,10 +21,11 @@ #ifndef CHECKBOX_DELEGATE_H #define CHECKBOX_DELEGATE_H +#include "scopy-m2k-gui_export.h" #include namespace scopy { -class CheckboxDelegate : public QStyledItemDelegate +class SCOPY_M2K_GUI_EXPORT CheckboxDelegate : public QStyledItemDelegate { Q_OBJECT diff --git a/gui/include/gui/cursor_readouts.h b/plugins/m2k/m2k-gui/include/m2k-gui/cursor_readouts.h similarity index 97% rename from gui/include/gui/cursor_readouts.h rename to plugins/m2k/m2k-gui/include/m2k-gui/cursor_readouts.h index 8238bb3a0a..8ddb90c4d3 100644 --- a/gui/include/gui/cursor_readouts.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/cursor_readouts.h @@ -21,9 +21,9 @@ #ifndef CURSOR_READOUTS_H #define CURSOR_READOUTS_H +#include "scopy-m2k-gui_export.h" #include "customanimation.h" #include "customplotpositionbutton.h" -#include "scopy-gui_export.h" #include #include @@ -36,7 +36,7 @@ class CursorReadouts; } namespace scopy { -class SCOPY_GUI_EXPORT CursorReadouts : public QWidget +class SCOPY_M2K_GUI_EXPORT CursorReadouts : public QWidget { public: CursorReadouts(QwtPlot *plot); diff --git a/gui/include/gui/customScale.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/customScale.hpp similarity index 94% rename from gui/include/gui/customScale.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/customScale.hpp index 2203b2b1cb..99e3861f93 100644 --- a/gui/include/gui/customScale.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/customScale.hpp @@ -21,13 +21,13 @@ #ifndef CUSTOM_SCALE_HPP #define CUSTOM_SCALE_HPP +#include "scopy-m2k-gui_export.h" #include "autoScaler.hpp" -#include "scopy-gui_export.h" #include namespace scopy { -class SCOPY_GUI_EXPORT CustomScale : public QwtThermo +class SCOPY_M2K_GUI_EXPORT CustomScale : public QwtThermo { Q_OBJECT diff --git a/gui/include/gui/custom_menu_button.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/custom_menu_button.hpp similarity index 86% rename from gui/include/gui/custom_menu_button.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/custom_menu_button.hpp index 1ca79129cf..b5d1a041d3 100644 --- a/gui/include/gui/custom_menu_button.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/custom_menu_button.hpp @@ -1,6 +1,7 @@ #ifndef CUSTOMMENUBUTTON_H #define CUSTOMMENUBUTTON_H +#include "scopy-m2k-gui_export.h" #include "customPushButton.h" #include @@ -14,9 +15,9 @@ class CustomMenuButton; } namespace scopy { -namespace gui { +namespace m2kgui { -class CustomMenuButton : public QWidget +class SCOPY_M2K_GUI_EXPORT CustomMenuButton : public QWidget { Q_OBJECT @@ -43,7 +44,7 @@ public Q_SLOTS: bool m_floatingMenu; }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // CUSTOMMENUBUTTON_H diff --git a/gui/include/gui/customplotpositionbutton.h b/plugins/m2k/m2k-gui/include/m2k-gui/customplotpositionbutton.h similarity index 93% rename from gui/include/gui/customplotpositionbutton.h rename to plugins/m2k/m2k-gui/include/m2k-gui/customplotpositionbutton.h index 7587695973..71a6d44429 100644 --- a/gui/include/gui/customplotpositionbutton.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/customplotpositionbutton.h @@ -20,8 +20,7 @@ #ifndef CUSTOMPLOTPOSITIONBUTTON_H #define CUSTOMPLOTPOSITIONBUTTON_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include @@ -30,7 +29,7 @@ class CustomPlotPositionButton; } namespace scopy { -class SCOPY_GUI_EXPORT CustomPlotPositionButton : public QWidget +class SCOPY_M2K_GUI_EXPORT CustomPlotPositionButton : public QWidget { Q_OBJECT diff --git a/gui/include/gui/db_click_buttons.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/db_click_buttons.hpp similarity index 94% rename from gui/include/gui/db_click_buttons.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/db_click_buttons.hpp index 45f3aab4b1..2d0598db40 100644 --- a/gui/include/gui/db_click_buttons.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/db_click_buttons.hpp @@ -20,8 +20,7 @@ #ifndef DB_CLICK_BUTTONS_HPP #define DB_CLICK_BUTTONS_HPP -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include @@ -33,7 +32,7 @@ class DbClickButtons; namespace scopy { -class SCOPY_GUI_EXPORT DbClickButtons : public QWidget +class SCOPY_M2K_GUI_EXPORT DbClickButtons : public QWidget { Q_OBJECT diff --git a/gui/include/gui/dbgraph.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/dbgraph.hpp similarity index 98% rename from gui/include/gui/dbgraph.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/dbgraph.hpp index 31e2a15905..e823b28dc2 100644 --- a/gui/include/gui/dbgraph.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/dbgraph.hpp @@ -21,10 +21,11 @@ #ifndef DBGRAPH_HPP #define DBGRAPH_HPP +#include "scopy-m2k-gui_export.h" #include "DisplayPlot.h" #include "cursor_readouts.h" #include "plot_line_handle.h" -#include "scopy-gui_export.h" + #include "symbol_controller.h" #include @@ -36,7 +37,7 @@ class OscScaleDraw; class PrefixFormatter; class OscScaleZoomer; -class SCOPY_GUI_EXPORT dBgraph : public DisplayPlot +class SCOPY_M2K_GUI_EXPORT dBgraph : public DisplayPlot { friend class NetworkAnalyzer_API; Q_OBJECT diff --git a/gui/include/gui/dropdown_switch_list.h b/plugins/m2k/m2k-gui/include/m2k-gui/dropdown_switch_list.h similarity index 95% rename from gui/include/gui/dropdown_switch_list.h rename to plugins/m2k/m2k-gui/include/m2k-gui/dropdown_switch_list.h index e7619efd02..656eeeb249 100644 --- a/gui/include/gui/dropdown_switch_list.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/dropdown_switch_list.h @@ -21,8 +21,8 @@ #ifndef DROPDOWN_SWITCH_LIST_H #define DROPDOWN_SWITCH_LIST_H +#include "scopy-m2k-gui_export.h" #include "ComboBoxLineEdit.h" -#include "scopy-gui_export.h" #include @@ -30,7 +30,7 @@ class QStandardItemModel; class QTreeView; namespace scopy { -class SCOPY_GUI_EXPORT DropdownSwitchList : public QComboBox +class SCOPY_M2K_GUI_EXPORT DropdownSwitchList : public QComboBox { Q_OBJECT diff --git a/gui/include/gui/extendingplotzoomer.h b/plugins/m2k/m2k-gui/include/m2k-gui/extendingplotzoomer.h similarity index 93% rename from gui/include/gui/extendingplotzoomer.h rename to plugins/m2k/m2k-gui/include/m2k-gui/extendingplotzoomer.h index 8b9ceabfd1..ba741b634c 100644 --- a/gui/include/gui/extendingplotzoomer.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/extendingplotzoomer.h @@ -20,13 +20,13 @@ #ifndef EXTENDINGPLOTZOOMER_H #define EXTENDINGPLOTZOOMER_H +#include "scopy-m2k-gui_export.h" #include "limitedplotzoomer.h" -#include "scopy-gui_export.h" #include namespace scopy { -class SCOPY_GUI_EXPORT ExtendingPlotZoomer : public LimitedPlotZoomer +class SCOPY_M2K_GUI_EXPORT ExtendingPlotZoomer : public LimitedPlotZoomer { public: explicit ExtendingPlotZoomer(QwtAxisId xAxis, QwtAxisId yAxis, QWidget *, bool doReplot = false); diff --git a/gui/include/gui/generic_menu.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/generic_menu.hpp similarity index 76% rename from gui/include/gui/generic_menu.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/generic_menu.hpp index 6533dd44b3..551f2c0888 100644 --- a/gui/include/gui/generic_menu.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/generic_menu.hpp @@ -1,17 +1,18 @@ #ifndef GENERICMENU_HPP #define GENERICMENU_HPP +#include "scopy-m2k-gui_export.h" #include "basemenu.h" #include "menu_header.hpp" -#include "scopy-gui_export.h" -#include "subsection_separator.hpp" + +#include #include namespace scopy { -namespace gui { +namespace m2kgui { -class SCOPY_GUI_EXPORT GenericMenu : public QWidget +class SCOPY_M2K_GUI_EXPORT GenericMenu : public QWidget { Q_OBJECT @@ -23,7 +24,7 @@ class SCOPY_GUI_EXPORT GenericMenu : public QWidget void initInteractiveMenu(); void setMenuHeader(const QString &title, const QColor *lineColor, bool hasEnableBtn); - void insertSection(SubsectionSeparator *section); + void insertSection(scopy::m2kgui::SubsectionSeparator *section); void addNewHeaderWidget(QWidget *widget); void setMenuWidget(QWidget *widget); @@ -40,7 +41,7 @@ class SCOPY_GUI_EXPORT GenericMenu : public QWidget int m_lastOpenPosition; }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // GENERICMENU_HPP diff --git a/gui/include/gui/genericlogicplotcurve.h b/plugins/m2k/m2k-gui/include/m2k-gui/genericlogicplotcurve.h similarity index 95% rename from gui/include/gui/genericlogicplotcurve.h rename to plugins/m2k/m2k-gui/include/m2k-gui/genericlogicplotcurve.h index 5404c019d5..f919871c4c 100644 --- a/gui/include/gui/genericlogicplotcurve.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/genericlogicplotcurve.h @@ -21,11 +21,10 @@ #ifndef GENERICLOGICPLOTCURVE_H #define GENERICLOGICPLOTCURVE_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include -#include +#include enum class LogicPlotCurveType : int { @@ -33,7 +32,7 @@ enum class LogicPlotCurveType : int Annotations = 1, }; -class SCOPY_GUI_EXPORT GenericLogicPlotCurve : public QObject, public QwtPlotCurve +class SCOPY_M2K_GUI_EXPORT GenericLogicPlotCurve : public QObject, public QwtPlotCurve { Q_OBJECT public: diff --git a/gui/include/gui/handles_area.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/handles_area.hpp similarity index 89% rename from gui/include/gui/handles_area.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/handles_area.hpp index 8010a148fc..055daca7a1 100644 --- a/gui/include/gui/handles_area.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/handles_area.hpp @@ -21,8 +21,8 @@ #ifndef HANDLES_AREA_H #define HANDLES_AREA_H +#include "scopy-m2k-gui_export.h" #include "handlesareaextension.h" -#include "scopy-gui_export.h" #include @@ -32,7 +32,7 @@ class QPoint; class PlotLineHandle; -class SCOPY_GUI_EXPORT HandlesArea : public QWidget +class SCOPY_M2K_GUI_EXPORT HandlesArea : public QWidget { Q_OBJECT @@ -60,7 +60,7 @@ class SCOPY_GUI_EXPORT HandlesArea : public QWidget std::vector> m_extensions; }; -class SCOPY_GUI_EXPORT VertHandlesArea : public HandlesArea +class SCOPY_M2K_GUI_EXPORT VertHandlesArea : public HandlesArea { Q_OBJECT public: @@ -82,7 +82,7 @@ class SCOPY_GUI_EXPORT VertHandlesArea : public HandlesArea int largest_child_height; }; -class SCOPY_GUI_EXPORT HorizHandlesArea : public HandlesArea +class SCOPY_M2K_GUI_EXPORT HorizHandlesArea : public HandlesArea { Q_OBJECT public: @@ -104,7 +104,7 @@ class SCOPY_GUI_EXPORT HorizHandlesArea : public HandlesArea int largest_child_width; }; -class SCOPY_GUI_EXPORT GateHandlesArea : public HorizHandlesArea +class SCOPY_M2K_GUI_EXPORT GateHandlesArea : public HorizHandlesArea { public: GateHandlesArea(QWidget *parent = 0); diff --git a/gui/include/gui/handlesareaextension.h b/plugins/m2k/m2k-gui/include/m2k-gui/handlesareaextension.h similarity index 77% rename from gui/include/gui/handlesareaextension.h rename to plugins/m2k/m2k-gui/include/m2k-gui/handlesareaextension.h index 9348c2cdc4..3878838ae8 100644 --- a/gui/include/gui/handlesareaextension.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/handlesareaextension.h @@ -1,13 +1,12 @@ #ifndef HANDLESAREAEXTENSION_H #define HANDLESAREAEXTENSION_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include class QwtPlot; -class SCOPY_GUI_EXPORT HandlesAreaExtension +class SCOPY_M2K_GUI_EXPORT HandlesAreaExtension { public: HandlesAreaExtension(QwtPlot *plot); @@ -23,7 +22,7 @@ class SCOPY_GUI_EXPORT HandlesAreaExtension QwtPlot *m_plot; }; -class SCOPY_GUI_EXPORT XBottomRuller : public HandlesAreaExtension +class SCOPY_M2K_GUI_EXPORT XBottomRuller : public HandlesAreaExtension { public: XBottomRuller(QwtPlot *plot); @@ -32,7 +31,7 @@ class SCOPY_GUI_EXPORT XBottomRuller : public HandlesAreaExtension virtual bool draw(QPainter *painter, QWidget *owner) Q_DECL_OVERRIDE; }; -class SCOPY_GUI_EXPORT YLeftRuller : public HandlesAreaExtension +class SCOPY_M2K_GUI_EXPORT YLeftRuller : public HandlesAreaExtension { public: YLeftRuller(QwtPlot *plot); @@ -41,7 +40,7 @@ class SCOPY_GUI_EXPORT YLeftRuller : public HandlesAreaExtension virtual bool draw(QPainter *painter, QWidget *owner) Q_DECL_OVERRIDE; }; -class SCOPY_GUI_EXPORT XTopRuller : public HandlesAreaExtension +class SCOPY_M2K_GUI_EXPORT XTopRuller : public HandlesAreaExtension { public: XTopRuller(QwtPlot *plot); diff --git a/gui/include/gui/instrumentnotes.h b/plugins/m2k/m2k-gui/include/m2k-gui/instrumentnotes.h similarity index 80% rename from gui/include/gui/instrumentnotes.h rename to plugins/m2k/m2k-gui/include/m2k-gui/instrumentnotes.h index 6887d2e9c2..cee0233ae4 100644 --- a/gui/include/gui/instrumentnotes.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/instrumentnotes.h @@ -1,15 +1,14 @@ #ifndef INSTRUMENTNOTES_H #define INSTRUMENTNOTES_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include namespace Ui { class InstrumentNotes; } namespace scopy { -class SCOPY_GUI_EXPORT InstrumentNotes : public QWidget +class SCOPY_M2K_GUI_EXPORT InstrumentNotes : public QWidget { Q_OBJECT diff --git a/gui/include/gui/limitedplotzoomer.h b/plugins/m2k/m2k-gui/include/m2k-gui/limitedplotzoomer.h similarity index 93% rename from gui/include/gui/limitedplotzoomer.h rename to plugins/m2k/m2k-gui/include/m2k-gui/limitedplotzoomer.h index aa85a804a5..f3b2435dde 100644 --- a/gui/include/gui/limitedplotzoomer.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/limitedplotzoomer.h @@ -20,12 +20,11 @@ #ifndef LIMITEDPLOTZOOMER_H #define LIMITEDPLOTZOOMER_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include namespace scopy { -class SCOPY_GUI_EXPORT LimitedPlotZoomer : public QwtPlotZoomer +class SCOPY_M2K_GUI_EXPORT LimitedPlotZoomer : public QwtPlotZoomer { public: LimitedPlotZoomer(QwtAxisId xAxis, QwtAxisId yAxis, QWidget *, bool doReplot = false); diff --git a/gui/include/gui/linked_button.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/linked_button.hpp similarity index 76% rename from gui/include/gui/linked_button.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/linked_button.hpp index 410eabb642..409426cc1b 100644 --- a/gui/include/gui/linked_button.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/linked_button.hpp @@ -1,13 +1,12 @@ #ifndef LINKEDBUTTON_HPP #define LINKEDBUTTON_HPP -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include namespace scopy { -class SCOPY_GUI_EXPORT LinkedButton : public QPushButton +class SCOPY_M2K_GUI_EXPORT LinkedButton : public QPushButton { Q_OBJECT diff --git a/gui/include/gui/logicdatacurve.h b/plugins/m2k/m2k-gui/include/m2k-gui/logicdatacurve.h similarity index 94% rename from gui/include/gui/logicdatacurve.h rename to plugins/m2k/m2k-gui/include/m2k-gui/logicdatacurve.h index eff4e57128..2e6bc8a5c4 100644 --- a/gui/include/gui/logicdatacurve.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/logicdatacurve.h @@ -21,12 +21,12 @@ #ifndef LOGICDATACURVE_H #define LOGICDATACURVE_H +#include "scopy-m2k-gui_export.h" #include "genericlogicplotcurve.h" -#include "scopy-gui_export.h" #include -class SCOPY_GUI_EXPORT LogicDataCurve : public GenericLogicPlotCurve +class SCOPY_M2K_GUI_EXPORT LogicDataCurve : public GenericLogicPlotCurve { public: LogicDataCurve(uint16_t *data, uint8_t bit); diff --git a/gui/include/gui/m2kmeasure.h b/plugins/m2k/m2k-gui/include/m2k-gui/m2kmeasure.h similarity index 96% rename from gui/include/gui/m2kmeasure.h rename to plugins/m2k/m2k-gui/include/m2k-gui/m2kmeasure.h index 470832f5d4..2ecf0c134d 100644 --- a/gui/include/gui/m2kmeasure.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/m2kmeasure.h @@ -21,8 +21,7 @@ #ifndef M2KMEASURE_H #define M2KMEASURE_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include @@ -31,7 +30,7 @@ namespace scopy { class M2kCrossingDetection; -class SCOPY_GUI_EXPORT M2kMeasurementData +class SCOPY_M2K_GUI_EXPORT M2kMeasurementData { public: enum unitTypes @@ -78,7 +77,7 @@ class SCOPY_GUI_EXPORT M2kMeasurementData enum axisType m_axis; }; -class SCOPY_GUI_EXPORT M2kMeasure +class SCOPY_M2K_GUI_EXPORT M2kMeasure { public: enum defaultMeasurements @@ -182,7 +181,7 @@ class SCOPY_GUI_EXPORT M2kMeasure std::function m_conversion_function; }; -class SCOPY_GUI_EXPORT M2kStatistic +class SCOPY_M2K_GUI_EXPORT M2kStatistic { public: M2kStatistic(); diff --git a/gui/include/gui/m2kmeasurement_gui.h b/plugins/m2k/m2k-gui/include/m2k-gui/m2kmeasurement_gui.h similarity index 82% rename from gui/include/gui/m2kmeasurement_gui.h rename to plugins/m2k/m2k-gui/include/m2k-gui/m2kmeasurement_gui.h index 92d024960e..a11b41cba1 100644 --- a/gui/include/gui/m2kmeasurement_gui.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/m2kmeasurement_gui.h @@ -20,6 +20,7 @@ #ifndef M2KMEASUREMENT_GUI_H #define M2KMEASUREMENT_GUI_H +#include "scopy-m2k-gui_export.h" #include "plot_utils.hpp" #include @@ -31,7 +32,7 @@ namespace scopy { class M2kMeasurementData; -class SCOPY_GUI_EXPORT M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kMeasurementGui { public: M2kMeasurementGui(); @@ -51,7 +52,7 @@ class SCOPY_GUI_EXPORT M2kMeasurementGui int m_minValLableWidth; }; -class SCOPY_GUI_EXPORT M2kMetricMeasurementGui : public M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kMetricMeasurementGui : public M2kMeasurementGui { public: M2kMetricMeasurementGui(); @@ -63,7 +64,7 @@ class SCOPY_GUI_EXPORT M2kMetricMeasurementGui : public M2kMeasurementGui MetricPrefixFormatter m_formatter; }; -class SCOPY_GUI_EXPORT M2kTimeMeasurementGui : public M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kTimeMeasurementGui : public M2kMeasurementGui { public: M2kTimeMeasurementGui(); @@ -75,7 +76,7 @@ class SCOPY_GUI_EXPORT M2kTimeMeasurementGui : public M2kMeasurementGui TimePrefixFormatter m_formatter; }; -class SCOPY_GUI_EXPORT M2kPercentageMeasurementGui : public M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kPercentageMeasurementGui : public M2kMeasurementGui { public: M2kPercentageMeasurementGui(); @@ -84,7 +85,7 @@ class SCOPY_GUI_EXPORT M2kPercentageMeasurementGui : public M2kMeasurementGui virtual void update(const M2kMeasurementData &data, double displayScale); }; -class SCOPY_GUI_EXPORT M2kDecibelsMeasurementGui : public M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kDecibelsMeasurementGui : public M2kMeasurementGui { public: M2kDecibelsMeasurementGui(); @@ -93,7 +94,7 @@ class SCOPY_GUI_EXPORT M2kDecibelsMeasurementGui : public M2kMeasurementGui virtual void update(const M2kMeasurementData &data, double displayScale); }; -class SCOPY_GUI_EXPORT M2kDecibelstoCarrierMeasurementGui : public M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kDecibelstoCarrierMeasurementGui : public M2kMeasurementGui { public: M2kDecibelstoCarrierMeasurementGui(); @@ -102,7 +103,7 @@ class SCOPY_GUI_EXPORT M2kDecibelstoCarrierMeasurementGui : public M2kMeasuremen virtual void update(const M2kMeasurementData &data, double displayScale); }; -class SCOPY_GUI_EXPORT M2kDimensionlessMeasurementGui : public M2kMeasurementGui +class SCOPY_M2K_GUI_EXPORT M2kDimensionlessMeasurementGui : public M2kMeasurementGui { public: M2kDimensionlessMeasurementGui(); diff --git a/gui/include/gui/marker_controller.h b/plugins/m2k/m2k-gui/include/m2k-gui/marker_controller.h similarity index 95% rename from gui/include/gui/marker_controller.h rename to plugins/m2k/m2k-gui/include/m2k-gui/marker_controller.h index e405916619..93bd897c6b 100644 --- a/gui/include/gui/marker_controller.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/marker_controller.h @@ -20,8 +20,7 @@ #ifndef MARKER_CONTROLLER_H #define MARKER_CONTROLLER_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include @@ -34,7 +33,7 @@ namespace scopy { class SpectrumMarker; -class SCOPY_GUI_EXPORT MarkerController : public QObject +class SCOPY_M2K_GUI_EXPORT MarkerController : public QObject { Q_OBJECT diff --git a/gui/include/gui/marker_table.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/marker_table.hpp similarity index 94% rename from gui/include/gui/marker_table.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/marker_table.hpp index 468ecb04a5..8563df3c6b 100644 --- a/gui/include/gui/marker_table.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/marker_table.hpp @@ -20,8 +20,7 @@ #ifndef MARKER_TABLE_HPP #define MARKER_TABLE_HPP -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include class QStandardItemModel; @@ -32,7 +31,7 @@ class MarkerTable; namespace scopy { -class SCOPY_GUI_EXPORT MarkerTable : public QWidget +class SCOPY_M2K_GUI_EXPORT MarkerTable : public QWidget { Q_OBJECT diff --git a/gui/include/gui/menu_header.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/menu_header.hpp similarity index 85% rename from gui/include/gui/menu_header.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/menu_header.hpp index 596a4930a4..ce8af030ad 100644 --- a/gui/include/gui/menu_header.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/menu_header.hpp @@ -1,6 +1,7 @@ #ifndef MENU_HEADER_HPP #define MENU_HEADER_HPP +#include "scopy-m2k-gui_export.h" #include #include @@ -9,9 +10,9 @@ class MenuHeader; } namespace scopy { -namespace gui { +namespace m2kgui { -class MenuHeader : public QWidget +class SCOPY_M2K_GUI_EXPORT MenuHeader : public QWidget { Q_OBJECT @@ -38,7 +39,7 @@ public Q_SLOTS: QPushButton *getEnableBtn(); void addNewHeaderWidget(QWidget *widget); }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // MENU_HEADER_HPP diff --git a/gui/include/gui/movingaverage.h b/plugins/m2k/m2k-gui/include/m2k-gui/movingaverage.h similarity index 83% rename from gui/include/gui/movingaverage.h rename to plugins/m2k/m2k-gui/include/m2k-gui/movingaverage.h index 2e9e7ae8d7..95bd2b3866 100644 --- a/gui/include/gui/movingaverage.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/movingaverage.h @@ -1,11 +1,10 @@ #ifndef MOVINGAVERAGE_H #define MOVINGAVERAGE_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include -class SCOPY_GUI_EXPORT MovingAverage +class SCOPY_M2K_GUI_EXPORT MovingAverage { public: MovingAverage(); diff --git a/gui/include/gui/nyquistGraph.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/nyquistGraph.hpp similarity index 96% rename from gui/include/gui/nyquistGraph.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/nyquistGraph.hpp index 00fe8d2a71..b83f8a1015 100644 --- a/gui/include/gui/nyquistGraph.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/nyquistGraph.hpp @@ -21,9 +21,9 @@ #ifndef NYQUISTGRAPH_HPP #define NYQUISTGRAPH_HPP +#include "scopy-m2k-gui_export.h" #include "dbgraph.hpp" #include "nyquistplotzoomer.h" -#include "scopy-gui_export.h" #include #include @@ -36,7 +36,7 @@ class QwtPolarGrid; namespace scopy { class NyquistSamplesArray; -class SCOPY_GUI_EXPORT NyquistGraph : public QwtPolarPlot +class SCOPY_M2K_GUI_EXPORT NyquistGraph : public QwtPolarPlot { Q_OBJECT diff --git a/gui/include/gui/nyquistplotzoomer.h b/plugins/m2k/m2k-gui/include/m2k-gui/nyquistplotzoomer.h similarity index 91% rename from gui/include/gui/nyquistplotzoomer.h rename to plugins/m2k/m2k-gui/include/m2k-gui/nyquistplotzoomer.h index c58fce4a9e..78a83cbd89 100644 --- a/gui/include/gui/nyquistplotzoomer.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/nyquistplotzoomer.h @@ -20,10 +20,11 @@ #ifndef NYQUISTPLOTZOOMER_H #define NYQUISTPLOTZOOMER_H +#include "scopy-m2k-gui_export.h" #include namespace scopy { -class NyquistPlotZoomer : public QwtPolarMagnifier +class SCOPY_M2K_GUI_EXPORT NyquistPlotZoomer : public QwtPolarMagnifier { public: NyquistPlotZoomer(QwtPolarCanvas *parent); diff --git a/gui/include/gui/osc_adjuster.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/osc_adjuster.hpp similarity index 93% rename from gui/include/gui/osc_adjuster.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/osc_adjuster.hpp index 8a5034b429..faa3740d81 100644 --- a/gui/include/gui/osc_adjuster.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/osc_adjuster.hpp @@ -21,8 +21,7 @@ #ifndef M2K_OSC_ADJUSTER_H #define M2K_OSC_ADJUSTER_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include @@ -32,7 +31,7 @@ class QWidget; class QMouseEvent; class QWheelEvent; -class SCOPY_GUI_EXPORT OscAdjuster : public QObject +class SCOPY_M2K_GUI_EXPORT OscAdjuster : public QObject { Q_OBJECT public: @@ -76,7 +75,7 @@ class SCOPY_GUI_EXPORT OscAdjuster : public QObject QwtAxisId d_axisId; }; -class SCOPY_GUI_EXPORT VertMouseGestures : public OscAdjuster +class SCOPY_M2K_GUI_EXPORT VertMouseGestures : public OscAdjuster { Q_OBJECT public: @@ -120,7 +119,7 @@ class SCOPY_GUI_EXPORT VertMouseGestures : public OscAdjuster } }; -class SCOPY_GUI_EXPORT HorizMouseGestures : public OscAdjuster +class SCOPY_M2K_GUI_EXPORT HorizMouseGestures : public OscAdjuster { Q_OBJECT public: diff --git a/gui/include/gui/osc_custom_scroll.h b/plugins/m2k/m2k-gui/include/m2k-gui/osc_custom_scroll.h similarity index 92% rename from gui/include/gui/osc_custom_scroll.h rename to plugins/m2k/m2k-gui/include/m2k-gui/osc_custom_scroll.h index 36181ee22f..dce93495e0 100644 --- a/gui/include/gui/osc_custom_scroll.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/osc_custom_scroll.h @@ -20,15 +20,14 @@ #ifndef OSCCUSTOMSCROLL_H #define OSCCUSTOMSCROLL_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include #include namespace scopy { -class SCOPY_GUI_EXPORT OscCustomScrollArea : public QScrollArea +class SCOPY_M2K_GUI_EXPORT OscCustomScrollArea : public QScrollArea { Q_OBJECT public: diff --git a/gui/include/gui/osc_export_settings.h b/plugins/m2k/m2k-gui/include/m2k-gui/osc_export_settings.h similarity index 95% rename from gui/include/gui/osc_export_settings.h rename to plugins/m2k/m2k-gui/include/m2k-gui/osc_export_settings.h index 35f40c7894..6133d521cb 100644 --- a/gui/include/gui/osc_export_settings.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/osc_export_settings.h @@ -21,8 +21,8 @@ #define OSC_EXPORT_SETTINGS_H /* Qt includes */ -#include "scopy-gui_export.h" +#include "scopy-m2k-gui_export.h" #include #include #include @@ -37,7 +37,7 @@ class ExportSettings; } namespace scopy { -class SCOPY_GUI_EXPORT ExportSettings : public QWidget +class SCOPY_M2K_GUI_EXPORT ExportSettings : public QWidget { Q_OBJECT diff --git a/gui/include/gui/osc_import_settings.h b/plugins/m2k/m2k-gui/include/m2k-gui/osc_import_settings.h similarity index 91% rename from gui/include/gui/osc_import_settings.h rename to plugins/m2k/m2k-gui/include/m2k-gui/osc_import_settings.h index a5462991cc..034a006e1a 100644 --- a/gui/include/gui/osc_import_settings.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/osc_import_settings.h @@ -21,15 +21,15 @@ #ifndef OSC_IMPORT_SETTINGS_H #define OSC_IMPORT_SETTINGS_H +#include "scopy-m2k-gui_export.h" #include "osc_export_settings.h" -#include "scopy-gui_export.h" namespace Ui { class ExportSettings; } namespace scopy { -class SCOPY_GUI_EXPORT ImportSettings : public ExportSettings +class SCOPY_M2K_GUI_EXPORT ImportSettings : public ExportSettings { Q_OBJECT diff --git a/gui/include/gui/osc_scale_zoomer.h b/plugins/m2k/m2k-gui/include/m2k-gui/osc_scale_zoomer.h similarity index 92% rename from gui/include/gui/osc_scale_zoomer.h rename to plugins/m2k/m2k-gui/include/m2k-gui/osc_scale_zoomer.h index be9b67f0dc..d7ec0cc04c 100644 --- a/gui/include/gui/osc_scale_zoomer.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/osc_scale_zoomer.h @@ -21,13 +21,13 @@ #ifndef OSC_SCALE_ZOOMER_H #define OSC_SCALE_ZOOMER_H +#include "scopy-m2k-gui_export.h" #include "limitedplotzoomer.h" -#include "scopy-gui_export.h" #include namespace scopy { -class SCOPY_GUI_EXPORT OscScaleZoomer : public LimitedPlotZoomer +class SCOPY_M2K_GUI_EXPORT OscScaleZoomer : public LimitedPlotZoomer { Q_OBJECT diff --git a/gui/include/gui/oscilloscope_plot.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/oscilloscope_plot.hpp similarity index 98% rename from gui/include/gui/oscilloscope_plot.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/oscilloscope_plot.hpp index 2b2ee9a192..36825b1fc0 100644 --- a/gui/include/gui/oscilloscope_plot.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/oscilloscope_plot.hpp @@ -21,13 +21,13 @@ #ifndef M2K_OSCILLOSCOPE_PLOT_H #define M2K_OSCILLOSCOPE_PLOT_H +#include "scopy-m2k-gui_export.h" #include "TimeDomainDisplayPlot.h" #include "customplotpositionbutton.h" #include "genericlogicplotcurve.h" #include "graticule.h" #include "m2kmeasure.h" #include "qstackedwidget.h" -#include "scopy-gui_export.h" #include @@ -39,7 +39,7 @@ namespace scopy { class Oscilloscope_API; class PlotWidget; -class SCOPY_GUI_EXPORT OscilloscopePlot : public TimeDomainDisplayPlot +class SCOPY_M2K_GUI_EXPORT OscilloscopePlot : public TimeDomainDisplayPlot { Q_OBJECT @@ -50,7 +50,7 @@ class SCOPY_GUI_EXPORT OscilloscopePlot : public TimeDomainDisplayPlot ~OscilloscopePlot(); }; -class SCOPY_GUI_EXPORT CapturePlot : public OscilloscopePlot +class SCOPY_M2K_GUI_EXPORT CapturePlot : public OscilloscopePlot { friend class Oscilloscope_API; friend class LogicAnalyzer_API; diff --git a/gui/include/gui/plot_line_handle.h b/plugins/m2k/m2k-gui/include/m2k-gui/plot_line_handle.h similarity index 90% rename from gui/include/gui/plot_line_handle.h rename to plugins/m2k/m2k-gui/include/m2k-gui/plot_line_handle.h index 43f2f1fafb..36c13917c2 100644 --- a/gui/include/gui/plot_line_handle.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/plot_line_handle.h @@ -21,8 +21,7 @@ #ifndef PLOT_LINE_HANDLE_H #define PLOT_LINE_HANDLE_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include @@ -30,7 +29,7 @@ class HandlesArea; -class SCOPY_GUI_EXPORT PlotLineHandle : public QWidget +class SCOPY_M2K_GUI_EXPORT PlotLineHandle : public QWidget { Q_OBJECT @@ -74,7 +73,7 @@ class SCOPY_GUI_EXPORT PlotLineHandle : public QWidget void setGrabbed(bool); }; -class SCOPY_GUI_EXPORT PlotGateHandle : public PlotLineHandle +class SCOPY_M2K_GUI_EXPORT PlotGateHandle : public PlotLineHandle { public: PlotGateHandle(const QPixmap &handleIcon, QWidget *parent = 0); @@ -105,7 +104,7 @@ class SCOPY_GUI_EXPORT PlotGateHandle : public PlotLineHandle scopy::TimePrefixFormatter d_timeFormatter; }; -class SCOPY_GUI_EXPORT PlotLineHandleH : public PlotLineHandle +class SCOPY_M2K_GUI_EXPORT PlotLineHandleH : public PlotLineHandle { public: PlotLineHandleH(const QPixmap &handleIcon, QWidget *parent = 0, bool facingBottom = false); @@ -126,7 +125,7 @@ class SCOPY_GUI_EXPORT PlotLineHandleH : public PlotLineHandle bool m_facingBottom; }; -class SCOPY_GUI_EXPORT PlotLineHandleV : public PlotLineHandle +class SCOPY_M2K_GUI_EXPORT PlotLineHandleV : public PlotLineHandle { public: PlotLineHandleV(const QPixmap &handleIcon, QWidget *parent = 0, bool facingRight = false); @@ -146,7 +145,7 @@ class SCOPY_GUI_EXPORT PlotLineHandleV : public PlotLineHandle bool m_facingRight; }; -class SCOPY_GUI_EXPORT FreePlotLineHandleH : public PlotLineHandleH +class SCOPY_M2K_GUI_EXPORT FreePlotLineHandleH : public PlotLineHandleH { public: FreePlotLineHandleH(const QPixmap &handleIcon, const QPixmap &beyondLeftIcon, const QPixmap &beyondRightIcon, @@ -163,7 +162,7 @@ class SCOPY_GUI_EXPORT FreePlotLineHandleH : public PlotLineHandleH bool m_isBeyondLeft; }; -class SCOPY_GUI_EXPORT FreePlotLineHandleV : public PlotLineHandleV +class SCOPY_M2K_GUI_EXPORT FreePlotLineHandleV : public PlotLineHandleV { public: FreePlotLineHandleV(const QPixmap &handleIcon, const QPixmap &beyondTopIcon, const QPixmap &beyondBottomIcon, @@ -184,7 +183,7 @@ class SCOPY_GUI_EXPORT FreePlotLineHandleV : public PlotLineHandleV QString m_name; }; -class SCOPY_GUI_EXPORT RoundedHandleV : public FreePlotLineHandleV +class SCOPY_M2K_GUI_EXPORT RoundedHandleV : public FreePlotLineHandleV { Q_OBJECT public: diff --git a/gui/include/gui/printableplot.h b/plugins/m2k/m2k-gui/include/m2k-gui/printableplot.h similarity index 91% rename from gui/include/gui/printableplot.h rename to plugins/m2k/m2k-gui/include/m2k-gui/printableplot.h index 4cd3959748..e3d9486087 100644 --- a/gui/include/gui/printableplot.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/printableplot.h @@ -22,19 +22,19 @@ #define PRINTABLEPLOT_H /*Qwt includes*/ +#include "scopy-m2k-gui_export.h" #include #include #include /*Qt includes*/ -#include "scopy-gui_export.h" #include -#include +#include "BasicPlot.h" namespace scopy { -class SCOPY_GUI_EXPORT PrintablePlot : public BasicPlot +class SCOPY_M2K_GUI_EXPORT PrintablePlot : public BasicPlot { Q_OBJECT public: diff --git a/gui/include/gui/qtgui_types.h b/plugins/m2k/m2k-gui/include/m2k-gui/qtgui_types.h similarity index 100% rename from gui/include/gui/qtgui_types.h rename to plugins/m2k/m2k-gui/include/m2k-gui/qtgui_types.h diff --git a/gui/include/gui/qwt_utils.h b/plugins/m2k/m2k-gui/include/m2k-gui/qwt_utils.h similarity index 79% rename from gui/include/gui/qwt_utils.h rename to plugins/m2k/m2k-gui/include/m2k-gui/qwt_utils.h index e8fddc7698..729113493d 100644 --- a/gui/include/gui/qwt_utils.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/qwt_utils.h @@ -1,8 +1,7 @@ #ifndef QWT_UTILS_H #define QWT_UTILS_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include @@ -10,7 +9,7 @@ #include #include -class SCOPY_GUI_EXPORT QwtDblClickPlotPicker : public QwtPlotPicker +class SCOPY_M2K_GUI_EXPORT QwtDblClickPlotPicker : public QwtPlotPicker { public: #if QWT_VERSION < 0x060100 @@ -24,7 +23,7 @@ class SCOPY_GUI_EXPORT QwtDblClickPlotPicker : public QwtPlotPicker virtual QwtPickerMachine *stateMachine(int) const; }; -class SCOPY_GUI_EXPORT QwtPickerDblClickPointMachine : public QwtPickerMachine +class SCOPY_M2K_GUI_EXPORT QwtPickerDblClickPointMachine : public QwtPickerMachine { public: QwtPickerDblClickPointMachine(); diff --git a/gui/include/gui/runsinglewidget.h b/plugins/m2k/m2k-gui/include/m2k-gui/runsinglewidget.h similarity index 94% rename from gui/include/gui/runsinglewidget.h rename to plugins/m2k/m2k-gui/include/m2k-gui/runsinglewidget.h index 448374d579..749c602cf7 100644 --- a/gui/include/gui/runsinglewidget.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/runsinglewidget.h @@ -21,8 +21,7 @@ #ifndef RUNSINGLEWIDGET_H #define RUNSINGLEWIDGET_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include @@ -31,7 +30,7 @@ class RunSingleWidget; } namespace scopy { -class SCOPY_GUI_EXPORT RunSingleWidget : public QWidget +class SCOPY_M2K_GUI_EXPORT RunSingleWidget : public QWidget { Q_OBJECT diff --git a/plugins/m2k/m2k-gui/include/m2k-gui/scopy-m2k-gui_config.h.cmakein b/plugins/m2k/m2k-gui/include/m2k-gui/scopy-m2k-gui_config.h.cmakein new file mode 100644 index 0000000000..04a248c9f3 --- /dev/null +++ b/plugins/m2k/m2k-gui/include/m2k-gui/scopy-m2k-gui_config.h.cmakein @@ -0,0 +1,7 @@ +#ifndef SCOPY_GUI_CONFIG_H_CMAKEIN +#define SCOPY_GUI_CONFIG_H_CMAKEIN + +#cmakedefine SCOPY_HAVE_GR_GUI +#cmakedefine SCOPY_HAVE_SIGROK_GUI + +#endif // SCOPY_CORE_CONFIG_H_CMAKEIN diff --git a/gui/include/gui/settings_pair_widget.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/settings_pair_widget.hpp similarity index 78% rename from gui/include/gui/settings_pair_widget.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/settings_pair_widget.hpp index 3dfa333dde..cb42200337 100644 --- a/gui/include/gui/settings_pair_widget.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/settings_pair_widget.hpp @@ -1,6 +1,7 @@ #ifndef SETTINGSCUSTOMWIDGET_H #define SETTINGSCUSTOMWIDGET_H +#include "scopy-m2k-gui_export.h" #include "customPushButton.h" #include @@ -13,8 +14,8 @@ class SettingsPairWidget; } namespace scopy { -namespace gui { -class SettingsPairWidget : public QWidget +namespace m2kgui { +class SCOPY_M2K_GUI_EXPORT SettingsPairWidget : public QWidget { Q_OBJECT @@ -28,7 +29,7 @@ class SettingsPairWidget : public QWidget private: Ui::SettingsPairWidget *m_ui; }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // SETTINGSPAIRWIDGET_H diff --git a/gui/include/gui/sismograph.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/sismograph.hpp similarity index 96% rename from gui/include/gui/sismograph.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/sismograph.hpp index 34daa8400a..d1fcaad153 100644 --- a/gui/include/gui/sismograph.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/sismograph.hpp @@ -21,9 +21,9 @@ #ifndef SISMOGRAPH_HPP #define SISMOGRAPH_HPP +#include "scopy-m2k-gui_export.h" #include "autoScaler.hpp" #include "customqwtscaledraw.hpp" -#include "scopy-gui_export.h" #include #include @@ -32,7 +32,7 @@ #include namespace scopy { -class SCOPY_GUI_EXPORT Sismograph : public QwtPlot +class SCOPY_M2K_GUI_EXPORT Sismograph : public QwtPlot { Q_OBJECT diff --git a/gui/include/gui/smoothcurvefitter.h b/plugins/m2k/m2k-gui/include/m2k-gui/smoothcurvefitter.h similarity index 92% rename from gui/include/gui/smoothcurvefitter.h rename to plugins/m2k/m2k-gui/include/m2k-gui/smoothcurvefitter.h index 37469d6f0a..03b0e3e60e 100644 --- a/gui/include/gui/smoothcurvefitter.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/smoothcurvefitter.h @@ -21,15 +21,14 @@ #ifndef SMOOTHCURVEFITTER_H #define SMOOTHCURVEFITTER_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include namespace scopy { -class SCOPY_GUI_EXPORT SmoothCurveFitter : public QwtCurveFitter +class SCOPY_M2K_GUI_EXPORT SmoothCurveFitter : public QwtCurveFitter { public: SmoothCurveFitter(); diff --git a/gui/include/gui/spectrumUpdateEvents.h b/plugins/m2k/m2k-gui/include/m2k-gui/spectrumUpdateEvents.h similarity index 89% rename from gui/include/gui/spectrumUpdateEvents.h rename to plugins/m2k/m2k-gui/include/m2k-gui/spectrumUpdateEvents.h index 28d8cfdf59..ca2b40313b 100644 --- a/gui/include/gui/spectrumUpdateEvents.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/spectrumUpdateEvents.h @@ -21,8 +21,7 @@ #ifndef M2K_SPECTRUM_UPDATE_EVENTS_H #define M2K_SPECTRUM_UPDATE_EVENTS_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include @@ -39,7 +38,7 @@ static const int SpectrumWindowCaptionEventType = 10008; static const int SpectrumWindowResetEventType = 10009; static const int SpectrumFrequencyRangeEventType = 10010; -class SCOPY_GUI_EXPORT SpectrumUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT SpectrumUpdateEvent : public QEvent { public: @@ -76,7 +75,7 @@ class SCOPY_GUI_EXPORT SpectrumUpdateEvent : public QEvent int _droppedFFTFrames; }; -class SCOPY_GUI_EXPORT SpectrumWindowCaptionEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT SpectrumWindowCaptionEvent : public QEvent { public: SpectrumWindowCaptionEvent(const QString &); @@ -88,7 +87,7 @@ class SCOPY_GUI_EXPORT SpectrumWindowCaptionEvent : public QEvent QString _labelString; }; -class SCOPY_GUI_EXPORT SpectrumWindowResetEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT SpectrumWindowResetEvent : public QEvent { public: SpectrumWindowResetEvent(); @@ -98,7 +97,7 @@ class SCOPY_GUI_EXPORT SpectrumWindowResetEvent : public QEvent private: }; -class SCOPY_GUI_EXPORT SpectrumFrequencyRangeEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT SpectrumFrequencyRangeEvent : public QEvent { public: SpectrumFrequencyRangeEvent(const double, const double, const double); @@ -114,7 +113,7 @@ class SCOPY_GUI_EXPORT SpectrumFrequencyRangeEvent : public QEvent double _stopFrequency; }; -class SCOPY_GUI_EXPORT TimeUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT TimeUpdateEvent : public QEvent { public: TimeUpdateEvent(const std::vector &timeDomainPoints, const uint64_t numTimeDomainDataPoints, @@ -141,7 +140,7 @@ class SCOPY_GUI_EXPORT TimeUpdateEvent : public QEvent /********************************************************************/ -class SCOPY_GUI_EXPORT IdentifiableTimeUpdateEvent : public TimeUpdateEvent +class SCOPY_M2K_GUI_EXPORT IdentifiableTimeUpdateEvent : public TimeUpdateEvent { public: IdentifiableTimeUpdateEvent(const std::vector &timeDomainPoints, @@ -159,7 +158,7 @@ class SCOPY_GUI_EXPORT IdentifiableTimeUpdateEvent : public TimeUpdateEvent /********************************************************************/ -class SCOPY_GUI_EXPORT FreqUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT FreqUpdateEvent : public QEvent { public: FreqUpdateEvent(const std::vector &dataPoints, const uint64_t numDataPoints); @@ -180,7 +179,7 @@ class SCOPY_GUI_EXPORT FreqUpdateEvent : public QEvent uint64_t _numDataPoints; }; -class SCOPY_GUI_EXPORT SetFreqEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT SetFreqEvent : public QEvent { public: SetFreqEvent(const double, const double); @@ -195,7 +194,7 @@ class SCOPY_GUI_EXPORT SetFreqEvent : public QEvent /********************************************************************/ -class SCOPY_GUI_EXPORT ConstUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT ConstUpdateEvent : public QEvent { public: ConstUpdateEvent(const std::vector &realDataPoints, const std::vector &imagDataPoints, @@ -219,7 +218,7 @@ class SCOPY_GUI_EXPORT ConstUpdateEvent : public QEvent uint64_t _numDataPoints; }; -class SCOPY_GUI_EXPORT WaterfallUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT WaterfallUpdateEvent : public QEvent { public: WaterfallUpdateEvent(const std::vector &dataPoints, const uint64_t numDataPoints, @@ -247,7 +246,7 @@ class SCOPY_GUI_EXPORT WaterfallUpdateEvent : public QEvent /********************************************************************/ -class SCOPY_GUI_EXPORT TimeRasterUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT TimeRasterUpdateEvent : public QEvent { public: TimeRasterUpdateEvent(const std::vector &dataPoints, const uint64_t numDataPoints); @@ -269,7 +268,7 @@ class SCOPY_GUI_EXPORT TimeRasterUpdateEvent : public QEvent /********************************************************************/ -class SCOPY_GUI_EXPORT HistogramUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT HistogramUpdateEvent : public QEvent { public: HistogramUpdateEvent(const std::vector &points, const uint64_t npoints); @@ -292,7 +291,7 @@ class SCOPY_GUI_EXPORT HistogramUpdateEvent : public QEvent /********************************************************************/ -class SCOPY_GUI_EXPORT NumberUpdateEvent : public QEvent +class SCOPY_M2K_GUI_EXPORT NumberUpdateEvent : public QEvent { public: NumberUpdateEvent(const std::vector &samples); diff --git a/gui/include/gui/spectrum_marker.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/spectrum_marker.hpp similarity index 94% rename from gui/include/gui/spectrum_marker.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/spectrum_marker.hpp index 3067b4e771..7878539f1e 100644 --- a/gui/include/gui/spectrum_marker.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/spectrum_marker.hpp @@ -21,14 +21,13 @@ #ifndef SPECTRUM_MARKER_H #define SPECTRUM_MARKER_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include namespace scopy { -class SCOPY_GUI_EXPORT SpectrumMarker : public QwtPlotMarker +class SCOPY_M2K_GUI_EXPORT SpectrumMarker : public QwtPlotMarker { public: SpectrumMarker(const QString &title, bool movable = true); diff --git a/gui/include/gui/startstoprangewidget.h b/plugins/m2k/m2k-gui/include/m2k-gui/startstoprangewidget.h similarity index 95% rename from gui/include/gui/startstoprangewidget.h rename to plugins/m2k/m2k-gui/include/m2k-gui/startstoprangewidget.h index 152740ebb4..c6f90d1d44 100644 --- a/gui/include/gui/startstoprangewidget.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/startstoprangewidget.h @@ -21,7 +21,7 @@ #ifndef STARTSTOPRANGEWIDGET_H #define STARTSTOPRANGEWIDGET_H -#include "scopy-gui_export.h" +#include "scopy-m2k-gui_export.h" #include "spinbox_a.hpp" #include @@ -31,7 +31,7 @@ class StartStopRangeWidget; } namespace scopy { -class SCOPY_GUI_EXPORT StartStopRangeWidget : public QWidget +class SCOPY_M2K_GUI_EXPORT StartStopRangeWidget : public QWidget { Q_OBJECT diff --git a/gui/include/gui/subsection_separator.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/subsection_separator.hpp similarity index 85% rename from gui/include/gui/subsection_separator.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/subsection_separator.hpp index d10ce6ea8a..5cd455efd0 100644 --- a/gui/include/gui/subsection_separator.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/subsection_separator.hpp @@ -1,8 +1,7 @@ #ifndef SUBSECTIONSEPARATOR_H #define SUBSECTIONSEPARATOR_H -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include #include @@ -12,8 +11,8 @@ class SubsectionSeparator; } namespace scopy { -namespace gui { -class SCOPY_GUI_EXPORT SubsectionSeparator : public QWidget +namespace m2kgui { +class SCOPY_M2K_GUI_EXPORT SubsectionSeparator : public QWidget { Q_OBJECT @@ -41,7 +40,7 @@ class SCOPY_GUI_EXPORT SubsectionSeparator : public QWidget void setContent(QWidget *content); QWidget *getContentWidget(); }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // SUBSECTIONSEPARATOR_H diff --git a/gui/include/gui/tool_view.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/tool_view.hpp similarity index 96% rename from gui/include/gui/tool_view.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/tool_view.hpp index 145f544879..9b52bf9603 100644 --- a/gui/include/gui/tool_view.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/tool_view.hpp @@ -1,6 +1,7 @@ #ifndef TOOL_VIEW_HPP #define TOOL_VIEW_HPP +#include "scopy-m2k-gui_export.h" #include "channel_manager.hpp" #include "channel_widget.hpp" #include "customPushButton.h" @@ -8,7 +9,6 @@ #include "generic_menu.hpp" #include "linked_button.hpp" #include "menu_anim.hpp" -#include "scopy-gui_export.h" #include #include @@ -22,9 +22,9 @@ class ToolView; } namespace scopy { -namespace gui { +namespace m2kgui { -class SCOPY_GUI_EXPORT ToolView : public QWidget +class SCOPY_M2K_GUI_EXPORT ToolView : public QWidget { friend class ToolViewBuilder; @@ -131,7 +131,7 @@ public Q_SLOTS: int m_nextMenuIndex; void initPlotInfoWidget(); }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // TOOL_VIEW_HPP diff --git a/gui/include/gui/tool_view_builder.hpp b/plugins/m2k/m2k-gui/include/m2k-gui/tool_view_builder.hpp similarity index 86% rename from gui/include/gui/tool_view_builder.hpp rename to plugins/m2k/m2k-gui/include/m2k-gui/tool_view_builder.hpp index b1b82eb8d4..5362f99269 100644 --- a/gui/include/gui/tool_view_builder.hpp +++ b/plugins/m2k/m2k-gui/include/m2k-gui/tool_view_builder.hpp @@ -1,11 +1,11 @@ #ifndef TOOLBUILDER_HPP #define TOOLBUILDER_HPP -#include "scopy-gui_export.h" +#include "scopy-m2k-gui_export.h" #include "tool_view.hpp" namespace scopy { -namespace gui { +namespace m2kgui { struct ToolViewRecipe { @@ -26,7 +26,7 @@ struct ToolViewRecipe bool hasHamburgerMenuBtn{true}; }; -class SCOPY_GUI_EXPORT ToolViewBuilder +class SCOPY_M2K_GUI_EXPORT ToolViewBuilder { public: ToolViewBuilder(const ToolViewRecipe &recipe, ChannelManager *channelManager = nullptr, @@ -37,7 +37,7 @@ class SCOPY_GUI_EXPORT ToolViewBuilder private: ToolView *m_toolView; }; -} // namespace gui +} // namespace m2kgui } // namespace scopy #endif // TOOLVIEWBUILDER_HPP diff --git a/gui/include/gui/trigger_mode.h b/plugins/m2k/m2k-gui/include/m2k-gui/trigger_mode.h similarity index 100% rename from gui/include/gui/trigger_mode.h rename to plugins/m2k/m2k-gui/include/m2k-gui/trigger_mode.h diff --git a/gui/include/gui/waterfallGlobalData.h b/plugins/m2k/m2k-gui/include/m2k-gui/waterfallGlobalData.h similarity index 96% rename from gui/include/gui/waterfallGlobalData.h rename to plugins/m2k/m2k-gui/include/m2k-gui/waterfallGlobalData.h index 36d65f3937..23d11b0ced 100644 --- a/gui/include/gui/waterfallGlobalData.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/waterfallGlobalData.h @@ -30,8 +30,7 @@ #ifndef WATERFALL_GLOBAL_DATA_HPP #define WATERFALL_GLOBAL_DATA_HPP -#include "scopy-gui_export.h" - +#include "scopy-m2k-gui_export.h" #include #include @@ -50,7 +49,7 @@ enum WaterfallFlowDirection DOWN }; -class SCOPY_GUI_EXPORT WaterfallData : public QwtRasterData +class SCOPY_M2K_GUI_EXPORT WaterfallData : public QwtRasterData { public: WaterfallData(const double, const double, const uint64_t, const unsigned int); diff --git a/gui/include/gui/x_axis_scale_zoomer.h b/plugins/m2k/m2k-gui/include/m2k-gui/x_axis_scale_zoomer.h similarity index 91% rename from gui/include/gui/x_axis_scale_zoomer.h rename to plugins/m2k/m2k-gui/include/m2k-gui/x_axis_scale_zoomer.h index 9e4c4c4f44..1faa34ae21 100644 --- a/gui/include/gui/x_axis_scale_zoomer.h +++ b/plugins/m2k/m2k-gui/include/m2k-gui/x_axis_scale_zoomer.h @@ -21,12 +21,13 @@ #ifndef X_AXIS_SCALE_ZOOMER_H #define X_AXIS_SCALE_ZOOMER_H +#include "scopy-m2k-gui_export.h" #include "osc_scale_zoomer.h" #include namespace scopy { -class XAxisScaleZoomer : public OscScaleZoomer +class SCOPY_M2K_GUI_EXPORT XAxisScaleZoomer : public OscScaleZoomer { Q_OBJECT public: diff --git a/gui/sigrok-gui/CMakeLists.txt b/plugins/m2k/m2k-gui/sigrok-gui/CMakeLists.txt similarity index 96% rename from gui/sigrok-gui/CMakeLists.txt rename to plugins/m2k/m2k-gui/sigrok-gui/CMakeLists.txt index 455d7517a1..ef49e3f2ad 100644 --- a/gui/sigrok-gui/CMakeLists.txt +++ b/plugins/m2k/m2k-gui/sigrok-gui/CMakeLists.txt @@ -75,12 +75,14 @@ target_include_directories( ${CMAKE_CURRENT_SOURCE_DIR}include/${SCOPY_MODULE}/prop ${LIBSIGROK_DECODE_INCLUDE_DIRS} scopy-gui + scopy-m2k-gui ) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}) target_link_libraries( - ${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Widgets scopy-gui ${LIBSIGROK_DECODE_LINK_LIBRARIES} + ${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Widgets scopy-gui scopy-m2k-gui + ${LIBSIGROK_DECODE_LINK_LIBRARIES} ) set(SCOPY_SIGROK_GUI ON PARENT_SCOPE) diff --git a/gui/sigrok-gui/include/sigrok-gui/annotation.h b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/annotation.h similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/annotation.h rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/annotation.h diff --git a/gui/sigrok-gui/include/sigrok-gui/annotationcurve.h b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/annotationcurve.h similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/annotationcurve.h rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/annotationcurve.h diff --git a/gui/sigrok-gui/include/sigrok-gui/annotationdecoder.h b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/annotationdecoder.h similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/annotationdecoder.h rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/annotationdecoder.h diff --git a/gui/sigrok-gui/include/sigrok-gui/binding/binding.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/binding/binding.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/binding/binding.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/binding/binding.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/binding/decoder.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/binding/decoder.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/binding/decoder.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/binding/decoder.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/decoder.h b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/decoder.h similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/decoder.h rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/decoder.h diff --git a/gui/sigrok-gui/include/sigrok-gui/prop/bool.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/bool.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/prop/bool.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/bool.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/prop/double.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/double.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/prop/double.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/double.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/prop/enum.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/enum.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/prop/enum.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/enum.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/prop/int.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/int.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/prop/int.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/int.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/prop/property.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/property.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/prop/property.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/property.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/prop/string.hpp b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/string.hpp similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/prop/string.hpp rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/prop/string.hpp diff --git a/gui/sigrok-gui/include/sigrok-gui/row.h b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/row.h similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/row.h rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/row.h diff --git a/gui/sigrok-gui/include/sigrok-gui/rowdata.h b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/rowdata.h similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/rowdata.h rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/rowdata.h diff --git a/gui/sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_config.h.cmakein b/plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_config.h.cmakein similarity index 100% rename from gui/sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_config.h.cmakein rename to plugins/m2k/m2k-gui/sigrok-gui/include/sigrok-gui/scopy-sigrok-gui_config.h.cmakein diff --git a/gui/sigrok-gui/src/annotation.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/annotation.cpp similarity index 100% rename from gui/sigrok-gui/src/annotation.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/annotation.cpp diff --git a/gui/sigrok-gui/src/annotationcurve.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/annotationcurve.cpp similarity index 100% rename from gui/sigrok-gui/src/annotationcurve.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/annotationcurve.cpp diff --git a/gui/sigrok-gui/src/annotationdecoder.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/annotationdecoder.cpp similarity index 100% rename from gui/sigrok-gui/src/annotationdecoder.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/annotationdecoder.cpp diff --git a/gui/sigrok-gui/src/binding/binding.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/binding/binding.cpp similarity index 100% rename from gui/sigrok-gui/src/binding/binding.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/binding/binding.cpp diff --git a/gui/sigrok-gui/src/binding/decoder.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/binding/decoder.cpp similarity index 100% rename from gui/sigrok-gui/src/binding/decoder.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/binding/decoder.cpp diff --git a/gui/sigrok-gui/src/decoder.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/decoder.cpp similarity index 100% rename from gui/sigrok-gui/src/decoder.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/decoder.cpp diff --git a/gui/sigrok-gui/src/prop/bool.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/prop/bool.cpp similarity index 100% rename from gui/sigrok-gui/src/prop/bool.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/prop/bool.cpp diff --git a/gui/sigrok-gui/src/prop/double.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/prop/double.cpp similarity index 100% rename from gui/sigrok-gui/src/prop/double.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/prop/double.cpp diff --git a/gui/sigrok-gui/src/prop/enum.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/prop/enum.cpp similarity index 100% rename from gui/sigrok-gui/src/prop/enum.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/prop/enum.cpp diff --git a/gui/sigrok-gui/src/prop/int.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/prop/int.cpp similarity index 100% rename from gui/sigrok-gui/src/prop/int.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/prop/int.cpp diff --git a/gui/sigrok-gui/src/prop/property.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/prop/property.cpp similarity index 100% rename from gui/sigrok-gui/src/prop/property.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/prop/property.cpp diff --git a/gui/sigrok-gui/src/prop/string.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/prop/string.cpp similarity index 100% rename from gui/sigrok-gui/src/prop/string.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/prop/string.cpp diff --git a/gui/sigrok-gui/src/row.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/row.cpp similarity index 100% rename from gui/sigrok-gui/src/row.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/row.cpp diff --git a/gui/sigrok-gui/src/rowdata.cpp b/plugins/m2k/m2k-gui/sigrok-gui/src/rowdata.cpp similarity index 100% rename from gui/sigrok-gui/src/rowdata.cpp rename to plugins/m2k/m2k-gui/sigrok-gui/src/rowdata.cpp diff --git a/gui/sigrok-gui/test/CMakeLists.txt b/plugins/m2k/m2k-gui/sigrok-gui/test/CMakeLists.txt similarity index 100% rename from gui/sigrok-gui/test/CMakeLists.txt rename to plugins/m2k/m2k-gui/sigrok-gui/test/CMakeLists.txt diff --git a/gui/src/BasicPlot.cpp b/plugins/m2k/m2k-gui/src/BasicPlot.cpp similarity index 100% rename from gui/src/BasicPlot.cpp rename to plugins/m2k/m2k-gui/src/BasicPlot.cpp diff --git a/gui/src/ComboBoxLineEdit.cpp b/plugins/m2k/m2k-gui/src/ComboBoxLineEdit.cpp similarity index 100% rename from gui/src/ComboBoxLineEdit.cpp rename to plugins/m2k/m2k-gui/src/ComboBoxLineEdit.cpp diff --git a/gui/src/ConstellationDisplayPlot.cc b/plugins/m2k/m2k-gui/src/ConstellationDisplayPlot.cc similarity index 98% rename from gui/src/ConstellationDisplayPlot.cc rename to plugins/m2k/m2k-gui/src/ConstellationDisplayPlot.cc index d26d7a11e1..1b6850a60a 100644 --- a/gui/src/ConstellationDisplayPlot.cc +++ b/plugins/m2k/m2k-gui/src/ConstellationDisplayPlot.cc @@ -45,8 +45,6 @@ #include "ConstellationDisplayPlot.h" -#include "scopy-gui_export.h" - #include #include #include @@ -56,7 +54,7 @@ using namespace scopy; -class SCOPY_GUI_EXPORT ConstellationDisplayZoomer : public QwtPlotZoomer +class SCOPY_M2K_GUI_EXPORT ConstellationDisplayZoomer : public QwtPlotZoomer { public: #if QWT_VERSION < 0x060100 diff --git a/gui/src/DisplayPlot.cc b/plugins/m2k/m2k-gui/src/DisplayPlot.cc similarity index 100% rename from gui/src/DisplayPlot.cc rename to plugins/m2k/m2k-gui/src/DisplayPlot.cc diff --git a/gui/src/FftDisplayPlot.cc b/plugins/m2k/m2k-gui/src/FftDisplayPlot.cc similarity index 100% rename from gui/src/FftDisplayPlot.cc rename to plugins/m2k/m2k-gui/src/FftDisplayPlot.cc diff --git a/gui/src/HistogramDisplayPlot.cc b/plugins/m2k/m2k-gui/src/HistogramDisplayPlot.cc similarity index 100% rename from gui/src/HistogramDisplayPlot.cc rename to plugins/m2k/m2k-gui/src/HistogramDisplayPlot.cc diff --git a/gui/src/TimeDomainDisplayPlot.cc b/plugins/m2k/m2k-gui/src/TimeDomainDisplayPlot.cc similarity index 100% rename from gui/src/TimeDomainDisplayPlot.cc rename to plugins/m2k/m2k-gui/src/TimeDomainDisplayPlot.cc diff --git a/gui/src/WaterfallDisplayPlot.cc b/plugins/m2k/m2k-gui/src/WaterfallDisplayPlot.cc similarity index 100% rename from gui/src/WaterfallDisplayPlot.cc rename to plugins/m2k/m2k-gui/src/WaterfallDisplayPlot.cc diff --git a/gui/src/autoScaler.cpp b/plugins/m2k/m2k-gui/src/autoScaler.cpp similarity index 100% rename from gui/src/autoScaler.cpp rename to plugins/m2k/m2k-gui/src/autoScaler.cpp diff --git a/gui/src/average.cpp b/plugins/m2k/m2k-gui/src/average.cpp similarity index 100% rename from gui/src/average.cpp rename to plugins/m2k/m2k-gui/src/average.cpp diff --git a/gui/src/channel_manager.cpp b/plugins/m2k/m2k-gui/src/channel_manager.cpp similarity index 99% rename from gui/src/channel_manager.cpp rename to plugins/m2k/m2k-gui/src/channel_manager.cpp index e7e6f7b55b..a3441ae0d7 100644 --- a/gui/src/channel_manager.cpp +++ b/plugins/m2k/m2k-gui/src/channel_manager.cpp @@ -1,11 +1,11 @@ #include "channel_manager.hpp" -#include "dynamicWidget.h" +#include "gui/dynamicWidget.h" #include using namespace scopy; -using namespace scopy::gui; +using namespace scopy::m2kgui; ChannelManager::ChannelManager(ChannelsPositionEnum position, QWidget *parent) : QWidget(parent) diff --git a/gui/src/channel_widget.cpp b/plugins/m2k/m2k-gui/src/channel_widget.cpp similarity index 99% rename from gui/src/channel_widget.cpp rename to plugins/m2k/m2k-gui/src/channel_widget.cpp index 929a4a6923..af07679ab1 100644 --- a/gui/src/channel_widget.cpp +++ b/plugins/m2k/m2k-gui/src/channel_widget.cpp @@ -19,7 +19,7 @@ */ #include "channel_widget.hpp" -#include "dynamicWidget.h" +#include "gui/dynamicWidget.h" #include "ui_channel.h" diff --git a/gui/src/checkbox_delegate.cpp b/plugins/m2k/m2k-gui/src/checkbox_delegate.cpp similarity index 100% rename from gui/src/checkbox_delegate.cpp rename to plugins/m2k/m2k-gui/src/checkbox_delegate.cpp diff --git a/gui/src/cursor_readouts.cpp b/plugins/m2k/m2k-gui/src/cursor_readouts.cpp similarity index 100% rename from gui/src/cursor_readouts.cpp rename to plugins/m2k/m2k-gui/src/cursor_readouts.cpp diff --git a/gui/src/customScale.cpp b/plugins/m2k/m2k-gui/src/customScale.cpp similarity index 100% rename from gui/src/customScale.cpp rename to plugins/m2k/m2k-gui/src/customScale.cpp diff --git a/gui/src/custom_menu_button.cpp b/plugins/m2k/m2k-gui/src/custom_menu_button.cpp similarity index 98% rename from gui/src/custom_menu_button.cpp rename to plugins/m2k/m2k-gui/src/custom_menu_button.cpp index 19ce42534f..20eeee0ea1 100644 --- a/gui/src/custom_menu_button.cpp +++ b/plugins/m2k/m2k-gui/src/custom_menu_button.cpp @@ -2,7 +2,7 @@ #include "ui_custom_menu_button.h" -using namespace scopy::gui; +using namespace scopy::m2kgui; CustomMenuButton::CustomMenuButton(QString labelText, bool checkboxVisible, bool checkBoxChecked, QWidget *parent) : CustomMenuButton(parent) diff --git a/gui/src/customplotpositionbutton.cpp b/plugins/m2k/m2k-gui/src/customplotpositionbutton.cpp similarity index 98% rename from gui/src/customplotpositionbutton.cpp rename to plugins/m2k/m2k-gui/src/customplotpositionbutton.cpp index 7032cbf20b..56a97a437a 100644 --- a/gui/src/customplotpositionbutton.cpp +++ b/plugins/m2k/m2k-gui/src/customplotpositionbutton.cpp @@ -19,7 +19,7 @@ */ #include "customplotpositionbutton.h" -#include "dynamicWidget.h" +#include "gui/dynamicWidget.h" #include "ui_customplotpositionbutton.h" diff --git a/gui/src/db_click_buttons.cpp b/plugins/m2k/m2k-gui/src/db_click_buttons.cpp similarity index 100% rename from gui/src/db_click_buttons.cpp rename to plugins/m2k/m2k-gui/src/db_click_buttons.cpp diff --git a/gui/src/dbgraph.cpp b/plugins/m2k/m2k-gui/src/dbgraph.cpp similarity index 100% rename from gui/src/dbgraph.cpp rename to plugins/m2k/m2k-gui/src/dbgraph.cpp diff --git a/gui/src/dropdown_switch_list.cpp b/plugins/m2k/m2k-gui/src/dropdown_switch_list.cpp similarity index 100% rename from gui/src/dropdown_switch_list.cpp rename to plugins/m2k/m2k-gui/src/dropdown_switch_list.cpp diff --git a/gui/src/extendingplotzoomer.cpp b/plugins/m2k/m2k-gui/src/extendingplotzoomer.cpp similarity index 100% rename from gui/src/extendingplotzoomer.cpp rename to plugins/m2k/m2k-gui/src/extendingplotzoomer.cpp diff --git a/gui/src/generic_menu.cpp b/plugins/m2k/m2k-gui/src/generic_menu.cpp similarity index 93% rename from gui/src/generic_menu.cpp rename to plugins/m2k/m2k-gui/src/generic_menu.cpp index ed4812b28a..241e400286 100644 --- a/gui/src/generic_menu.cpp +++ b/plugins/m2k/m2k-gui/src/generic_menu.cpp @@ -2,7 +2,7 @@ #include -using namespace scopy::gui; +using namespace scopy::m2kgui; GenericMenu::GenericMenu(QWidget *parent) : QWidget(parent) @@ -38,7 +38,7 @@ void GenericMenu::setMenuHeader(const QString &title, const QColor *lineColor, b m_menuHeader->setEnabledBtnState(hasEnableBtn); } -void GenericMenu::insertSection(SubsectionSeparator *section) +void GenericMenu::insertSection(scopy::m2kgui::SubsectionSeparator *section) { BaseMenuItem *item = new BaseMenuItem(m_menu); item->setWidget(section); diff --git a/gui/src/genericlogicplotcurve.cpp b/plugins/m2k/m2k-gui/src/genericlogicplotcurve.cpp similarity index 98% rename from gui/src/genericlogicplotcurve.cpp rename to plugins/m2k/m2k-gui/src/genericlogicplotcurve.cpp index 80a9ef72ed..949633a683 100644 --- a/gui/src/genericlogicplotcurve.cpp +++ b/plugins/m2k/m2k-gui/src/genericlogicplotcurve.cpp @@ -19,9 +19,8 @@ */ #include "genericlogicplotcurve.h" - -#include -#include +#include +#include GenericLogicPlotCurve::GenericLogicPlotCurve(const QString &name, const QString &id, LogicPlotCurveType type, double pixelOffset, double traceHeight, double sampleRate, diff --git a/gui/src/handles_area.cpp b/plugins/m2k/m2k-gui/src/handles_area.cpp similarity index 99% rename from gui/src/handles_area.cpp rename to plugins/m2k/m2k-gui/src/handles_area.cpp index 3248bb3c18..00ec97309a 100644 --- a/gui/src/handles_area.cpp +++ b/plugins/m2k/m2k-gui/src/handles_area.cpp @@ -20,7 +20,7 @@ #include "handles_area.hpp" -#include "handlesareaextension.h" +//#include "handlesareaextension.h" #include "plot_line_handle.h" #include diff --git a/gui/src/handlesareaextension.cpp b/plugins/m2k/m2k-gui/src/handlesareaextension.cpp similarity index 100% rename from gui/src/handlesareaextension.cpp rename to plugins/m2k/m2k-gui/src/handlesareaextension.cpp diff --git a/gui/src/instrumentnotes.cpp b/plugins/m2k/m2k-gui/src/instrumentnotes.cpp similarity index 100% rename from gui/src/instrumentnotes.cpp rename to plugins/m2k/m2k-gui/src/instrumentnotes.cpp diff --git a/gui/src/limitedplotzoomer.cpp b/plugins/m2k/m2k-gui/src/limitedplotzoomer.cpp similarity index 100% rename from gui/src/limitedplotzoomer.cpp rename to plugins/m2k/m2k-gui/src/limitedplotzoomer.cpp diff --git a/gui/src/linked_button.cpp b/plugins/m2k/m2k-gui/src/linked_button.cpp similarity index 100% rename from gui/src/linked_button.cpp rename to plugins/m2k/m2k-gui/src/linked_button.cpp diff --git a/gui/src/logicdatacurve.cpp b/plugins/m2k/m2k-gui/src/logicdatacurve.cpp similarity index 100% rename from gui/src/logicdatacurve.cpp rename to plugins/m2k/m2k-gui/src/logicdatacurve.cpp diff --git a/gui/src/m2kmeasure.cpp b/plugins/m2k/m2k-gui/src/m2kmeasure.cpp similarity index 100% rename from gui/src/m2kmeasure.cpp rename to plugins/m2k/m2k-gui/src/m2kmeasure.cpp diff --git a/gui/src/m2kmeasurement_gui.cpp b/plugins/m2k/m2k-gui/src/m2kmeasurement_gui.cpp similarity index 100% rename from gui/src/m2kmeasurement_gui.cpp rename to plugins/m2k/m2k-gui/src/m2kmeasurement_gui.cpp diff --git a/gui/src/marker_controller.cpp b/plugins/m2k/m2k-gui/src/marker_controller.cpp similarity index 100% rename from gui/src/marker_controller.cpp rename to plugins/m2k/m2k-gui/src/marker_controller.cpp diff --git a/gui/src/marker_table.cpp b/plugins/m2k/m2k-gui/src/marker_table.cpp similarity index 100% rename from gui/src/marker_table.cpp rename to plugins/m2k/m2k-gui/src/marker_table.cpp diff --git a/gui/src/menu_header.cpp b/plugins/m2k/m2k-gui/src/menu_header.cpp similarity index 97% rename from gui/src/menu_header.cpp rename to plugins/m2k/m2k-gui/src/menu_header.cpp index 0344cc094f..55f0ff8816 100644 --- a/gui/src/menu_header.cpp +++ b/plugins/m2k/m2k-gui/src/menu_header.cpp @@ -5,7 +5,7 @@ #include #include -using namespace scopy::gui; +using namespace scopy::m2kgui; MenuHeader::MenuHeader(QWidget *parent) : QWidget(parent) diff --git a/gui/src/movingaverage.cpp b/plugins/m2k/m2k-gui/src/movingaverage.cpp similarity index 100% rename from gui/src/movingaverage.cpp rename to plugins/m2k/m2k-gui/src/movingaverage.cpp diff --git a/gui/src/nyquistGraph.cpp b/plugins/m2k/m2k-gui/src/nyquistGraph.cpp similarity index 100% rename from gui/src/nyquistGraph.cpp rename to plugins/m2k/m2k-gui/src/nyquistGraph.cpp diff --git a/gui/src/nyquistplotzoomer.cpp b/plugins/m2k/m2k-gui/src/nyquistplotzoomer.cpp similarity index 100% rename from gui/src/nyquistplotzoomer.cpp rename to plugins/m2k/m2k-gui/src/nyquistplotzoomer.cpp diff --git a/gui/src/osc_adjuster.cpp b/plugins/m2k/m2k-gui/src/osc_adjuster.cpp similarity index 100% rename from gui/src/osc_adjuster.cpp rename to plugins/m2k/m2k-gui/src/osc_adjuster.cpp diff --git a/gui/src/osc_custom_scroll.cpp b/plugins/m2k/m2k-gui/src/osc_custom_scroll.cpp similarity index 100% rename from gui/src/osc_custom_scroll.cpp rename to plugins/m2k/m2k-gui/src/osc_custom_scroll.cpp diff --git a/gui/src/osc_export_settings.cpp b/plugins/m2k/m2k-gui/src/osc_export_settings.cpp similarity index 100% rename from gui/src/osc_export_settings.cpp rename to plugins/m2k/m2k-gui/src/osc_export_settings.cpp diff --git a/gui/src/osc_import_settings.cpp b/plugins/m2k/m2k-gui/src/osc_import_settings.cpp similarity index 100% rename from gui/src/osc_import_settings.cpp rename to plugins/m2k/m2k-gui/src/osc_import_settings.cpp diff --git a/gui/src/osc_scale_zoomer.cpp b/plugins/m2k/m2k-gui/src/osc_scale_zoomer.cpp similarity index 100% rename from gui/src/osc_scale_zoomer.cpp rename to plugins/m2k/m2k-gui/src/osc_scale_zoomer.cpp diff --git a/gui/src/oscilloscope_plot.cpp b/plugins/m2k/m2k-gui/src/oscilloscope_plot.cpp similarity index 100% rename from gui/src/oscilloscope_plot.cpp rename to plugins/m2k/m2k-gui/src/oscilloscope_plot.cpp diff --git a/gui/src/plot_line_handle.cpp b/plugins/m2k/m2k-gui/src/plot_line_handle.cpp similarity index 100% rename from gui/src/plot_line_handle.cpp rename to plugins/m2k/m2k-gui/src/plot_line_handle.cpp diff --git a/gui/src/printableplot.cpp b/plugins/m2k/m2k-gui/src/printableplot.cpp similarity index 100% rename from gui/src/printableplot.cpp rename to plugins/m2k/m2k-gui/src/printableplot.cpp diff --git a/gui/src/qwt_utils.cpp b/plugins/m2k/m2k-gui/src/qwt_utils.cpp similarity index 100% rename from gui/src/qwt_utils.cpp rename to plugins/m2k/m2k-gui/src/qwt_utils.cpp diff --git a/gui/src/runsinglewidget.cpp b/plugins/m2k/m2k-gui/src/runsinglewidget.cpp similarity index 99% rename from gui/src/runsinglewidget.cpp rename to plugins/m2k/m2k-gui/src/runsinglewidget.cpp index 252a631f52..e8d9322698 100644 --- a/gui/src/runsinglewidget.cpp +++ b/plugins/m2k/m2k-gui/src/runsinglewidget.cpp @@ -20,7 +20,7 @@ #include "runsinglewidget.h" -#include "customPushButton.h" +#include #include "dynamicWidget.h" #include "utils.h" diff --git a/gui/src/settings_pair_widget.cpp b/plugins/m2k/m2k-gui/src/settings_pair_widget.cpp similarity index 94% rename from gui/src/settings_pair_widget.cpp rename to plugins/m2k/m2k-gui/src/settings_pair_widget.cpp index 7689e00912..d308939436 100644 --- a/gui/src/settings_pair_widget.cpp +++ b/plugins/m2k/m2k-gui/src/settings_pair_widget.cpp @@ -2,7 +2,7 @@ #include "ui_settings_pair_widget.h" -using namespace scopy::gui; +using namespace scopy::m2kgui; SettingsPairWidget::SettingsPairWidget(QWidget *parent) : QWidget(parent) diff --git a/gui/src/sismograph.cpp b/plugins/m2k/m2k-gui/src/sismograph.cpp similarity index 100% rename from gui/src/sismograph.cpp rename to plugins/m2k/m2k-gui/src/sismograph.cpp diff --git a/gui/src/smoothcurvefitter.cpp b/plugins/m2k/m2k-gui/src/smoothcurvefitter.cpp similarity index 100% rename from gui/src/smoothcurvefitter.cpp rename to plugins/m2k/m2k-gui/src/smoothcurvefitter.cpp diff --git a/gui/src/spectrumUpdateEvents.cc b/plugins/m2k/m2k-gui/src/spectrumUpdateEvents.cc similarity index 100% rename from gui/src/spectrumUpdateEvents.cc rename to plugins/m2k/m2k-gui/src/spectrumUpdateEvents.cc diff --git a/gui/src/spectrum_marker.cpp b/plugins/m2k/m2k-gui/src/spectrum_marker.cpp similarity index 100% rename from gui/src/spectrum_marker.cpp rename to plugins/m2k/m2k-gui/src/spectrum_marker.cpp diff --git a/gui/src/startstoprangewidget.cpp b/plugins/m2k/m2k-gui/src/startstoprangewidget.cpp similarity index 100% rename from gui/src/startstoprangewidget.cpp rename to plugins/m2k/m2k-gui/src/startstoprangewidget.cpp diff --git a/gui/src/subsection_separator.cpp b/plugins/m2k/m2k-gui/src/subsection_separator.cpp similarity index 98% rename from gui/src/subsection_separator.cpp rename to plugins/m2k/m2k-gui/src/subsection_separator.cpp index 940146df30..07c535bbba 100644 --- a/gui/src/subsection_separator.cpp +++ b/plugins/m2k/m2k-gui/src/subsection_separator.cpp @@ -4,7 +4,7 @@ #include -using namespace scopy::gui; +using namespace scopy::m2kgui; SubsectionSeparator::SubsectionSeparator(QWidget *parent) : QWidget(parent) diff --git a/gui/src/tool_view.cpp b/plugins/m2k/m2k-gui/src/tool_view.cpp similarity index 99% rename from gui/src/tool_view.cpp rename to plugins/m2k/m2k-gui/src/tool_view.cpp index 18bd955243..31120d60b1 100644 --- a/gui/src/tool_view.cpp +++ b/plugins/m2k/m2k-gui/src/tool_view.cpp @@ -9,7 +9,7 @@ #include #include -using namespace scopy::gui; +using namespace scopy::m2kgui; ToolView::ToolView(QWidget *parent) : QWidget(parent) @@ -229,7 +229,7 @@ void ToolView::configureAddMathBtn(QWidget *menu, bool dockable) } else { m_ui->stackedWidget->addWidget(menu); id = getNewID(); - m_menuList[id] = dynamic_cast(menu); + m_menuList[id] = dynamic_cast(menu); } m_group.addButton(addBtn); diff --git a/gui/src/tool_view_builder.cpp b/plugins/m2k/m2k-gui/src/tool_view_builder.cpp similarity index 97% rename from gui/src/tool_view_builder.cpp rename to plugins/m2k/m2k-gui/src/tool_view_builder.cpp index 91a6f0ab90..062b8e4dba 100644 --- a/gui/src/tool_view_builder.cpp +++ b/plugins/m2k/m2k-gui/src/tool_view_builder.cpp @@ -2,7 +2,7 @@ #include "dynamicWidget.h" -using namespace scopy::gui; +using namespace scopy::m2kgui; ToolViewBuilder::ToolViewBuilder(const ToolViewRecipe &recipe, ChannelManager *channelManager, QWidget *parent) { diff --git a/gui/src/waterfallGlobalData.cc b/plugins/m2k/m2k-gui/src/waterfallGlobalData.cc similarity index 100% rename from gui/src/waterfallGlobalData.cc rename to plugins/m2k/m2k-gui/src/waterfallGlobalData.cc diff --git a/gui/src/x_axis_scale_zoomer.cpp b/plugins/m2k/m2k-gui/src/x_axis_scale_zoomer.cpp similarity index 100% rename from gui/src/x_axis_scale_zoomer.cpp rename to plugins/m2k/m2k-gui/src/x_axis_scale_zoomer.cpp diff --git a/plugins/m2k/m2k-gui/test/CMakeLists.txt b/plugins/m2k/m2k-gui/test/CMakeLists.txt new file mode 100644 index 0000000000..72baa8a4f8 --- /dev/null +++ b/plugins/m2k/m2k-gui/test/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.5) + +function(SETUP_TESTS) + foreach(_testname ${ARGS}) + add_executable(_testname ${ARGS}) + add_test(NAME ${_testname} COMMAND ${_testname}) + target_link_libraries(${_testname} Qt${QT_VERSION_MAJOR}::Test) + endforeach() +endfunction() + +# Tell CMake to run moc when necessary: +set(CMAKE_AUTOMOC ON) +# As moc files are generated in the binary dir, tell CMake to always look for includes there: +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED) + +setup_tests(tst_test1) diff --git a/plugins/m2k/m2k-gui/test/tst_test1.cpp b/plugins/m2k/m2k-gui/test/tst_test1.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/gui/ui/channel.ui b/plugins/m2k/m2k-gui/ui/channel.ui similarity index 100% rename from gui/ui/channel.ui rename to plugins/m2k/m2k-gui/ui/channel.ui diff --git a/gui/ui/cursor_readouts.ui b/plugins/m2k/m2k-gui/ui/cursor_readouts.ui similarity index 100% rename from gui/ui/cursor_readouts.ui rename to plugins/m2k/m2k-gui/ui/cursor_readouts.ui diff --git a/gui/ui/custom_menu_button.ui b/plugins/m2k/m2k-gui/ui/custom_menu_button.ui similarity index 100% rename from gui/ui/custom_menu_button.ui rename to plugins/m2k/m2k-gui/ui/custom_menu_button.ui diff --git a/gui/ui/customplotpositionbutton.ui b/plugins/m2k/m2k-gui/ui/customplotpositionbutton.ui similarity index 95% rename from gui/ui/customplotpositionbutton.ui rename to plugins/m2k/m2k-gui/ui/customplotpositionbutton.ui index 9c5408c980..14edbc80df 100644 --- a/gui/ui/customplotpositionbutton.ui +++ b/plugins/m2k/m2k-gui/ui/customplotpositionbutton.ui @@ -6,7 +6,7 @@ 0 0 - 80 + 88 80 diff --git a/gui/ui/db_click_buttons.ui b/plugins/m2k/m2k-gui/ui/db_click_buttons.ui similarity index 100% rename from gui/ui/db_click_buttons.ui rename to plugins/m2k/m2k-gui/ui/db_click_buttons.ui diff --git a/gui/ui/instrumentnotes.ui b/plugins/m2k/m2k-gui/ui/instrumentnotes.ui similarity index 94% rename from gui/ui/instrumentnotes.ui rename to plugins/m2k/m2k-gui/ui/instrumentnotes.ui index 4456e4b2e7..14d41f497b 100644 --- a/gui/ui/instrumentnotes.ui +++ b/plugins/m2k/m2k-gui/ui/instrumentnotes.ui @@ -117,8 +117,11 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css"> p, li { white-space: pre-wrap; } +hr { height: 1px; border-width: 0; } +li.unchecked::marker { content: "\2610"; } +li.checked::marker { content: "\2612"; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> diff --git a/gui/ui/marker_table.ui b/plugins/m2k/m2k-gui/ui/marker_table.ui similarity index 100% rename from gui/ui/marker_table.ui rename to plugins/m2k/m2k-gui/ui/marker_table.ui diff --git a/gui/ui/menu_header.ui b/plugins/m2k/m2k-gui/ui/menu_header.ui similarity index 100% rename from gui/ui/menu_header.ui rename to plugins/m2k/m2k-gui/ui/menu_header.ui diff --git a/gui/ui/osc_export_settings.ui b/plugins/m2k/m2k-gui/ui/osc_export_settings.ui similarity index 100% rename from gui/ui/osc_export_settings.ui rename to plugins/m2k/m2k-gui/ui/osc_export_settings.ui diff --git a/gui/ui/runsinglewidget.ui b/plugins/m2k/m2k-gui/ui/runsinglewidget.ui similarity index 93% rename from gui/ui/runsinglewidget.ui rename to plugins/m2k/m2k-gui/ui/runsinglewidget.ui index 341f081316..5a389dc011 100644 --- a/gui/ui/runsinglewidget.ui +++ b/plugins/m2k/m2k-gui/ui/runsinglewidget.ui @@ -73,7 +73,7 @@ QPushButton:disabled { Run - + :/gui/icons/play.svg :/gui/icons/scopy-default/icons/play_stop.svg :/gui/icons/scopy-default/icons/play_stop.svg:/gui/icons/play.svg @@ -134,7 +134,7 @@ QPushButton:disabled { Single - + :/gui/icons/play_oneshot.svg :/gui/icons/scopy-default/icons/play_stop.svg:/gui/icons/play_oneshot.svg @@ -152,7 +152,8 @@ QPushButton:disabled { - + + diff --git a/gui/ui/settings_pair_widget.ui b/plugins/m2k/m2k-gui/ui/settings_pair_widget.ui similarity index 100% rename from gui/ui/settings_pair_widget.ui rename to plugins/m2k/m2k-gui/ui/settings_pair_widget.ui diff --git a/gui/ui/startstoprangewidget.ui b/plugins/m2k/m2k-gui/ui/startstoprangewidget.ui similarity index 100% rename from gui/ui/startstoprangewidget.ui rename to plugins/m2k/m2k-gui/ui/startstoprangewidget.ui diff --git a/gui/ui/subsection_separator.ui b/plugins/m2k/m2k-gui/ui/subsection_separator.ui similarity index 100% rename from gui/ui/subsection_separator.ui rename to plugins/m2k/m2k-gui/ui/subsection_separator.ui diff --git a/gui/ui/tool_view.ui b/plugins/m2k/m2k-gui/ui/tool_view.ui similarity index 98% rename from gui/ui/tool_view.ui rename to plugins/m2k/m2k-gui/ui/tool_view.ui index 777d8b4b9e..1509aa5ef9 100644 --- a/gui/ui/tool_view.ui +++ b/plugins/m2k/m2k-gui/ui/tool_view.ui @@ -129,7 +129,7 @@ Print - + :/gui/icons/printer.svg:/gui/icons/printer.svg @@ -212,7 +212,7 @@ - + @@ -693,21 +693,21 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); }1 - scopy::gui::SettingsPairWidget + scopy::InstrumentNotes QWidget -
settings_pair_widget.hpp
+
instrumentnotes.h
1 - scopy::InstrumentNotes + scopy::m2kgui::SettingsPairWidget QWidget -
instrumentnotes.h
+
settings_pair_widget.hpp
1 - - + + diff --git a/plugins/m2k/src/old/logicanalyzer/logic_analyzer.cpp b/plugins/m2k/src/old/logicanalyzer/logic_analyzer.cpp index 52aabb089c..ff4b238b9f 100644 --- a/plugins/m2k/src/old/logicanalyzer/logic_analyzer.cpp +++ b/plugins/m2k/src/old/logicanalyzer/logic_analyzer.cpp @@ -25,8 +25,8 @@ #include "filter.hpp" #include "gui/basemenu.h" #include "gui/dynamicWidget.h" -#include "gui/logicdatacurve.h" -#include "gui/osc_export_settings.h" +#include "m2k-gui/logicdatacurve.h" +#include "m2k-gui/osc_export_settings.h" #include "logicanalyzer/decoder_table_model.hpp" #include "logicanalyzer_api.h" #include "logicgroupitem.h" diff --git a/plugins/m2k/src/old/logicanalyzer/logic_analyzer.h b/plugins/m2k/src/old/logicanalyzer/logic_analyzer.h index 60dd85c54f..194f65c94e 100644 --- a/plugins/m2k/src/old/logicanalyzer/logic_analyzer.h +++ b/plugins/m2k/src/old/logicanalyzer/logic_analyzer.h @@ -38,7 +38,7 @@ #include #include -#include +#include "m2k-gui/dropdown_switch_list.h" #include #include #include diff --git a/plugins/m2k/src/old/measure_settings.cpp b/plugins/m2k/src/old/measure_settings.cpp index 8982557d19..80247db385 100644 --- a/plugins/m2k/src/old/measure_settings.cpp +++ b/plugins/m2k/src/old/measure_settings.cpp @@ -19,7 +19,7 @@ */ #include "measure_settings.h" -#include "gui/dropdown_switch_list.h" +#include "m2k-gui/dropdown_switch_list.h" #include "oscilloscope_plot.hpp" #include "ui_measure_settings.h" diff --git a/plugins/m2k/src/old/network_analyzer.hpp b/plugins/m2k/src/old/network_analyzer.hpp index 5b92716d9a..dd2423a9d3 100644 --- a/plugins/m2k/src/old/network_analyzer.hpp +++ b/plugins/m2k/src/old/network_analyzer.hpp @@ -28,7 +28,7 @@ #include "gui/customPushButton.h" #include "gui/mousewheelwidgetguard.h" #include "gui/spinbox_a.hpp" -#include "gui/startstoprangewidget.h" +#include "m2k-gui/startstoprangewidget.h" #include "handles_area.hpp" #include "iio_manager.hpp" #include "m2ktool.hpp" diff --git a/plugins/m2k/src/old/oscilloscope.cpp b/plugins/m2k/src/old/oscilloscope.cpp index e4ec626923..d41785fa1d 100644 --- a/plugins/m2k/src/old/oscilloscope.cpp +++ b/plugins/m2k/src/old/oscilloscope.cpp @@ -48,11 +48,11 @@ #include "adc_sample_conv.hpp" #include "buffer_previewer.hpp" #include "filemanager.h" -#include "gui/channel_widget.hpp" +#include "m2k-gui/channel_widget.hpp" #include "gui/customPushButton.h" -#include "gui/customplotpositionbutton.h" +#include "m2k-gui/customplotpositionbutton.h" #include "gui/dynamicWidget.h" -#include "gui/runsinglewidget.h" +#include "m2k-gui/runsinglewidget.h" #include "m2kmeasurement_gui.h" #include "m2kpluginExceptionHandler.h" #include "measure_settings.h" diff --git a/plugins/m2k/src/old/oscilloscope.hpp b/plugins/m2k/src/old/oscilloscope.hpp index 1dbfe2fd5a..15715ddda2 100644 --- a/plugins/m2k/src/old/oscilloscope.hpp +++ b/plugins/m2k/src/old/oscilloscope.hpp @@ -53,8 +53,8 @@ #include "fft_block.hpp" #include "filter.hpp" #include "frequency_compensation_filter.h" -#include "gui/osc_import_settings.h" -#include "gui/oscilloscope_plot.hpp" +#include "m2k-gui/osc_import_settings.h" +#include "m2k-gui/oscilloscope_plot.hpp" #include "gui/spinbox_a.hpp" #include "histogram_sink_f.h" #include "iio_manager.hpp" diff --git a/plugins/m2k/src/old/oscilloscope_api.cpp b/plugins/m2k/src/old/oscilloscope_api.cpp index b7ddf01ac5..2c5ff474ed 100644 --- a/plugins/m2k/src/old/oscilloscope_api.cpp +++ b/plugins/m2k/src/old/oscilloscope_api.cpp @@ -19,7 +19,7 @@ */ #include "oscilloscope_api.hpp" -#include "gui/channel_widget.hpp" +#include "m2k-gui/channel_widget.hpp" #include "measure_settings.h" #include "ui_channel_settings.h" diff --git a/plugins/m2k/src/old/patterngenerator/pattern_generator.cpp b/plugins/m2k/src/old/patterngenerator/pattern_generator.cpp index dcda2bc98d..cb41224dbe 100644 --- a/plugins/m2k/src/old/patterngenerator/pattern_generator.cpp +++ b/plugins/m2k/src/old/patterngenerator/pattern_generator.cpp @@ -24,7 +24,7 @@ #include "digitalchannel_manager.hpp" #include "gui/basemenu.h" #include "gui/dynamicWidget.h" -#include "gui/logicdatacurve.h" +#include "m2k-gui/logicdatacurve.h" #include "m2kpluginExceptionHandler.h" #include "pattern_generator_api.h" #include "patterns/patterns.hpp" diff --git a/plugins/m2k/src/old/patterngenerator/pattern_generator.h b/plugins/m2k/src/old/patterngenerator/pattern_generator.h index 223f197b7b..6155501fd0 100644 --- a/plugins/m2k/src/old/patterngenerator/pattern_generator.h +++ b/plugins/m2k/src/old/patterngenerator/pattern_generator.h @@ -22,7 +22,7 @@ #define PATTERNGENERATOR_H #include "buffer_previewer.hpp" -#include "gui/genericlogicplotcurve.h" +#include "m2k-gui/genericlogicplotcurve.h" #include "gui/spinbox_a.hpp" #include "m2ktool.hpp" #include "mousewheelwidgetguard.h" diff --git a/plugins/m2k/src/old/patterngenerator/patterns/patterns.hpp b/plugins/m2k/src/old/patterngenerator/patterns/patterns.hpp index 55ba7cbbdc..a5ddfc96f8 100644 --- a/plugins/m2k/src/old/patterngenerator/patterns/patterns.hpp +++ b/plugins/m2k/src/old/patterngenerator/patterns/patterns.hpp @@ -21,7 +21,7 @@ #ifndef PG_PATTERNS_HPP #define PG_PATTERNS_HPP -#include "gui/osc_import_settings.h" +#include "m2k-gui/osc_import_settings.h" #include "gui/spinbox_a.hpp" #include @@ -39,7 +39,7 @@ // Generated UI #include "filemanager.h" -#include "gui/genericlogicplotcurve.h" +#include "m2k-gui/genericlogicplotcurve.h" #include "sigrok-gui/decoder.h" #include "ui_binarycounterpatternui.h" diff --git a/plugins/m2k/src/old/signal_generator.cpp b/plugins/m2k/src/old/signal_generator.cpp index 9ec5d9d2dc..2826ef8d9a 100644 --- a/plugins/m2k/src/old/signal_generator.cpp +++ b/plugins/m2k/src/old/signal_generator.cpp @@ -21,7 +21,7 @@ #include "signal_generator.hpp" #include "gnuradio/blocks/multiply_const.h" -#include "gui/channel_widget.hpp" +#include "m2k-gui/channel_widget.hpp" #include "gui/dynamicWidget.h" #include "gui/spinbox_a.hpp" #include "m2kpluginExceptionHandler.h" diff --git a/plugins/m2k/src/old/signal_generator_api.cpp b/plugins/m2k/src/old/signal_generator_api.cpp index d1a10c7ba9..ce426aaedd 100644 --- a/plugins/m2k/src/old/signal_generator_api.cpp +++ b/plugins/m2k/src/old/signal_generator_api.cpp @@ -19,7 +19,7 @@ */ #include "signal_generator_api.hpp" -#include "gui/channel_widget.hpp" +#include "m2k-gui/channel_widget.hpp" #include "gui/spinbox_a.hpp" #include "ui_signal_generator.h" diff --git a/plugins/m2k/src/old/spectrum_analyzer.cpp b/plugins/m2k/src/old/spectrum_analyzer.cpp index 942cf4b965..8010f95ee2 100644 --- a/plugins/m2k/src/old/spectrum_analyzer.cpp +++ b/plugins/m2k/src/old/spectrum_analyzer.cpp @@ -43,8 +43,8 @@ #include "fft_block.hpp" #include "filemanager.h" #include "filter.hpp" -#include "gui/channel_widget.hpp" -#include "gui/db_click_buttons.hpp" +#include "m2k-gui/channel_widget.hpp" +#include "m2k-gui/db_click_buttons.hpp" #include "gui/dynamicWidget.h" #include "math.hpp" #include "spectrum_analyzer.hpp" diff --git a/plugins/m2k/src/old/spectrum_analyzer.hpp b/plugins/m2k/src/old/spectrum_analyzer.hpp index 03cb21c885..fc5d47fdd7 100644 --- a/plugins/m2k/src/old/spectrum_analyzer.hpp +++ b/plugins/m2k/src/old/spectrum_analyzer.hpp @@ -26,7 +26,7 @@ #include "fft_block.hpp" #include "gui/customPushButton.h" #include "gui/spinbox_a.hpp" -#include "gui/startstoprangewidget.h" +#include "m2k-gui/startstoprangewidget.h" #include "iio_manager.hpp" #include "m2ktool.hpp" #include "plot_utils.hpp" diff --git a/plugins/m2k/src/old/spectrum_analyzer_api.cpp b/plugins/m2k/src/old/spectrum_analyzer_api.cpp index 492c565e26..de00e3709c 100644 --- a/plugins/m2k/src/old/spectrum_analyzer_api.cpp +++ b/plugins/m2k/src/old/spectrum_analyzer_api.cpp @@ -19,8 +19,8 @@ */ #include "spectrum_analyzer_api.hpp" -#include "gui/channel_widget.hpp" -#include "gui/db_click_buttons.hpp" +#include "m2k-gui/channel_widget.hpp" +#include "m2k-gui/db_click_buttons.hpp" #include "ui_cursors_settings.h" #include "ui_spectrum_analyzer.h" diff --git a/plugins/m2k/src/old/statistic_widget.cpp b/plugins/m2k/src/old/statistic_widget.cpp index 5424a79e4d..33796709bf 100644 --- a/plugins/m2k/src/old/statistic_widget.cpp +++ b/plugins/m2k/src/old/statistic_widget.cpp @@ -20,7 +20,7 @@ #include "statistic_widget.h" -#include "gui/m2kmeasure.h" +#include "m2k-gui/m2kmeasure.h" #include "plot_utils.hpp" #include "ui_statistic.h" diff --git a/plugins/m2k/ui/digitalio.ui b/plugins/m2k/ui/digitalio.ui index 0f617d5a2a..e7a781ca2b 100644 --- a/plugins/m2k/ui/digitalio.ui +++ b/plugins/m2k/ui/digitalio.ui @@ -266,17 +266,18 @@ background-color: grey; scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 scopy::LinkedButton QPushButton -
gui/linked_button.hpp
+
m2k-gui/linked_button.hpp
 + diff --git a/plugins/m2k/ui/dmm.ui b/plugins/m2k/ui/dmm.ui index 1b879bace6..d51ce409e3 100644 --- a/plugins/m2k/ui/dmm.ui +++ b/plugins/m2k/ui/dmm.ui @@ -1996,18 +1996,18 @@ line-height: 14px; scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 - scopy::CustomSwitch + scopy::LinkedButton QPushButton -
gui/customSwitch.h
+
m2k-gui/linked_button.hpp
 - scopy::LinkedButton + scopy::CustomSwitch QPushButton -
gui/linked_button.hpp
+
gui/customSwitch.h
 QwtThermo @@ -2022,17 +2022,18 @@ line-height: 14px; scopy::Sismograph QFrame -
sismograph.hpp
+
m2k-gui/sismograph.hpp
1 scopy::CustomScale QwtThermo -
gui/customScale.hpp
+
m2k-gui/customScale.hpp
 + @@ -2069,7 +2070,7 @@ line-height: 14px; - + diff --git a/plugins/m2k/ui/logic_analyzer.ui b/plugins/m2k/ui/logic_analyzer.ui index 4241fa5c5d..9a4636a1ad 100644 --- a/plugins/m2k/ui/logic_analyzer.ui +++ b/plugins/m2k/ui/logic_analyzer.ui @@ -2446,34 +2446,22 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); } - - scopy::CustomPushButton - QPushButton -
gui/customPushButton.h
- scopy::DetachDragZone QWidget
detachdragzone.h
1 - - scopy::MenuHAnim - QWidget -
gui/menu_anim.hpp
- 1 - scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 - scopy::RunSingleWidget - QWidget -
gui/runsinglewidget.h
- 1 + scopy::LinkedButton + QPushButton +
m2k-gui/linked_button.hpp
 scopy::CustomSwitch @@ -2481,9 +2469,21 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); }gui/customSwitch.h - scopy::LinkedButton + scopy::CustomPushButton QPushButton -
gui/linked_button.hpp
+
gui/customPushButton.h
+ + + scopy::MenuHAnim + QWidget +
gui/menu_anim.hpp
+ 1 + + + scopy::RunSingleWidget + QWidget +
m2k-gui/runsinglewidget.h
+ 1 scopy::m2k::logic::DecoderTable @@ -2493,6 +2493,7 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); } + diff --git a/plugins/m2k/ui/measure_panel.ui b/plugins/m2k/ui/measure_panel.ui index bd728a0094..72bd68047e 100644 --- a/plugins/m2k/ui/measure_panel.ui +++ b/plugins/m2k/ui/measure_panel.ui @@ -259,7 +259,7 @@ scopy::OscCustomScrollArea QScrollArea -
gui/osc_custom_scroll.h
+
m2k-gui/osc_custom_scroll.h
1 diff --git a/plugins/m2k/ui/network_analyzer.ui b/plugins/m2k/ui/network_analyzer.ui index 8cf6117d12..e1ed56c162 100644 --- a/plugins/m2k/ui/network_analyzer.ui +++ b/plugins/m2k/ui/network_analyzer.ui @@ -97,7 +97,7 @@ Print - + :/gui/icons/printer.svg:/gui/icons/printer.svg @@ -1940,7 +1940,7 @@ QPushButton[invalid=true]:enabled:!pressed { background-color: #4a64ff; } Previous - + :/gui/icons/arrow_left.svg:/gui/icons/arrow_left.svg @@ -1996,7 +1996,7 @@ padding-left: 20px; Next - + :/gui/icons/arrow_right.svg:/gui/icons/arrow_right.svg @@ -3134,34 +3134,22 @@ QLabel { - - scopy::CustomPushButton - QPushButton -
gui/customPushButton.h
- scopy::DetachDragZone QWidget
detachdragzone.h
1 - - scopy::MenuHAnim - QWidget -
gui/menu_anim.hpp
- 1 - scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 - scopy::RunSingleWidget - QWidget -
gui/runsinglewidget.h
- 1 + scopy::LinkedButton + QPushButton +
m2k-gui/linked_button.hpp
 scopy::CustomSwitch @@ -3169,9 +3157,21 @@ QLabel {
gui/customSwitch.h
 - scopy::LinkedButton + scopy::CustomPushButton QPushButton -
gui/linked_button.hpp
+
gui/customPushButton.h
+ + + scopy::MenuHAnim + QWidget +
gui/menu_anim.hpp
+ 1 + + + scopy::RunSingleWidget + QWidget +
m2k-gui/runsinglewidget.h
+ 1 scopy::dBgraph @@ -3188,7 +3188,7 @@ QLabel { scopy::CustomPlotPositionButton QWidget -
gui/customplotpositionbutton.h
+
m2k-gui/customplotpositionbutton.h
1 @@ -3198,8 +3198,8 @@ QLabel { - - + + diff --git a/plugins/m2k/ui/oscilloscope.ui b/plugins/m2k/ui/oscilloscope.ui index f9bf910532..480ea8fe95 100644 --- a/plugins/m2k/ui/oscilloscope.ui +++ b/plugins/m2k/ui/oscilloscope.ui @@ -1052,11 +1052,6 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); } - - scopy::CustomPushButton - QPushButton -
gui/customPushButton.h
- scopy::DetachDragZone QWidget @@ -1064,31 +1059,37 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); }1 - scopy::MenuHAnim + scopy::InstrumentNotes QWidget -
gui/menu_anim.hpp
+
m2k-gui/instrumentnotes.h
1 - scopy::InstrumentNotes + scopy::LinkedButton + QPushButton +
m2k-gui/linked_button.hpp
+ + + scopy::CustomPushButton + QPushButton +
gui/customPushButton.h
+ + + scopy::MenuHAnim QWidget -
gui/instrumentnotes.h
+
gui/menu_anim.hpp
1 scopy::RunSingleWidget QWidget -
gui/runsinglewidget.h
+
m2k-gui/runsinglewidget.h
1 - - scopy::LinkedButton - QPushButton -
gui/linked_button.hpp
- + diff --git a/plugins/m2k/ui/pattern_generator.ui b/plugins/m2k/ui/pattern_generator.ui index fc97641b93..a9f339315c 100644 --- a/plugins/m2k/ui/pattern_generator.ui +++ b/plugins/m2k/ui/pattern_generator.ui @@ -1782,34 +1782,22 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); } - - scopy::CustomPushButton - QPushButton -
gui/customPushButton.h
- scopy::DetachDragZone QWidget
detachdragzone.h
1 - - scopy::MenuHAnim - QWidget -
gui/menu_anim.hpp
- 1 - scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 - scopy::RunSingleWidget - QWidget -
gui/runsinglewidget.h
- 1 + scopy::LinkedButton + QPushButton +
m2k-gui/linked_button.hpp
 scopy::CustomSwitch @@ -1817,13 +1805,26 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); }gui/customSwitch.h - scopy::LinkedButton + scopy::CustomPushButton QPushButton -
gui/linked_button.hpp
+
gui/customPushButton.h
+ + + scopy::MenuHAnim + QWidget +
gui/menu_anim.hpp
+ 1 + + + scopy::RunSingleWidget + QWidget +
m2k-gui/runsinglewidget.h
+ 1 + diff --git a/plugins/m2k/ui/powercontrol.ui b/plugins/m2k/ui/powercontrol.ui index 2d72fb006a..8614bacaa3 100644 --- a/plugins/m2k/ui/powercontrol.ui +++ b/plugins/m2k/ui/powercontrol.ui @@ -1093,21 +1093,21 @@ QPushButton:disabled {
detachdragzone.h
1 - - scopy::CustomSwitch - QPushButton -
gui/customSwitch.h
- scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 scopy::LinkedButton QPushButton -
gui/linked_button.hpp
+
m2k-gui/linked_button.hpp
+ + + scopy::CustomSwitch + QPushButton +
gui/customSwitch.h
 QwtThermo @@ -1117,11 +1117,12 @@ QPushButton:disabled { scopy::LcdNumber QLCDNumber -
gui/lcdNumber.hpp
+
lcdNumber.hpp
 + diff --git a/plugins/m2k/ui/signal_generator.ui b/plugins/m2k/ui/signal_generator.ui index d082696174..3d79186150 100644 --- a/plugins/m2k/ui/signal_generator.ui +++ b/plugins/m2k/ui/signal_generator.ui @@ -261,7 +261,7 @@ - 3 + 2 false @@ -1460,31 +1460,31 @@ background-repeat: no-repeat; scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 scopy::LinkedButton QPushButton -
gui/linked_button.hpp
+
m2k-gui/linked_button.hpp
+ + + scopy::CustomSwitch + QPushButton +
gui/customSwitch.h
 scopy::MenuHAnim QWidget -
gui/menu_anim.hpp
+
gui/menu_anim.hpp
1 scopy::RunSingleWidget QWidget -
gui/runsinglewidget.h
+
m2k-gui/runsinglewidget.h
1 - - scopy::CustomSwitch - QPushButton -
customSwitch.h
- scopy::Math QWidget diff --git a/plugins/m2k/ui/spectrum_analyzer.ui b/plugins/m2k/ui/spectrum_analyzer.ui index 408d4a0f24..0ee38f3e88 100644 --- a/plugins/m2k/ui/spectrum_analyzer.ui +++ b/plugins/m2k/ui/spectrum_analyzer.ui @@ -2524,51 +2524,52 @@ QPushButton:checked { border-image: url(:/gui/icons/setup_btn_checked.svg); } scopy::InstrumentNotes QWidget -
gui/instrumentnotes.h
+
m2k-gui/instrumentnotes.h
1 scopy::LinkedButton QPushButton -
gui/linked_button.hpp
+
m2k-gui/linked_button.hpp
+ + + scopy::CustomSwitch + QPushButton +
gui/customSwitch.h
+ + + scopy::CustomPushButton + QPushButton +
gui/customPushButton.h
 scopy::MenuHAnim QWidget -
gui/menu_anim.hpp
+
gui/menu_anim.hpp
1 scopy::RunSingleWidget QWidget -
gui/runsinglewidget.h
+
m2k-gui/runsinglewidget.h
1 - - scopy::CustomSwitch - QPushButton -
customSwitch.h
- - - scopy::CustomPushButton - QPushButton -
customPushButton.h
- scopy::MarkerTable QWidget -
gui/marker_table.hpp
+
m2k-gui/marker_table.hpp
1 scopy::ImportSettings QWidget -
gui/osc_import_settings.h
+
m2k-gui/osc_import_settings.h
1 + diff --git a/plugins/m2k/ui/statistics_panel.ui b/plugins/m2k/ui/statistics_panel.ui index e8f06bed82..121bef36ce 100644 --- a/plugins/m2k/ui/statistics_panel.ui +++ b/plugins/m2k/ui/statistics_panel.ui @@ -190,7 +190,7 @@ QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { scopy::OscCustomScrollArea QScrollArea -
gui/osc_custom_scroll.h
+
m2k-gui/osc_custom_scroll.h
1 diff --git a/plugins/pqm/src/waveforminstrument.cpp b/plugins/pqm/src/waveforminstrument.cpp index cef74350ba..e00aa5a15e 100644 --- a/plugins/pqm/src/waveforminstrument.cpp +++ b/plugins/pqm/src/waveforminstrument.cpp @@ -1,5 +1,6 @@ #include "waveforminstrument.h" #include "plotaxis.h" +#include #include #include #include diff --git a/plugins/regmap/src/deviceregistermap.cpp b/plugins/regmap/src/deviceregistermap.cpp index 0904294100..97d80b8d03 100644 --- a/plugins/regmap/src/deviceregistermap.cpp +++ b/plugins/regmap/src/deviceregistermap.cpp @@ -31,7 +31,6 @@ #include #include -#include #include using namespace scopy; diff --git a/plugins/test/src/testtool.cpp b/plugins/test/src/testtool.cpp index 0d2a3f22ab..72004536ed 100644 --- a/plugins/test/src/testtool.cpp +++ b/plugins/test/src/testtool.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using namespace scopy;