kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: simplify sketch solver messages

Browse Source
This commit is contained in:
logari81
2012-05-26 20:02:57 +02:00
parent b849393644
commit ba63b3d778
5 changed files with 46 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
View File

@@ -54,8 +54,8 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch *sketchView)
this->groupLayout()->addWidget(proxy);
connectionSetUp = sketchView->signalSetUp.connect(boost::bind(&SketcherGui::TaskSketcherMessages::slotSetUp, this,_1,_2,_3));
connectionSolved = sketchView->signalSolved.connect(boost::bind(&SketcherGui::TaskSketcherMessages::slotSolved, this,_1,_2));
connectionSetUp = sketchView->signalSetUp.connect(boost::bind(&SketcherGui::TaskSketcherMessages::slotSetUp, this,_1));
connectionSolved = sketchView->signalSolved.connect(boost::bind(&SketcherGui::TaskSketcherMessages::slotSolved, this,_1));
}
TaskSketcherMessages::~TaskSketcherMessages()
@@ -65,46 +65,14 @@ TaskSketcherMessages::~TaskSketcherMessages()
delete ui;
}
void TaskSketcherMessages::slotSetUp(int type, int dofs, const std::string &msg)
void TaskSketcherMessages::slotSetUp(QString msg)
{
switch(type){
case -1:
ui->labelConstrainStatus->setText(QString::fromLatin1("Empty sketch"));
break;
case 0:
ui->labelConstrainStatus->setText(QString::fromLatin1("<font color='green'>Fully constrained sketch </font>"));
break;
case 1:
if (dofs==1)
ui->labelConstrainStatus->setText(QString::fromLatin1("Under-constrained sketch with 1 degree of freedom"));
else
ui->labelConstrainStatus->setText(QString::fromLatin1("Under-constrained sketch with %1 degrees of freedom").arg(dofs));
break;
case 2:
ui->labelConstrainStatus->setText(QString::fromLatin1("<font color='red'>Sketch contains conflicting constraints<br/>%1</font>").arg(QString::fromStdString(msg)));
break;
case 3:
ui->labelConstrainStatus->setText(QString::fromLatin1("<font color='red'>Over-constrained sketch<br/>%1</font>").arg(QString::fromStdString(msg)));
break;
case 4:
ui->labelConstrainStatus->setText(QString::fromLatin1("Sketch contains redundant constraints<br/>%1").arg(QString::fromStdString(msg)));
break;
}
ui->labelConstrainStatus->setText(msg);
}
void TaskSketcherMessages::slotSolved(int type, float time)
void TaskSketcherMessages::slotSolved(QString msg)
{
switch(type){
case -1:
ui->labelSolverStatus->setText(QString());
break;
case 0:
ui->labelSolverStatus->setText(QString::fromLatin1("Solved in %1 sec").arg(time));
break;
case 1:
ui->labelSolverStatus->setText(QString::fromLatin1("Unsolved (%1)").arg(time));
break;
}
ui->labelSolverStatus->setText(msg);
}
#include "moc_TaskSketcherMessages.cpp"