palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-06-26 14:18:12 +02:00
Code Issues Projects Releases Wiki Activity

Set start position for base point according to items bounding rect.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-11-03 17:54:44 +02:00
parent a342948437
commit 00a4187eda
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/app/valentina/mainwindow.cpp
View file

@ -190,7 +190,8 @@ void MainWindow::AddPP(const QString &PPName)
//Create single point
ui->view->itemClicked(nullptr);//hide options previous tool
const QString label = doc->GenerateLabel(LabelType::NewPatternPiece);
const quint32 id = pattern->AddGObject(new VPointF(30+comboBoxDraws->count()*5, 40, label, 5, 10));
const QPointF startPosition = StartPositionNewPP();
const quint32 id = pattern->AddGObject(new VPointF(startPosition.x(), startPosition.y(), label, 5, 10));
VToolBasePoint *spoint = new VToolBasePoint(doc, pattern, id, Source::FromGui, PPName);
sceneDraw->addItem(spoint);
ui->view->itemClicked(spoint);
@ -218,9 +219,37 @@ void MainWindow::AddPP(const QString &PPName)
}
comboBoxDraws->blockSignals(false);
// Show best for new PP
ui->view->fitInView(doc->ActiveDrawBoundingRect(), Qt::KeepAspectRatio);
ui->view->NewFactor(ui->view->transform().m11());
ui->actionNewDraw->setEnabled(true);
}
//---------------------------------------------------------------------------------------------------------------------
QPointF MainWindow::StartPositionNewPP() const
{
const qreal originX = 30.0;
const qreal originY = 40.0;
const qreal margin = 40.0;
if (comboBoxDraws->count() > 1)
{
const QRectF rect = sceneDraw->itemsBoundingRect();
if (rect.width() <= rect.height())
{
return QPointF(rect.width()+margin, originY);
}
else
{
return QPointF(originX, rect.height()+margin);
}
}
else
{
return QPointF(originX, originY);
}
}
//---------------------------------------------------------------------------------------------------------------------
void MainWindow::InitScenes()
{

1
src/app/valentina/mainwindow.h
View file

@ -295,6 +295,7 @@ private:
void ToolBarStyle(QToolBar *bar);
void AddPP(const QString &PPName);
QPointF StartPositionNewPP() const;
void InitScenes();