这是indexloc提供的服务,不要输入任何密码
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/mainwindow2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ GNU General Public License for more details.
#include "fileformat.h" //contains constants used by Pencil File Format
#include "util.h"
#include "backupelement.h"
#include "legacybackupelement.h"

// app headers
#include "colorbox.h"
Expand Down
3 changes: 2 additions & 1 deletion app/src/mainwindow2.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class Timeline2;
class ActionCommands;
class ImportImageSeqDialog;
class BackupElement;
class LegacyBackupElement;
class LayerOpacityDialog;
class PegBarAlignmentDialog;
class RepositionFramesDialog;
Expand Down Expand Up @@ -172,7 +173,7 @@ private slots:
QToolBar* mOverlayToolbar = nullptr;

// backup
BackupElement* mBackupAtSave = nullptr;
LegacyBackupElement* mBackupAtSave = nullptr;

PegBarAlignmentDialog* mPegAlign = nullptr;
RepositionFramesDialog* mReposDialog = nullptr;
Expand Down
7 changes: 7 additions & 0 deletions core_lib/core_lib.pro
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,19 @@ HEADERS += \
src/interface/camerapropertiesdialog.h \
src/interface/editor.h \
src/interface/flowlayout.h \
src/interface/legacybackupelement.h \
src/interface/recentfilemenu.h \
src/interface/scribblearea.h \
src/interface/timecontrols.h \
src/interface/timeline.h \
src/interface/timelinecells.h \
src/interface/basedockwidget.h \
src/interface/backgroundwidget.h \
src/managers/backupmanager.h \
src/managers/basemanager.h \
src/managers/overlaymanager.h \
src/managers/clipboardmanager.h \
src/managers/canvasmanager.h \
src/managers/selectionmanager.h \
src/managers/colormanager.h \
src/managers/layermanager.h \
Expand Down Expand Up @@ -94,6 +97,7 @@ HEADERS += \
src/util/cameraeasingtype.h \
src/util/camerafieldoption.h \
src/util/colordictionary.h \
src/util/direction.h \
src/util/fileformat.h \
src/util/filetype.h \
src/util/mathutils.h \
Expand Down Expand Up @@ -126,16 +130,19 @@ SOURCES += src/graphics/bitmap/bitmapimage.cpp \
src/interface/camerapropertiesdialog.cpp \
src/interface/editor.cpp \
src/interface/flowlayout.cpp \
src/interface/legacybackupelement.cpp \
src/interface/recentfilemenu.cpp \
src/interface/scribblearea.cpp \
src/interface/timecontrols.cpp \
src/interface/timeline.cpp \
src/interface/timelinecells.cpp \
src/interface/basedockwidget.cpp \
src/interface/backgroundwidget.cpp \
src/managers/backupmanager.cpp \
src/managers/basemanager.cpp \
src/managers/overlaymanager.cpp \
src/managers/clipboardmanager.cpp \
src/managers/canvasmanager.cpp \
src/managers/selectionmanager.cpp \
src/managers/colormanager.cpp \
src/managers/layermanager.cpp \
Expand Down
23 changes: 22 additions & 1 deletion core_lib/src/graphics/vector/vectorimage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ GNU General Public License for more details.
#include <QXmlStreamWriter>
#include "object.h"


VectorImage::VectorImage()
{
deselectAll();
Expand Down Expand Up @@ -677,6 +676,28 @@ void VectorImage::setSelected(QList<VertexRef> vertexList, bool YesOrNo)
}
}

void VectorImage::setSelected(const QList<int> curveList, const QList<VertexRef> vertexList, const bool YesOrNo)
{
for (int curveI = 0; curveI < curveList.size(); curveI++)
{
int curveNumber = curveList.at(curveI);

if (vertexList.isEmpty())
{
setSelected(curveNumber, YesOrNo);
}
else
{
for (int i = 0; i < vertexList.size(); i++)
{
setSelected(curveNumber, vertexList.at(i).vertexNumber, YesOrNo);
}
}
}
}



/**
* @brief VectorImage::setAreaSelected
* @param areaNumber: int
Expand Down
1 change: 1 addition & 0 deletions core_lib/src/graphics/vector/vectorimage.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class VectorImage : public KeyFrame
void setSelected(VertexRef vertexRef, bool YesOrNo);
void setSelected(QList<int> curveList, bool YesOrNo);
void setSelected(QList<VertexRef> vertexList, bool YesOrNo);
void setSelected(const QList<int> curveList, const QList<VertexRef> vertexList, const bool YesOrNo);
bool isSelected(int curveNumber);
bool isSelected(int curveNumber, int vertexNumber);
bool isSelected(VertexRef vertexRef);
Expand Down
Loading