From 29d50dbc015f66a6214391eeda8afe02ba9822ab Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 25 Dec 2014 23:10:42 +0100 Subject: [PATCH] + improve whitespace --- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 279 +++++++++--------- 1 file changed, 138 insertions(+), 141 deletions(-) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 185988860..81bd0c724 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -315,66 +315,64 @@ void TaskSketcherElements::onSelectionChanged(const Gui::SelectionChanges& msg) QString expr = QString::fromAscii(msg.pSubName); std::string shapetype(msg.pSubName); // if-else edge vertex - if (shapetype.size() > 4 && shapetype.substr(0,4) == "Edge") - { - QRegExp rx(QString::fromAscii("^Edge(\\d+)$")); - int pos = expr.indexOf(rx); - if (pos > -1) { - bool ok; - int ElementId = rx.cap(1).toInt(&ok) - 1; - if (ok) { - int countItems = ui->listWidgetElements->count(); - for (int i=0; i < countItems; i++) { - ElementItem* item = static_cast + if (shapetype.size() > 4 && shapetype.substr(0,4) == "Edge") { + QRegExp rx(QString::fromAscii("^Edge(\\d+)$")); + int pos = expr.indexOf(rx); + if (pos > -1) { + bool ok; + int ElementId = rx.cap(1).toInt(&ok) - 1; + if (ok) { + int countItems = ui->listWidgetElements->count(); + for (int i=0; i < countItems; i++) { + ElementItem* item = static_cast (ui->listWidgetElements->item(i)); - if (item->ElementNbr == ElementId) { - item->isLineSelected=select; - break; - } - } - } - } + if (item->ElementNbr == ElementId) { + item->isLineSelected=select; + break; + } + } + } + } } else if (shapetype.size() > 6 && shapetype.substr(0,6) == "Vertex"){ - QRegExp rx(QString::fromAscii("^Vertex(\\d+)$")); - int pos = expr.indexOf(rx); - if (pos > -1) { - bool ok; - int ElementId = rx.cap(1).toInt(&ok) - 1; - if (ok) { - // Get the GeoID&Pos - int GeoId; - Sketcher::PointPos PosId; - sketchView->getSketchObject()->getGeoVertexIndex(ElementId,GeoId, PosId); + QRegExp rx(QString::fromAscii("^Vertex(\\d+)$")); + int pos = expr.indexOf(rx); + if (pos > -1) { + bool ok; + int ElementId = rx.cap(1).toInt(&ok) - 1; + if (ok) { + // Get the GeoID&Pos + int GeoId; + Sketcher::PointPos PosId; + sketchView->getSketchObject()->getGeoVertexIndex(ElementId,GeoId, PosId); - int countItems = ui->listWidgetElements->count(); - for (int i=0; i < countItems; i++) { - ElementItem* item = static_cast + int countItems = ui->listWidgetElements->count(); + for (int i=0; i < countItems; i++) { + ElementItem* item = static_cast (ui->listWidgetElements->item(i)); - if (item->ElementNbr == GeoId) { - switch(PosId) - { + if (item->ElementNbr == GeoId) { + switch(PosId) + { case Sketcher::start: - item->isStartingPointSelected=select; - break; + item->isStartingPointSelected=select; + break; case Sketcher::end: - item->isEndPointSelected=select; - break; + item->isEndPointSelected=select; + break; case Sketcher::mid: - item->isMidPointSelected=select; - break; + item->isMidPointSelected=select; + break; default: + break; + } break; - } - break; - } - } - } - } + } + } + } + } } // update the listwidget int element=ui->comboBoxElementFilter->currentIndex(); - ui->listWidgetElements->blockSignals(true); @@ -426,41 +424,41 @@ void TaskSketcherElements::on_listWidgetElements_itemSelectionChanged(void) bool multipleselection=true; // ctrl type of selection in listWidget bool multipleconsecutiveselection=false; // shift type of selection in listWidget - - if(!inhibitSelectionUpdate){ - if(itf!=NULL) { - switch(element){ - case 0: - itf->isLineSelected=!itf->isLineSelected; - break; - case 1: - itf->isStartingPointSelected=!itf->isStartingPointSelected; - break; - case 2: - itf->isEndPointSelected=!itf->isEndPointSelected; - break; - case 3: - itf->isMidPointSelected=!itf->isMidPointSelected; - break; + + if (!inhibitSelectionUpdate) { + if(itf!=NULL) { + switch(element){ + case 0: + itf->isLineSelected=!itf->isLineSelected; + break; + case 1: + itf->isStartingPointSelected=!itf->isStartingPointSelected; + break; + case 2: + itf->isEndPointSelected=!itf->isEndPointSelected; + break; + case 3: + itf->isMidPointSelected=!itf->isMidPointSelected; + break; + } } - } - - if(QApplication::keyboardModifiers()==Qt::ControlModifier)// multiple ctrl selection? - multipleselection=true; - else - multipleselection=false; - - if(QApplication::keyboardModifiers()==Qt::ShiftModifier)// multiple shift selection? - multipleconsecutiveselection=true; - else - multipleconsecutiveselection=false; - - if(multipleselection && multipleconsecutiveselection){ // ctrl takes priority over shift functionality - multipleselection=true; - multipleconsecutiveselection=false; - } - } - + + if (QApplication::keyboardModifiers()==Qt::ControlModifier)// multiple ctrl selection? + multipleselection=true; + else + multipleselection=false; + + if (QApplication::keyboardModifiers()==Qt::ShiftModifier)// multiple shift selection? + multipleconsecutiveselection=true; + else + multipleconsecutiveselection=false; + + if (multipleselection && multipleconsecutiveselection) { // ctrl takes priority over shift functionality + multipleselection=true; + multipleconsecutiveselection=false; + } + } + std::string doc_name = sketchView->getSketchObject()->getDocument()->getName(); std::string obj_name = sketchView->getSketchObject()->getNameInDocument(); @@ -470,18 +468,16 @@ void TaskSketcherElements::on_listWidgetElements_itemSelectionChanged(void) for (int i=0;ilistWidgetElements->count(); i++) { ElementItem * ite=static_cast(ui->listWidgetElements->item(i)); - if(multipleselection==false && multipleconsecutiveselection==false && ite!=itf) - { - ite->isLineSelected=false; - ite->isStartingPointSelected=false; - ite->isEndPointSelected=false; - ite->isMidPointSelected=false; + if(multipleselection==false && multipleconsecutiveselection==false && ite!=itf) { + ite->isLineSelected=false; + ite->isStartingPointSelected=false; + ite->isEndPointSelected=false; + ite->isMidPointSelected=false; } - if(multipleconsecutiveselection==true) - { - if( (( i>focusItemIndex && ipreviouslySelectedItemIndex )) && + if( multipleconsecutiveselection) { + if ((( i>focusItemIndex && ipreviouslySelectedItemIndex )) && previouslySelectedItemIndex>=0){ // select the element of the Item switch(element){ @@ -521,43 +517,44 @@ void TaskSketcherElements::on_listWidgetElements_itemSelectionChanged(void) std::stringstream ss; int vertex; - if(ite->isLineSelected){ - ss << "Edge" << ite->ElementNbr + 1; - Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + if (ite->isLineSelected) { + ss << "Edge" << ite->ElementNbr + 1; + Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); } - if(ite->isStartingPointSelected){ - ss.str(std::string()); - vertex= ite->StartingVertex; - if(vertex!=-1){ - ss << "Vertex" << vertex + 1; - Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); - } + if (ite->isStartingPointSelected) { + ss.str(std::string()); + vertex= ite->StartingVertex; + if (vertex!=-1) { + ss << "Vertex" << vertex + 1; + Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + } } - if(ite->isEndPointSelected){ - ss.str(std::string()); - vertex= ite->EndVertex; - if(vertex!=-1){ - ss << "Vertex" << vertex + 1; - Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); - } + if (ite->isEndPointSelected) { + ss.str(std::string()); + vertex= ite->EndVertex; + if (vertex!=-1) { + ss << "Vertex" << vertex + 1; + Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + } } - if(ite->isMidPointSelected){ - ss.str(std::string()); - vertex= ite->MidVertex; - if(vertex!=-1){ - ss << "Vertex" << vertex + 1; - Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); - } + if (ite->isMidPointSelected) { + ss.str(std::string()); + vertex= ite->MidVertex; + if (vertex!=-1) { + ss << "Vertex" << vertex + 1; + Gui::Selection().addSelection(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + } } } + this->blockConnection(block); ui->listWidgetElements->blockSignals(false); - - if(focusItemIndex>-1 && focusItemIndexlistWidgetElements->count()) - previouslySelectedItemIndex=focusItemIndex; + + if (focusItemIndex>-1 && focusItemIndexlistWidgetElements->count()) + previouslySelectedItemIndex=focusItemIndex; } void TaskSketcherElements::on_listWidgetElements_itemEntered(QListWidgetItem *item) @@ -583,17 +580,17 @@ void TaskSketcherElements::on_listWidgetElements_itemEntered(QListWidgetItem *it // Edge Auto-Switch functionality - if(isautoSwitchBoxChecked && tempitemindex!=focusItemIndex){ - ui->listWidgetElements->blockSignals(true); - if(it->GeometryType==Part::GeomPoint::getClassTypeId()) { - ui->comboBoxElementFilter->setCurrentIndex(1); - } - else { - ui->comboBoxElementFilter->setCurrentIndex(0); - } - ui->listWidgetElements->blockSignals(false); + if (isautoSwitchBoxChecked && tempitemindex!=focusItemIndex){ + ui->listWidgetElements->blockSignals(true); + if (it->GeometryType==Part::GeomPoint::getClassTypeId()) { + ui->comboBoxElementFilter->setCurrentIndex(1); + } + else { + ui->comboBoxElementFilter->setCurrentIndex(0); + } + ui->listWidgetElements->blockSignals(false); } - + int element=ui->comboBoxElementFilter->currentIndex(); focusItemIndex=tempitemindex; @@ -602,28 +599,28 @@ void TaskSketcherElements::on_listWidgetElements_itemEntered(QListWidgetItem *it switch(element) { - case 0: - ss << "Edge" << it->ElementNbr + 1; - Gui::Selection().setPreselect(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + case 0: + { + ss << "Edge" << it->ElementNbr + 1; + Gui::Selection().setPreselect(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + } break; - case 1: - case 2: - case 3: + case 1: + case 2: + case 3: vertex= sketchView->getSketchObject()->getVertexIndexGeoPos(it->ElementNbr,static_cast(element)); - if(vertex!=-1){ - ss << "Vertex" << vertex + 1; - Gui::Selection().setPreselect(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); + if (vertex!=-1) { + ss << "Vertex" << vertex + 1; + Gui::Selection().setPreselect(doc_name.c_str(), obj_name.c_str(), ss.str().c_str()); } break; } - } void TaskSketcherElements::leaveEvent ( QEvent * event ) { - Gui::Selection().rmvPreselect(); - ui->listWidgetElements->clearFocus(); - //Base::leaveEvent(event); + Gui::Selection().rmvPreselect(); + ui->listWidgetElements->clearFocus(); } void TaskSketcherElements::slotElementsChanged(void)