Skip to content

Commit

Permalink
[TD]Preferences: reorganize and add missing
Browse files Browse the repository at this point in the history
  • Loading branch information
@WandererFan
WandererFan committed Jan 27, 2020
1 parent 3ea761d commit c282924
Show file tree
Hide file tree
Showing 25 changed files with 3,816 additions and 1,234 deletions.
21 changes: 19 additions & 2 deletions src/Mod/TechDraw/App/DrawView.cpp
View file
Expand Up @@ -81,8 +81,8 @@ DrawView::DrawView(void):
ADD_PROPERTY_TYPE(Rotation, (0.0), group, App::Prop_None, "Rotation in degrees counterclockwise");

ScaleType.setEnums(ScaleTypeEnums);
ADD_PROPERTY_TYPE(ScaleType, ((long)0), group, App::Prop_None, "Scale Type");
ADD_PROPERTY_TYPE(Scale, (1.0), group, App::Prop_None, "Scale factor of the view");
ADD_PROPERTY_TYPE(ScaleType, (prefScaleType()), group, App::Prop_None, "Scale Type");
ADD_PROPERTY_TYPE(Scale, (prefScale()), group, App::Prop_None, "Scale factor of the view");
Scale.setConstraints(&scaleRange);

ADD_PROPERTY_TYPE(Caption, (""), group, App::Prop_None, "Short text about the view");
Expand Down Expand Up @@ -429,6 +429,23 @@ bool DrawView::keepUpdated(void)
return result;
}

int DrawView::prefScaleType(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General");
int result = hGrp->GetInt("DefaultScaleType", 0);
return result;
}

double DrawView::prefScale(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General");
double result = hGrp->GetInt("DefaultViewScale", 1.0);
return result;
}


void DrawView::requestPaint(void)
{
// Base::Console().Message("DV::requestPaint() - %s\n", getNameInDocument());
Expand Down
5 changes: 5 additions & 0 deletions src/Mod/TechDraw/App/DrawView.h
View file
Expand Up @@ -103,6 +103,11 @@ class TechDrawExport DrawView : public App::DocumentObject
bool autoPos;
bool mouseMove;

int prefScaleType(void);
double prefScale(void);



private:
static const char* ScaleTypeEnums[];
static App::PropertyFloatConstraint::Constraints scaleRange;
Expand Down
21 changes: 19 additions & 2 deletions src/Mod/TechDraw/App/DrawViewBalloon.cpp
View file
Expand Up @@ -115,10 +115,10 @@ DrawViewBalloon::DrawViewBalloon(void)
ADD_PROPERTY_TYPE(OriginIsSet, (false), "",(App::PropertyType)(App::Prop_None),"Balloon origin is set");

EndType.setEnums(endTypeEnums);
ADD_PROPERTY(EndType,((long)0));
ADD_PROPERTY(EndType,(prefEnd()));

Symbol.setEnums(balloonTypeEnums);
ADD_PROPERTY(Symbol,((long)0));
ADD_PROPERTY(Symbol,(prefShape()));

ADD_PROPERTY_TYPE(SymbolScale,(1),"",(App::PropertyType)(App::Prop_None),"Balloon symbol scale");

Expand Down Expand Up @@ -270,6 +270,23 @@ double DrawViewBalloon::prefKinkLength(void) const
return length;
}

int DrawViewBalloon::prefShape(void) const
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations");
int result = hGrp->GetInt("BalloonShape", 0);
return result;
}

int DrawViewBalloon::prefEnd(void) const
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter().
GetGroup("BaseApp")->GetGroup("Preferences")->
GetGroup("Mod/TechDraw/Decorations");
int length = hGrp->GetFloat("BalloonArrow", 5.0);
return length;
}

