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

Arch/TD: Support for Arch BuildingParts in TD ArchView

Browse Source
This commit is contained in:
Yorik van Havre
2019-08-16 19:03:49 -03:00
parent 892bfa92a4
commit 5ca5f906d9
5 changed files with 180 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/TechDraw/App/DrawViewArch.cpp
View File

@@ -54,7 +54,7 @@ DrawViewArch::DrawViewArch(void)
{
static const char *group = "Arch view";
ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"Section Plane object for this view");
ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"SectionPlane or BuildingPart object for this view");
Source.setScope(App::LinkScope::Global);
ADD_PROPERTY_TYPE(AllOn ,(false),group,App::Prop_None,"If hidden objects must be shown or not");
RenderMode.setEnums(RenderModeEnums);
@@ -62,8 +62,10 @@ DrawViewArch::DrawViewArch(void)
ADD_PROPERTY_TYPE(FillSpaces ,(false),group,App::Prop_None,"If True, Arch Spaces are shown as a colored area");
ADD_PROPERTY_TYPE(ShowHidden ,(false),group,App::Prop_None,"If the hidden geometry behind the section plane is shown or not");
ADD_PROPERTY_TYPE(ShowFill ,(false),group,App::Prop_None,"If cut areas must be filled with a hatch pattern or not");
ADD_PROPERTY_TYPE(LineWidth,(0.35),group,App::Prop_None,"Line width of this view");
ADD_PROPERTY_TYPE(LineWidth,(0.25),group,App::Prop_None,"Line width of this view");
ADD_PROPERTY_TYPE(FontSize,(12.0),group,App::Prop_None,"Text size for this view");
ADD_PROPERTY_TYPE(CutLineWidth,(0.50),group,App::Prop_None,"Width of cut lines of this view");
ADD_PROPERTY_TYPE(JoinArch ,(false),group,App::Prop_None,"If True, walls and structure will be fused by material");
ScaleType.setValue("Custom");
}
@@ -81,7 +83,9 @@ short DrawViewArch::mustExecute() const
ShowHidden.isTouched() ||
ShowFill.isTouched() ||
LineWidth.isTouched() ||
FontSize.isTouched());
FontSize.isTouched() ||
CutLineWidth.isTouched() ||
JoinArch.isTouched());
}
if ((bool) result) {
return result;
@@ -115,7 +119,9 @@ App::DocumentObjectExecReturn *DrawViewArch::execute(void)
<< ",fontsize=" << FontSize.getValue()
<< ",techdraw=True"
<< ",rotation=" << Rotation.getValue()
<< ",fillSpaces=" << (FillSpaces.getValue() ? "True" : "False");
<< ",fillSpaces=" << (FillSpaces.getValue() ? "True" : "False")
<< ",cutlinewidth=" << CutLineWidth.getValue()
<< ",joinArch=" << (JoinArch.getValue() ? "True" : "False");
Base::Interpreter().runString("import ArchSectionPlane");
Base::Interpreter().runStringArg("svgBody = ArchSectionPlane.getSVG(App.activeDocument().%s %s)",
@@ -145,7 +151,7 @@ std::string DrawViewArch::getSVGTail(void)
void DrawViewArch::Restore(Base::XMLReader &reader)
{
// this is temporary code for backwards compat (within v0.17). can probably be deleted once there are no development
// fcstd files with old property types in use.
// fcstd files with old property types in use.
reader.readElement("Properties");
int Cnt = reader.getAttributeAsInteger("Count");
@@ -175,9 +181,9 @@ void DrawViewArch::Restore(Base::XMLReader &reader)
static_cast<App::PropertyLink*>(schemaProp)->setScope(App::LinkScope::Global);
static_cast<App::PropertyLink*>(schemaProp)->setValue(link.getValue());
}
} else {
// has Source prop isn't PropertyLink or PropertyLinkGlobal!
// has Source prop isn't PropertyLink or PropertyLinkGlobal!
Base::Console().Log("DrawViewArch::Restore - old Document Source is weird: %s\n", TypeName);
// no idea
}

6
src/Mod/TechDraw/App/DrawViewArch.h
View File

@@ -50,6 +50,8 @@ public:
App::PropertyBool ShowFill;
App::PropertyFloat LineWidth;
App::PropertyFloat FontSize;
App::PropertyFloat CutLineWidth;
App::PropertyBool JoinArch;
/** @name methods override Feature */
//@{
@@ -61,7 +63,7 @@ public:
virtual const char* getViewProviderName(void) const override {
return "TechDrawGui::ViewProviderArch";
}
virtual short mustExecute() const override;
void Restore(Base::XMLReader &reader) override;
@@ -72,7 +74,7 @@ protected:
Base::BoundBox3d bbox;
std::string getSVGHead(void);
std::string getSVGTail(void);
private:
static const char* RenderModeEnums[];
};

35
src/Mod/TechDraw/Gui/Command.cpp
View File

@@ -79,16 +79,6 @@
using namespace TechDrawGui;
using namespace std;
bool isArchSection(App::DocumentObject* obj)
{
bool result = true;
App::Property* prop1 = obj->getPropertyByName("Objects");
App::Property* prop2 = obj->getPropertyByName("OnlySolids");
if ( (!prop1) || (!prop2) ) {
result = false;
}
return result;
}
//===========================================================================
// TechDraw_NewPageDef (default template)
@@ -1057,34 +1047,17 @@ void CmdTechDrawArchView::activated(int iMsg)
return;
}
std::vector<App::DocumentObject*> objects = getSelection().getObjectsOfType(App::DocumentObject::getClassTypeId());
if (objects.empty()) {
const std::vector<App::DocumentObject*> objects = getSelection().getObjectsOfType(App::DocumentObject::getClassTypeId());
if (objects.size() != 1) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select at least one object."));
return;
}
int ifound = 0;
bool found = false;
for (auto& obj: objects) {
if (isArchSection(obj)) {
found = true;
break;
}
ifound++;
}
App::DocumentObject* archObj;
if (found) {
archObj = objects[ifound];
} else {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("There is no Section Plane in selection."));
QObject::tr("Select exactly one object."));
return;
}
std::string PageName = page->getNameInDocument();
std::string FeatName = getUniqueObjectName("ArchView");
std::string SourceName = archObj->getNameInDocument();
std::string SourceName = objects.front()->getNameInDocument();
openCommand("Create ArchView");
doCommand(Doc,"App.activeDocument().addObject('TechDraw::DrawViewArch','%s')",FeatName.c_str());
doCommand(Doc,"App.activeDocument().%s.Source = App.activeDocument().%s",FeatName.c_str(),SourceName.c_str());