summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/mapdata/main.cpp4
-rw-r--r--examples/mapdata/mapdata.cpp14
-rw-r--r--examples/widget/main.cpp2
-rw-r--r--src/datavis3d/engine/q3dbars.cpp15
-rw-r--r--src/datavis3d/engine/q3dbars.h3
-rw-r--r--src/datavis3d/engine/q3dmaps.cpp15
-rw-r--r--src/datavis3d/engine/q3dmaps.h3
7 files changed, 50 insertions, 6 deletions
diff --git a/examples/mapdata/main.cpp b/examples/mapdata/main.cpp
index a7d227cb..976b2165 100644
--- a/examples/mapdata/main.cpp
+++ b/examples/mapdata/main.cpp
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
QWidget *widget = new QWidget;
QHBoxLayout *hLayout = new QHBoxLayout(widget);
- QVBoxLayout *vLayout = new QVBoxLayout(widget);
+ QVBoxLayout *vLayout = new QVBoxLayout();
Q3DMaps *chart = new Q3DMaps();
QSize screenSize = chart->screen()->size();
@@ -145,7 +145,7 @@ int main(int argc, char **argv)
QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, widget);
fontSizeSlider->setTickInterval(1);
fontSizeSlider->setMinimum(1);
- fontSizeSlider->setValue(20);
+ fontSizeSlider->setValue(80);
fontSizeSlider->setMaximum(200);
// vLayout->addWidget(rotationCheckBox, 0, Qt::AlignTop);
diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp
index 3d8dd58a..8f4aee7c 100644
--- a/examples/mapdata/mapdata.cpp
+++ b/examples/mapdata/mapdata.cpp
@@ -47,15 +47,23 @@ using namespace QtDataVis3D;
MapsModifier::MapsModifier(Q3DMaps *maps)
: m_chart(maps),
m_imageRect(QRect()),
- m_fontSize(20.0f),
+ m_fontSize(80.0f),
m_barSpecs(QVector3D(30.0f, 30.0f, 30.0f))
{
- m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustAll);
QImage image = QImage(QStringLiteral(":/images/finland"));
m_imageRect = image.rect();
m_chart->setAreaSpecs(m_imageRect, image);
- //m_chart->setBarType(Cones, false);
+ m_chart->setFontSize(m_fontSize);
+
+#if 0
+ m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustHeight);
+ m_chart->setBarType(BevelBars, true);
+ m_chart->setTheme(ThemeBlueIcy);
+ m_chart->setShadowQuality(ShadowMedium);
+#else
+ m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustAll);
m_chart->setMeshFileName(QStringLiteral(":/meshes/weirdthing"));
+#endif
}
MapsModifier::~MapsModifier()
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
index 320606f9..3824f717 100644
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
QWidget *widget = new QWidget;
QHBoxLayout *hLayout = new QHBoxLayout(widget);
- QVBoxLayout *vLayout = new QVBoxLayout(widget);
+ QVBoxLayout *vLayout = new QVBoxLayout();
Q3DBars *widgetchart = new Q3DBars();
QSize screenSize = widgetchart->screen()->size();
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index fd65393d..59e1018b 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -1444,6 +1444,17 @@ void Q3DBars::drawScene()
d_ptr->m_labelShader->release();
}
+#if defined(Q_OS_ANDROID)
+void Q3DBars::mouseDoubleClickEvent(QMouseEvent *event)
+{
+ if (!d_ptr->m_zoomActivated) {
+ d_ptr->m_mousePressed = Q3DBarsPrivate::MouseOnScene;
+ // update mouse positions to prevent jumping when releasing or repressing a button
+ d_ptr->m_mousePos = event->pos();
+ }
+}
+#endif
+
void Q3DBars::mousePressEvent(QMouseEvent *event)
{
if (Qt::LeftButton == event->button()) {
@@ -1457,7 +1468,11 @@ void Q3DBars::mousePressEvent(QMouseEvent *event)
//qDebug() << "Mouse pressed on zoom";
}
} else {
+#if !defined(Q_OS_ANDROID)
d_ptr->m_mousePressed = Q3DBarsPrivate::MouseOnScene;
+#else
+ d_ptr->m_mousePressed = Q3DBarsPrivate::MouseRotating;
+#endif
// update mouse positions to prevent jumping when releasing or repressing a button
d_ptr->m_mousePos = event->pos();
//qDebug() << "Mouse pressed on scene";
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index 3e490144..fc9111cd 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -149,6 +149,9 @@ public:
void setTickCount(GLint tickCount, GLfloat step, GLfloat minimum = 0.0f);
protected:
+#if defined(Q_OS_ANDROID)
+ void mouseDoubleClickEvent(QMouseEvent *event);
+#endif
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp
index 381a8d5a..bcfa41da 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/datavis3d/engine/q3dmaps.cpp
@@ -921,6 +921,17 @@ void Q3DMaps::drawScene()
#endif
}
+#if defined(Q_OS_ANDROID)
+void Q3DMaps::mouseDoubleClickEvent(QMouseEvent *event)
+{
+ if (!d_ptr->m_zoomActivated) {
+ d_ptr->m_mousePressed = Q3DMapsPrivate::MouseOnScene;
+ // update mouse positions to prevent jumping when releasing or repressing a button
+ d_ptr->m_mousePos = event->pos();
+ }
+}
+#endif
+
void Q3DMaps::mousePressEvent(QMouseEvent *event)
{
if (Qt::LeftButton == event->button()) {
@@ -935,7 +946,11 @@ void Q3DMaps::mousePressEvent(QMouseEvent *event)
//qDebug() << "Mouse pressed on zoom";
}
} else {
+#if !defined(Q_OS_ANDROID)
d_ptr->m_mousePressed = Q3DMapsPrivate::MouseOnScene;
+#else
+ d_ptr->m_mousePressed = Q3DMapsPrivate::MouseRotating;
+#endif
// update mouse positions to prevent jumping when releasing or repressing a button
d_ptr->m_mousePos = event->pos();
//qDebug() << "Mouse pressed on scene";
diff --git a/src/datavis3d/engine/q3dmaps.h b/src/datavis3d/engine/q3dmaps.h
index 37bf08e7..c6e44170 100644
--- a/src/datavis3d/engine/q3dmaps.h
+++ b/src/datavis3d/engine/q3dmaps.h
@@ -149,6 +149,9 @@ public:
void setShadowQuality(ShadowQuality quality);
protected:
+#if defined(Q_OS_ANDROID)
+ void mouseDoubleClickEvent(QMouseEvent *event);
+#endif
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 15:16:50 +0000