/*
PyObject *DrawViewBalloon::getPyObject(void)
{
Expand Down
3 changes: 2 additions & 1 deletion src/Mod/TechDraw/App/DrawViewBalloon.h
View file
Expand Up @@ -81,7 +81,8 @@ class TechDrawExport DrawViewBalloon : public TechDraw::DrawView
void handleXYLock(void) override;

double prefKinkLength(void) const;

int prefShape(void) const;
int prefEnd(void) const;

protected:
void onChanged(const App::Property* prop) override;
Expand Down
86 changes: 78 additions & 8 deletions src/Mod/TechDraw/App/DrawViewPart.cpp
View file
Expand Up @@ -151,14 +151,14 @@ DrawViewPart::DrawViewPart(void) :
bool coarseView = hGrp->GetBool("CoarseView", false);
ADD_PROPERTY_TYPE(CoarseView, (coarseView), sgroup, App::Prop_None, "Coarse View on/off");
//add property for visible outline?
ADD_PROPERTY_TYPE(SmoothVisible ,(false),sgroup,App::Prop_None,"Visible Smooth lines on/off");
ADD_PROPERTY_TYPE(SeamVisible ,(false),sgroup,App::Prop_None,"Visible Seam lines on/off");
ADD_PROPERTY_TYPE(IsoVisible ,(false),sgroup,App::Prop_None,"Visible Iso u,v lines on/off");
ADD_PROPERTY_TYPE(HardHidden ,(false),sgroup,App::Prop_None,"Hidden Hard lines on/off");
ADD_PROPERTY_TYPE(SmoothHidden ,(false),sgroup,App::Prop_None,"Hidden Smooth lines on/off");
ADD_PROPERTY_TYPE(SeamHidden ,(false),sgroup,App::Prop_None,"Hidden Seam lines on/off");
ADD_PROPERTY_TYPE(IsoHidden ,(false),sgroup,App::Prop_None,"Hidden Iso u,v lines on/off");
ADD_PROPERTY_TYPE(IsoCount ,(0),sgroup,App::Prop_None,"Number of isoparameters");
ADD_PROPERTY_TYPE(SmoothVisible ,(prefSmoothViz()),sgroup,App::Prop_None,"Show Visible Smooth lines");
ADD_PROPERTY_TYPE(SeamVisible ,(prefSeamViz()),sgroup,App::Prop_None,"Show Visible Seam lines");
ADD_PROPERTY_TYPE(IsoVisible ,(prefIsoViz()),sgroup,App::Prop_None,"Show Visible Iso u,v lines");
ADD_PROPERTY_TYPE(HardHidden ,(prefHardHid()),sgroup,App::Prop_None,"Show Hidden Hard lines");
ADD_PROPERTY_TYPE(SmoothHidden ,(prefSmoothHid()),sgroup,App::Prop_None,"Show Hidden Smooth lines");
ADD_PROPERTY_TYPE(SeamHidden ,(prefSeamHid()),sgroup,App::Prop_None,"Show Hidden Seam lines");
ADD_PROPERTY_TYPE(IsoHidden ,(prefIsoHid()),sgroup,App::Prop_None,"Show Hidden Iso u,v lines");
ADD_PROPERTY_TYPE(IsoCount ,(prefIsoCount()),sgroup,App::Prop_None,"Number of iso parameters lines");

// ADD_PROPERTY_TYPE(CosmeticVertexes ,(0),sgroup,App::Prop_Output,"CosmeticVertex Save/Restore");
// ADD_PROPERTY_TYPE(CosmeticEdges ,(0),sgroup,App::Prop_Output,"CosmeticEdge Save/Restore");
Expand Down Expand Up @@ -1220,7 +1220,77 @@ void DrawViewPart::handleChangedPropertyName(Base::XMLReader &reader, const char
DrawView::handleChangedPropertyName(reader, TypeName, PropName);
}

bool DrawViewPart::prefHardViz(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("HardViz", true);
return result;
}

bool DrawViewPart::prefSeamViz(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("SeamViz", true);
return result;
}

bool DrawViewPart::prefSmoothViz(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("SmoothViz", true);
return result;
}

bool DrawViewPart::prefIsoViz(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("IsoViz", true);
return result;
}

bool DrawViewPart::prefHardHid(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("HardHid", true);
return result;
}

bool DrawViewPart::prefSeamHid(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("SeamHid", true);
return result;
}

bool DrawViewPart::prefSmoothHid(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("SmoothHid", true);
return result;
}

bool DrawViewPart::prefIsoHid(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
bool result = hGrp->GetBool("IsoHid", true);
return result;
}

int DrawViewPart::prefIsoCount(void)
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR");
int result = hGrp->GetBool("IsoCount", 0);
return result;
}


// Python Drawing feature ---------------------------------------------------------
Expand Down
10 changes: 10 additions & 0 deletions src/Mod/TechDraw/App/DrawViewPart.h
View file
Expand Up @@ -215,6 +215,16 @@ class TechDrawExport DrawViewPart : public DrawView, public CosmeticExtension

void handleChangedPropertyName(Base::XMLReader &reader, const char* TypeName, const char* PropName) override;

bool prefHardViz(void);
bool prefSeamViz(void);
bool prefSmoothViz(void);
bool prefIsoViz(void);
bool prefHardHid(void);
bool prefSeamHid(void);
bool prefSmoothHid(void);
bool prefIsoHid(void);
int prefIsoCount(void);


private:
bool nowUnsetting;
Expand Down
12 changes: 9 additions & 3 deletions src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
View file
Expand Up @@ -39,8 +39,11 @@
#include "Workbench.h"
#include "MDIViewPage.h"

#include "DlgPrefsTechDrawImp.h"
#include "DlgPrefsTechDraw1Imp.h"
#include "DlgPrefsTechDraw2Imp.h"
#include "DlgPrefsTechDraw3Imp.h"
#include "DlgPrefsTechDraw4Imp.h"
#include "DlgPrefsTechDraw5Imp.h"
#include "ViewProviderPage.h"
#include "ViewProviderDrawingView.h"
#include "ViewProviderDimension.h"
Expand Down Expand Up @@ -146,8 +149,11 @@ PyMOD_INIT_FUNC(TechDrawGui)
TechDrawGui::ViewProviderCosmeticExtension::init();

// register preferences pages
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawImp> ("TechDraw");
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw2Imp> ("TechDraw");
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw1Imp> ("TechDraw"); //General
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw2Imp> ("TechDraw"); //Scale
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw3Imp> ("TechDraw"); //Dimensions
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw5Imp> ("TechDraw"); //HLR
new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw4Imp> ("TechDraw"); //Advanced

// add resources and reloads the translators
loadTechDrawResource();
Expand Down
25 changes: 20 additions & 5 deletions src/Mod/TechDraw/Gui/CMakeLists.txt
View file
Expand Up @@ -44,8 +44,11 @@ set(TechDrawGui_MOC_HDRS
QGIViewDimension.h
QGIViewBalloon.h
TaskProjGroup.h
DlgPrefsTechDrawImp.h
DlgPrefsTechDraw1Imp.h
DlgPrefsTechDraw2Imp.h
DlgPrefsTechDraw3Imp.h
DlgPrefsTechDraw4Imp.h
DlgPrefsTechDraw5Imp.h
TaskLinkDim.h
DlgTemplateField.h
TaskSectionView.h
Expand Down Expand Up @@ -79,8 +82,11 @@ else()
endif()

set(TechDrawGui_UIC_SRCS
DlgPrefsTechDraw.ui
DlgPrefsTechDraw1.ui
DlgPrefsTechDraw2.ui
DlgPrefsTechDraw3.ui
DlgPrefsTechDraw4.ui
DlgPrefsTechDraw5.ui
TaskProjGroup.ui
TaskLinkDim.ui
DlgTemplateField.ui
Expand Down Expand Up @@ -137,12 +143,21 @@ SET(TechDrawGui_SRCS
TaskProjGroup.ui
TaskProjGroup.cpp
TaskProjGroup.h
DlgPrefsTechDraw.ui
DlgPrefsTechDrawImp.cpp
DlgPrefsTechDrawImp.h
DlgPrefsTechDraw1.ui
DlgPrefsTechDraw1Imp.cpp
DlgPrefsTechDraw1Imp.h
DlgPrefsTechDraw2.ui
DlgPrefsTechDraw2Imp.cpp
DlgPrefsTechDraw2Imp.h
DlgPrefsTechDraw3.ui
DlgPrefsTechDraw3Imp.cpp
DlgPrefsTechDraw3Imp.h
DlgPrefsTechDraw4.ui
DlgPrefsTechDraw4Imp.cpp
DlgPrefsTechDraw4Imp.h
DlgPrefsTechDraw5.ui
DlgPrefsTechDraw5Imp.cpp
DlgPrefsTechDraw5Imp.h
TaskLinkDim.ui
TaskLinkDim.cpp
TaskLinkDim.h
Expand Down

0 comments on commit c282924

Please sign in to comment.