Commit e4b0abb3 authored by Tao Zhong's avatar Tao Zhong
Browse files

Merge branch 'develop' into 'master'

parents 57e8dec1 2967ff71
Pipeline #15971 failed with stages
in 11 seconds
build/
backup*
cmake-build-debug/
.DS_Store
.idea
examples/
bin/
tests/
.vscode
# C++ objects and libs
*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.dll
*.dylib
# Qt-es
object_script.*.Release
object_script.*.Debug
*_plugin_import.cpp
/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*
# Qt unit tests
target_wrapper.*
# QtCreator
*.autosave
# QtCreator Qml
*.qmlproject.user
*.qmlproject.user.*
# QtCreator CMake
CMakeLists.txt.user*
# Prerequisites
*.d
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
# Change Log
All notable changes to this project will be documented in this file.
## v0.8.6 [08.01.2019]
## Added
- Add zoom extents option #64
- Add zoom Windows option #64
- Add wirte ini-files feature #27
## Changed
- Improve statbility #105
- Use panning mode by middle button
## Bugs fixed
- Fix shortcut for "Del"
## v0.8.5 [02.11.2018]
## Added
- Add Auto Saving function #67
......
This diff is collapsed.
......@@ -57,6 +57,7 @@
<addaction name="actionAuto_Definition"/>
<addaction name="actionGather_data"/>
<addaction name="actionLandmarkWidget"/>
<addaction name="actionNew_Inifile"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
......@@ -65,10 +66,12 @@
<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="actionZoom_Windows"/>
<addaction name="actionZoom_Extents"/>
</widget>
<widget class="QMenu" name="menuEdit">
<property name="title">
......@@ -124,7 +127,6 @@
<addaction name="separator"/>
<addaction name="actiongridmode"/>
<addaction name="actionObjectsnap"/>
<addaction name="actionPanning_Mode"/>
<addaction name="separator"/>
<addaction name="actionRoom"/>
</widget>
......@@ -704,6 +706,44 @@
<bool>true</bool>
</property>
</action>
<action name="actionNew_Inifile">
<property name="text">
<string>New Inifile</string>
</property>
<property name="shortcut">
<string>Meta+I</string>
</property>
</action>
<action name="actionBack_to_Origin">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Back to Origin</string>
</property>
<property name="shortcut">
<string>Meta+O</string>
</property>
<property name="visible">
<bool>true</bool>
</property>
</action>
<action name="actionZoom_Windows">
<property name="text">
<string>Zoom Windows</string>
</property>
<property name="shortcut">
<string>Meta+W</string>
</property>
</action>
<action name="actionZoom_Extents">
<property name="text">
<string>Zoom Extents</string>
</property>
<property name="shortcut">
<string>Meta+E</string>
</property>
</action>
</widget>
<resources>
<include location="../Resources/resources.qrc"/>
......
This diff is collapsed.
This diff is collapsed.
......@@ -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);
......@@ -99,6 +96,7 @@ public:
void AutoZoom();
qreal CalcGridSize();
void ShowOrigin();
void selectedWindows();
//Catch lines, points and intersections
......@@ -205,7 +203,6 @@ private:
bool statDoor;
bool statExit;
bool statLandmark;
bool statPanning;
bool _statHLine;
int _statCopy;
QPointF _copyOrigin;
......@@ -247,6 +244,8 @@ private:
ActionStack _undoStack;
ActionStack _redoStack;
//View
bool statzoomwindows;
signals:
void mouse_moved();
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment