suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix warnings

Browse Source
This commit is contained in:
wmayer 2016-05-08 06:19:32 +02:00
parent a034fc58b3
commit fbf72553f3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
View File

@ -388,13 +388,13 @@ void TaskDatumParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
refnames.push_back(subname); refnames.push_back(subname);
} }
bool error = false; //bool error = false;
try { try {
pcDatum->Support.setValues(refs, refnames); pcDatum->Support.setValues(refs, refnames);
updateListOfModes(); updateListOfModes();
eMapMode mmode = getActiveMapMode();//will be mmDeactivated, if no modes are available eMapMode mmode = getActiveMapMode();//will be mmDeactivated, if no modes are available
if(mmode == mmDeactivated){ if(mmode == mmDeactivated){
error = true; //error = true;
this->completed = false; this->completed = false;
} else { } else {
this->completed = true; this->completed = true;
@ -403,7 +403,7 @@ void TaskDatumParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
updatePreview(); updatePreview();
} }
catch(Base::Exception& e) { catch(Base::Exception& e) {
error = true; //error = true;
ui->message->setText(QString::fromLatin1(e.what())); ui->message->setText(QString::fromLatin1(e.what()));
ui->message->setStyleSheet(QString::fromLatin1("QLabel{color: red;}")); ui->message->setStyleSheet(QString::fromLatin1("QLabel{color: red;}"));
} }
@ -670,7 +670,7 @@ void TaskDatumParameters::updateRefButton(int idx)
if (iActiveRef == idx) { if (iActiveRef == idx) {
b->setText(tr("Selecting...")); b->setText(tr("Selecting..."));
} else if (idx < this->lastSuggestResult.references_Types.size()){ } else if (idx < static_cast<int>(this->lastSuggestResult.references_Types.size())){
b->setText(AttacherGui::getShapeTypeText(this->lastSuggestResult.references_Types[idx])); b->setText(AttacherGui::getShapeTypeText(this->lastSuggestResult.references_Types[idx]));
} else { } else {
b->setText(tr("Reference%1").arg(idx+1)); b->setText(tr("Reference%1").arg(idx+1));
@ -742,7 +742,7 @@ void TaskDatumParameters::updateListOfModes(eMapMode curMode)
//obtain list of available modes: //obtain list of available modes:
Part::Datum* pcDatum = static_cast<Part::Datum*>(DatumView->getObject()); Part::Datum* pcDatum = static_cast<Part::Datum*>(DatumView->getObject());
this->lastSuggestResult.bestFitMode = mmDeactivated; this->lastSuggestResult.bestFitMode = mmDeactivated;
int lastValidModeItemIndex = mmDummy_NumberOfModes; size_t lastValidModeItemIndex = mmDummy_NumberOfModes;
if (pcDatum->Support.getSize() > 0){ if (pcDatum->Support.getSize() > 0){
pcDatum->attacher().suggestMapModes(this->lastSuggestResult); pcDatum->attacher().suggestMapModes(this->lastSuggestResult);
modesInList = this->lastSuggestResult.allApplicableModes; modesInList = this->lastSuggestResult.allApplicableModes;