SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

CMake refactoring

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-04 22:31:50 +03:00
parent bd421ff5af
commit c576a14deb
29 changed files with 316 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/CMakeLists.txt
View File

@@ -1 +1 @@
add_directories_with_include("qad_")
shstk_add_directories_with_include(TRUE "qad_")

2
libs/blockview/CMakeLists.txt
View File

@@ -1 +1 @@
qad_library(blockview "Gui;Widgets" "qad_utils;qad_widgets")
qad_library(blockview "Gui;Widgets" "qad_widgets")

2
libs/graphic/CMakeLists.txt
View File

@@ -1 +1 @@
qad_library(graphic "Gui;Widgets;OpenGL" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
qad_library(graphic "Gui;Widgets;OpenGL" "qad_widgets;${OPENGL_LIBRARIES}")

26
libs/graphic/graphic.cpp
View File

@@ -50,6 +50,8 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), canvas(0), line_x_min(this),
ui->checkGuides->addAction(ui->actionGuidesFree );
ui->checkGuides->addAction(ui->actionGuidesTraceX);
ui->checkGuides->addAction(ui->actionGuidesTraceY);
ui->buttonAutofit->addAction(ui->actionExpandX);
ui->buttonAutofit->addAction(ui->actionExpandY);
line_x_min.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
line_x_max.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
((QBoxLayout * )ui->widgetLY->layout())->insertWidget(0, &line_y_min);
@@ -593,18 +595,12 @@ void Graphic::setMaxVisibleTime(double val) {
void Graphic::setOnlyExpandY(bool yes) {
only_expand_y = yes;
ui->checkExpandY->blockSignals(true);
ui->checkExpandY->setCheckable(yes);
ui->checkExpandY->blockSignals(false);
ui->actionExpandY->setChecked(yes);
}
void Graphic::setOnlyExpandX(bool yes) {
only_expand_x = yes;
ui->checkExpandX->blockSignals(true);
ui->checkExpandX->setCheckable(yes);
ui->checkExpandX->blockSignals(false);
ui->actionExpandX->setChecked(yes);
}
@@ -655,8 +651,6 @@ void Graphic::setButtons(Graphic::Buttons b) {
ui->buttonAutofit->setVisible(b.testFlag(Autofit));
ui->checkGrid->setVisible(b.testFlag(Grid));
ui->checkGuides->setVisible(b.testFlag(CursorAxis));
ui->checkExpandY->setVisible(b.testFlag(OnlyExpandY));
ui->checkExpandX->setVisible(b.testFlag(OnlyExpandX));
ui->buttonFullscreen->setVisible(b.testFlag(Fullscreen));
ui->checkBorderInputs->setVisible(b.testFlag(BorderInputs));
ui->checkLegend->setVisible(b.testFlag(Legend));
@@ -1791,15 +1785,15 @@ void Graphic::setLegendVisible(bool visible) {
}
void Graphic::on_checkExpandY_toggled(bool checked) {
only_expand_y = checked;
ui->checkExpandY->setIcon(checked ? icon_exp_y : icon_exp_sy);
void Graphic::on_actionExpandX_triggered(bool checked) {
only_expand_x = checked;
ui->actionExpandX->setIcon(checked ? icon_exp_x : icon_exp_sx);
}
void Graphic::on_checkExpandX_toggled(bool checked) {
only_expand_x = checked;
ui->checkExpandX->setIcon(checked ? icon_exp_x : icon_exp_sx);
void Graphic::on_actionExpandY_triggered(bool checked) {
only_expand_y = checked;
ui->actionExpandY->setIcon(checked ? icon_exp_y : icon_exp_sy);
}

7
libs/graphic/graphic.h
View File

@@ -129,8 +129,6 @@ public:
Autofit = 0x01,
Grid = 0x02,
CursorAxis = 0x04,
OnlyExpandY = 0x08,
OnlyExpandX = 0x10,
Fullscreen = 0x20,
BorderInputs = 0x40,
Legend = 0x80,
@@ -423,8 +421,8 @@ protected slots:
void on_buttonSave_clicked() {saveImage();}
void on_checkGrid_toggled(bool checked) {grid = checked; update();}
void on_checkGuides_toggled(bool checked);
void on_checkExpandY_toggled(bool checked);
void on_checkExpandX_toggled(bool checked);
void on_actionExpandX_triggered(bool checked);
void on_actionExpandY_triggered(bool checked);
void on_checkBorderInputs_toggled(bool checked) {setBorderInputsVisible(checked);}
void on_checkLegend_toggled(bool checked) {setLegendVisible(checked);}
void on_checkPause_toggled(bool checked) {setPaused(checked);}
@@ -443,7 +441,6 @@ signals:
void cleared();
void visualRectChanged();
void graphicSettingsChanged();
};

47
libs/graphic/graphic.ui
View File

@@ -89,34 +89,6 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="checkExpandY">
<property name="toolTip">
<string>Only expand Y</string>
</property>
<property name="icon">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/expand_s_y.png</normaloff>:/icons/expand_s_y.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="checkExpandX">
<property name="toolTip">
<string>Only expand X</string>
</property>
<property name="icon">
<iconset resource="qad_graphic.qrc">
<normaloff>:/icons/expand_s_x.png</normaloff>:/icons/expand_s_x.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="buttonFullscreen">
<property name="toolTip">
@@ -449,6 +421,25 @@
<string>Trace Y</string>
</property>
</action>
<action name="actionExpandX">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Only expand X</string>
</property>
</action>
<action name="actionExpandY">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Only expand Y</string>
</property>
<property name="toolTip">
<string>Only expand Y</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

7
libs/piqt/CMakeLists.txt
View File

@@ -1 +1,6 @@
piqt_library(piqt "Gui;Positioning" "qad_utils;qad_widgets")
find_package(PIP)
if (PIP_FOUND)
qad_library(piqt "Gui;Positioning" "PIP;qad_widgets")
endif()

26
libs/piqt/piqt.h
View File

@@ -29,14 +29,14 @@
#if QT_VERSION >= 0x050200
# include "pigeoposition.h"
#endif
#include "piqt_export.h"
#include "qad_piqt_export.h"
class QGeoCoordinate;
PIQT_EXPORT const QVariant PI2QVariant(const PIVariant & v);
PIQT_EXPORT const PIVariant Q2PIVariant(const QVariant & v);
QAD_PIQT_EXPORT const QVariant PI2QVariant(const PIVariant & v);
QAD_PIQT_EXPORT const PIVariant Q2PIVariant(const QVariant & v);
//inline const QString PI2QString(const PIString & v) {return QString::fromLocal8Bit(v.data());}
inline const QString PI2QString(const PIString & v) {return QString::fromUtf8(v.dataUTF8());}
@@ -125,20 +125,20 @@ inline PropertyStorage PI2QPropertyStorage(const PIPropertyStorage & props) {
}
PIQT_EXPORT const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el);
PIQT_EXPORT const QAD::File PI2QADFile(const PIVariantTypes::File & v);
PIQT_EXPORT const QAD::Dir PI2QADDir(const PIVariantTypes::Dir & v);
PIQT_EXPORT const QAD::IODevice PI2QADIODevice(const PIVariantTypes::IODevice & v);
PIQT_EXPORT const PIVariantTypes::Enum QAD2PIEnum(const QAD::Enum & el);
PIQT_EXPORT const PIVariantTypes::File QAD2PIFile(const QAD::File & v);
PIQT_EXPORT const PIVariantTypes::Dir QAD2PIDir(const QAD::Dir & v);
PIQT_EXPORT const PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v);
QAD_PIQT_EXPORT const QAD::Enum PI2QADEnum(const PIVariantTypes::Enum & el);
QAD_PIQT_EXPORT const QAD::File PI2QADFile(const PIVariantTypes::File & v);
QAD_PIQT_EXPORT const QAD::Dir PI2QADDir(const PIVariantTypes::Dir & v);
QAD_PIQT_EXPORT const QAD::IODevice PI2QADIODevice(const PIVariantTypes::IODevice & v);
QAD_PIQT_EXPORT const PIVariantTypes::Enum QAD2PIEnum(const QAD::Enum & el);
QAD_PIQT_EXPORT const PIVariantTypes::File QAD2PIFile(const QAD::File & v);
QAD_PIQT_EXPORT const PIVariantTypes::Dir QAD2PIDir(const QAD::Dir & v);
QAD_PIQT_EXPORT const PIVariantTypes::IODevice QAD2PIIODevice(const QAD::IODevice & v);
//inline const PIVariant QString2PIVariant(const QString & v) {return PIVariant::readFromString(QString2PIString(v));}
#if QT_VERSION >= 0x050200
PIQT_EXPORT const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v);
PIQT_EXPORT const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v);
QAD_PIQT_EXPORT const QGeoCoordinate PI2QGeoPosition(const PIGeoPosition & v);
QAD_PIQT_EXPORT const PIGeoPosition Q2PIGeoPosition(const QGeoCoordinate & v);
#endif
template <typename From>

