mirror of
https://github.com/YACReader/yacreader
synced 2026-03-01 18:33:09 -05:00
Remove software and opengl flow implementations
This simplifies the code base A LOT.
This commit is contained in:
@ -3,75 +3,40 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include "pictureflow.h"
|
||||
#include "comic_flow.h"
|
||||
#ifndef NO_OPENGL
|
||||
// Conditional include based on Qt version and RHI availability
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) && defined(YACREADER_USE_RHI)
|
||||
#include "yacreader_global.h"
|
||||
|
||||
#include "yacreader_comic_flow_rhi.h"
|
||||
using YACReaderComicFlowImpl = YACReaderComicFlow3D;
|
||||
#else
|
||||
#include "yacreader_flow_gl.h"
|
||||
using YACReaderComicFlowImpl = YACReaderComicFlowGL;
|
||||
#endif
|
||||
#endif
|
||||
#include "yacreader_global_gui.h"
|
||||
|
||||
class ComicFlowWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
ComicFlowWidget(QWidget *paret = nullptr);
|
||||
ComicFlowWidget(QWidget *parent = nullptr);
|
||||
|
||||
public slots:
|
||||
virtual void setShowMarks(bool value) = 0;
|
||||
virtual void setMarks(QVector<YACReaderComicReadStatus> marks) = 0;
|
||||
virtual void setMarkImage(QImage &image) = 0;
|
||||
virtual void markSlide(int index, YACReaderComicReadStatus status) = 0;
|
||||
virtual void unmarkSlide(int index) = 0;
|
||||
virtual void setSlideSize(QSize size) = 0;
|
||||
virtual void clear() = 0;
|
||||
virtual void setImagePaths(QStringList paths) = 0;
|
||||
virtual void setCenterIndex(int index) = 0;
|
||||
virtual void showSlide(int index) = 0;
|
||||
virtual int centerIndex() = 0;
|
||||
virtual void updateMarks() = 0;
|
||||
virtual void setFlowType(FlowType flowType) = 0;
|
||||
virtual void render() = 0;
|
||||
virtual void updateConfig(QSettings *settings) = 0;
|
||||
virtual void add(const QString &path, int index) = 0;
|
||||
virtual void remove(int cover) = 0;
|
||||
virtual void resortCovers(QList<int> newOrder) = 0;
|
||||
void setShowMarks(bool value);
|
||||
void setMarks(QVector<YACReader::YACReaderComicReadStatus> marks);
|
||||
void setMarkImage(QImage &image);
|
||||
void markSlide(int index, YACReader::YACReaderComicReadStatus status);
|
||||
void unmarkSlide(int index);
|
||||
void setSlideSize(QSize size);
|
||||
void clear();
|
||||
void setImagePaths(QStringList paths);
|
||||
void setCenterIndex(int index);
|
||||
void showSlide(int index);
|
||||
int centerIndex();
|
||||
void updateMarks();
|
||||
void setFlowType(YACReader::FlowType flowType);
|
||||
void render();
|
||||
void updateConfig(QSettings *settings);
|
||||
void add(const QString &path, int index);
|
||||
void remove(int cover);
|
||||
void resortCovers(QList<int> newOrder);
|
||||
|
||||
signals:
|
||||
void centerIndexChanged(int);
|
||||
void selected(unsigned int);
|
||||
};
|
||||
|
||||
class ComicFlowWidgetSW : public ComicFlowWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
private:
|
||||
ComicFlow *flow;
|
||||
|
||||
public:
|
||||
ComicFlowWidgetSW(QWidget *parent = nullptr);
|
||||
|
||||
void setShowMarks(bool value) override;
|
||||
void setMarks(QVector<YACReaderComicReadStatus> marks) override;
|
||||
void setMarkImage(QImage &image) override;
|
||||
void markSlide(int index, YACReaderComicReadStatus status) override;
|
||||
void unmarkSlide(int index) override;
|
||||
void setSlideSize(QSize size) override;
|
||||
void clear() override;
|
||||
void setImagePaths(QStringList paths) override;
|
||||
void setCenterIndex(int index) override;
|
||||
void showSlide(int index) override;
|
||||
int centerIndex() override;
|
||||
void updateMarks() override;
|
||||
void setFlowType(FlowType flowType) override;
|
||||
void render() override;
|
||||
void updateConfig(QSettings *settings) override;
|
||||
void add(const QString &path, int index) override;
|
||||
void remove(int cover) override;
|
||||
void resortCovers(QList<int> newOrder) override;
|
||||
|
||||
protected:
|
||||
void keyPressEvent(QKeyEvent *event) override;
|
||||
@ -81,64 +46,9 @@ protected:
|
||||
void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize sizeHint() const override;
|
||||
QSize slideSizeW;
|
||||
QSize slideSizeF;
|
||||
};
|
||||
|
||||
#ifndef NO_OPENGL
|
||||
class ComicFlowWidgetGL : public ComicFlowWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
private:
|
||||
YACReaderComicFlowImpl *flow;
|
||||
|
||||
public:
|
||||
ComicFlowWidgetGL(QWidget *parent = nullptr);
|
||||
|
||||
void setShowMarks(bool value) override;
|
||||
void setMarks(QVector<YACReaderComicReadStatus> marks) override;
|
||||
void setMarkImage(QImage &image) override;
|
||||
void markSlide(int index, YACReaderComicReadStatus status) override;
|
||||
void unmarkSlide(int index) override;
|
||||
void setSlideSize(QSize size) override;
|
||||
void clear() override;
|
||||
void setImagePaths(QStringList paths) override;
|
||||
void setCenterIndex(int index) override;
|
||||
void showSlide(int index) override;
|
||||
int centerIndex() override;
|
||||
void updateMarks() override;
|
||||
void setFlowType(FlowType flowType) override;
|
||||
void render() override;
|
||||
void updateConfig(QSettings *settings) override;
|
||||
void add(const QString &path, int index) override;
|
||||
void remove(int cover) override;
|
||||
void resortCovers(QList<int> newOrder) override;
|
||||
// public slots:
|
||||
// void setCF_RX(int value);
|
||||
// //the Y Rotation of the Coverflow
|
||||
// void setCF_RY(int value);
|
||||
// //the Z Rotation of the Coverflow
|
||||
// void setCF_RZ(int value);
|
||||
// //perspective
|
||||
// void setZoom(int zoom);
|
||||
// void setRotation(int angle);
|
||||
// //sets the distance between the covers
|
||||
// void setX_Distance(int distance);
|
||||
// //sets the distance between the centered and the non centered covers
|
||||
// void setCenter_Distance(int distance);
|
||||
// //sets the pushback amount
|
||||
// void setZ_Distance(int distance);
|
||||
// void setCF_Y(int value);
|
||||
// void setY_Distance(int value);
|
||||
// void setPreset(const Preset & p);
|
||||
protected:
|
||||
void keyPressEvent(QKeyEvent *event) override;
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
void resizeEvent(QResizeEvent *event) override;
|
||||
void mouseDoubleClickEvent(QMouseEvent *event) override;
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize sizeHint() const override;
|
||||
YACReaderComicFlow3D *flow;
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user