diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.cpp b/src/Mod/Sketcher/Gui/SketcherSettings.cpp index 5f7aa495d8..f27ef5be0f 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp +++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp @@ -109,10 +109,6 @@ void SketcherSettings::saveSettings() ui->checkBoxNotifyConstraintSubstitutions->onSave(); form->saveSettings(); - ParameterGrp::handle hViewGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); - int markerSize = ui->EditSketcherMarkerSize->itemData(ui->EditSketcherMarkerSize->currentIndex()).toInt(); - hViewGrp->SetInt("EditSketcherMarkerSize", markerSize); - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Part"); QVariant data = ui->comboBox->itemData(ui->comboBox->currentIndex()); int pattern = data.toInt(); @@ -136,16 +132,6 @@ void SketcherSettings::loadSettings() ui->checkBoxNotifyConstraintSubstitutions->onRestore(); form->loadSettings(); - std::list sizes = Gui::Inventor::MarkerBitmaps::getSupportedSizes("CIRCLE_FILLED"); - for (std::list::iterator it = sizes.begin(); it != sizes.end(); ++it) - ui->EditSketcherMarkerSize->addItem(tr("%1 px").arg(*it), *it); - ParameterGrp::handle hViewGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); - int markerSize = hViewGrp->GetInt("EditSketcherMarkerSize", 7); - int markerIndex = ui->EditSketcherMarkerSize->findData(QVariant(markerSize)); - if (markerIndex < 0) - markerIndex = 1; - ui->EditSketcherMarkerSize->setCurrentIndex(markerIndex); - ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Part"); int pattern = hGrp->GetInt("GridLinePattern", 0x0f0f); int index = ui->comboBox->findData(QVariant(pattern)); diff --git a/src/Mod/Sketcher/Gui/SketcherSettings.ui b/src/Mod/Sketcher/Gui/SketcherSettings.ui index ce1cf3b6d8..ad9fbf52e6 100644 --- a/src/Mod/Sketcher/Gui/SketcherSettings.ui +++ b/src/Mod/Sketcher/Gui/SketcherSettings.ui @@ -55,27 +55,14 @@ - - - - - 182 - 0 - - - - Marker size - - - - + -1 - + Ask for value after creating a distance constraint @@ -91,17 +78,14 @@ - + Grid line pattern - - - - + Geometry Creation "Continue Mode" @@ -117,7 +101,7 @@ - + Constraint Creation "Continue Mode" (Experimental) @@ -133,7 +117,7 @@ - + true @@ -280,7 +264,7 @@ - + true @@ -335,14 +319,14 @@ - + Segments per geometry - + 50 @@ -424,7 +408,6 @@ EditSketcherFontSize - EditSketcherMarkerSize comboBox dialogOnDistanceConstraint continueMode diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp index 378ebf5d7c..51bb5a3a8a 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp @@ -57,6 +57,7 @@ #include #include #include +#include using namespace SketcherGui; using namespace Gui::TaskView; @@ -545,7 +546,7 @@ void SketcherValidation::showPoints(const std::vector& pts) SoBaseColor * markcol = new SoBaseColor(); markcol->rgb.setValue(1.0f, 1.0f, 0.0f); SoMarkerSet* marker = new SoMarkerSet(); - marker->markerIndex=SoMarkerSet::PLUS_9_9; + marker->markerIndex=Gui::Inventor::MarkerBitmaps::getMarkerIndex("PLUS", App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View")->GetInt("MarkerSize", 9)); pointsep->addChild(markcol); pointsep->addChild(marker); diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index ebe3a23f53..00a6a76f37 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -5336,7 +5336,7 @@ bool ViewProviderSketch::setEdit(int ModNum) edit = new EditData(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/View"); - edit->MarkerSize = hGrp->GetInt("EditSketcherMarkerSize", 7); + edit->MarkerSize = hGrp->GetInt("MarkerSize", 7); createEditInventorNodes();