Commit 66098b70 authored by Tao Zhong's avatar Tao Zhong

Version 0.8.5

parent 0594cbe8
Pipeline #14198 passed with stages
in 48 seconds
build/
backup*
......@@ -23,7 +23,7 @@ configure-linux:
script:
- mkdir -p build
- cd build
- cmake -DCMAKE_BUILD_TYPE=Debug ..
- cmake -DCMAKE_BUILD_TYPE=Debug -DDESIRED_QT_VERSION=4 ..
- echo "configure | ${CI_PROJECT_DIR}"
stage: configure
tags:
......
# Change Log
All notable changes to this project will be documented in this file.
## v0.8.5 [02.11.2018]
## Added
- Add Auto Saving function #67
- Better Panning Mode #100
## Changed
- Update Shortcuts #92
- Design new origin and axis #99
## Bugs fixed
- Esc doesn't work while drawing #98
- SegFault: Delete all Rooms #91
## v0.8.4 [05.10.2018]
## Added
- In menu bar, under "Edit" you will find "Clear Rooms and Doors button" to clear all defined rooms and doors. #54
......
This diff is collapsed.
<?xml version="1.0" ?><svg height="32px" version="1.1" viewBox="0 0 32 32" width="32px" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" xmlns:xlink="http://www.w3.org/1999/xlink"><title/><desc/><defs/><g fill="none" fill-rule="evenodd" id="Page-1" stroke="none" stroke-width="1"><g fill="#000000" id="icon-44-one-finger-swipe"><path d="M20.9719734,14 L27.049999,14 L23.799999,10.75 L24.549999,10 L29.049999,14.5 L24.549999,19 L23.799999,18.25 L27.049999,15 L27.049999,15 L21,15 L21,31 L12,31 L12,15 L5.950001,15 L5.950001,15 L9.200001,18.25 L8.450001,19 L3.950001,14.5 L8.450001,10 L9.200001,10.75 L5.950001,14 L12.0278925,14 C12.2600811,11.9115065 13.9154776,10.2577821 16,10.0274511 L16,3.950001 L16,3.950001 L12.75,7.200001 L12,6.450001 L16.5,1.950001 L21,6.450001 L20.25,7.200001 L17,3.950001 L17,10.0275945 C19.0806613,10.2586377 20.7390274,11.9142645 20.9719734,14 L20.9719734,14 L20.9719734,14 Z M16.5,11 C14.5670034,11 13,12.5710144 13,14.5070349 L13,30 L20,30 L20,14.5070349 C20,12.570153 18.4290634,11 16.5,11 L16.5,11 Z M16.5,12 C15.1192881,12 14,13.1285541 14,14.5097752 L14,18 L19,18 L19,14.5097752 C19,13.1236646 17.8903379,12 16.5,12 L16.5,12 Z M16.5,13 C15.6715729,13 15,13.6785455 15,14.5008327 L15,17 L18,17 L18,14.5008327 C18,13.6719457 17.3342028,13 16.5,13 L16.5,13 Z M14,21 L14,22 L19,22 L19,21 L14,21 L14,21 Z M14,23 L14,24 L19,24 L19,23 L14,23 L14,23 Z" id="one-finger-swipe"/></g></g></svg>
\ No newline at end of file
......@@ -57,5 +57,6 @@
<file>Icons/rotate.png</file>
<file>Icons/plus.svg</file>
<file>Icons/landmark.svg</file>
<file>Icons/moved_hand.svg</file>
</qresource>
</RCC>
......@@ -4,10 +4,12 @@ RED='\033[0;31m'
NC='\033[0m' # No Color
#Version=0.8.4
CMD=jpseditor
#Change Build folder before running script
release=Repos/jpseditor/qmake-build-release
#echo "INFO: running dynlibbundler .."
#dylibbundler -od -b -x ../bin/${CMD}.app/Contents/MacOS/${CMD} -d ../bin/${CMD}.app/Contents/libs/
echo "INFO: running macdeployqt .."
macdeployqt ./qmake-build-release//${CMD}.app -dmg
macdeployqt ${release}/JPSeditor.app -dmg
......@@ -65,6 +65,7 @@
<addaction name="actiongridmode"/>
<addaction name="actionShow_Point_of_Origin"/>
<addaction name="actionRotate_90_deg_clockwise"/>
<addaction name="actionPanning_Mode"/>
<addaction name="separator"/>
<addaction name="actionanglesnap"/>
<addaction name="actionObjectsnap"/>
......@@ -123,6 +124,7 @@
<addaction name="separator"/>
<addaction name="actiongridmode"/>
<addaction name="actionObjectsnap"/>
<addaction name="actionPanning_Mode"/>
<addaction name="separator"/>
<addaction name="actionRoom"/>
</widget>
......@@ -370,6 +372,9 @@
<property name="toolTip">
<string>Select Mode</string>
</property>
<property name="shortcut">
<string>Meta+S</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
......@@ -484,7 +489,7 @@
<string>Orthomode</string>
</property>
<property name="shortcut">
<string>Meta+S</string>
<string>Meta+A</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
......@@ -684,6 +689,21 @@
<string>Online Help</string>
</property>
</action>
<action name="actionPanning_Mode">
<property name="icon">
<iconset resource="../Resources/resources.qrc">
<normaloff>:/inAppIcons/Icons/moved_hand.svg</normaloff>:/inAppIcons/Icons/moved_hand.svg</iconset>
</property>
<property name="text">
<string>Panning Mode</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+P</string>
</property>
<property name="iconVisibleInMenu">
<bool>true</bool>
</property>
</action>
</widget>
<resources>
<include location="../Resources/resources.qrc"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingDialog</class>
<widget class="QDialog" name="SettingDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>318</width>
<height>480</height>
</rect>
</property>
<property name="windowTitle">
<string>Setting</string>
</property>
<widget class="QTabWidget" name="tabWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>301</width>
<height>461</height>
</rect>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="backupTab">
<attribute name="title">
<string>Backup</string>
</attribute>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>271</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Backup Interval: </string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="timeLine">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Minutes</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QPushButton" name="chooseButton">
<property name="geometry">
<rect>
<x>5</x>
<y>100</y>
<width>121</width>
<height>32</height>
</rect>
</property>
<property name="text">
<string>Choose Folder</string>
</property>
</widget>
<widget class="QLineEdit" name="locationLine">
<property name="geometry">
<rect>
<x>11</x>
<y>70</y>
<width>271</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>11</x>
<y>41</y>
<width>89</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Backup folder:</string>
</property>
</widget>
<widget class="QWidget" name="horizontalLayoutWidget_2">
<property name="geometry">
<rect>
<x>0</x>
<y>400</y>
<width>291</width>
<height>32</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyButton">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="confirmButton">
<property name="text">
<string>Ok</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</widget>
<resources/>
<connections/>
</ui>
......@@ -14,7 +14,7 @@
# along with JuPedSim. If not, see <http://www.gnu.org/licenses/>.
#
# copyright <2009-2018> Forschungszentrum Juelich GmbH.
# Compatibility with Qt4 and Qt5
greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
......@@ -31,7 +31,8 @@ FORMS += \
forms/mainwindow.ui \
forms/roomwidget.ui \
forms/widgetlandmark.ui \
forms/widgetsettings.ui
forms/widgetsettings.ui \
forms/settingdialog.ui \
HEADERS += \
src/mainWindow.h \
......@@ -66,7 +67,8 @@ HEADERS += \
src/AutomaticRoomIdentification/roomID.h\
src/AutomaticRoomIdentification/roomdefinition.h \
src/AutomaticRoomIdentification/roomidentification.h \
src/dtrace.h
src/dtrace.h \
src/settingdialog.h
SOURCES += \
......@@ -92,17 +94,36 @@ SOURCES += \
src/UndoFramework/lineaction.cpp \
src/jpsregion.cpp \
src/AutomaticRoomIdentification/roomdefinition.cpp \
src/AutomaticRoomIdentification/roomidentification.cpp
src/AutomaticRoomIdentification/roomidentification.cpp \
src/settingdialog.cpp
#INCLUDEPATH += D:/boost_1_59_0/boost_1_59_0
RESOURCES += \
RESOURCES += \
Resources/resources.qrc
RC_FILE = Resources/jpseditor.rc
#osx fix
ICON = Resources/jupedsim.icns
ICON = Resources/jpseditor.icns
CONFIG(debug, debug|release) {
DESTDIR = build/debug
}
CONFIG(release, debug|release) {
DESTDIR = build/release
}
OBJECTS_DIR = $$DESTDIR/.obj
MOC_DIR = $$DESTDIR/.moc
RCC_DIR = $$DESTDIR/.qrc
UI_DIR = $$DESTDIR/.u
demos.path = /usr/local/bin/jpseditor
demos.files = examples/*
INSTALLS += demos
target.path = /usr/local/bin/jpseditor
INSTALLS += target
class Jpseditor < Formula
desc "A graphical user interface to create the geometry of a scenario simulated by JuPedSim"
homepage "https://www.jupedsim.org/"
head "https://github.com/JuPedSim/jpseditor.git" :branch => "develop"
depends_on "cmake" => :build
depends_on "qt"
def install
Dir.pwd
Dir.mkdir "build"
Dir.chdir "build"
system "cmake", "..", *std_cmake_args
system "make", "install"
puts ""
puts "------------------------------------"
puts "JPSeditor installed in /tmp"
puts "open /tmp/JPSeditor.app"
puts "------------------------------------"
end
end
......@@ -67,6 +67,7 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent, jpsDatamanager *datamanager):Q
statDoor=false;
statExit=false;
_statHLine=false;
statPanning=false;
_statCopy=0;
statLandmark=false;
markedLandmark=nullptr;
......@@ -178,7 +179,7 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent)
}
if (midbutton_hold)
if (midbutton_hold && statPanning)
{
translations(old_pos);
}
......@@ -303,6 +304,11 @@ void jpsGraphicsView::mousePressEvent(QMouseEvent *mouseEvent)
{
midbutton_hold=true;
}
else if (mouseEvent->button()==Qt::RightButton)
{
disable_drawing();
emit no_drawing();
}
update();
}
......@@ -922,6 +928,8 @@ void jpsGraphicsView::disable_drawing()
_statLineEdit=false;
_statHLine=false;
_statCopy=0;
// if drawing was canceled by pushing ESC
if (current_line!=nullptr)
{
......@@ -935,7 +943,6 @@ void jpsGraphicsView::disable_drawing()
delete _currentVLine;
_currentVLine=nullptr;
}
}
jpsLineItem* jpsGraphicsView::addLineItem(const qreal &x1,const qreal &y1,const qreal &x2,const qreal &y2,const QString &type)
......@@ -1549,12 +1556,12 @@ void jpsGraphicsView::ShowOrigin()
if (_origin.isEmpty())
{
//Scene->DrawOrigin();
_origin.push_back(Scene->addLine(0,0,0,0+gl_scale_f*100,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0+gl_scale_f*100,0-gl_scale_f*10,0+gl_scale_f*100-gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0+gl_scale_f*100,0+gl_scale_f*10,0+gl_scale_f*100-gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0,0+gl_scale_f*100,0,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0+gl_scale_f*100,0,gl_scale_f*100-gl_scale_f*10,-gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0+gl_scale_f*100,0,gl_scale_f*100-gl_scale_f*10,+gl_scale_f*10,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0,0,0+gl_scale_f*100,QPen(Qt::red,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0+gl_scale_f*100,0-gl_scale_f*10,0+gl_scale_f*100-gl_scale_f*10,QPen(Qt::red,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0+gl_scale_f*100,0+gl_scale_f*10,0+gl_scale_f*100-gl_scale_f*10,QPen(Qt::red,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0,0,0+gl_scale_f*100,0,QPen(Qt::red,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0+gl_scale_f*100,0,gl_scale_f*100-gl_scale_f*10,-gl_scale_f*10,QPen(Qt::red,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0+gl_scale_f*100,0,gl_scale_f*100-gl_scale_f*10,+gl_scale_f*10,QPen(Qt::red,gl_scale_f*2)));
//Y
_origin.push_back(Scene->addLine(0-gl_scale_f*10,gl_scale_f*100-gl_scale_f*50,0-gl_scale_f*5,gl_scale_f*100-gl_scale_f*45,QPen(Qt::black,gl_scale_f*2)));
_origin.push_back(Scene->addLine(0-gl_scale_f*10,gl_scale_f*100-gl_scale_f*50,0-gl_scale_f*15,gl_scale_f*100-gl_scale_f*45,QPen(Qt::black,gl_scale_f*2)));
......@@ -1576,6 +1583,8 @@ void jpsGraphicsView::ShowOrigin()
}
_origin.clear();
}
}
void jpsGraphicsView::StatPositionDef()
......@@ -1861,6 +1870,41 @@ void jpsGraphicsView::en_disableWall()
}
bool jpsGraphicsView::statusPanning()
{
return statPanning;
}
void jpsGraphicsView::en_disablePanning()
{
statPanning=!statPanning;
statWall=false;
statDoor=false;
statExit=false;
_statHLine=false;
statLandmark=false;
if (statPanning==false)
{
QString info = "Panning Mode is off!";
QMessageBox messageBox;
messageBox.information(0,tr("Panning Mode"),info);
}
else
{
QString info = "\
Panning Mode is on!\n\
Press middle button to move view";
QMessageBox messageBox;
messageBox.information(0,tr("Panning Mode"),info);
}
}
bool jpsGraphicsView::statusWall()
{
return statWall;
......
......@@ -82,6 +82,9 @@ public:
bool statusLandmark();
void en_disableLandmark();
bool statusPanning();
void en_disablePanning();
// global functions
qreal get_scale_f();
void take_l_from_lineEdit(const qreal &length);
......@@ -202,6 +205,7 @@ private:
bool statDoor;
bool statExit;
bool statLandmark;
bool statPanning;
bool _statHLine;
int _statCopy;
QPointF _copyOrigin;
......
......@@ -100,11 +100,11 @@ void GraphicScene::DrawLineGrid(QPainter *painter, const QRectF &rect)
painter->drawLines(lines.data(), lines.size());
//draw orgin and x y axis
painter->setPen(QPen(Qt::red,0));
painter->drawRect(origin);
painter->fillRect(origin, Qt::red);
painter->drawLine(xaxis);
painter->drawLine(yaxis);
// painter->setPen(QPen(Qt::red,0));
// painter->drawRect(origin);
// painter->fillRect(origin, Qt::red);
// painter->drawLine(xaxis);
// painter->drawLine(yaxis);
}
void GraphicScene::DrawPointGrid(QPainter *painter, const QRectF &rect)
......
......@@ -36,6 +36,8 @@
#include <QShortcut>
#include <QDesktopServices>
#include <QUrl>
#include <QDebug>
#include <QSettings>
MWindow :: MWindow() {
......@@ -43,7 +45,6 @@ MWindow :: MWindow() {
//Signal/Slot
//VBox= new QVBoxLayout;
mview = new jpsGraphicsView(this);
dmanager = new jpsDatamanager(this,mview);
mview->SetDatamanager(dmanager);
......@@ -52,8 +53,7 @@ MWindow :: MWindow() {
rwidget=nullptr;
//Landmarkwidget
lwidget=nullptr;
//WidgetSettings
_settings=nullptr;
//StaturBar
......@@ -95,6 +95,7 @@ MWindow :: MWindow() {
setCentralWidget(mview);
//this->setMaximumSize(1920,1080);
this->showMaximized();
statusBar()->addPermanentWidget(infoLabel);
statusBar()->addPermanentWidget(label_x);
statusBar()->addPermanentWidget(x_edit);
......@@ -104,10 +105,10 @@ MWindow :: MWindow() {
// statusBar()->addPermanentWidget(length_edit);
// statusBar()->addPermanentWidget(label2);
//Timer needed for autosave function
//Timer needed for autosaving function
// timer will trigger autosave every 5th minute
timer = new QTimer(this);
timer->setInterval(300000);
timer->setInterval(60000);
timer->start();
_cMapTimer = new QTimer(this);
......@@ -144,9 +145,14 @@ MWindow :: MWindow() {
connect(actionDoor,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
connect(actionExit,SIGNAL(triggered(bool)),this,SLOT(dis_selectMode()));
connect(actionScale,SIGNAL(triggered(bool)),this,SLOT(enableScale()));
// Tab View
connect(actionRotate_90_deg_clockwise,SIGNAL(triggered(bool)),this,SLOT(rotate()));
connect(actionShow_Point_of_Origin,SIGNAL(triggered(bool)),this,SLOT(ShowOrigin()));
// Panning mode
connect(actionPanning_Mode,SIGNAL(triggered(bool)),this,SLOT(en_disablePanning()));
// Length edit
// connect(length_edit,SIGNAL(returnPressed()),this,SLOT(send_length()));
// connect(length_edit,SIGNAL(returnPressed()),this,SLOT(ScaleLines()));
......@@ -161,6 +167,11 @@ MWindow :: MWindow() {
connect(mview,SIGNAL(set_focus_textedit()),length_edit,SLOT(setFocus()));
connect(mview,SIGNAL(mouse_moved()),this,SLOT(show_coords()));
connect(mview,SIGNAL(LineLengthChanged()),this,SLOT(ShowLineLength()));
// QAction *str_escape = new QAction(this);
// str_escape->setShortcut(Qt::Key_Escape);
// connect(str_escape, SIGNAL(triggered(bool)), mview, SLOT(disableDrawing()));
// Mark all lines
QAction *str_a = new QAction(this);
str_a->setShortcut(Qt::Key_A | Qt::CTRL);
......@@ -188,6 +199,7 @@ MWindow :: MWindow() {
// room type data gathering
connect(actionGather_data,SIGNAL(triggered(bool)),this, SLOT(GatherData()));
}
MWindow::~MWindow()
......@@ -204,32 +216,24 @@ MWindow::~MWindow()
void MWindow::AutoSave()
{
QFile file("Name");
if (_filename!="")
{
QString fN="backup_"+_filename+".xml";
file.setFileName(fN);
}
else
{
QString fN="backup_untitled.xml";
file.setFileName(fN);
}
QMap<QString, QString> settingsmap = loadSettings();
QString backupfolder = settingsmap["backupfolder"];
QString filename = backupfolder + "/backup_untitled.xml";
QFile file(filename);
if(file.open(QIODevice::WriteOnly|QIODevice::Text))
{
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
//QString coord_string=mview->build_coordString();
dmanager->AutoSaveXML(file);
dmanager->writeXML(file);
//file.write(coord_string.toUtf8());//textEdit->toPlainText().toUtf8());
statusBar()->showMessage(tr("Backup file generated!"),10000);
statusBar()->showMessage(tr("Backup file generated!"), 10000);
//routing (hlines)
QString fileNameRouting = file.fileName();
fileNameRouting=fileNameRouting.split(".").first()+"_routing.xml";
fileNameRouting = fileNameRouting.split(".").first() + "_routing.xml";
QFile routingFile(fileNameRouting);
if (routingFile.open(QIODevice::WriteOnly|QIODevice::Text))
if (routingFile.open(QIODevice::WriteOnly | QIODevice::Text))
dmanager->writeRoutingXML(routingFile);
}
}
......@@ -286,20 +290,25 @@ void MWindow::GatherData()
void MWindow::Settings()
{
if (_settings==nullptr)
{
_settings = new WidgetSettings(this,mview);
_settings->setAttribute(Qt::WA_DeleteOnClose);
_settings->setGeometry(QRect(QPoint(5,75), _settings->size()));
_settings->show();
}
settingDialog = new SettingDialog;
else
{
_settings->close();
_settings=nullptr;
}
// QString backupfolder = settings.value("backupfolder").toString();
// QString interval = settings.value("interval").toString();
//
// qDebug()<< settings.value("backupfolder");
// qDebug()<< settings.value("interval");
//
// QMap<QString, QString> defaultsetting;
// defaultsetting["backupfolder"] = backupfolder;
// defaultsetting["interval"] = interval;
QMap<QString, QString> defaultsetting = loadSettings();
connect(settingDialog,SIGNAL(sendSetting(QMap<QString, QString>)),
this,SLOT(saveSettings(QMap<QString, QString>)));
settingDialog->setCurrentSetting(defaultsetting);
settingDialog->setModal(true);
settingDialog->exec();
}
void MWindow::ShowOrigin()
......@@ -683,6 +692,7 @@ void MWindow::en_selectMode()
mview->disable_drawing();
actionSelect_Mode->setChecked(true);
actionWall->setChecked(false);
actionDoor->setChecked(false);
actionExit->setChecked(false);
......@@ -771,8 +781,62 @@ void MWindow::on_actionOnline_Help_triggered()
void MWindow::on_actionClear_all_Rooms_and_Doors_triggered()
{
dmanager->remove_all();
rwidget->show_rooms();
rwidget->show_crossings();
rwidget->show_exits();
rwidget->show_obstacles();
if(rwidget!= nullptr){
rwidget->show_rooms();
rwidget->show_crossings();
rwidget->show_obstacles();
}
}
void MWindow::keyPressEvent(QKeyEvent *event)
{
switch(event->key())
{
case Qt::Key_Escape:
mview->disable_drawing();
en_selectMode();
break;
default:
QWidget::keyPressEvent(event);
}
}
// Default settings
void MWindow::saveSettings(QMap<QString, QString> settingsmap)
{
QSettings settings("FZJ","JPSeditor");
settings.beginGroup("backup");
settings.setValue("backupfolder", settingsmap["backupfolder"]);
settings.setValue("interval", settingsmap["interval"]);
timer->setInterval(settingsmap["interval"].toInt());
settings.endGroup();
}
QMap<QString, QString> MWindow::loadSettings()
{
QSettings settings("FZJ","JPSeditor");
settings.beginGroup("backup");
QString value = settings.value("backupfolder", "../").toString();
QString interval = settings.value("interval", "60000").toString();
settings.endGroup();
QMap<QString, QString> settingsmap;
settingsmap["backupfolder"] = value;
settingsmap["interval"] = interval;
return settingsmap;
}
// Panning mode
void MWindow::en_disablePanning()
{
this->disableDrawing();
mview->en_disablePanning();
}
......@@ -41,7 +41,7 @@
#include "GraphicView.h"
#include "datamanager.h"
#include "rooms.h"
#include "src/settingdialog.h"
class MWindow : public QMainWindow, private Ui::MainWindow {