offer a few zoom factors

diff --git a/bigintwidget.cpp b/bigintwidget.cpp
index 17e213812baef49a6018b4505cd3e27d513d1d01..d7342a7f77d1e04e0113e25e85963fe29e0bcb17 100644 (file)
--- a/bigintwidget.cpp
+++ b/bigintwidget.cpp
@@ -4,6 +4,7 @@
 #include <QFileDialog>
 #include <QLayout>
 #include <QMouseEvent>
+#include <QPainter>
 #include <QPushButton>
 #include <QtConcurrent/QtConcurrent>
 
@@ -13,6 +14,7 @@ static inline QMenuBar *setup_menu_bar(BigintWidget *parent) {
     QMenuBar *menu_bar = new QMenuBar(parent);
     QMenu *menu = new QMenu("&File", parent);
     QPushButton *button = new QPushButton("Settings");
+    QAction *two, *four, *eight, *sixteen;
     menu_bar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     QObject::connect(
         menu->addAction("&Reset"),
@@ -47,6 +49,65 @@ static inline QMenuBar *setup_menu_bar(BigintWidget *parent) {
         &BigintWidget::close
     );
     menu_bar->addMenu(menu);
+    menu = new QMenu("&Zoom factor", parent);
+    two = menu->addAction("&2");
+    four = menu->addAction("&4");
+    eight = menu->addAction("&8");
+    sixteen = menu->addAction("1&6");
+    two->setCheckable(true);
+    two->setChecked(true);
+    four->setCheckable(true);
+    eight->setCheckable(true);
+    sixteen->setCheckable(true);
+    QObject::connect(
+        two,
+        &QAction::triggered,
+        parent,
+        [two, four, eight, sixteen, parent]() {
+            two->setChecked(true);
+            four->setChecked(false);
+            eight->setChecked(false);
+            sixteen->setChecked(false);
+            parent->set_zoom_factor(2);
+        }
+    );
+    QObject::connect(
+        four,
+        &QAction::triggered,
+        parent,
+        [two, four, eight, sixteen, parent]() {
+            two->setChecked(false);
+            four->setChecked(true);
+            eight->setChecked(false);
+            sixteen->setChecked(false);
+            parent->set_zoom_factor(4);
+        }
+    );
+    QObject::connect(
+        eight,
+        &QAction::triggered,
+        parent,
+        [two, four, eight, sixteen, parent]() {
+            two->setChecked(false);
+            four->setChecked(false);
+            eight->setChecked(true);
+            sixteen->setChecked(false);
+            parent->set_zoom_factor(8);
+        }
+    );
+    QObject::connect(
+        sixteen,
+        &QAction::triggered,
+        parent,
+        [two, four, eight, sixteen, parent]() {
+            two->setChecked(false);
+            four->setChecked(false);
+            eight->setChecked(false);
+            sixteen->setChecked(true);
+            parent->set_zoom_factor(16);
+        }
+    );
+    menu_bar->addMenu(menu);
     QObject::connect(
         button,
         &QPushButton::clicked,
@@ -76,7 +137,8 @@ BigintWidget::BigintWidget(QWidget *parent)
     img_label(new QLabel(this)),
     img_dirty(true),
     status_bar(new QStatusBar(this)),
-    settings_widget(new SettingsWidget(this))
+    settings_widget(new SettingsWidget(this)),
+    draw_progress(-1)
 {
     scroll_area->setWidget(img_label);
     connect(
@@ -112,15 +174,30 @@ BigintWidget::~BigintWidget() {
 }
 
 void BigintWidget::finished_cell(int num) {
+    int y = num / settings.get_params().get_size().width();
+    if (y > draw_progress)
+        draw_progress = y;
     settings.finished_cell(num, fw->resultAt(num));
     update_img();
 }
 
 void BigintWidget::finished() {
+    draw_progress = -1;
     settings_widget->set_finished(true);
     update_img();
 }
 
+static inline QPixmap enhance_pixmap(QPixmap pixmap, int draw_progress) {
+    QPainter qp;
+    if (draw_progress > -1) {
+        qp.begin(&pixmap);
+        qp.setPen(Qt::GlobalColor::gray);
+        qp.drawLine(0, draw_progress, pixmap.width() - 1, draw_progress);
+        qp.end();
+    }
+    return pixmap;
+}
+
 static inline void calculating_status(
     QStatusBar *status_bar, int &prev_num_threads
 ) {
@@ -141,7 +218,7 @@ void BigintWidget::paintEvent(QPaintEvent *event) {
     static int prev_num_threads = -1;
     if (!img_dirty)
         return;
-    img_label->setPixmap(settings.get_pixmap());
+    img_label->setPixmap(enhance_pixmap(settings.get_pixmap(), draw_progress));
     img_label->resize(img_label->pixmap().size());
     img_dirty = false;
     if (fw->isFinished())
@@ -165,7 +242,7 @@ void BigintWidget::mousePressEvent(QMouseEvent *event) {
             || pos.y() < 0
             || pos.y() >= size.height())
         return;
-    settings.zoom(get_ideal_size(), pos);
+    settings.zoom(get_ideal_size(), zoom_factor, pos);
     start_calculation(fw, settings.get_cells());
     update_img();
 }

diff --git a/bigintwidget.h b/bigintwidget.h
index 327c92ca3130b47e5e2e5a7e18129d811d78318c..f6d45d2b84791e2fa59d45c791ddd1ab19ec9fff 100644 (file)
--- a/bigintwidget.h
+++ b/bigintwidget.h
@@ -24,6 +24,7 @@ class BigintWidget : public QWidget {
     bool img_dirty;
     QStatusBar *status_bar;
     SettingsWidget *settings_widget;
+    int draw_progress, zoom_factor;
 
     inline const QSize get_ideal_size() const {
         return scroll_area->size().shrunkBy(scroll_area->contentsMargins());
@@ -35,6 +36,9 @@ public:
     void paintEvent(QPaintEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void update_img();
+    inline void set_zoom_factor(int zoom_factor) {
+        this->zoom_factor = zoom_factor;
+    }
 
 public Q_SLOT:
     void reset();

diff --git a/mandel.cpp b/mandel.cpp
index b6b11d8f777887e297c505a514fe0751cef35efa..e723f8b03fe13889eaba1254b4cd62aee4c95b73 100644 (file)
--- a/mandel.cpp
+++ b/mandel.cpp
@@ -28,13 +28,17 @@ MandelParams::MandelParams(
 :   max_iter(max_iter),
     size(size),
     center_f(center_f),
-    one(one) {}
+    one(one),
+    left(center_f.get_x() - size.width() / 2.),
+    top(center_f.get_y() + size.height() / 2.) {}
 
 MandelParams::MandelParams(const MandelParams &other)
 :   max_iter(other.max_iter),
     size(other.size),
     center_f(other.center_f),
-    one(other.one) {}
+    one(other.one),
+    left(center_f.get_x() - size.width() / 2.),
+    top(center_f.get_y() + size.height() / 2.) {}
 
 MandelParams MandelParams::from_json(const QJsonObject &json) {
     return MandelParams(
@@ -94,13 +98,13 @@ MandelSettings::MandelSettings(size_t max_iter, const QSize size)
     reset(max_iter, size);
 }
 
-void MandelSettings::zoom(const QSize size, const QPoint pos) {
+void MandelSettings::zoom(const QSize size, int zoom_factor, const QPoint pos) {
     MpzPoint p = cells[img->width() * pos.y() + pos.x()].get_rpos0();
     params = MandelParams(
         params.get_max_iter(),
         size,
-        MpzPoint(p.get_x() * 2, p.get_y() * 2),
-        params.get_one() * 2
+        MpzPoint(p.get_x() * zoom_factor, p.get_y() * zoom_factor),
+        params.get_one() * zoom_factor
     );
     img = setup_image(img, size);
     img->fill(Qt::GlobalColor::black);
@@ -167,13 +171,8 @@ MandelCell::MandelCell(const MandelCell &cell)
     rpos0(cell.rpos0) {}
 
 void MandelCell::setup(const QPoint pos) {
-    QSize size(params->get_size());
-    MpzPoint center_f = params->get_center_f();
     this->pos = pos;
-    rpos0 = MpzPoint(
-        center_f.get_x() + (pos.x() - size.width() / 2.),
-        center_f.get_y() - (pos.y() - size.height() / 2.)
-    );
+    rpos0 = MpzPoint(params->get_left() + pos.x(), params->get_top() - pos.y());
     result = MandelResultCell();
 }
 

diff --git a/mandel.h b/mandel.h
index 27880e773384aadc74ddf0a46cac63a5c5809f10..14fc2a97e75581da2e741da328e80cd9c1705ec3 100644 (file)
--- a/mandel.h
+++ b/mandel.h
@@ -18,8 +18,8 @@ public:
     MpzPoint();
     MpzPoint(mpz_class x, mpz_class y);
     MpzPoint(const MpzPoint &other);
-    const mpz_class get_x() const { return x; }
-    const mpz_class get_y() const { return y; }
+    inline const mpz_class get_x() const { return x; }
+    inline const mpz_class get_y() const { return y; }
 };
 
 class MandelResultCell {
@@ -28,8 +28,8 @@ class MandelResultCell {
 public:
     MandelResultCell();
     MandelResultCell(size_t iter, MpzPoint rpos);
-    const size_t get_iter() const { return iter; }
-    const MpzPoint get_rpos() const { return rpos; }
+    inline const size_t get_iter() const { return iter; }
+    inline const MpzPoint get_rpos() const { return rpos; }
 };
 
 class MandelParams {
@@ -37,7 +37,7 @@ private:
     size_t max_iter;
     QSize size;
     MpzPoint center_f;
-    mpz_class one;
+    mpz_class left, top, one;
 
 public:
     MandelParams();
@@ -48,11 +48,17 @@ public:
         mpz_class one
     );
     MandelParams(const MandelParams &other);
-    const size_t get_max_iter() const { return max_iter; }
-    void set_max_iter(const size_t max_iter) { this->max_iter = max_iter; }
-    const QSize get_size() const { return size; }
-    const MpzPoint get_center_f() const { return center_f; }
-    const mpz_class get_one() const { return one; }
+    inline const size_t get_max_iter() const { return max_iter; }
+    inline void set_max_iter(const size_t max_iter) { this->max_iter = max_iter; }
+    inline const QSize get_size() const { return size; }
+    inline const MpzPoint get_center_f() const { return center_f; }
+    inline const mpz_class get_left() const {
+        return left;
+    }
+    inline const mpz_class get_top() const {
+        return top;
+    }
+    inline const mpz_class get_one() const { return one; }
 
     static MandelParams from_json(const QJsonObject &json);
     QJsonObject to_json() const;
@@ -65,12 +71,12 @@ class MandelSettings {
 
 public:
     MandelSettings(size_t max_iter, QSize size);
-    inline const QPixmap get_pixmap() const { return QPixmap::fromImage(*img); }
+    inline QPixmap get_pixmap() const { return QPixmap::fromImage(*img); }
     inline const QVector<MandelCell> get_cells() const { return cells; }
     inline const MandelParams &get_params() const { return params; }
     inline void set_max_iter(size_t max_iter) { params.set_max_iter(max_iter); }
 
-    void zoom(const QSize size, const QPoint pos);
+    void zoom(const QSize size, int zoom_factor, const QPoint pos);
     void finished_cell(int num, const MandelResultCell &cell);
     void save_img(QString file_name);
     void reset(size_t max_iter, QSize size);