aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide rotation controls while exporting.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-09-06 18:06:06 +03:00
parent 7b134d8b62
commit addfcd94ad
4 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/puzzle/layout/vplayout.cpp
View File

@ -133,7 +133,7 @@ void VPLayout::RefreshScenePieces() const
{
if (not sheet.isNull())
{
sheet->SceneData()->RefreshPieces(sheet);
sheet->SceneData()->RefreshPieces();
}
}
}

41
src/app/puzzle/layout/vpsheet.cpp
View File

@ -41,7 +41,8 @@
//---------------------------------------------------------------------------------------------------------------------
VPSheetSceneData::VPSheetSceneData(const VPLayoutPtr &layout, const QUuid &sheetUuid)
: m_layout(layout),
m_scene(new VMainGraphicsScene())
m_scene(new VMainGraphicsScene()),
m_sheetUuid(sheetUuid)
{
SCASSERT(not layout.isNull())
@ -49,7 +50,7 @@ VPSheetSceneData::VPSheetSceneData(const VPLayoutPtr &layout, const QUuid &sheet
m_graphicsSheet->setPos(0, 0);
m_scene->addItem(m_graphicsSheet);
m_graphicsTileGrid = new VPGraphicsTileGrid(layout, sheetUuid);
m_graphicsTileGrid = new VPGraphicsTileGrid(layout, m_sheetUuid);
m_scene->addItem(m_graphicsTileGrid);
m_rotationControls = new VPGraphicsPieceControls(layout);
@ -89,11 +90,18 @@ void VPSheetSceneData::RefreshLayout()
}
//---------------------------------------------------------------------------------------------------------------------
void VPSheetSceneData::RefreshPieces(const VPSheetPtr &sheet)
void VPSheetSceneData::RefreshPieces()
{
qDeleteAll(m_graphicsPieces);
m_graphicsPieces.clear();
VPLayoutPtr layout = m_layout.toStrongRef();
if(layout.isNull())
{
return;
}
VPSheetPtr sheet = layout->GetSheet(m_sheetUuid);
if (not sheet.isNull())
{
QList<VPPiecePtr> pieces = sheet->GetPieces();
@ -118,6 +126,9 @@ void VPSheetSceneData::PrepareForExport()
m_graphicsSheet->SetShowBorder(false);
m_graphicsSheet->SetShowMargin(false);
m_rotationControls->setVisible(false);
m_rotationOrigin->setVisible(false);
VPLayoutPtr layout = m_layout.toStrongRef();
if (not layout.isNull())
{
@ -126,9 +137,21 @@ void VPSheetSceneData::PrepareForExport()
m_showTilesTmp = layout->LayoutSettings().GetShowTiles();
layout->LayoutSettings().SetShowTiles(false);
VPSheetPtr sheet = layout->GetSheet(m_sheetUuid);
m_slectedPiecesTmp = sheet->GetSelectedPieces();
for (const auto& piece : m_slectedPiecesTmp)
{
if (not piece.isNull())
{
piece->SetSelected(false);
}
}
}
RefreshLayout();
RefreshPieces();
}
//---------------------------------------------------------------------------------------------------------------------
@ -142,9 +165,19 @@ void VPSheetSceneData::CleanAfterExport()
{
layout->LayoutSettings().SetShowGrid(m_showGridTmp);
layout->LayoutSettings().SetShowTiles(m_showTilesTmp);
for (const auto& piece : m_slectedPiecesTmp)
{
if (not piece.isNull())
{
piece->SetSelected(true);
emit layout->PieceSelectionChanged(piece);
}
}
}
RefreshLayout();
RefreshPieces();
}
//---------------------------------------------------------------------------------------------------------------------
@ -612,7 +645,7 @@ void VPSheet::ClearSelection() const
VPLayoutPtr layout = GetLayout();
if (not layout.isNull())
{
emit GetLayout()->PieceSelectionChanged(VPPiecePtr());
emit layout->PieceSelectionChanged(VPPiecePtr());
}
}
}

6
src/app/puzzle/layout/vpsheet.h
View File

@ -60,7 +60,7 @@ public:
*/
void RefreshLayout();
void RefreshPieces(const VPSheetPtr &sheet);
void RefreshPieces();
/**
* @brief PrepareForExport prepares the graphic for an export (i.e hide margin etc)
@ -110,6 +110,10 @@ private:
*/
bool m_showGridTmp{false};
QUuid m_sheetUuid;
QList<VPPiecePtr> m_slectedPiecesTmp{};
void ConnectPiece(VPGraphicsPiece *piece);
};

2
src/app/puzzle/scene/vpmaingraphicsview.cpp
View File

@ -104,7 +104,7 @@ void VPMainGraphicsView::RefreshPieces()
VPSheetPtr sheet = layout->GetFocusedSheet();
if (not sheet.isNull())
{
sheet->SceneData()->RefreshPieces(sheet);
sheet->SceneData()->RefreshPieces();
}
}
}