Completed middle click drag - given how the scene and view interact w…

…hen image is redrawn, doing this by adjustin the scoll bars ended up being the most sensible way. As a result it only works when scrolls are present, which is fine, I think
palaeoware · May 7, 2020 · 1231dd0 · 1231dd0
1 parent 25f4219
commit 1231dd0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/SPIERS.pro.user b/SPIERS.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.0, 2020-05-01T16:51:17. -->
+<!-- Written by QtCreator 4.12.0, 2020-05-07T12:01:59. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -75,7 +75,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{1ae6612c-f6d2-49c4-b633-95ee8a3a2d24}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -318,7 +318,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Release/SPIERSalign/bin</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Debug/SPIERSalign/bin</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
     <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
@@ -392,7 +392,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Release/SPIERSedit/bin</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Debug/SPIERSedit/bin</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2">
     <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
@@ -466,7 +466,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Release/SPIERSutility/SPIERSversion/bin</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Debug/SPIERSutility/SPIERSversion/bin</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.3">
     <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
@@ -540,7 +540,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Release/SPIERSview/bin</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/media/russell/Krimson/Work/Programming/Palaeoware_repos/build-SPIERS-Desktop_1ae661-Debug/SPIERSview/bin</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">4</value>
   </valuemap>

diff --git a/SPIERSedit/src/myscene.cpp b/SPIERSedit/src/myscene.cpp
@@ -90,8 +90,8 @@ void myscene::DoMouse(int x, int y, int PressedButton)
             dx = LastMouseX;
             dy = LastMouseY;
 
-            mouseDownViewCenter = mainwin->graphicsView->mapToScene(mainwin->graphicsView->viewport()->rect().center());
-            qDebug() << mouseDownViewCenter << mainwin->graphicsView->viewport()->rect().center();
+            //mouseDownViewCenter = mainwin->graphicsView->mapFromScene(mainwin->graphicsView->viewport()->rect().center());
+            //qDebug() << mouseDownViewCenter << mainwin->graphicsView->viewport()->rect().center();
 
             DoAction(LastMouseX, LastMouseY);
             return;
@@ -143,15 +143,18 @@ void myscene::DoAction(int x, int y)
         ChangeFlag = true;
         MouseUp();
     }
+    //RJG - If middle mouse drag and viewport has scroll bars - scroll view
     else if (button == 3)
     {
-        //Translate here
 
-        //int xmove = dx - x;
-        // qDebug() << dx << x << xmove << mouseDownViewCenter;
-        //mainwin->graphicsView->centerOn(mouseDownView.x() + xmove, mouseDownView.y());
-        //mainwin->graphicsView->show();
-        // mainwin->graphicsView->horizontalScrollBar()->setValue(newX);
+        int newX = mainwin->graphicsView->horizontalScrollBar()->value()-(x-dx);
+        mainwin->graphicsView->horizontalScrollBar()->setValue(newX);
+
+        int newY =  mainwin->graphicsView->verticalScrollBar()->value()-(y-dy);
+        mainwin->graphicsView->verticalScrollBar()->setValue(newY);
+
+        dx=x;
+        dy=y;
     }
     else
     {