diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui index fb5cb5973405114228b486569a84872e07b0a6e9..91eed28d974a035e11586ac5f270b18f7cf861d9 100644 --- a/forms/mainwindow.ui +++ b/forms/mainwindow.ui @@ -66,10 +66,11 @@ <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"/> + <addaction name="separator"/> + <addaction name="actionBack_to_Origin"/> </widget> <widget class="QMenu" name="menuEdit"> <property name="title"> @@ -125,7 +126,6 @@ <addaction name="separator"/> <addaction name="actiongridmode"/> <addaction name="actionObjectsnap"/> - <addaction name="actionPanning_Mode"/> <addaction name="separator"/> <addaction name="actionRoom"/> </widget> @@ -713,6 +713,14 @@ <string>Meta+I</string> </property> </action> + <action name="actionBack_to_Origin"> + <property name="text"> + <string>Back to Origin</string> + </property> + <property name="shortcut"> + <string>Meta+O</string> + </property> + </action> </widget> <resources> <include location="../Resources/resources.qrc"/> diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp index d0e0aa2240b0e1265b3a65c3544949f458a00fd3..86985c6103cf20efed6127b5ff2b416e32fb5c29 100644 --- a/src/GraphicView.cpp +++ b/src/GraphicView.cpp @@ -67,7 +67,6 @@ jpsGraphicsView::jpsGraphicsView(QWidget* parent, jpsDatamanager *datamanager):Q statDoor=false; statExit=false; _statHLine=false; - statPanning=false; _statCopy=0; statLandmark=false; markedLandmark=nullptr; @@ -179,7 +178,7 @@ void jpsGraphicsView::mouseMoveEvent(QMouseEvent *mouseEvent) } - if (midbutton_hold && statPanning) + if (midbutton_hold) { translations(old_pos); } @@ -1867,40 +1866,6 @@ 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() { diff --git a/src/GraphicView.h b/src/GraphicView.h index 95c4378f623afdb2d69a2b819b556ceae4567b03..71217a804d8ca6a8a278be638f7557afe3701300 100644 --- a/src/GraphicView.h +++ b/src/GraphicView.h @@ -82,9 +82,6 @@ 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); @@ -205,7 +202,6 @@ private: bool statDoor; bool statExit; bool statLandmark; - bool statPanning; bool _statHLine; int _statCopy; QPointF _copyOrigin; diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp index 3b171a6b30ea9113973ba767fd90b689eace6e61..fe87b011fc99064c8018600ebbc81b9d2458d437 100644 --- a/src/mainWindow.cpp +++ b/src/mainWindow.cpp @@ -150,8 +150,6 @@ MWindow :: MWindow() { 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())); @@ -830,16 +828,14 @@ QMap<QString, QString> MWindow::loadSettings() return settingsmap; } -// Panning mode -void MWindow::en_disablePanning() -{ - this->disableDrawing(); - mview->en_disablePanning(); -} - void MWindow::on_actionNew_Inifile_triggered() { inifileWidget = new InifileWidget(this); inifileWidget->show(); qDebug()<< "MWindow::on_actionNew_Inifile_triggered(): inifile widget is showed!"; } + +void MWindow::on_actionBack_to_Origin_triggered() +{ + mview->centerOn(0,0); +} diff --git a/src/mainWindow.h b/src/mainWindow.h index dd2d395a3bbad577c6504854ca2b0a1b48418d8c..a9272a834513cfe85093140d57dbbb4bc1607712 100644 --- a/src/mainWindow.h +++ b/src/mainWindow.h @@ -110,7 +110,6 @@ protected slots: void en_disableExit(); void en_disableLandmark(); void en_disableHLine(); - void en_disablePanning(); void disableDrawing(); void objectsnap(); @@ -168,6 +167,7 @@ private slots: void saveSettings(QMap<QString, QString> settingsmap); QMap<QString, QString> loadSettings(); void on_actionNew_Inifile_triggered(); + void on_actionBack_to_Origin_triggered(); }; #endif // MAINWINDOW_H