4
libs/piqt/qpiconnection.h
View File

@@ -25,10 +25,10 @@
#include "piconnection.h"
#include "qpiconfig.h"
#include "piqt.h"
#include "piqt_export.h"
#include "qad_piqt_export.h"
class PIQT_EXPORT QPIConnection: public QObject, public PIConnection {
class QAD_PIQT_EXPORT QPIConnection: public QObject, public PIConnection {
Q_OBJECT
PIOBJECT_SUBCLASS(QPIConnection, PIConnection)
public:

21
libs/piqt_widgets/CMakeLists.txt
View File

@@ -1,9 +1,14 @@
include(PIPMacros)
pip_code_model(CCM "${ROOT_DIR}/pip/libs/main/io_devices/piiodevice.h" "${ROOT_DIR}/pip/libs/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
piqt_library(piqt_utils "Gui" "qad_utils;qad_widgets;qad_blockview;piqt" ${CCM})
find_package(PIP)
if (PIP_FOUND AND BUILDING_pip)
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
add_dependencies(piqt_utils${_v} pip_cmg)
endif()
endforeach()
project(piqt_utils)
pip_code_model(CCM "${pip_ROOT_SRC}/libs/main/io_devices/piiodevice.h" "${pip_ROOT_SRC}/libs/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es" ABSOLUTE)
qad_library(piqt_utils "Gui" "qad_blockview;qad_piqt" ${CCM})
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
add_dependencies(qad_piqt_utils${_v} pip_cmg)
endif()
endforeach()
endif()

4
libs/piqt_widgets/piqt_connection_edit.h
View File

@@ -22,7 +22,7 @@
#include <QDialog>
#include "piconnection.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
namespace Ui {
@@ -33,7 +33,7 @@ class FilterItem;
class DeviceItem;
class SenderItem;
class PIQT_UTILS_EXPORT ConnectionEdit: public QDialog {
class QAD_PIQT_UTILS_EXPORT ConnectionEdit: public QDialog {
Q_OBJECT
public:
explicit ConnectionEdit(QWidget * parent = 0);

10
libs/piqt_widgets/piqt_connection_view.h
View File

@@ -22,14 +22,14 @@
#include "blockview.h"
#include "piconnection.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
const int __CV_Device = 1;
const int __CV_Filter = 2;
const int __CV_Sender = 3;
class PIQT_UTILS_EXPORT DeviceItem: public BlockItem {
class QAD_PIQT_UTILS_EXPORT DeviceItem: public BlockItem {
public:
DeviceItem();
@@ -55,7 +55,7 @@ protected:
};
class PIQT_UTILS_EXPORT FilterItem: public BlockItem {
class QAD_PIQT_UTILS_EXPORT FilterItem: public BlockItem {
public:
FilterItem();
@@ -85,7 +85,7 @@ protected:
};
class PIQT_UTILS_EXPORT SenderItem: public BlockItem {
class QAD_PIQT_UTILS_EXPORT SenderItem: public BlockItem {
public:
SenderItem();
@@ -105,7 +105,7 @@ protected:
};
class PIQT_UTILS_EXPORT ConnectionView: public BlockView {
class QAD_PIQT_UTILS_EXPORT ConnectionView: public BlockView {
Q_OBJECT
public:
explicit ConnectionView(QWidget * parent = 0);

6
libs/piqt_widgets/piqt_highlighter.h
View File

@@ -23,11 +23,11 @@
#include <QSyntaxHighlighter>
#include <QTextCursor>
#include <QTextCharFormat>
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
class QTextDocument;
class PIQT_UTILS_EXPORT ConfigHighlighter : public QSyntaxHighlighter
class QAD_PIQT_UTILS_EXPORT ConfigHighlighter : public QSyntaxHighlighter
{
Q_OBJECT
public:
@@ -38,7 +38,7 @@ public:
private:
void highlightBlock(const QString &text);
struct PIQT_UTILS_EXPORT HighlightingRule {
struct QAD_PIQT_UTILS_EXPORT HighlightingRule {
QRegExp pattern;
QTextCharFormat format;
};

8
libs/piqt_widgets/piqt_iodevice_edit.h
View File

@@ -22,14 +22,14 @@
#include <QWidget>
#include "qad_types.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
class QLineEdit;
class QToolButton;
class IODeviceEditDialog;
class PIQT_UTILS_EXPORT IODeviceEdit: public QWidget {
class QAD_PIQT_UTILS_EXPORT IODeviceEdit: public QWidget {
Q_OBJECT
Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
@@ -61,14 +61,14 @@ signals:
};
class PIQT_UTILS_EXPORT __IODeviceEditRegistrator__ {
class QAD_PIQT_UTILS_EXPORT __IODeviceEditRegistrator__ {
public:
__IODeviceEditRegistrator__();
};
static __IODeviceEditRegistrator__ __iodeviceeditregistrator__;
PIQT_UTILS_EXPORT void QAD_IODevice_toString(const QVariant & v, QString & r);
QAD_PIQT_UTILS_EXPORT void QAD_IODevice_toString(const QVariant & v, QString & r);
#endif // PIQT_IODEVICE_EDIT_H

4
libs/piqt_widgets/piqt_iodevice_edit_dialog.h
View File

@@ -23,13 +23,13 @@
#include <QDialog>
#include "qad_types.h"
#include "propertystorage.h"
#include "piqt_utils_export.h"
#include "qad_piqt_utils_export.h"
namespace Ui {
class IODeviceEditDialog;
}
class PIQT_UTILS_EXPORT IODeviceEditDialog: public QDialog {
class QAD_PIQT_UTILS_EXPORT IODeviceEditDialog: public QDialog {
Q_OBJECT
public:
explicit IODeviceEditDialog(QWidget * parent = 0);

4
libs/qglview/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
find_package(OpenGL REQUIRED)
_qt_project(qglview FALSE "QAD" "Gui;OpenGL;Xml" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
_qt_install(qglview FALSE "qad" "out_HDR" "out_QM")
shstk_qt_project(qglview FALSE "qad" "Gui;OpenGL;Xml" "qad_widgets;qad_utils;${OPENGL_LIBRARIES}")
shstk_qt_install("qad" FALSE qglview "out_HDR" "out_QM")
qt_sources(test_SRC DIR "qglview_test")
qt_wrap(${test_SRC} CPPS test_CPP)

2
libs/qglview/plugin/CMakeLists.txt
View File

@@ -1 +1 @@
_qt_plugin(qglview "Gui;Widgets;OpenGL" "qglview")
shstk_qt_plugin(qglview "Gui;Widgets;OpenGL" "qglview")

7
libs/widgets/qcodeedit.cpp
View File

@@ -1243,7 +1243,7 @@ void QCodeEdit::invokeAutoCompletition(bool force) {
hideHelp();
return;
}
acl << wordsCompletitionList(scope.second);
if (word_complet) acl << wordsCompletitionList(scope.second);
QFont bf(font());
bf.setBold(true);
foreach (const ACPair & ac, acl) {
@@ -1274,8 +1274,9 @@ void QCodeEdit::invokeAutoCompletition(bool force) {
completer->setVisible(true);
//qApp->processEvents();
int sz = completer->verticalScrollBar()->width();
for (int i = 0; i < completer->header()->count(); ++i)
sz += qMax<int>(sz, ((QAbstractItemView*)completer)->sizeHintForColumn(i));
sz += ((QAbstractItemView*)completer)->viewport()->width();
// for (int i = 0; i < completer->header()->count(); ++i)
// sz += ((QAbstractItemView*)completer)->sizeHintForColumn(i);
completer->resize(sz, fontHeight() * 16);
} else
completer->hide();

8
libs/widgets/qcodeedit.h
View File

@@ -38,6 +38,7 @@ class QAD_WIDGETS_EXPORT QCodeEdit: public QWidget
Q_PROPERTY(QString text READ text WRITE setText)
Q_PROPERTY(bool showSpaces READ showSpaces WRITE setShowSpaces)
Q_PROPERTY(bool showLineNumbers READ showLineNumbers WRITE setShowLineNumbers)
Q_PROPERTY(bool wordCompletitionEnabled READ wordCompletitionEnabled WRITE setWordCompletitionEnabled)
Q_PROPERTY(QFont editorFont READ editorFont WRITE setEditorFont)
public:
@@ -72,6 +73,8 @@ public:
void registerAutoCompletitionClass(int id, ACClassType ac_class, const QString & name, const QIcon & icon = QIcon()) {ac_classes[id] = ACClass(id, ac_class, name, icon);}
bool wordCompletitionEnabled() const {return word_complet;}
protected:
typedef QPair<QString, QString> StringsPair;
typedef QPair<int, QList<StringsPair> > ACPair;
@@ -111,6 +114,7 @@ private:
QStringList cursor_scope;
int prev_lc, auto_comp_pl, timer, cur_search_ind, pos_press, pos_el_press;
bool spaces_, _ignore_focus_out, _first, _destructor, _replacing;
bool word_complet;
bool eventFilter(QObject * o, QEvent * e);
void showEvent(QShowEvent * );
@@ -124,7 +128,7 @@ private:
void clearSearch();
void moveToSearch();
int searchIndFromCursor();
private slots:
void syncScrolls();
void scrollUp();
@@ -163,7 +167,9 @@ public slots:
void searchNext(bool next = true);
void searchPrevious();
void hideSearch();
void setWordCompletitionEnabled(bool on) {word_complet = on;}
signals:
void textChanged();
void parseRequest();