From ad1e8aec1d6c4b32e41cf151be1d3a13e7b93e67 Mon Sep 17 00:00:00 2001
From: Ulrich Kemloh <kemlohulrich@gmail.com>
Date: Sat, 25 Jul 2015 22:05:48 +0200
Subject: [PATCH] online mode is now disable if drag and drop is detected.
---
src/MainWindow.cpp | 14 +++++++++++---
src/TimerCallback.cpp | 2 +-
src/geometry/LinePlotter2D.cpp | 5 +----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index f725d71..05aaf95 100755
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -252,7 +252,13 @@ MainWindow::MainWindow(QWidget *parent) :
//restore the settings
loadAllSettings();
- if(mayPlay)slotStartPlaying();
+ // was call from the command line with a file.
+ // disable the online mode if it was enabled
+ if(mayPlay)
+ {
+ slotSetOfflineMode(true);
+ slotStartPlaying();
+ }
}
MainWindow::~MainWindow()
@@ -1819,8 +1825,10 @@ void MainWindow::dropEvent(QDropEvent *event)
{
if (!extern_offline_mode) {
- slotErrorOutput("online mode, ignoring DnD !");
- return;
+ //slotErrorOutput("online mode, ignoring DnD !");
+ slotErrorOutput("You want DnD? I am now disabling the online mode");
+ slotSetOfflineMode(true);
+ //return;
}
QList<QUrl> urls = event->mimeData()->urls();
diff --git a/src/TimerCallback.cpp b/src/TimerCallback.cpp
index 3ed2cf6..0b08ed5 100644
--- a/src/TimerCallback.cpp
+++ b/src/TimerCallback.cpp
@@ -448,7 +448,7 @@ void TimerCallback::takeScreenshot(vtkRenderWindow *renderWindow)
static int imageID=0;
vtkWindowToImageFilter * winToImFilter = vtkWindowToImageFilter::New();
winToImFilter->SetInput( renderWindow );
- winToImFilter->SetMagnification(4);
+ //winToImFilter->SetMagnification(4);
//renderWindow->Delete();
//vtkPostScriptWriter * image = vtkPostScriptWriter::New();
vtkPNGWriter * image = vtkPNGWriter::New();
diff --git a/src/geometry/LinePlotter2D.cpp b/src/geometry/LinePlotter2D.cpp
index 6db4b9f..a02f39d 100644
--- a/src/geometry/LinePlotter2D.cpp
+++ b/src/geometry/LinePlotter2D.cpp
@@ -71,7 +71,7 @@ LinePlotter2D::LinePlotter2D()
wall_lines = vtkCellArray::New();
wall_lineScalars = vtkFloatArray::New();
wall_curPointID=0;
- wall_width=2;
+ wall_width=4;
navline_curPointID =0;
navline_width=2;
@@ -93,9 +93,6 @@ LinePlotter2D::LinePlotter2D()
//m_lookupTable->SetValueRange(0.0,1.0);
//m_lookupTable->SetSaturationRange(0.0,0.0);
m_lookupTable->Build();
-
-
-
}
LinePlotter2D::~LinePlotter2D()
--
GitLab