Little refactoring.
--HG-- branch : feature
This commit is contained in:
parent
8683b69f13
commit
791d874c9a
|
@ -48,6 +48,12 @@
|
|||
#include "../ifc/xml/vvstconverter.h"
|
||||
#include "../ifc/xml/vvitconverter.h"
|
||||
#include "../vwidgets/vwidgetpopup.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
#include "tools/drawTools/drawtools.h"
|
||||
#include "../vtools/dialogs/tooldialogs.h"
|
||||
#include "tools/vtooldetail.h"
|
||||
#include "tools/vtooluniondetails.h"
|
||||
#include "dialogs/dialogs.h"
|
||||
|
||||
#include <QInputDialog>
|
||||
#include <QDebug>
|
||||
|
@ -66,6 +72,8 @@
|
|||
#include <QDesktopServices>
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include <QFileSystemWatcher>
|
||||
#include <QComboBox>
|
||||
|
||||
#if defined(Q_OS_MAC)
|
||||
#include <QMimeData>
|
||||
|
|
|
@ -30,17 +30,10 @@
|
|||
#define MAINWINDOW_H
|
||||
|
||||
#include "mainwindowsnogui.h"
|
||||
#include "../vwidgets/vmaingraphicsview.h"
|
||||
#include "../vtools/dialogs/tooldialogs.h"
|
||||
#include "dialogs/dialogs.h"
|
||||
#include "tools/vtooldetail.h"
|
||||
#include "tools/vtooluniondetails.h"
|
||||
#include "tools/drawTools/drawtools.h"
|
||||
#include "core/vcmdexport.h"
|
||||
#include "../vmisc/vlockguard.h"
|
||||
#include <QPointer>
|
||||
|
||||
#include <QFileSystemWatcher>
|
||||
#include <QPointer>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
@ -49,6 +42,12 @@ namespace Ui
|
|||
|
||||
class VToolOptionsPropertyBrowser;
|
||||
class VMeasurements;
|
||||
class VMainGraphicsScene;
|
||||
class QFileSystemWatcher;
|
||||
class QLabel;
|
||||
class DialogIncrements;
|
||||
class DialogTool;
|
||||
class DialogHistory;
|
||||
|
||||
/**
|
||||
* @brief The MainWindow class main windows.
|
||||
|
|
|
@ -279,7 +279,7 @@ void DialogEndLine::ShowDialog(bool click)
|
|||
{
|
||||
if (click)
|
||||
{
|
||||
/*We will ignore click if poinet is in point circle*/
|
||||
/*We will ignore click if pointer is in point circle*/
|
||||
VMainGraphicsScene *scene = qobject_cast<VMainGraphicsScene *>(qApp->getCurrentScene());
|
||||
SCASSERT(scene != nullptr);
|
||||
const QSharedPointer<VPointF> point = data->GeometricObject<VPointF>(GetBasePointId());
|
||||
|
|
|
@ -31,12 +31,10 @@
|
|||
|
||||
#include "../vabstracttool.h"
|
||||
#include "../../dialogs/tools/dialogtool.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
#include "../vwidgets/vmaingraphicsview.h"
|
||||
|
||||
#include <QMenu>
|
||||
#include <QGraphicsSceneContextMenuEvent>
|
||||
#include <QGraphicsView>
|
||||
|
||||
/**
|
||||
* @brief The VDrawTool abstract class for all draw tool.
|
||||
|
|
Loading…
Reference in New Issue
Block a user