diff --git a/data/examples/FemCalculixCantilever2D.FCStd b/data/examples/FemCalculixCantilever2D.FCStd index 7029b54be6..22bc6f4ef5 100644 Binary files a/data/examples/FemCalculixCantilever2D.FCStd and b/data/examples/FemCalculixCantilever2D.FCStd differ diff --git a/data/examples/FemCalculixCantilever3D.FCStd b/data/examples/FemCalculixCantilever3D.FCStd index f001970390..6a2509b01f 100644 Binary files a/data/examples/FemCalculixCantilever3D.FCStd and b/data/examples/FemCalculixCantilever3D.FCStd differ diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 7754554d9e..2aa62f41dc 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -147,6 +147,34 @@ using namespace Base; using namespace App; using namespace std; +/** Observer that watches relabeled objects and make sure that the labels inside + * a document are unique. + * @note In the FreeCAD design it is explicitly allowed to have duplicate labels + * (i.e. the user visible text e.g. in the tree view) while the internal names + * are always guaranteed to be unique. + */ +class ObjectLabelObserver +{ +public: + /// The one and only instance. + static ObjectLabelObserver* instance(); + /// Destructs the sole instance. + static void destruct (); + + /** Checks the new label of the object and relabel it if needed + * to make it unique document-wide + */ + void slotRelabelObject(const App::DocumentObject&, const App::Property&); + +private: + static ObjectLabelObserver* _singleton; + + ObjectLabelObserver(); + ~ObjectLabelObserver(); + const App::DocumentObject* current; + ParameterGrp::handle _hPGrp; +}; + //========================================================================== // Application @@ -160,7 +188,6 @@ Base::ConsoleObserverFile *Application::_pConsoleObserverFile =0; AppExport std::map Application::mConfig; BaseExport extern PyObject* Base::BaseExceptionFreeCADError; - //************************************************************************** // Construction and destruction @@ -1346,6 +1373,8 @@ void Application::initApplication(void) Console().Log("Run App init script\n"); Interpreter().runString(Base::ScriptFactory().ProduceScript("CMakeVariables")); Interpreter().runString(Base::ScriptFactory().ProduceScript("FreeCADInit")); + + ObjectLabelObserver::instance(); } std::list Application::getCmdLineFiles() @@ -2261,3 +2290,80 @@ std::string Application::FindHomePath(const char* sCall) #else # error "std::string Application::FindHomePath(const char*) not implemented" #endif + +ObjectLabelObserver* ObjectLabelObserver::_singleton = 0; + +ObjectLabelObserver* ObjectLabelObserver::instance() +{ + if (!_singleton) + _singleton = new ObjectLabelObserver; + return _singleton; +} + +void ObjectLabelObserver::destruct () +{ + delete _singleton; + _singleton = 0; +} + +void ObjectLabelObserver::slotRelabelObject(const App::DocumentObject& obj, const App::Property& prop) +{ + // observe only the Label property + if (&prop == &obj.Label) { + // have we processed this (or another?) object right now? + if (current) { + return; + } + + std::string label = obj.Label.getValue(); + App::Document* doc = obj.getDocument(); + if (doc && !_hPGrp->GetBool("DuplicateLabels")) { + std::vector objectLabels; + std::vector::const_iterator it; + std::vector objs = doc->getObjects(); + bool match = false; + + for (it = objs.begin();it != objs.end();++it) { + if (*it == &obj) + continue; // don't compare object with itself + std::string objLabel = (*it)->Label.getValue(); + if (!match && objLabel == label) + match = true; + objectLabels.push_back(objLabel); + } + + // make sure that there is a name conflict otherwise we don't have to do anything + if (match && !label.empty()) { + // remove number from end to avoid lengthy names + size_t lastpos = label.length()-1; + while (label[lastpos] >= 48 && label[lastpos] <= 57) { + // if 'lastpos' becomes 0 then all characters are digits. In this case we use + // the complete label again + if (lastpos == 0) { + lastpos = label.length()-1; + break; + } + lastpos--; + } + + label = label.substr(0, lastpos+1); + label = Base::Tools::getUniqueName(label, objectLabels, 3); + this->current = &obj; + const_cast(obj).Label.setValue(label); + this->current = 0; + } + } + } +} + +ObjectLabelObserver::ObjectLabelObserver() : current(0) +{ + App::GetApplication().signalChangedObject.connect(boost::bind + (&ObjectLabelObserver::slotRelabelObject, this, _1, _2)); + _hPGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp"); + _hPGrp = _hPGrp->GetGroup("Preferences")->GetGroup("Document"); +} + +ObjectLabelObserver::~ObjectLabelObserver() +{ +} diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 23547b101d..77be9f9c55 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -615,6 +615,7 @@ void Document::exportGraphviz(std::ostream& out) const if (i_in_deg_pair.first == in_edges.end()) { removeEdges(in_edges, out_edges, i_out_deg_pair, [&](Edge e) { return target(e, DepList); }); changed = true; + i_out_deg_pair = out_edges.equal_range(*uvi); } // Remove in edges of nodes that don't have a single edge out diff --git a/src/App/DocumentObjectExtension.cpp b/src/App/DocumentObjectExtension.cpp index 526bda7764..9c8c5a34f7 100644 --- a/src/App/DocumentObjectExtension.cpp +++ b/src/App/DocumentObjectExtension.cpp @@ -37,7 +37,7 @@ EXTENSION_PROPERTY_SOURCE(App::DocumentObjectExtension, App::Extension) DocumentObjectExtension::DocumentObjectExtension() { - initExtension(App::DocumentObjectExtension::getExtensionClassTypeId()); + initExtensionType(App::DocumentObjectExtension::getExtensionClassTypeId()); } DocumentObjectExtension::~DocumentObjectExtension() diff --git a/src/App/Extension.cpp b/src/App/Extension.cpp index 35637df6d3..519982bc5b 100644 --- a/src/App/Extension.cpp +++ b/src/App/Extension.cpp @@ -71,7 +71,7 @@ Extension::~Extension() } } -void Extension::initExtension(Base::Type type) { +void Extension::initExtensionType(Base::Type type) { m_extensionType = type; if(m_extensionType.isBad()) diff --git a/src/App/Extension.h b/src/App/Extension.h index 1dfc8dab80..4b1137ed3b 100644 --- a/src/App/Extension.h +++ b/src/App/Extension.h @@ -215,7 +215,7 @@ public: Extension(); virtual ~Extension(); - void initExtension(App::ExtensionContainer* obj); + virtual void initExtension(App::ExtensionContainer* obj); App::ExtensionContainer* getExtendedContainer() {return m_base;} const App::ExtensionContainer* getExtendedContainer() const {return m_base;} @@ -272,7 +272,7 @@ protected: friend class App::ExtensionContainer; protected: - void initExtension(Base::Type type); + void initExtensionType(Base::Type type); bool m_isPythonExtension = false; Py::Object ExtensionPythonObject; @@ -309,7 +309,7 @@ public: ExtensionPythonT() { ExtensionT::m_isPythonExtension = true; - ExtensionT::initExtension(ExtensionPythonT::getExtensionClassTypeId()); + ExtensionT::initExtensionType(ExtensionPythonT::getExtensionClassTypeId()); EXTENSION_ADD_PROPERTY(ExtensionProxy,(Py::Object())); } diff --git a/src/App/ExtensionContainer.cpp b/src/App/ExtensionContainer.cpp index 1b5ef4f49d..6fd435415d 100644 --- a/src/App/ExtensionContainer.cpp +++ b/src/App/ExtensionContainer.cpp @@ -35,11 +35,11 @@ using namespace App; -TYPESYSTEM_SOURCE(App::ExtensionContainer, App::PropertyContainer); +TYPESYSTEM_SOURCE(App::ExtensionContainer, App::PropertyContainer) ExtensionContainer::ExtensionContainer() { -}; +} ExtensionContainer::~ExtensionContainer() { @@ -48,7 +48,7 @@ ExtensionContainer::~ExtensionContainer() { if(entry.second->isPythonExtension()) delete entry.second; } -}; +} void ExtensionContainer::registerExtension(Base::Type extension, Extension* ext) { @@ -361,7 +361,7 @@ void ExtensionContainer::restoreExtensions(Base::XMLReader& reader) { for (int i=0 ;iisDerivedFrom(App::GeoFeature::getClassTypeId())) + throw Base::Exception("GeoFeatureGroupExtension can only be applied to GeoFeatures"); + + App::GroupExtension::initExtension(obj); +} + +PropertyPlacement& GeoFeatureGroupExtension::placement() { + + if(!getExtendedContainer()) + throw Base::Exception("GeoFeatureGroupExtension was not applied to GeoFeature"); + + return static_cast(getExtendedContainer())->Placement; +} + + void GeoFeatureGroupExtension::transformPlacement(const Base::Placement &transform) { // NOTE: Keep in sync with APP::GeoFeature - Base::Placement plm = this->Placement.getValue(); + Base::Placement plm = this->placement().getValue(); plm = transform * plm; - this->Placement.setValue(plm); + this->placement().setValue(plm); } std::vector GeoFeatureGroupExtension::getGeoSubObjects () const { @@ -128,9 +143,9 @@ bool GeoFeatureGroupExtension::geoHasObject (const DocumentObject* obj) const { DocumentObject* GeoFeatureGroupExtension::getGroupOfObject(const DocumentObject* obj, bool indirect) { const Document* doc = obj->getDocument(); - std::vector grps = doc->getObjectsOfType(GeoFeatureGroupExtension::getExtensionClassTypeId()); + std::vector grps = doc->getObjectsWithExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()); for (std::vector::const_iterator it = grps.begin(); it != grps.end(); ++it) { - GeoFeatureGroupExtension* grp = (GeoFeatureGroupExtension*)(*it); + GeoFeatureGroupExtension* grp = (*it)->getExtensionByType(); if ( indirect ) { if (grp->geoHasObject(obj)) { return dynamic_cast(grp); diff --git a/src/App/GeoFeatureGroupExtension.h b/src/App/GeoFeatureGroupExtension.h index 31f22eb3d7..901b34bcfd 100644 --- a/src/App/GeoFeatureGroupExtension.h +++ b/src/App/GeoFeatureGroupExtension.h @@ -41,7 +41,9 @@ class AppExport GeoFeatureGroupExtension : public App::GroupExtension EXTENSION_PROPERTY_HEADER(App::GeoFeatureGroupExtension); public: - PropertyPlacement Placement; + PropertyPlacement& placement(); + + virtual void initExtension(ExtensionContainer* obj); /** * @brief transformPlacement applies transform to placement of this shape. @@ -71,7 +73,8 @@ public: /// Returns true if the given DocumentObject is DocumentObjectGroup but not GeoFeatureGroup static bool isNonGeoGroup(const DocumentObject* obj) { - return obj->hasExtension(GroupExtension::getExtensionClassTypeId()); + return obj->hasExtension(GroupExtension::getExtensionClassTypeId()) & + !obj->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()); } }; diff --git a/src/App/GroupExtension.cpp b/src/App/GroupExtension.cpp index a070840b5d..0ed16d8f15 100644 --- a/src/App/GroupExtension.cpp +++ b/src/App/GroupExtension.cpp @@ -38,7 +38,7 @@ EXTENSION_PROPERTY_SOURCE(App::GroupExtension, App::DocumentObjectExtension) GroupExtension::GroupExtension() { - initExtension(GroupExtension::getExtensionClassTypeId()); + initExtensionType(GroupExtension::getExtensionClassTypeId()); EXTENSION_ADD_PROPERTY_TYPE(Group,(0),"Base",(App::PropertyType)(Prop_Output),"List of referenced objects"); } @@ -63,6 +63,11 @@ void GroupExtension::addObject(DocumentObject* obj) if(!allowObject(obj)) return; + //only one group per object + auto *group = App::GroupExtension::getGroupOfObject(obj); + if(group && group != getExtendedObject()) + group->getExtensionByType()->removeObject(obj); + if (!hasObject(obj)) { std::vector grp = Group.getValues(); grp.push_back(obj); @@ -180,9 +185,9 @@ int GroupExtension::countObjectsOfType(const Base::Type& typeId) const DocumentObject* GroupExtension::getGroupOfObject(const DocumentObject* obj) { const Document* doc = obj->getDocument(); - std::vector grps = doc->getObjectsOfType(GroupExtension::getExtensionClassTypeId()); + std::vector grps = doc->getObjectsWithExtension(GroupExtension::getExtensionClassTypeId()); for (std::vector::const_iterator it = grps.begin(); it != grps.end(); ++it) { - GroupExtension* grp = (GroupExtension*)(*it); + GroupExtension* grp = (*it)->getExtensionByType(); if (grp->hasObject(obj)) return *it; } diff --git a/src/App/GroupExtension.h b/src/App/GroupExtension.h index 01fe0fa79f..f6531020f4 100644 --- a/src/App/GroupExtension.h +++ b/src/App/GroupExtension.h @@ -49,20 +49,20 @@ public: /** Adds an object of \a sType with \a pObjectName to the document this group belongs to and * append it to this group as well. */ - DocumentObject *addObject(const char* sType, const char* pObjectName); + virtual DocumentObject *addObject(const char* sType, const char* pObjectName); /* Adds the object \a obj to this group. */ - void addObject(DocumentObject* obj); + virtual void addObject(DocumentObject* obj); /*override this function if you want only special objects */ virtual bool allowObject(DocumentObject* ) {return true;}; /** Removes an object from this group. */ - void removeObject(DocumentObject* obj); + virtual void removeObject(DocumentObject* obj); /** Removes all children objects from this group and the document. */ - void removeObjectsFromDocument(); + virtual void removeObjectsFromDocument(); /** Returns the object of this group with \a Name. If the group doesn't have such an object 0 is returned. * @note This method might return 0 even if the document this group belongs to contains an object with this name. */ diff --git a/src/App/OriginGroupExtension.cpp b/src/App/OriginGroupExtension.cpp index 2f0ac1468c..0235ea6b8c 100644 --- a/src/App/OriginGroupExtension.cpp +++ b/src/App/OriginGroupExtension.cpp @@ -39,7 +39,7 @@ EXTENSION_PROPERTY_SOURCE(App::OriginGroupExtension, App::GeoFeatureGroupExtensi OriginGroupExtension::OriginGroupExtension () { - initExtension(OriginGroupExtension::getExtensionClassTypeId()); + initExtensionType(OriginGroupExtension::getExtensionClassTypeId()); EXTENSION_ADD_PROPERTY_TYPE ( Origin, (0), 0, App::Prop_Hidden, "Origin linked to the group" ); } @@ -129,6 +129,69 @@ void OriginGroupExtension::onExtendedUnsetupObject () { GeoFeatureGroupExtension::onExtendedUnsetupObject (); } +void OriginGroupExtension::relinkToOrigin(App::DocumentObject* obj) +{ + //we get all links and replace the origin objects if needed (subnames need not to change, they + //would stay the same) + std::vector< App::DocumentObject* > result; + std::vector list; + obj->getPropertyList(list); + for(App::Property* prop : list) { + if(prop->getTypeId().isDerivedFrom(App::PropertyLink::getClassTypeId())) { + + auto p = static_cast(prop); + if(!p->getValue() || !p->getValue()->isDerivedFrom(App::OriginFeature::getClassTypeId())) + continue; + + p->setValue(getOrigin()->getOriginFeature(static_cast(p->getValue())->Role.getValue())); + } + else if(prop->getTypeId().isDerivedFrom(App::PropertyLinkList::getClassTypeId())) { + auto p = static_cast(prop); + auto vec = p->getValues(); + std::vector result; + bool changed = false; + for(App::DocumentObject* o : vec) { + if(!o || !o->isDerivedFrom(App::OriginFeature::getClassTypeId())) + result.push_back(o); + else { + result.push_back(getOrigin()->getOriginFeature(static_cast(o)->Role.getValue())); + changed = true; + } + } + if(changed) + static_cast(prop)->setValues(result); + } + else if(prop->getTypeId().isDerivedFrom(App::PropertyLinkSub::getClassTypeId())) { + auto p = static_cast(prop); + if(!p->getValue() || !p->getValue()->isDerivedFrom(App::OriginFeature::getClassTypeId())) + continue; + + p->setValue(getOrigin()->getOriginFeature(static_cast(p->getValue())->Role.getValue())); + } + else if(prop->getTypeId().isDerivedFrom(App::PropertyLinkSubList::getClassTypeId())) { + auto p = static_cast(prop); + auto vec = p->getValues(); + std::vector result; + bool changed = false; + for(App::DocumentObject* o : vec) { + if(!o || !o->isDerivedFrom(App::OriginFeature::getClassTypeId())) + result.push_back(o); + else { + result.push_back(getOrigin()->getOriginFeature(static_cast(o)->Role.getValue())); + changed = true; + } + } + if(changed) + static_cast(prop)->setValues(result); + } + } +} + +void OriginGroupExtension::addObject(DocumentObject* obj) { + relinkToOrigin(obj); + App::GeoFeatureGroupExtension::addObject(obj); +} + // Python feature --------------------------------------------------------- diff --git a/src/App/OriginGroupExtension.h b/src/App/OriginGroupExtension.h index fe5cb89f36..53938ade2a 100644 --- a/src/App/OriginGroupExtension.h +++ b/src/App/OriginGroupExtension.h @@ -62,6 +62,11 @@ public: /// Origin linked to the group PropertyLink Origin; + + //changes all links of obj to a origin to point to this groupes origin + void relinkToOrigin(App::DocumentObject* obj); + + virtual void addObject(DocumentObject* obj); protected: /// Checks integrity of the Origin diff --git a/src/App/Part.cpp b/src/App/Part.cpp index 96303bad40..8030c0212d 100644 --- a/src/App/Part.cpp +++ b/src/App/Part.cpp @@ -35,7 +35,7 @@ using namespace App; -PROPERTY_SOURCE_WITH_EXTENSIONS(App::Part, App::DocumentObject) +PROPERTY_SOURCE_WITH_EXTENSIONS(App::Part, App::GeoFeature) //=========================================================================== diff --git a/src/App/Part.h b/src/App/Part.h index d34388fe48..089c0d6888 100644 --- a/src/App/Part.h +++ b/src/App/Part.h @@ -35,7 +35,7 @@ namespace App /** Base class of all geometric document objects. */ -class AppExport Part : public App::DocumentObject, public App::OriginGroupExtension +class AppExport Part : public App::GeoFeature, public App::OriginGroupExtension { PROPERTY_HEADER_WITH_EXTENSIONS(App::Part); diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index af47278204..924f4859e1 100644 --- a/src/Build/CMakeLists.txt +++ b/src/Build/CMakeLists.txt @@ -3,6 +3,9 @@ set(PACKAGE_WCREF "$WCREV$") set(PACKAGE_WCDATE "$WCDATE$") set(PACKAGE_WCURL "$WCURL$") +# If the sources don't include a Version.h then create one +if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Version.h) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/Version.h.in ) @@ -19,3 +22,4 @@ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h) ${CMAKE_CURRENT_BINARY_DIR}/Version.h ) endif (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h) +endif (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Version.h) diff --git a/src/Doc/BuildWebDoc.cfg.in b/src/Doc/BuildWebDoc.cfg.in index 257643eea1..dcec68aa6d 100644 --- a/src/Doc/BuildWebDoc.cfg.in +++ b/src/Doc/BuildWebDoc.cfg.in @@ -500,7 +500,7 @@ SHOW_FILES = NO # This will remove the Namespaces entry from the Quick Index # and from the Folder Tree View (if specified). The default is YES. -SHOW_NAMESPACES = NO +SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from diff --git a/src/Doc/mainpage.dox b/src/Doc/mainpage.dox index 971b3e396f..172d02e94f 100644 --- a/src/Doc/mainpage.dox +++ b/src/Doc/mainpage.dox @@ -26,7 +26,7 @@ \mainpage FreeCAD source documentation - This is the source documentation of FreeCAD. + This is the source documentation of FreeCAD. It is automatically generated from the source code, and describes the different components of the FreeCAD source code, for both the parts written in C++ and Python. diff --git a/src/Doc/templates/customdoxygen.css b/src/Doc/templates/customdoxygen.css index 53a9a9eb9f..753938007b 100644 --- a/src/Doc/templates/customdoxygen.css +++ b/src/Doc/templates/customdoxygen.css @@ -1,3 +1,19 @@ +@font-face { + font-family: 'Fira Sans'; + src: url('/fonts/FiraSans-Regular.eot'); + src: local('☺'), url('/fonts/FiraSans-Regular.woff') format('woff'), url('/fonts/FiraSans-Regular.ttf') format('truetype'), url('/fonts/FiraSans-Regular.svg') format('svg'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Roboto'; + src: url('/fonts/Roboto.eot'); + src: local('☺'), url('/fonts/Roboto.woff') format('woff'), url('/fonts/Roboto.ttf') format('truetype'), url('/fonts/Roboto.svg') format('svg'); + font-weight: 400; + font-style: normal; +} + h1, .h1, h2, .h2, h3, .h3{ font-weight: 200 !important; } @@ -389,3 +405,6 @@ pre.fragment { .memdoc p { text-align: left; } +body, table, div, p, dl { + font: 400 16px/22px Fira Sans,sans-serif; +} diff --git a/src/Doc/templates/header.html b/src/Doc/templates/header.html index 9d41180a0c..f0b9b181fa 100644 --- a/src/Doc/templates/header.html +++ b/src/Doc/templates/header.html @@ -43,10 +43,18 @@
    diff --git a/src/Gui/ActionFunction.cpp b/src/Gui/ActionFunction.cpp index 7f83f98a27..56e6612265 100644 --- a/src/Gui/ActionFunction.cpp +++ b/src/Gui/ActionFunction.cpp @@ -112,4 +112,45 @@ void ActionFunction::hovered() } } +// ---------------------------------------------------------------------------- + +namespace Gui { +class TimerFunctionPrivate +{ +public: + boost::function timeoutFunc; + bool autoDelete; +}; +} + +TimerFunction::TimerFunction(QObject* parent) + : QObject(parent), d_ptr(new TimerFunctionPrivate()) +{ + d_ptr->autoDelete = false; +} + +TimerFunction::~TimerFunction() +{ +} + +void TimerFunction::setFunction(boost::function func) +{ + Q_D(TimerFunction); + d->timeoutFunc = func; +} + +void TimerFunction::setAutoDelete(bool on) +{ + Q_D(TimerFunction); + d->autoDelete = on; +} + +void TimerFunction::timeout() +{ + Q_D(TimerFunction); + d->timeoutFunc(); + if (d->autoDelete) + deleteLater(); +} + #include "moc_ActionFunction.cpp" diff --git a/src/Gui/ActionFunction.h b/src/Gui/ActionFunction.h index 04484b5bd5..8fa367d1fd 100644 --- a/src/Gui/ActionFunction.h +++ b/src/Gui/ActionFunction.h @@ -86,6 +86,29 @@ private: Q_DECLARE_PRIVATE(ActionFunction) }; +class TimerFunctionPrivate; + +class GuiExport TimerFunction : public QObject +{ + Q_OBJECT + +public: + /// Constructor + TimerFunction(QObject* = 0); + virtual ~TimerFunction(); + + void setFunction(boost::function func); + void setAutoDelete(bool); + +private Q_SLOTS: + void timeout(); + +private: + QScopedPointer d_ptr; + Q_DISABLE_COPY(TimerFunction) + Q_DECLARE_PRIVATE(TimerFunction) +}; + } //namespace Gui diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 5df5b8cd54..62a1c09bad 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -165,111 +165,6 @@ struct ApplicationP CommandManager commandManager; }; -/** Observer that watches relabeled objects and make sure that the labels inside - * a document are unique. - * @note In the FreeCAD design it is explicitly allowed to have duplicate labels - * (i.e. the user visible text e.g. in the tree view) while the internal names - * are always guaranteed to be unique. - */ -class ObjectLabelObserver -{ -public: - /// The one and only instance. - static ObjectLabelObserver* instance(); - /// Destructs the sole instance. - static void destruct (); - - /** Checks the new label of the object and relabel it if needed - * to make it unique document-wide - */ - void slotRelabelObject(const App::DocumentObject&, const App::Property&); - -private: - static ObjectLabelObserver* _singleton; - - ObjectLabelObserver(); - ~ObjectLabelObserver(); - const App::DocumentObject* current; - ParameterGrp::handle _hPGrp; -}; - -ObjectLabelObserver* ObjectLabelObserver::_singleton = 0; - -ObjectLabelObserver* ObjectLabelObserver::instance() -{ - if (!_singleton) - _singleton = new ObjectLabelObserver; - return _singleton; -} - -void ObjectLabelObserver::destruct () -{ - delete _singleton; - _singleton = 0; -} - -void ObjectLabelObserver::slotRelabelObject(const App::DocumentObject& obj, const App::Property& prop) -{ - // observe only the Label property - if (&prop == &obj.Label) { - // have we processed this (or another?) object right now? - if (current) { - return; - } - - std::string label = obj.Label.getValue(); - App::Document* doc = obj.getDocument(); - if (doc && !_hPGrp->GetBool("DuplicateLabels")) { - std::vector objectLabels; - std::vector::const_iterator it; - std::vector objs = doc->getObjects(); - bool match = false; - - for (it = objs.begin();it != objs.end();++it) { - if (*it == &obj) - continue; // don't compare object with itself - std::string objLabel = (*it)->Label.getValue(); - if (!match && objLabel == label) - match = true; - objectLabels.push_back(objLabel); - } - - // make sure that there is a name conflict otherwise we don't have to do anything - if (match && !label.empty()) { - // remove number from end to avoid lengthy names - size_t lastpos = label.length()-1; - while (label[lastpos] >= 48 && label[lastpos] <= 57) { - // if 'lastpos' becomes 0 then all characters are digits. In this case we use - // the complete label again - if (lastpos == 0) { - lastpos = label.length()-1; - break; - } - lastpos--; - } - - label = label.substr(0, lastpos+1); - label = Base::Tools::getUniqueName(label, objectLabels, 3); - this->current = &obj; - const_cast(obj).Label.setValue(label); - this->current = 0; - } - } - } -} - -ObjectLabelObserver::ObjectLabelObserver() : current(0) -{ - App::GetApplication().signalChangedObject.connect(boost::bind - (&ObjectLabelObserver::slotRelabelObject, this, _1, _2)); - _hPGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp"); - _hPGrp = _hPGrp->GetGroup("Preferences")->GetGroup("Document"); -} - -ObjectLabelObserver::~ObjectLabelObserver() -{ -} - static PyObject * FreeCADGui_subgraphFromObject(PyObject * /*self*/, PyObject *args) { @@ -460,7 +355,6 @@ Application::Application(bool GUIenabled) createStandardOperations(); MacroCommand::load(); } - ObjectLabelObserver::instance(); } Application::~Application() @@ -1142,7 +1036,7 @@ bool Application::activateWorkbench(const char* name) } Base::Console().Error("%s\n", (const char*)msg.toLatin1()); - Base::Console().Log("%s\n", e.getStackTrace().c_str()); + Base::Console().Error("%s\n", e.getStackTrace().c_str()); if (!d->startingUp) { wc.restoreCursor(); QMessageBox::critical(getMainWindow(), QObject::tr("Workbench failure"), @@ -1385,10 +1279,9 @@ typedef void (*_qt_msg_handler_old)(QtMsgType type, const char *msg); _qt_msg_handler_old old_qtmsg_handler = 0; #if QT_VERSION >= 0x050000 -void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &qmsg) +void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { Q_UNUSED(context); - const QChar *msg = qmsg.unicode(); #ifdef FC_DEBUG switch (type) { @@ -1396,26 +1289,26 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt case QtInfoMsg: #endif case QtDebugMsg: - Base::Console().Message("%s\n", msg); + Base::Console().Message("%s\n", msg.toUtf8().constData()); break; case QtWarningMsg: - Base::Console().Warning("%s\n", msg); + Base::Console().Warning("%s\n", msg.toUtf8().constData()); break; case QtCriticalMsg: - Base::Console().Error("%s\n", msg); + Base::Console().Error("%s\n", msg.toUtf8().constData()); break; case QtFatalMsg: - Base::Console().Error("%s\n", msg); + Base::Console().Error("%s\n", msg.toUtf8().constData()); abort(); // deliberately core dump } #ifdef FC_OS_WIN32 if (old_qtmsg_handler) - (*old_qtmsg_handler)(type, context, qmsg); + (*old_qtmsg_handler)(type, context, msg); #endif #else // do not stress user with Qt internals but write to log file if enabled Q_UNUSED(type); - Base::Console().Log("%s\n", msg); + Base::Console().Log("%s\n", msg.toUtf8().constData()); #endif } #else diff --git a/src/Gui/DlgSettingsImage.ui b/src/Gui/DlgSettingsImage.ui index 5dcf0ffb0d..ea478962b0 100644 --- a/src/Gui/DlgSettingsImage.ui +++ b/src/Gui/DlgSettingsImage.ui @@ -61,6 +61,11 @@ Black + + + Transparent + + diff --git a/src/Gui/OnlineDocumentation.h b/src/Gui/OnlineDocumentation.h index b4ec736e76..3a7cf57447 100644 --- a/src/Gui/OnlineDocumentation.h +++ b/src/Gui/OnlineDocumentation.h @@ -69,7 +69,7 @@ public: void pause(); void resume(); -private slots: +private Q_SLOTS: void readClient(); void discardClient(); diff --git a/src/Gui/QSint/actionpanel/taskheader_p.cpp b/src/Gui/QSint/actionpanel/taskheader_p.cpp index 8ea426a257..42f18b9dc8 100644 --- a/src/Gui/QSint/actionpanel/taskheader_p.cpp +++ b/src/Gui/QSint/actionpanel/taskheader_p.cpp @@ -195,7 +195,7 @@ void TaskHeader::leaveEvent ( QEvent * /*event*/ ) void TaskHeader::fold() { if (myExpandable) { - emit activated(); + Q_EMIT activated(); // Toggling the 'm_fold' member here may lead to inconsistencies with its ActionGroup. // Thus, the method setFold() was added and called from ActionGroup when required. #if 0 @@ -254,7 +254,7 @@ void TaskHeader::changeIcons() void TaskHeader::mouseReleaseEvent ( QMouseEvent * event ) { if (event->button() == Qt::LeftButton) { - emit activated(); + Q_EMIT activated(); } } diff --git a/src/Gui/Quarter/ContextMenu.h b/src/Gui/Quarter/ContextMenu.h index ac44f98ddf..a9965001e3 100644 --- a/src/Gui/Quarter/ContextMenu.h +++ b/src/Gui/Quarter/ContextMenu.h @@ -50,7 +50,7 @@ public: QMenu * getMenu(void) const; -public slots: +public Q_SLOTS: void changeRenderMode(QAction * action); void changeStereoMode(QAction * action); void changeTransparencyType(QAction * action); diff --git a/src/Gui/Quarter/SensorManager.h b/src/Gui/Quarter/SensorManager.h index 4b3fb7d0d0..6344cf93e6 100644 --- a/src/Gui/Quarter/SensorManager.h +++ b/src/Gui/Quarter/SensorManager.h @@ -48,7 +48,7 @@ public: SensorManager(void); ~SensorManager(); -public slots: +public Q_SLOTS: void idleTimeout(void); void delayTimeout(void); void timerQueueTimeout(void); diff --git a/src/Gui/Quarter/SignalThread.cpp b/src/Gui/Quarter/SignalThread.cpp index 2b7254d3ce..6d18f8636d 100644 --- a/src/Gui/Quarter/SignalThread.cpp +++ b/src/Gui/Quarter/SignalThread.cpp @@ -70,7 +70,7 @@ SignalThread::run(void) // just wait, and trigger every time we receive a signal this->waitcond.wait(&this->mutex); if (!this->isstopped) { - emit triggerSignal(); + Q_EMIT triggerSignal(); } } } diff --git a/src/Gui/View3DInventorViewer.cpp b/src/Gui/View3DInventorViewer.cpp index ba337b8872..3152015f76 100644 --- a/src/Gui/View3DInventorViewer.cpp +++ b/src/Gui/View3DInventorViewer.cpp @@ -92,6 +92,7 @@ #include #include #include +#include #include "View3DInventorViewer.h" #include "ViewProviderDocumentObject.h" @@ -1545,35 +1546,18 @@ void View3DInventorViewer::printDimension() else if (dimX < dimY) fHeight *= ((float)dimY)/((float)dimX); - float fLog = float(log10(fWidth)), fFac; - int nExp = int(fLog); - QString unit; + // Translate screen units into user's unit schema + Base::Quantity qWidth(Base::Quantity::MilliMetre); + Base::Quantity qHeight(Base::Quantity::MilliMetre); + qWidth.setValue(fWidth); + qHeight.setValue(fHeight); + QString wStr = Base::UnitsApi::schemaTranslate(qWidth); + QString hStr = Base::UnitsApi::schemaTranslate(qHeight); - if (nExp >= 6) { - fFac = 1.0e+6f; - unit = QLatin1String("km"); - } - else if (nExp >= 3) { - fFac = 1.0e+3f; - unit = QLatin1String("m"); - } - else if ((nExp >= 0) && (fLog > 0.0f)) { - fFac = 1.0e+0f; - unit = QLatin1String("mm"); - } - else if (nExp >= -3) { - fFac = 1.0e-3f; - unit = QLatin1String("um"); - } - else { - fFac = 1.0e-6f; - unit = QLatin1String("nm"); - } - - QString dim = QString::fromLatin1("%1 x %2 %3") - .arg(fWidth / fFac,0,'f',2) - .arg(fHeight / fFac,0,'f',2) - .arg(unit); + // Create final string and update window + QString dim = QString::fromLatin1("%1 x %2") + .arg(wStr) + .arg(hStr); getMainWindow()->setPaneText(2, dim); } else diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp index e65b95d481..7e89d675c8 100644 --- a/src/Gui/ViewProvider.cpp +++ b/src/Gui/ViewProvider.cpp @@ -25,6 +25,7 @@ #ifndef _PreComp_ # include +# include # include # include # include @@ -44,6 +45,7 @@ #include "ViewProvider.h" #include "Application.h" +#include "ActionFunction.h" #include "Document.h" #include "ViewProviderPy.h" #include "BitmapFactory.h" @@ -52,6 +54,8 @@ #include "SoFCDB.h" #include "ViewProviderExtension.h" +#include + using namespace std; using namespace Gui; @@ -171,10 +175,16 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node) const SbBool press = ke->getState() == SoButtonEvent::DOWN ? true : false; switch (ke->getKey()) { case SoKeyboardEvent::ESCAPE: - if (self->keyPressed (press, ke->getKey())) + if (self->keyPressed (press, ke->getKey())) { node->setHandled(); - else - Gui::Application::Instance->activeDocument()->resetEdit(); + } + else { + Gui::TimerFunction* func = new Gui::TimerFunction(); + func->setAutoDelete(true); + Gui::Document* doc = Gui::Application::Instance->activeDocument(); + func->setFunction(boost::bind(&Document::resetEdit, doc)); + QTimer::singleShot(0, func, SLOT(timeout())); + } break; default: // call the virtual method diff --git a/src/Gui/ViewProviderExtension.cpp b/src/Gui/ViewProviderExtension.cpp index 0cbba6602b..49386eb93d 100644 --- a/src/Gui/ViewProviderExtension.cpp +++ b/src/Gui/ViewProviderExtension.cpp @@ -37,7 +37,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderExtension, App::Extension) ViewProviderExtension::ViewProviderExtension() { - initExtension(Gui::ViewProviderExtension::getExtensionClassTypeId()); + initExtensionType(Gui::ViewProviderExtension::getExtensionClassTypeId()); } ViewProviderExtension::~ViewProviderExtension() diff --git a/src/Gui/ViewProviderExtension.h b/src/Gui/ViewProviderExtension.h index ed3e90b9d8..4e4520d100 100644 --- a/src/Gui/ViewProviderExtension.h +++ b/src/Gui/ViewProviderExtension.h @@ -97,7 +97,7 @@ public: ViewProviderExtensionPythonT() { ExtensionT::m_isPythonExtension = true; - ExtensionT::initExtension(ViewProviderExtensionPythonT::getExtensionClassTypeId()); + ExtensionT::initExtensionType(ViewProviderExtensionPythonT::getExtensionClassTypeId()); EXTENSION_ADD_PROPERTY(ExtensionProxy,(Py::Object())); } diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp index e700b91dd2..fe9d8f6d87 100644 --- a/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp +++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.cpp @@ -29,6 +29,9 @@ #endif #include "ViewProviderGeoFeatureGroupExtension.h" +#include "Command.h" +#include "Application.h" +#include "Document.h" #include #include @@ -38,7 +41,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderGeoFeatureGroupExtension, Gui::ViewPr ViewProviderGeoFeatureGroupExtension::ViewProviderGeoFeatureGroupExtension() { - initExtension(ViewProviderGeoFeatureGroupExtension::getExtensionClassTypeId()); + initExtensionType(ViewProviderGeoFeatureGroupExtension::getExtensionClassTypeId()); pcGroupChildren = new SoGroup(); pcGroupChildren->ref(); @@ -84,13 +87,96 @@ std::vector ViewProviderGeoFeatureGroupExtension::extensionGetDispl void ViewProviderGeoFeatureGroupExtension::extensionUpdateData(const App::Property* prop) { auto obj = getExtendedViewProvider()->getObject()->getExtensionByType(); - if (obj && prop == &obj->Placement) { - getExtendedViewProvider()->setTransformation ( obj->Placement.getValue().toMatrix() ); + if (obj && prop == &obj->placement()) { + getExtendedViewProvider()->setTransformation ( obj->placement().getValue().toMatrix() ); } else { ViewProviderGroupExtension::extensionUpdateData ( prop ); } } +std::vector< App::DocumentObject* > ViewProviderGeoFeatureGroupExtension::getLinkedObjects(App::DocumentObject* obj) { + + if(!obj) + return std::vector< App::DocumentObject* >(); + + //we get all linked objects, and that recursively + std::vector< App::DocumentObject* > result; + std::vector list; + obj->getPropertyList(list); + for(App::Property* prop : list) { + if(prop->getTypeId().isDerivedFrom(App::PropertyLink::getClassTypeId())) + result.push_back(static_cast(prop)->getValue()); + else if(prop->getTypeId().isDerivedFrom(App::PropertyLinkList::getClassTypeId())) { + auto vec = static_cast(prop)->getValues(); + result.insert(result.end(), vec.begin(), vec.end()); + } + else if(prop->getTypeId().isDerivedFrom(App::PropertyLinkSub::getClassTypeId())) + result.push_back(static_cast(prop)->getValue()); + else if(prop->getTypeId().isDerivedFrom(App::PropertyLinkSubList::getClassTypeId())) { + auto vec = static_cast(prop)->getValues(); + result.insert(result.end(), vec.begin(), vec.end()); + } + } + + //clear all null objects + result.erase(std::remove(result.begin(), result.end(), nullptr), result.end()); + + //collect all dependencies of those objects + for(App::DocumentObject *obj : result) { + auto vec = getLinkedObjects(obj); + result.insert(result.end(), vec.begin(), vec.end()); + } + + return result; +} + +void ViewProviderGeoFeatureGroupExtension::extensionDropObject(App::DocumentObject* obj) { + + // Open command + App::DocumentObject* grp = static_cast(getExtendedViewProvider()->getObject()); + App::Document* doc = grp->getDocument(); + Gui::Document* gui = Gui::Application::Instance->getDocument(doc); + gui->openCommand("Move object"); + + //links between different CS are not allowed, hence we need to ensure if all dependencies are in + //the same geofeaturegroup + auto vec = getLinkedObjects(obj); + + //remove all objects already in the correct group + vec.erase(std::remove_if(vec.begin(), vec.end(), [this](App::DocumentObject* o){ + return App::GroupExtension::getGroupOfObject(o) == this->getExtendedViewProvider()->getObject(); + }), vec.end()); + + vec.push_back(obj); + + for(App::DocumentObject* o : vec) { + // build Python command for execution + QString cmd; + cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").addObject(" + "App.getDocument(\"%1\").getObject(\"%3\"))") + .arg(QString::fromLatin1(doc->getName())) + .arg(QString::fromLatin1(grp->getNameInDocument())) + .arg(QString::fromLatin1(o->getNameInDocument())); + + Gui::Command::doCommand(Gui::Command::App, cmd.toUtf8()); + } + gui->commitCommand(); +} + + +void ViewProviderGeoFeatureGroupExtension::extensionDragObject(App::DocumentObject* obj) { + //links between different coordinate systems are not allowed, hence draging one object also needs + //to drag out all dependend objects + auto vec = getLinkedObjects(obj); + + //add this object + vec.push_back(obj); + + for(App::DocumentObject* obj : vec) + ViewProviderGroupExtension::extensionDragObject(obj); +} + + namespace Gui { EXTENSION_PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderGeoFeatureGroupExtensionPython, Gui::ViewProviderGeoFeatureGroupExtension) diff --git a/src/Gui/ViewProviderGeoFeatureGroupExtension.h b/src/Gui/ViewProviderGeoFeatureGroupExtension.h index 0521ac0b21..fc17992c84 100644 --- a/src/Gui/ViewProviderGeoFeatureGroupExtension.h +++ b/src/Gui/ViewProviderGeoFeatureGroupExtension.h @@ -58,8 +58,13 @@ public: virtual void extensionUpdateData(const App::Property*) override; + virtual void extensionDropObject(App::DocumentObject*); + virtual void extensionDragObject(App::DocumentObject*); + protected: SoGroup *pcGroupChildren; + + std::vector getLinkedObjects(App::DocumentObject* obj); }; typedef ViewProviderExtensionPythonT ViewProviderGeoFeatureGroupExtensionPython; diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp index 317073a6cb..d1d234a62a 100644 --- a/src/Gui/ViewProviderGroupExtension.cpp +++ b/src/Gui/ViewProviderGroupExtension.cpp @@ -45,7 +45,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderGroupExtension, Gui::ViewProviderExte ViewProviderGroupExtension::ViewProviderGroupExtension() : visible(false) { - initExtension(ViewProviderGroupExtension::getExtensionClassTypeId()); + initExtensionType(ViewProviderGroupExtension::getExtensionClassTypeId()); } ViewProviderGroupExtension::~ViewProviderGroupExtension() diff --git a/src/Gui/ViewProviderOriginGroupExtension.cpp b/src/Gui/ViewProviderOriginGroupExtension.cpp index c87341641a..d03faf42bd 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.cpp +++ b/src/Gui/ViewProviderOriginGroupExtension.cpp @@ -34,6 +34,7 @@ #include "ViewProviderOrigin.h" #include "View3DInventorViewer.h" #include "View3DInventor.h" +#include "Command.h" #include #include #include @@ -48,7 +49,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderOriginGroupExtension, Gui::ViewProvid ViewProviderOriginGroupExtension::ViewProviderOriginGroupExtension() { - initExtension(ViewProviderOriginGroupExtension::getExtensionClassTypeId()); + initExtensionType(ViewProviderOriginGroupExtension::getExtensionClassTypeId()); } ViewProviderOriginGroupExtension::~ViewProviderOriginGroupExtension() @@ -196,6 +197,63 @@ void ViewProviderOriginGroupExtension::updateOriginSize () { vpOrigin->Size.setValue ( size * 1.3 ); } +void ViewProviderOriginGroupExtension::extensionDragObject(App::DocumentObject* obj) { + + //links between different coordinate systems are not allowed, hence draging one object also needs + //to drag out all dependend objects + auto vec = getLinkedObjects(obj); + + //remove all origin objects + vec.erase(std::remove_if(vec.begin(), vec.end(), [this](App::DocumentObject* o) { + return o->isDerivedFrom(App::OriginFeature::getClassTypeId());}), vec.end()); + + //add the original object + vec.push_back(obj); + + for(App::DocumentObject* obj : vec) + ViewProviderGroupExtension::extensionDragObject(obj); +} + +void ViewProviderOriginGroupExtension::extensionDropObject(App::DocumentObject* obj) { + + // Open command + App::DocumentObject* grp = static_cast(getExtendedViewProvider()->getObject()); + App::Document* doc = grp->getDocument(); + Gui::Document* gui = Gui::Application::Instance->getDocument(doc); + gui->openCommand("Move object"); + + //links between different CS are not allowed, hence we need to enure if all dependencies are in + //the same geofeaturegroup + auto vec = getLinkedObjects(obj); + + //remove all origin objects + vec.erase(std::remove_if(vec.begin(), vec.end(), [](App::DocumentObject* o) { + return o->isDerivedFrom(App::OriginFeature::getClassTypeId());}), vec.end()); + + //remove all objects already in the correct group + vec.erase(std::remove_if(vec.begin(), vec.end(), [this](App::DocumentObject* o){ + return App::GroupExtension::getGroupOfObject(o) == this->getExtendedViewProvider()->getObject(); + }), vec.end()); + + //add the original object + vec.push_back(obj); + + for(App::DocumentObject* o : vec) { + + // build Python command for execution + QString cmd; + cmd = QString::fromLatin1("App.getDocument(\"%1\").getObject(\"%2\").addObject(" + "App.getDocument(\"%1\").getObject(\"%3\"))") + .arg(QString::fromLatin1(doc->getName())) + .arg(QString::fromLatin1(grp->getNameInDocument())) + .arg(QString::fromLatin1(o->getNameInDocument())); + + Gui::Command::doCommand(Gui::Command::App, cmd.toUtf8()); + } + gui->commitCommand(); + +} + namespace Gui { EXTENSION_PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderOriginGroupExtensionPython, Gui::ViewProviderOriginGroupExtension) diff --git a/src/Gui/ViewProviderOriginGroupExtension.h b/src/Gui/ViewProviderOriginGroupExtension.h index 33137c8a77..1d42bd26ee 100644 --- a/src/Gui/ViewProviderOriginGroupExtension.h +++ b/src/Gui/ViewProviderOriginGroupExtension.h @@ -46,6 +46,9 @@ public: virtual void extensionAttach(App::DocumentObject *pcObject) override; virtual void extensionUpdateData(const App::Property* prop) override; + virtual void extensionDragObject(App::DocumentObject*) override; + virtual void extensionDropObject(App::DocumentObject*); + void updateOriginSize(); protected: diff --git a/src/Gui/iisTaskPanel/src/iisiconlabel.cpp b/src/Gui/iisTaskPanel/src/iisiconlabel.cpp index f014cbf3c6..f967eacc38 100644 --- a/src/Gui/iisTaskPanel/src/iisiconlabel.cpp +++ b/src/Gui/iisTaskPanel/src/iisiconlabel.cpp @@ -9,193 +9,193 @@ #include "iistaskpanelscheme.h" iisIconLabel::iisIconLabel(const QIcon &icon, const QString &title, QWidget *parent) - : QWidget(parent), - myPixmap(icon), - myText(title), - mySchemePointer(0), - m_over(false), - m_pressed(false), - m_changeCursorOver(true), - m_underlineOver(true) + : QWidget(parent), + myPixmap(icon), + myText(title), + mySchemePointer(0), + m_over(false), + m_pressed(false), + m_changeCursorOver(true), + m_underlineOver(true) { - setFocusPolicy(Qt::StrongFocus); - setCursor(Qt::PointingHandCursor); + setFocusPolicy(Qt::StrongFocus); + setCursor(Qt::PointingHandCursor); - myFont.setWeight(0); - myPen.setStyle(Qt::NoPen); + myFont.setWeight(0); + myPen.setStyle(Qt::NoPen); - myColor = myColorOver = myColorDisabled = QColor(); + myColor = myColorOver = myColorDisabled = QColor(); } iisIconLabel::~iisIconLabel() { - //if (m_changeCursorOver) - // QApplication::restoreOverrideCursor(); + //if (m_changeCursorOver) + // QApplication::restoreOverrideCursor(); } void iisIconLabel::setSchemePointer(iisIconLabelScheme **pointer) { - mySchemePointer = pointer; - update(); + mySchemePointer = pointer; + update(); } void iisIconLabel::setColors(const QColor &color, const QColor &colorOver, const QColor &colorOff) { - myColor = color; - myColorOver = colorOver; - myColorDisabled = colorOff; - update(); + myColor = color; + myColorOver = colorOver; + myColorDisabled = colorOff; + update(); } void iisIconLabel::setFont(const QFont &font) { - myFont = font; - update(); + myFont = font; + update(); } void iisIconLabel::setFocusPen(const QPen &pen) { - myPen = pen; - update(); + myPen = pen; + update(); } QSize iisIconLabel::sizeHint() const { - return minimumSize(); + return minimumSize(); } QSize iisIconLabel::minimumSizeHint() const { - int s = (mySchemePointer && *mySchemePointer) ? (*mySchemePointer)->iconSize : 16; - QPixmap px = myPixmap.pixmap(s,s, - isEnabled() ? QIcon::Normal : QIcon::Disabled); + int s = (mySchemePointer && *mySchemePointer) ? (*mySchemePointer)->iconSize : 16; + QPixmap px = myPixmap.pixmap(s,s, + isEnabled() ? QIcon::Normal : QIcon::Disabled); - int h = 4+px.height(); - int w = 8 + px.width(); - if (!myText.isEmpty()) { - QFontMetrics fm(myFont); - w += fm.width(myText); - h = qMax(h, 4+fm.height()); - } + int h = 4+px.height(); + int w = 8 + px.width(); + if (!myText.isEmpty()) { + QFontMetrics fm(myFont); + w += fm.width(myText); + h = qMax(h, 4+fm.height()); + } - return QSize(w+2,h+2); + return QSize(w+2,h+2); } -void iisIconLabel::paintEvent ( QPaintEvent * event ) +void iisIconLabel::paintEvent ( QPaintEvent * event ) { - Q_UNUSED(event); - QPainter p(this); + Q_UNUSED(event); + QPainter p(this); - QRect textRect(rect().adjusted(0,0,-1,0)); + QRect textRect(rect().adjusted(0,0,-1,0)); - int x = 2; + int x = 2; - if (!myPixmap.isNull()) { - int s = (mySchemePointer && *mySchemePointer) ? (*mySchemePointer)->iconSize : 16; - QPixmap px = myPixmap.pixmap(s,s, - isEnabled() ? QIcon::Normal : QIcon::Disabled); - p.drawPixmap(x,0,px); - x += px.width() + 4; - } + if (!myPixmap.isNull()) { + int s = (mySchemePointer && *mySchemePointer) ? (*mySchemePointer)->iconSize : 16; + QPixmap px = myPixmap.pixmap(s,s, + isEnabled() ? QIcon::Normal : QIcon::Disabled); + p.drawPixmap(x,0,px); + x += px.width() + 4; + } - if (!myText.isEmpty()) { - QColor text = myColor, textOver = myColorOver, textOff = myColorDisabled; - QFont fnt = myFont; - QPen focusPen = myPen; - bool underline = m_underlineOver/*, cursover = m_changeCursorOver*/; - if (mySchemePointer && *mySchemePointer) { - if (!text.isValid()) text = (*mySchemePointer)->text; - if (!textOver.isValid()) textOver = (*mySchemePointer)->textOver; - if (!textOff.isValid()) textOff = (*mySchemePointer)->textOff; - if (!fnt.weight()) fnt = (*mySchemePointer)->font; - if (focusPen.style() == Qt::NoPen) focusPen = (*mySchemePointer)->focusPen; - underline = (*mySchemePointer)->underlineOver; - //cursover = (*mySchemePointer)->cursorOver; - } + if (!myText.isEmpty()) { + QColor text = myColor, textOver = myColorOver, textOff = myColorDisabled; + QFont fnt = myFont; + QPen focusPen = myPen; + bool underline = m_underlineOver/*, cursover = m_changeCursorOver*/; + if (mySchemePointer && *mySchemePointer) { + if (!text.isValid()) text = (*mySchemePointer)->text; + if (!textOver.isValid()) textOver = (*mySchemePointer)->textOver; + if (!textOff.isValid()) textOff = (*mySchemePointer)->textOff; + if (!fnt.weight()) fnt = (*mySchemePointer)->font; + if (focusPen.style() == Qt::NoPen) focusPen = (*mySchemePointer)->focusPen; + underline = (*mySchemePointer)->underlineOver; + //cursover = (*mySchemePointer)->cursorOver; + } - p.setPen(isEnabled() ? m_over ? textOver : text : textOff); + p.setPen(isEnabled() ? m_over ? textOver : text : textOff); - if (isEnabled() && underline && m_over) - fnt.setUnderline(true); - p.setFont(fnt); + if (isEnabled() && underline && m_over) + fnt.setUnderline(true); + p.setFont(fnt); - textRect.setLeft(x); - QRect boundingRect; + textRect.setLeft(x); + QRect boundingRect; - QFontMetrics fm(fnt); + QFontMetrics fm(fnt); #if QT_VERSION >= 0x040203 - QString txt(fm.elidedText(myText, Qt::ElideRight, textRect.width())); + QString txt(fm.elidedText(myText, Qt::ElideRight, textRect.width())); #else - QString txt = myText; + QString txt = myText; #endif - p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, txt, &boundingRect); + p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, txt, &boundingRect); - if (hasFocus()) { - p.setPen(focusPen); - p.drawRect(boundingRect.adjusted(-2,-1,0,0)); - } - } + if (hasFocus()) { + p.setPen(focusPen); + p.drawRect(boundingRect.adjusted(-2,-1,0,0)); + } + } } void iisIconLabel::enterEvent ( QEvent * /*event*/ ) { - m_over = true; + m_over = true; - //if (m_changeCursorOver) - // QApplication::setOverrideCursor(Qt::PointingHandCursor); + //if (m_changeCursorOver) + // QApplication::setOverrideCursor(Qt::PointingHandCursor); - update(); + update(); } void iisIconLabel::leaveEvent ( QEvent * /*event*/ ) { - m_over = false; - update(); + m_over = false; + update(); - //if (m_changeCursorOver) - // QApplication::restoreOverrideCursor(); + //if (m_changeCursorOver) + // QApplication::restoreOverrideCursor(); } void iisIconLabel::mousePressEvent ( QMouseEvent * event ) { - if (event->button() == Qt::LeftButton) { - m_pressed = true; - emit pressed(); - } else - if (event->button() == Qt::RightButton) - emit contextMenu(); + if (event->button() == Qt::LeftButton) { + m_pressed = true; + Q_EMIT pressed(); + } else + if (event->button() == Qt::RightButton) + Q_EMIT contextMenu(); - update(); + update(); } void iisIconLabel::mouseReleaseEvent ( QMouseEvent * event ) { - if (event->button() == Qt::LeftButton) { - m_pressed = false; - emit released(); + if (event->button() == Qt::LeftButton) { + m_pressed = false; + Q_EMIT released(); - if (rect().contains( event->pos() )) { - emit clicked(); - emit activated(); - } - } + if (rect().contains( event->pos() )) { + Q_EMIT clicked(); + Q_EMIT activated(); + } + } - update(); + update(); } void iisIconLabel::keyPressEvent ( QKeyEvent * event ) { - switch (event->key()) { - case Qt::Key_Space: - case Qt::Key_Return: - emit activated(); - break; + switch (event->key()) { + case Qt::Key_Space: + case Qt::Key_Return: + Q_EMIT activated(); + break; - default:; - } + default:; + } - QWidget::keyPressEvent(event); + QWidget::keyPressEvent(event); } diff --git a/src/Gui/iisTaskPanel/src/iistaskheader.cpp b/src/Gui/iisTaskPanel/src/iistaskheader.cpp index 12e75cc201..4d1cd42432 100644 --- a/src/Gui/iisTaskPanel/src/iistaskheader.cpp +++ b/src/Gui/iisTaskPanel/src/iistaskheader.cpp @@ -16,38 +16,38 @@ #include "iisiconlabel.h" iisTaskHeader::iisTaskHeader(const QIcon &icon, const QString &title, bool expandable, QWidget *parent) - : QFrame(parent), - myExpandable(expandable), - m_over(false), - m_buttonOver(false), - m_fold(true), - m_opacity(0.1), - myButton(0) + : QFrame(parent), + myExpandable(expandable), + m_over(false), + m_buttonOver(false), + m_fold(true), + m_opacity(0.1), + myButton(0) { - myTitle = new iisIconLabel(icon, title, this); - myTitle->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); + myTitle = new iisIconLabel(icon, title, this); + myTitle->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); - connect(myTitle, SIGNAL(activated()), this, SLOT(fold())); + connect(myTitle, SIGNAL(activated()), this, SLOT(fold())); - QHBoxLayout *hbl = new QHBoxLayout(); - hbl->setMargin(2); - setLayout(hbl); + QHBoxLayout *hbl = new QHBoxLayout(); + hbl->setMargin(2); + setLayout(hbl); - hbl->addWidget(myTitle); + hbl->addWidget(myTitle); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); - setScheme(iisTaskPanelScheme::defaultScheme()); - myTitle->setSchemePointer(&myLabelScheme); + setScheme(iisTaskPanelScheme::defaultScheme()); + myTitle->setSchemePointer(&myLabelScheme); - if (myExpandable) { - myButton = new QLabel(this); - hbl->addWidget(myButton); - myButton->installEventFilter(this); - myButton->setFixedWidth(myScheme->headerButtonSize.width()); - changeIcons(); - } + if (myExpandable) { + myButton = new QLabel(this); + hbl->addWidget(myButton); + myButton->installEventFilter(this); + myButton->setFixedWidth(myScheme->headerButtonSize.width()); + changeIcons(); + } } iisTaskHeader::~iisTaskHeader() @@ -57,145 +57,145 @@ iisTaskHeader::~iisTaskHeader() bool iisTaskHeader::eventFilter(QObject *obj, QEvent *event) { - switch (event->type()) { - case QEvent::MouseButtonPress: - fold(); - return true; + switch (event->type()) { + case QEvent::MouseButtonPress: + fold(); + return true; - case QEvent::Enter: - m_buttonOver = true; - changeIcons(); - return true; + case QEvent::Enter: + m_buttonOver = true; + changeIcons(); + return true; - case QEvent::Leave: - m_buttonOver = false; - changeIcons(); - return true; + case QEvent::Leave: + m_buttonOver = false; + changeIcons(); + return true; - default:; - } + default:; + } - return QFrame::eventFilter(obj, event); + return QFrame::eventFilter(obj, event); } void iisTaskHeader::setScheme(iisTaskPanelScheme *scheme) { - if (scheme) { - myScheme = scheme; - myLabelScheme = &(scheme->headerLabelScheme); + if (scheme) { + myScheme = scheme; + myLabelScheme = &(scheme->headerLabelScheme); - if (myExpandable) { - setCursor(myLabelScheme->cursorOver ? Qt::PointingHandCursor : cursor()); - changeIcons(); - } + if (myExpandable) { + setCursor(myLabelScheme->cursorOver ? Qt::PointingHandCursor : cursor()); + changeIcons(); + } - setFixedHeight(scheme->headerSize); + setFixedHeight(scheme->headerSize); - update(); - } + update(); + } } -void iisTaskHeader::paintEvent ( QPaintEvent * event ) +void iisTaskHeader::paintEvent ( QPaintEvent * event ) { - Q_UNUSED(event); - QPainter p(this); + Q_UNUSED(event); + QPainter p(this); #if QT_VERSION >= 0x040203 - if (myScheme->headerAnimation) - p.setOpacity(m_opacity+0.7); + if (myScheme->headerAnimation) + p.setOpacity(m_opacity+0.7); #endif - p.setPen(myScheme->headerBorder); - p.setBrush(myScheme->headerBackground); - if (myScheme->headerBorder.style() == Qt::NoPen) - p.drawRect(rect()); - else - p.drawRect(rect().adjusted(0,0,-1,-1)); + p.setPen(myScheme->headerBorder); + p.setBrush(myScheme->headerBackground); + if (myScheme->headerBorder.style() == Qt::NoPen) + p.drawRect(rect()); + else + p.drawRect(rect().adjusted(0,0,-1,-1)); } void iisTaskHeader::animate() { - if (!myScheme->headerAnimation) - return; + if (!myScheme->headerAnimation) + return; - if (!isEnabled()) { - m_opacity = 0.1; - update(); - return; - } + if (!isEnabled()) { + m_opacity = 0.1; + update(); + return; + } - if (m_over) { - if (m_opacity >= 0.3) { - m_opacity = 0.3; - return; - } - m_opacity += 0.05; - } else { - if (m_opacity <= 0.1) { - m_opacity = 0.1; - return; - } - m_opacity = qMax(0.1, m_opacity-0.05); - } + if (m_over) { + if (m_opacity >= 0.3) { + m_opacity = 0.3; + return; + } + m_opacity += 0.05; + } else { + if (m_opacity <= 0.1) { + m_opacity = 0.1; + return; + } + m_opacity = qMax(0.1, m_opacity-0.05); + } - QTimer::singleShot(100, this, SLOT(animate())); - update(); + QTimer::singleShot(100, this, SLOT(animate())); + update(); } void iisTaskHeader::enterEvent ( QEvent * /*event*/ ) { - m_over = true; + m_over = true; - if (isEnabled()) - QTimer::singleShot(100, this, SLOT(animate())); + if (isEnabled()) + QTimer::singleShot(100, this, SLOT(animate())); - update(); + update(); } void iisTaskHeader::leaveEvent ( QEvent * /*event*/ ) { - m_over = false; - - if (isEnabled()) - QTimer::singleShot(100, this, SLOT(animate())); + m_over = false; - update(); + if (isEnabled()) + QTimer::singleShot(100, this, SLOT(animate())); + + update(); } void iisTaskHeader::fold() { - if (myExpandable) { - emit activated(); + if (myExpandable) { + Q_EMIT activated(); - m_fold = !m_fold; - changeIcons(); - } + m_fold = !m_fold; + changeIcons(); + } } void iisTaskHeader::changeIcons() { - if (!myButton) - return; + if (!myButton) + return; - if (m_buttonOver) - { - if (m_fold) - myButton->setPixmap(myScheme->headerButtonFoldOver.pixmap(myScheme->headerButtonSize)); - else - myButton->setPixmap(myScheme->headerButtonUnfoldOver.pixmap(myScheme->headerButtonSize)); - } else - { - if (m_fold) - myButton->setPixmap(myScheme->headerButtonFold.pixmap(myScheme->headerButtonSize)); - else - myButton->setPixmap(myScheme->headerButtonUnfold.pixmap(myScheme->headerButtonSize)); - } + if (m_buttonOver) + { + if (m_fold) + myButton->setPixmap(myScheme->headerButtonFoldOver.pixmap(myScheme->headerButtonSize)); + else + myButton->setPixmap(myScheme->headerButtonUnfoldOver.pixmap(myScheme->headerButtonSize)); + } else + { + if (m_fold) + myButton->setPixmap(myScheme->headerButtonFold.pixmap(myScheme->headerButtonSize)); + else + myButton->setPixmap(myScheme->headerButtonUnfold.pixmap(myScheme->headerButtonSize)); + } } void iisTaskHeader::mouseReleaseEvent ( QMouseEvent * event ) { - if (event->button() == Qt::LeftButton) { - emit activated(); - } + if (event->button() == Qt::LeftButton) { + Q_EMIT activated(); + } } diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index e75a6fd668..3595aef02a 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -968,7 +968,7 @@ def getExtrusionData(shape): return None if not shape.Solids: return None - if len(shape.Faces) < 5: + if len(shape.Faces) < 3: return None # build faces list with normals faces = [] diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py index 96f1e85d44..b61c71945f 100644 --- a/src/Mod/Arch/ArchComponent.py +++ b/src/Mod/Arch/ArchComponent.py @@ -387,9 +387,11 @@ class Component: "returns (shape,extrusion vector,placement) or None" if hasattr(obj,"CloneOf"): if obj.CloneOf: - data = obj.CloneOf.Proxy.getExtrusionData(obj.CloneOf) - if data: - return data + if hasattr(obj.CloneOf,"Proxy"): + if hasattr(obj.CloneOf.Proxy,"getExtrusionData"): + data = obj.CloneOf.Proxy.getExtrusionData(obj.CloneOf) + if data: + return data if obj.Base: if obj.Base.isDerivedFrom("Part::Extrusion"): if obj.Base.Base: @@ -403,6 +405,37 @@ class Component: if obj.Base.LengthForward.Value: extrusion = extrusion.multiply(obj.Base.LengthForward.Value) return (base,extrusion,placement) + elif obj.Base.isDerivedFrom("Part::MultiFuse"): + rshapes = [] + revs = [] + rpls = [] + for sub in obj.Base.Shapes: + if sub.isDerivedFrom("Part::Extrusion"): + if sub.Base: + base,placement = self.rebase(sub.Base.Shape) + extrusion = FreeCAD.Vector(sub.Dir) + if extrusion.Length == 0: + extrusion = FreeCAD.Vector(0,0,1) + else: + extrusion = placement.inverse().Rotation.multVec(extrusion) + if hasattr(sub,"LengthForward"): + if sub.LengthForward.Value: + extrusion = extrusion.multiply(sub.LengthForward.Value) + placement = obj.Placement.multiply(placement) + rshapes.append(base) + revs.append(extrusion) + rpls.append(placement) + else: + exdata = ArchCommands.getExtrusionData(sub.Shape) + if exdata: + base,placement = self.rebase(exdata[0]) + extrusion = placement.inverse().Rotation.multVec(exdata[1]) + placement = obj.Placement.multiply(placement) + rshapes.append(base) + revs.append(extrusion) + rpls.append(placement) + if rshapes and revs and rpls: + return (rshapes,revs,rpls) return None def rebase(self,shape): diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index 5c7ad8d37c..5a1fbbdd3a 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -461,7 +461,9 @@ class _Structure(ArchComponent.Component): import Part,DraftGeomUtils data = ArchComponent.Component.getExtrusionData(self,obj) if data: - return data + if not isinstance(data[0],list): + # multifuses not considered here + return data length = obj.Length.Value width = obj.Width.Value height = obj.Height.Value diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py index 104c920275..8d28684b3e 100644 --- a/src/Mod/Arch/ArchWall.py +++ b/src/Mod/Arch/ArchWall.py @@ -502,7 +502,9 @@ class _Wall(ArchComponent.Component): import Part,DraftGeomUtils data = ArchComponent.Component.getExtrusionData(self,obj) if data: - return data + if not isinstance(data[0],list): + # multifuses not considered here + return data length = obj.Length.Value width = obj.Width.Value height = obj.Height.Value diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 2d096138d8..9ea142e70f 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -56,7 +56,7 @@ class ArchWorkbench(Workbench): "Draft_Shape2DView","Draft_Draft2Sketch","Draft_Array", "Draft_Clone"] self.draftextratools = ["Draft_WireToBSpline","Draft_AddPoint","Draft_DelPoint","Draft_ShapeString", - "Draft_PathArray","Draft_Mirror"] + "Draft_PathArray","Draft_Mirror","Draft_Stretch"] self.draftcontexttools = ["Draft_ApplyStyle","Draft_ToggleDisplayMode","Draft_AddToGroup", "Draft_SelectGroup","Draft_SelectPlane", "Draft_ShowSnapBar","Draft_ToggleGrid","Draft_UndoLine", diff --git a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg index 94d5053294..c55eabaa85 100755 --- a/src/Mod/Arch/Resources/icons/ArchWorkbench.svg +++ b/src/Mod/Arch/Resources/icons/ArchWorkbench.svg @@ -7,16 +7,41 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2816" version="1.1" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="preferences-arch.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="ArchWorkbench.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-global="true"> + + @@ -144,6 +512,31 @@ + + + [triplus] + + + ArchWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/ArchWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + @@ -151,73 +544,123 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - - - - - - - - + id="path2267" + sodipodi:cx="25.1875" + sodipodi:cy="41.625" + transform="matrix(1.6349796,0,0,1.0662685,-9.1810484,1.3522451)" + d="m 43.25,41.625 a 18.0625,5.875 0 1 1 -36.125,0 18.0625,5.875 0 1 1 36.125,0 z" + sodipodi:type="arc" + style="opacity:0.26704544;color:#000000;fill:url(#radialGradient3027);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + sodipodi:ry="5.875" + sodipodi:rx="18.0625" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_3Views.svg b/src/Mod/Arch/Resources/icons/Arch_3Views.svg index 3d877b4cd5..d3a88fd4ab 100644 --- a/src/Mod/Arch/Resources/icons/Arch_3Views.svg +++ b/src/Mod/Arch/Resources/icons/Arch_3Views.svg @@ -1,112 +1,64 @@ - - - - + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_3Views + 2014-08-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_3Views.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + + + + + + + + + + + + - - - diff --git a/src/Mod/Arch/Resources/icons/Arch_Add.svg b/src/Mod/Arch/Resources/icons/Arch_Add.svg index 50e5226e58..18db382fb5 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Add.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Add.svg @@ -1,109 +1,71 @@ - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Add + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Add.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Axis.svg b/src/Mod/Arch/Resources/icons/Arch_Axis.svg index 9e95231ebf..03d635a9d1 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Axis.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Axis.svg @@ -1,141 +1,110 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Axis + 2011-12-12 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Axis.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Axis_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Axis_Tree.svg index d55c9cef5a..6ac98b41e8 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Axis_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Axis_Tree.svg @@ -1,126 +1,110 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Axis_Tree + 2011-12-12 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Axis_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Building.svg b/src/Mod/Arch/Resources/icons/Arch_Building.svg index 7d3d158df0..f549fd72aa 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Building.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Building.svg @@ -1,414 +1,125 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Building + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Building.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Building_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Building_Tree.svg index 2e9af5f8ee..c6903c7c7d 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Building_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Building_Tree.svg @@ -1,396 +1,125 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Building_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Building_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Cell.svg b/src/Mod/Arch/Resources/icons/Arch_Cell.svg index 3827522d9d..07805912d6 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Cell.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Cell.svg @@ -1,475 +1,130 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Cell + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Cell.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Cell_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Cell_Tree.svg index 1c0dd4d0d6..da7b6f7241 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Cell_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Cell_Tree.svg @@ -1,467 +1,130 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Cell_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Cell_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Check.svg b/src/Mod/Arch/Resources/icons/Arch_Check.svg index 61be1a1b4a..9ab7b88a12 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Check.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Check.svg @@ -1,162 +1,75 @@ - - - - - - + + + + + - - - + + + - - - - - - + + + - + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Check + 2012-07-22 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Check.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_CloseHoles.svg b/src/Mod/Arch/Resources/icons/Arch_CloseHoles.svg index c0fcbf1dd3..4c46f27a5c 100644 --- a/src/Mod/Arch/Resources/icons/Arch_CloseHoles.svg +++ b/src/Mod/Arch/Resources/icons/Arch_CloseHoles.svg @@ -1,117 +1,67 @@ - - - - - - + + + + + - - - + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_CloseHoles + 2012-07-22 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_CloseHoles.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Component.svg b/src/Mod/Arch/Resources/icons/Arch_Component.svg index 82c6c6d7ac..5e260dd36c 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Component.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Component.svg @@ -1,96 +1,71 @@ - - - - - - + + + + + - + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Component + 2015-04-08 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Component.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Component_Clone.svg b/src/Mod/Arch/Resources/icons/Arch_Component_Clone.svg index 4c3455bf50..ac5b297379 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Component_Clone.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Component_Clone.svg @@ -1,182 +1,105 @@ - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Component + 2015-04-08 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Component.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson, [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_CutPlane.svg b/src/Mod/Arch/Resources/icons/Arch_CutPlane.svg index 5299b43cc4..eca21b6074 100644 --- a/src/Mod/Arch/Resources/icons/Arch_CutPlane.svg +++ b/src/Mod/Arch/Resources/icons/Arch_CutPlane.svg @@ -1,402 +1,137 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - - + + + - - - - - - - - - - + + + + - - - - + + + + + - - - + + + + - - - + + + + - - - + + + - - - + + + - - - - + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - - + + + + + + [wood galaxy] + + + Arch_CutPlane + 2014-11-11 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_CutPlane.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + - - - - - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Equipment.svg b/src/Mod/Arch/Resources/icons/Arch_Equipment.svg index 0fdddefe78..6eb2aadde9 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Equipment.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Equipment.svg @@ -1,896 +1,220 @@ - - - - - - - - + + + + + - - - - - - - - - + + + - - - - + + + - - - - + + + - - - - - + + + - - - - + + + - - - - + + + - - - - - + + + - - - - + + + + + - - - - + + + + + + + + - - - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + - - - - + + + + - - - - + + + - - - - - + + + - - - - + + + + - - - - + + + - - - - - + + + - - - - + + + + - - - - - + + + + - - - - + + + - - - - - + + + + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Equipment + 2014-08-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Equipment.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Equipment_Clone.svg b/src/Mod/Arch/Resources/icons/Arch_Equipment_Clone.svg index 2d5fca113a..d35ce897c6 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Equipment_Clone.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Equipment_Clone.svg @@ -1,657 +1,243 @@ - - - - - - + + + + + - - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + + + - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - - + + + + - - - + + + + - - - + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Equipment_Clone + 2016-09-07 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Equipment_Clone.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Equipment_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Equipment_Tree.svg index 928ceaf469..bf710c67a3 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Equipment_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Equipment_Tree.svg @@ -1,572 +1,232 @@ - - - - - - + + + + + - - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + + + - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - - + + + + - - - + + + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Equipment_Tree + 2014-08-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Equipment_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Fixture.svg b/src/Mod/Arch/Resources/icons/Arch_Fixture.svg index ee11cd0a8d..2014eef8fb 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Fixture.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Fixture.svg @@ -1,243 +1,111 @@ - - - - - - + + + + + - - - - - + + + - - - + + + - - - - + + + + + - - - - - + + + - - - - + + + + - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Fixture + 2013-07-07 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Floor.svg b/src/Mod/Arch/Resources/icons/Arch_Floor.svg index c553bfdcad..2094ecfb91 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Floor.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Floor.svg @@ -1,406 +1,120 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Floor + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Floor_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Floor_Tree.svg index 5d9934bb6f..05e2013631 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Floor_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Floor_Tree.svg @@ -1,393 +1,116 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Floor_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Frame.svg b/src/Mod/Arch/Resources/icons/Arch_Frame.svg index 8dc0b3347b..07cdf703b6 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Frame.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Frame.svg @@ -1,1099 +1,289 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - - + + + - - - + + + + - - - - - + + + + + - - - - - + + + - - - - - + + + + + - - - - - - + + + + + - - - - - - - - + + + + + - - - - + + + + + + - - - - + + + + + + + + - - - - - + + + + - - - - - - - - - - + + + + - - - - + + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - - - - - - - + + + + - - - - - + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Frame + 2013-12-22 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Frame_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Frame_Tree.svg index b8aefdc7b9..4a7ea5c9ab 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Frame_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Frame_Tree.svg @@ -1,750 +1,319 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - - + + + - - - + + + - - - - - + + + - - - - - + + + + - - - - - + + + + + - - - - - - + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + + - - - - + + + + + + + + - - - + + + + - - - - + + + + - - - + + + + + - - - + + + + + + + + + + - - - - + + + + - - - + + + + - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Frame_Tree + 2013-12-22 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Material.svg b/src/Mod/Arch/Resources/icons/Arch_Material.svg index a9a3ec05cb..a2937dbb71 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Material.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Material.svg @@ -1,510 +1,128 @@ - - - - - - + + + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Material + 2015-04-15 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Material.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Material_Group.svg b/src/Mod/Arch/Resources/icons/Arch_Material_Group.svg index 2bab17b3a5..4a6bb9b840 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Material_Group.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Material_Group.svg @@ -1,680 +1,185 @@ - - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Material_Group + 2015-04-19 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Material_Group.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + - - - + + + + + - - - + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_MergeWalls.svg b/src/Mod/Arch/Resources/icons/Arch_MergeWalls.svg index d96db03bac..a4e6447b84 100644 --- a/src/Mod/Arch/Resources/icons/Arch_MergeWalls.svg +++ b/src/Mod/Arch/Resources/icons/Arch_MergeWalls.svg @@ -1,422 +1,116 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_MergeWalls + 2013-03-24 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_MergeWalls.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_MeshToShape.svg b/src/Mod/Arch/Resources/icons/Arch_MeshToShape.svg index e0f896b9d9..a6f2ed50cb 100644 --- a/src/Mod/Arch/Resources/icons/Arch_MeshToShape.svg +++ b/src/Mod/Arch/Resources/icons/Arch_MeshToShape.svg @@ -1,106 +1,121 @@ - - - - + + Mesh_Mesh_from_Shape + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + Mesh_Mesh_from_Shape + + Solid cube with arrow pointing towards a tesselated cube mesh + + + [agryson] Alexander Gryson, [agryson] Alexander Gryson + + + + + cube + mesh + solid + convert + + + http://www.freecadweb.org/wiki/index.php?title=Artwork + FreeCAD/src/Mod/Mesh/Gui/Resources/icons/Mesh_Mesh_from_Shape.svg + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + Sat Dec 14 00:58:58 2013 +1100 + + + [jmaustpc] + + + https://www.gnu.org/copyleft/lesser.html - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Panel.svg b/src/Mod/Arch/Resources/icons/Arch_Panel.svg index 09b00a2c1d..a816858462 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Panel.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Panel.svg @@ -1,168 +1,68 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Panel + 2014-04-07 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Panel.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Panel_Clone.svg b/src/Mod/Arch/Resources/icons/Arch_Panel_Clone.svg index 60271de3da..6cd3248c3a 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Panel_Clone.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Panel_Clone.svg @@ -14,10 +14,22 @@ height="64px" id="svg2985" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.48.5 r10040" sodipodi:docname="Arch_Panel_Clone.svg"> + + + + + inkscape:collect="always" + xlink:href="#linearGradient3772" + id="linearGradient3778" + x1="30.995529" + y1="51.867905" + x2="22.622681" + y2="13.438423" + gradientUnits="userSpaceOnUse" /> + + + id="stop3799" /> + id="stop3801" /> - - - - - - - - - - + xlink:href="#linearGradient3962" + id="linearGradient3968" + x1="30" + y1="48" + x2="29" + y2="39" + gradientUnits="userSpaceOnUse" /> - + id="linearGradient3962"> + id="stop3964" /> + id="stop3966" /> + + + + + + + + + + + + inkscape:object-nodes="true" + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:snap-nodes="false"> + + @@ -256,7 +246,32 @@ image/svg+xml - + + + + [Yorik van Havre] + + + Arch_Panel_Clone + 2016-12-03 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Panel_Clone.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + @@ -266,102 +281,126 @@ inkscape:groupmode="layer"> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccc" /> - - - - - - - - - - - - + sodipodi:nodetypes="ccccccccccccc" /> + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Panel_Cut.svg b/src/Mod/Arch/Resources/icons/Arch_Panel_Cut.svg index 52048f7eba..89784292ab 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Panel_Cut.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Panel_Cut.svg @@ -1,139 +1,70 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Panel_Cut + 2016-12-17 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Panel_Cut.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Panel_Sheet.svg b/src/Mod/Arch/Resources/icons/Arch_Panel_Sheet.svg index b256ecfb16..bd12afb51e 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Panel_Sheet.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Panel_Sheet.svg @@ -1,484 +1,128 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Panel_Sheet + 2016-12-17 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Panel_Sheet.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Panel_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Panel_Tree.svg index 5b085c6054..906398d0ee 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Panel_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Panel_Tree.svg @@ -1,164 +1,68 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Panel_Tree + 2014-04-07 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Panel_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Pipe.svg b/src/Mod/Arch/Resources/icons/Arch_Pipe.svg index 5b13d560e8..74df010370 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Pipe.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Pipe.svg @@ -1,168 +1,96 @@ - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Pipe + 2016-08-24 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Pipe.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_PipeConnector.svg b/src/Mod/Arch/Resources/icons/Arch_PipeConnector.svg index 5ee3c1d3b0..1fa4b23eb1 100644 --- a/src/Mod/Arch/Resources/icons/Arch_PipeConnector.svg +++ b/src/Mod/Arch/Resources/icons/Arch_PipeConnector.svg @@ -1,262 +1,106 @@ - - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_PipeConnector + 2016-08-24 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_PipeConnector.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Pipe_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Pipe_Tree.svg index ed42cabb4c..af7045bbd8 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Pipe_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Pipe_Tree.svg @@ -1,135 +1,96 @@ - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Pipe_Tree + 2016-08-24 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Pipe_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Rebar.svg b/src/Mod/Arch/Resources/icons/Arch_Rebar.svg index 5049353ac4..fed850ea00 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Rebar.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Rebar.svg @@ -1,440 +1,169 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - - + + + - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - - - + + + + - - - - - - - - + + + + + - - - - + + + - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Rebar + 2013-10-07 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Rebar.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Rebar_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Rebar_Tree.svg index 3da5550961..77ad45cf2e 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Rebar_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Rebar_Tree.svg @@ -1,435 +1,169 @@ - - - - - - + + + + + - - - + + + - - - - + + + - - - - - + + + - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - - - + + + + - - - - - - - - + + + + + - - - - + + + - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Rebar_Tree + 2013-10-07 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Rebar_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Remove.svg b/src/Mod/Arch/Resources/icons/Arch_Remove.svg index e9b8e1c2d7..bd5f2c81c4 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Remove.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Remove.svg @@ -1,165 +1,71 @@ - - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Remove + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Remove.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_RemoveShape.svg b/src/Mod/Arch/Resources/icons/Arch_RemoveShape.svg index e1d6cbd1f2..0dd0b7698e 100644 --- a/src/Mod/Arch/Resources/icons/Arch_RemoveShape.svg +++ b/src/Mod/Arch/Resources/icons/Arch_RemoveShape.svg @@ -1,155 +1,85 @@ - - - - + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_RemoveShape + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_RemoveShape.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Roof.svg b/src/Mod/Arch/Resources/icons/Arch_Roof.svg index 0d72e27b02..0f1e14617c 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Roof.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Roof.svg @@ -1,406 +1,106 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Roof + 2012-05-13 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Roof.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Roof_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Roof_Tree.svg index 8b105168a9..393ba9879b 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Roof_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Roof_Tree.svg @@ -1,397 +1,106 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Roof_Tree + 2012-05-13 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Roof_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Schedule.svg b/src/Mod/Arch/Resources/icons/Arch_Schedule.svg index c7c414e094..25328ac65c 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Schedule.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Schedule.svg @@ -1,164 +1,68 @@ - - - - - - + + + + + - - - - - + + + - - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Schedule + 2015-04-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Schedule.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_SectionPlane.svg b/src/Mod/Arch/Resources/icons/Arch_SectionPlane.svg index 1d3eb44d43..47bc65fa98 100644 --- a/src/Mod/Arch/Resources/icons/Arch_SectionPlane.svg +++ b/src/Mod/Arch/Resources/icons/Arch_SectionPlane.svg @@ -1,99 +1,67 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_SectionPlane + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_SectionPlane.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - A + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_SectionPlane_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_SectionPlane_Tree.svg index d392badbb8..9bf5b3ea87 100644 --- a/src/Mod/Arch/Resources/icons/Arch_SectionPlane_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_SectionPlane_Tree.svg @@ -1,94 +1,56 @@ - - - - - + + + + + + + + + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_SectionPlane_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_SectionPlane_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - A + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_SelectNonManifold.svg b/src/Mod/Arch/Resources/icons/Arch_SelectNonManifold.svg index eb39166fa1..13fdb94afc 100644 --- a/src/Mod/Arch/Resources/icons/Arch_SelectNonManifold.svg +++ b/src/Mod/Arch/Resources/icons/Arch_SelectNonManifold.svg @@ -1,93 +1,77 @@ - - - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_SelectNonManifold + 2012-07-22 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_SelectNonManifold.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Site.svg b/src/Mod/Arch/Resources/icons/Arch_Site.svg index fac20eef01..38a3ebbb85 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Site.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Site.svg @@ -1,136 +1,71 @@ - - - - - - + + + + + - - - - + + + - - - - + + + + - + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Site + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Site.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Site_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Site_Tree.svg index d43aee6133..1545a06d9c 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Site_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Site_Tree.svg @@ -1,126 +1,71 @@ - - - - - - + + + + + - - - + + + - - - - + + + + - + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Site_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Site_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Space.svg b/src/Mod/Arch/Resources/icons/Arch_Space.svg index 1e302c4dd5..a4c1f4b388 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Space.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Space.svg @@ -1,202 +1,114 @@ - - - - - - + + + + + - - - - - - + + + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Space + 2013-07-16 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Space.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg index 65ca3cf5e5..83fe9c30a5 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg @@ -1,165 +1,112 @@ - - - - - - + + + + + - - - - - + + + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Space_Tree + 2013-07-16 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Space_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_SplitMesh.svg b/src/Mod/Arch/Resources/icons/Arch_SplitMesh.svg index 840b29db0e..b2b6952577 100644 --- a/src/Mod/Arch/Resources/icons/Arch_SplitMesh.svg +++ b/src/Mod/Arch/Resources/icons/Arch_SplitMesh.svg @@ -1,100 +1,64 @@ - - - - + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_SplitMesh + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_SplitMesh.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Stairs.svg b/src/Mod/Arch/Resources/icons/Arch_Stairs.svg index ef02ab7a34..add894af6a 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Stairs.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Stairs.svg @@ -1,389 +1,138 @@ - - - - - - - - + + + + + - - - - - - - - - + + + + + - - - - - + + + + + + + + - - - - + + + - - - - - + + + + - - - - + + + + - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Stairs + 2013-07-25 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Stairs.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Stairs_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Stairs_Tree.svg index 11b5eaf120..62007ac309 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Stairs_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Stairs_Tree.svg @@ -1,323 +1,138 @@ - - - - - - - - + + + + + - - - - - - - - + + + + + - - - + + + + + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Stairs_Tree + 2013-07-25 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Stairs_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_StructuralSystem.svg b/src/Mod/Arch/Resources/icons/Arch_StructuralSystem.svg index fecc8252b3..740715a8c0 100644 --- a/src/Mod/Arch/Resources/icons/Arch_StructuralSystem.svg +++ b/src/Mod/Arch/Resources/icons/Arch_StructuralSystem.svg @@ -1,279 +1,112 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_StructuralSystem + 2014-03-28 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_StructuralSystem.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_StructuralSystem_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_StructuralSystem_Tree.svg index dd05a7d39c..4932ff1836 100644 --- a/src/Mod/Arch/Resources/icons/Arch_StructuralSystem_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_StructuralSystem_Tree.svg @@ -1,267 +1,112 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_StructuralSystem_Tree + 2014-03-28 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_StructuralSystem_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Structure.svg b/src/Mod/Arch/Resources/icons/Arch_Structure.svg index 1f3fd7ede1..bae94bf4b4 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Structure.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Structure.svg @@ -1,187 +1,109 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Structure + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Structure.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Structure_Clone.svg b/src/Mod/Arch/Resources/icons/Arch_Structure_Clone.svg index 3b9f2659cd..81982ce25c 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Structure_Clone.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Structure_Clone.svg @@ -1,288 +1,146 @@ - - - - - - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Structure_Clone + 2016-06-15 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Structure_Clone.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Structure_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Structure_Tree.svg index 6514d3de8e..54d1155e58 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Structure_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Structure_Tree.svg @@ -1,182 +1,117 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Structure_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Structure_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Survey.svg b/src/Mod/Arch/Resources/icons/Arch_Survey.svg index 3965f0350e..58fb62ccc0 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Survey.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Survey.svg @@ -1,290 +1,116 @@ - - - - - - - + + + + + - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + + - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Survey + 2014-02-11 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Survey.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_ToggleIfcBrepFlag.svg b/src/Mod/Arch/Resources/icons/Arch_ToggleIfcBrepFlag.svg index f3acb37e4b..d5dd308dfe 100644 --- a/src/Mod/Arch/Resources/icons/Arch_ToggleIfcBrepFlag.svg +++ b/src/Mod/Arch/Resources/icons/Arch_ToggleIfcBrepFlag.svg @@ -1,106 +1,68 @@ - - - - + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_ToggleIfcBrepFlag + 2014-07-15 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ToggleIfcBrep + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg b/src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg index 3de5fc3b58..993c0e6f6e 100644 --- a/src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg +++ b/src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg @@ -1,473 +1,125 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_ToggleSubs + 2016-09-20 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_ToggleSubs.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Wall.svg b/src/Mod/Arch/Resources/icons/Arch_Wall.svg index 77b155b856..5065f45336 100755 --- a/src/Mod/Arch/Resources/icons/Arch_Wall.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Wall.svg @@ -1,367 +1,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Wall + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Wall.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Wall_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Wall_Tree.svg index 4eced1df39..a5d2f106ab 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Wall_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Wall_Tree.svg @@ -1,309 +1,100 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Wall_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Wall_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Wall_Tree_Assembly.svg b/src/Mod/Arch/Resources/icons/Arch_Wall_Tree_Assembly.svg index 57db4d808b..fb7ec5f5cf 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Wall_Tree_Assembly.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Wall_Tree_Assembly.svg @@ -1,415 +1,167 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Wall_Tree_Assembly + 2013-04-17 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Wall_Tree_Assembly.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Window.svg b/src/Mod/Arch/Resources/icons/Arch_Window.svg index 73a6c03756..d3dcdb82dd 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Window.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Window.svg @@ -1,494 +1,144 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [wmayer] + + + Arch_Window + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Window.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Window_Clone.svg b/src/Mod/Arch/Resources/icons/Arch_Window_Clone.svg index a1bb541718..db138304f1 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Window_Clone.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Window_Clone.svg @@ -1,579 +1,173 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + Arch_Window_Clone + 2016-09-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Window_Clone.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/Arch_Window_Tree.svg b/src/Mod/Arch/Resources/icons/Arch_Window_Tree.svg index 71a1c72fef..d96ae5b14b 100644 --- a/src/Mod/Arch/Resources/icons/Arch_Window_Tree.svg +++ b/src/Mod/Arch/Resources/icons/Arch_Window_Tree.svg @@ -1,489 +1,144 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [yorikvanhavre] + + + Arch_Window_Tree + 2011-12-06 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/Arch_Window_Tree.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Mod/Arch/Resources/icons/preferences-arch.svg b/src/Mod/Arch/Resources/icons/preferences-arch.svg index 94d5053294..0840f4334b 100755 --- a/src/Mod/Arch/Resources/icons/preferences-arch.svg +++ b/src/Mod/Arch/Resources/icons/preferences-arch.svg @@ -7,16 +7,41 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2816" version="1.1" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="preferences-arch.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="ArchWorkbench.svg"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:window-y="27" + inkscape:window-maximized="0" + inkscape:snap-global="true"> + + @@ -143,7 +511,32 @@ image/svg+xml - + + + + [triplus] + + + ArchWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Arch/Resources/icons/ArchWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + @@ -151,73 +544,123 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - - - - - - - - + id="path2267" + sodipodi:cx="25.1875" + sodipodi:cy="41.625" + transform="matrix(1.6349796,0,0,1.0662685,-9.1810484,1.3522451)" + d="m 43.25,41.625 a 18.0625,5.875 0 1 1 -36.125,0 18.0625,5.875 0 1 1 36.125,0 z" + sodipodi:type="arc" + style="opacity:0.26704544;color:#000000;fill:url(#radialGradient3027);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" + sodipodi:ry="5.875" + sodipodi:rx="18.0625" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index 42251aa124..a3b01d38c7 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -1463,6 +1463,53 @@ def createCurve(ifcfile,wire): return pol +def getProfile(ifcfile,p): + """returns an IFC profile definition from a shape""" + + import Part,DraftGeomUtils + profile = None + if len(p.Edges) == 1: + pxvc = ifcfile.createIfcDirection((1.0,0.0)) + povc = ifcfile.createIfcCartesianPoint((0.0,0.0)) + pt = ifcfile.createIfcAxis2Placement2D(povc,pxvc) + if isinstance(p.Edges[0].Curve,Part.Circle): + # extruded circle + profile = ifcfile.createIfcCircleProfileDef("AREA",None,pt,p.Edges[0].Curve.Radius) + elif isinstance(p.Edges[0].Curve,Part.Ellipse): + # extruded ellipse + profile = ifcfile.createIfcEllipseProfileDef("AREA",None,pt,p.Edges[0].Curve.MajorRadius,p.Edges[0].Curve.MinorRadius) + elif (len(p.Faces) == 1) and (len(p.Wires) > 1): + # face with holes + f = p.Faces[0] + if DraftGeomUtils.hasCurves(f.OuterWire): + outerwire = createCurve(ifcfile,f.OuterWire) + else: + w = Part.Wire(Part.__sortEdges__(f.OuterWire.Edges)) + pts = [ifcfile.createIfcCartesianPoint(tuple(v.Point)[:2]) for v in w.Vertexes+[w.Vertexes[0]]] + outerwire = ifcfile.createIfcPolyline(pts) + innerwires = [] + for w in f.Wires: + if w.hashCode() != f.OuterWire.hashCode(): + if DraftGeomUtils.hasCurves(w): + innerwires.append(createCurve(ifcfile,w)) + else: + w = Part.Wire(Part.__sortEdges__(w.Edges)) + pts = [ifcfile.createIfcCartesianPoint(tuple(v.Point)[:2]) for v in w.Vertexes+[w.Vertexes[0]]] + innerwires.append(ifcfile.createIfcPolyline(pts)) + profile = ifcfile.createIfcArbitraryProfileDefWithVoids("AREA",None,outerwire,innerwires) + else: + if DraftGeomUtils.hasCurves(p): + # extruded composite curve + pol = createCurve(ifcfile,p) + else: + # extruded polyline + w = Part.Wire(Part.__sortEdges__(p.Wires[0].Edges)) + pts = [ifcfile.createIfcCartesianPoint(tuple(v.Point)[:2]) for v in w.Vertexes+[w.Vertexes[0]]] + pol = ifcfile.createIfcPolyline(pts) + profile = ifcfile.createIfcArbitraryClosedProfileDef("AREA",None,pol) + return profile + + def getRepresentation(ifcfile,context,obj,forcebrep=False,subtraction=False,tessellation=1): """returns an IfcShapeRepresentation object or None""" @@ -1497,81 +1544,55 @@ def getRepresentation(ifcfile,context,obj,forcebrep=False,subtraction=False,tess if (not shapes) and (not forcebrep): profile = None + ev = FreeCAD.Vector() if hasattr(obj,"Proxy"): if hasattr(obj.Proxy,"getExtrusionData"): extdata = obj.Proxy.getExtrusionData(obj) if extdata: # convert to meters p = extdata[0] - p.scale(0.001) + if not isinstance(p,list): + p = [p] ev = extdata[1] - ev.multiply(0.001) + if not isinstance(ev,list): + ev = [ev] pl = extdata[2] - pl.Base = pl.Base.multiply(0.001) - pstr = str([v.Point for v in extdata[0].Vertexes]) - if pstr in profiledefs: - profile = profiledefs[pstr] - shapetype = "reusing profile" - else: - if len(p.Edges) == 1: - pxvc = ifcfile.createIfcDirection((1.0,0.0)) - povc = ifcfile.createIfcCartesianPoint((0.0,0.0)) - pt = ifcfile.createIfcAxis2Placement2D(povc,pxvc) - if isinstance(p.Edges[0].Curve,Part.Circle): - # extruded circle - profile = ifcfile.createIfcCircleProfileDef("AREA",None,pt, p.Edges[0].Curve.Radius) - elif isinstance(p.Edges[0].Curve,Part.Ellipse): - # extruded ellipse - profile = ifcfile.createIfcEllipseProfileDef("AREA",None,pt, p.Edges[0].Curve.MajorRadius, p.Edges[0].Curve.MinorRadius) - elif (len(p.Faces) == 1) and (len(p.Wires) > 1): - # face with holes - f = p.Faces[0] - if DraftGeomUtils.hasCurves(f.OuterWire): - outerwire = createCurve(ifcfile,f.OuterWire) - else: - w = Part.Wire(Part.__sortEdges__(f.OuterWire.Edges)) - pts = [ifcfile.createIfcCartesianPoint(tuple(v.Point)[:2]) for v in w.Vertexes+[w.Vertexes[0]]] - outerwire = ifcfile.createIfcPolyline(pts) - innerwires = [] - for w in f.Wires: - if w.hashCode() != f.OuterWire.hashCode(): - if DraftGeomUtils.hasCurves(w): - innerwires.append(createCurve(ifcfile,w)) - else: - w = Part.Wire(Part.__sortEdges__(w.Edges)) - pts = [ifcfile.createIfcCartesianPoint(tuple(v.Point)[:2]) for v in w.Vertexes+[w.Vertexes[0]]] - innerwires.append(ifcfile.createIfcPolyline(pts)) - profile = ifcfile.createIfcArbitraryProfileDefWithVoids("AREA",None,outerwire,innerwires) + if not isinstance(pl,list): + pl = [pl] + if (len(p) != len(ev)) or (len(p) != len(pl)): + raise ValueError("importIFC: Extrusion data length mismatch: "+obj.Label) + for i in range(len(p)): + pi = p[i] + pi.scale(0.001) + evi = ev[i] + evi.multiply(0.001) + pli = pl[i] + pli.Base = pli.Base.multiply(0.001) + pstr = str([v.Point for v in p[i].Vertexes]) + if pstr in profiledefs: + profile = profiledefs[pstr] + shapetype = "reusing profile" else: - if DraftGeomUtils.hasCurves(p): - # extruded composite curve - pol = createCurve(ifcfile,p) - else: - # extruded polyline - w = Part.Wire(Part.__sortEdges__(p.Wires[0].Edges)) - pts = [ifcfile.createIfcCartesianPoint(tuple(v.Point)[:2]) for v in w.Vertexes+[w.Vertexes[0]]] - pol = ifcfile.createIfcPolyline(pts) - profile = ifcfile.createIfcArbitraryClosedProfileDef("AREA",None,pol) - if profile: - profiledefs[pstr] = profile - - if profile and not(DraftVecUtils.isNull(ev)): - #ev = pl.Rotation.inverted().multVec(ev) - #print "ev:",ev - if not tostore: - # add the object placement to the profile placement. Otherwise it'll be done later at map insert - pl2 = FreeCAD.Placement(obj.Placement) - pl2.Base = pl2.Base.multiply(0.001) - pl = pl2.multiply(pl) - xvc = ifcfile.createIfcDirection(tuple(pl.Rotation.multVec(FreeCAD.Vector(1,0,0)))) - zvc = ifcfile.createIfcDirection(tuple(pl.Rotation.multVec(FreeCAD.Vector(0,0,1)))) - ovc = ifcfile.createIfcCartesianPoint(tuple(pl.Base)) - lpl = ifcfile.createIfcAxis2Placement3D(ovc,zvc,xvc) - edir = ifcfile.createIfcDirection(tuple(FreeCAD.Vector(ev).normalize())) - shape = ifcfile.createIfcExtrudedAreaSolid(profile,lpl,edir,ev.Length) - shapes.append(shape) - solidType = "SweptSolid" - shapetype = "extrusion" + profile = getProfile(ifcfile,pi) + if profile: + profiledefs[pstr] = profile + if profile and not(DraftVecUtils.isNull(evi)): + #ev = pl.Rotation.inverted().multVec(evi) + #print "evi:",evi + if not tostore: + # add the object placement to the profile placement. Otherwise it'll be done later at map insert + pl2 = FreeCAD.Placement(obj.Placement) + pl2.Base = pl2.Base.multiply(0.001) + pli = pl2.multiply(pli) + xvc = ifcfile.createIfcDirection(tuple(pli.Rotation.multVec(FreeCAD.Vector(1,0,0)))) + zvc = ifcfile.createIfcDirection(tuple(pli.Rotation.multVec(FreeCAD.Vector(0,0,1)))) + ovc = ifcfile.createIfcCartesianPoint(tuple(pli.Base)) + lpl = ifcfile.createIfcAxis2Placement3D(ovc,zvc,xvc) + edir = ifcfile.createIfcDirection(tuple(FreeCAD.Vector(evi).normalize())) + shape = ifcfile.createIfcExtrudedAreaSolid(profile,lpl,edir,evi.Length) + shapes.append(shape) + solidType = "SweptSolid" + shapetype = "extrusion" if not shapes: # brep representation @@ -1833,6 +1854,7 @@ def setRepresentation(representation,scaling=1000): result = preresult return result + def getRotation(entity): "returns a FreeCAD rotation from an IfcProduct with a IfcMappedItem representation" try: diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py index d6b04f4c14..a50f8fb772 100755 --- a/src/Mod/Draft/DraftGeomUtils.py +++ b/src/Mod/Draft/DraftGeomUtils.py @@ -96,10 +96,14 @@ def isNull(something): def isPtOnEdge(pt,edge) : '''isPtOnEdge(Vector,edge): Tests if a point is on an edge''' v = Part.Vertex(pt) - d = v.distToShape(edge) - if d: - if round(d[0],precision()) == 0: - return True + try: + d = v.distToShape(edge) + except: + return False + else: + if d: + if round(d[0],precision()) == 0: + return True return False def hasCurves(shape): @@ -454,7 +458,7 @@ def findIntersection(edge1,edge2,infinite1=False,infinite2=False,ex1=False,ex2=F return int else: - # print("DraftGeomUtils: Unsupported curve type: (" + str(edge1.Curve) + ", " + str(edge2.Curve) + ")") + print("DraftGeomUtils: Unsupported curve type: (" + str(edge1.Curve) + ", " + str(edge2.Curve) + ")") return [] def wiresIntersect(wire1,wire2): @@ -870,8 +874,10 @@ def flattenWire(wire): w = Part.makePolygon(verts) return w - def findWires(edgeslist): + return [ Part.Wire(e) for e in Part.sortEdges(edgeslist)] + +def findWiresOld2(edgeslist): '''finds connected wires in the given list of edges''' def touches(e1,e2): diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index 2a7d3a51b0..6bd409b165 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -2670,6 +2670,149 @@ class Offset(Modifier): self.finish() +class Stretch(Modifier): + "The Draft_Stretch FreeCAD command definition" + + def GetResources(self): + return {'Pixmap' : 'Draft_Stretch', + 'Accel' : "S, H", + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Stretch", "Stretch"), + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Stretch", "Stretches the selected objects")} + + def Activated(self): + Modifier.Activated(self,"Stretch") + if self.ui: + if not FreeCADGui.Selection.getSelection(): + self.ui.selectUi() + msg(translate("draft", "Select an object to stretch\n")) + self.call = self.view.addEventCallback("SoEvent",selectObject) + else: + self.proceed() + + def proceed(self): + if self.call: + self.view.removeEventCallback("SoEvent",self.call) + self.sel = FreeCADGui.Selection.getSelection() + if self.ui and self.sel: + self.step = 1 + self.refpoint = None + self.ui.pointUi("Stretch") + self.ui.extUi() + self.call = self.view.addEventCallback("SoEvent",self.action) + self.rectracker = rectangleTracker() + self.nodetracker = [] + self.displacement = None + msg(translate("draft", "Pick first point of selection rectangle:\n")) + + def action(self,arg): + "scene event handler" + if arg["Type"] == "SoKeyboardEvent": + if arg["Key"] == "ESCAPE": + self.finish() + elif arg["Type"] == "SoLocation2Event": #mouse movement detection + point,ctrlPoint,info = getPoint(self,arg) #,mobile=True) #,noTracker=(self.step < 3)) + if self.step == 2: + self.rectracker.update(point) + elif arg["Type"] == "SoMouseButtonEvent": + if (arg["State"] == "DOWN") and (arg["Button"] == "BUTTON1"): + if (arg["Position"] == self.pos): + # clicked twice on the same point + self.finish() + else: + point,ctrlPoint,info = getPoint(self,arg) #,mobile=True) #,noTracker=(self.step < 3)) + self.addPoint(point) + + def addPoint(self,point): + if self.step == 1: + # first rctangle point + msg(translate("draft", "Pick opposite point of selection rectangle:\n")) + self.ui.setRelative() + self.rectracker.setorigin(point) + self.rectracker.on() + if self.planetrack: + self.planetrack.set(point) + self.step = 2 + elif self.step == 2: + # second rectangle point + msg(translate("draft", "Pick start point of displacement:\n")) + self.rectracker.off() + nodes = [] + self.ops = [] + for o in self.sel: + tp = Draft.getType(o) + if tp in ["Wire","BSpline","BezCurve"]: + np = [] + iso = False + for p in o.Points: + p = o.Placement.multVec(p) + isi = self.rectracker.isInside(p) + np.append(isi) + if isi: + iso = True + nodes.append(p) + if iso: + self.ops.append([o,np]) + elif tp == "Circle": + self.ops.append([o]) + nodes.append(o.Placement.Base) + else: + print "Draft Stretch: Skipping unsupported object: ",o.Label + for n in nodes: + nt = editTracker(n) + nt.on() + self.nodetracker.append(nt) + self.step = 3 + elif self.step == 3: + # first point of displacement line + msg(translate("draft", "Pick end point of displacement:\n")) + self.displacement = point + self.node = [point] + self.step = 4 + elif self.step == 4: + self.displacement = point.sub(self.displacement) + self.doStretch() + if self.point: + self.ui.redraw() + + def numericInput(self,numx,numy,numz): + "this function gets called by the toolbar when valid x, y, and z have been entered there" + point = Vector(numx,numy,numz) + self.addPoint(point) + + def finish(self,closed=False): + if self.rectracker: + self.rectracker.finalize() + if self.nodetracker: + for n in self.nodetracker: + n.finalize() + Modifier.finish(self) + + def doStretch(self): + "does the actual stretching" + commitops = [] + if self.displacement: + if self.displacement.Length > 0: + + for ops in self.ops: + tp = Draft.getType(ops[0]) + if tp in ["Wire","BSpline","BezCurve"]: + pts = [] + for i in range(len(ops[1])): + if ops[1][i] == False: + pts.append(ops[0].Points[i]) + else: + pts.append(ops[0].Points[i].add(self.displacement)) + pts = str(pts).replace("Vector","FreeCAD.Vector") + commitops.append("FreeCAD.ActiveDocument."+ops[0].Name+".Points="+pts) + elif tp == "Circle": + commitops.append("FreeCAD.ActiveDocument."+ops[0].Name+".Placement.Base=FreeCAD."+str(ops[0].Placement.Base.add(self.displacement))) + if commitops: + commitops.append("FreeCAD.ActiveDocument.recompute()") + FreeCADGui.addModule("Draft") + self.commit(translate("draft","Stretch"),commitops) + self.finish() + + class Upgrade(Modifier): '''The Draft_Upgrade FreeCAD command definition.''' @@ -4923,6 +5066,7 @@ FreeCADGui.addCommand('Draft_Heal',Heal()) FreeCADGui.addCommand('Draft_VisGroup',VisGroup()) FreeCADGui.addCommand('Draft_Mirror',Mirror()) FreeCADGui.addCommand('Draft_Slope',Draft_Slope()) +FreeCADGui.addCommand('Draft_Stretch',Stretch()) # context commands FreeCADGui.addCommand('Draft_FinishLine',FinishLine()) diff --git a/src/Mod/Draft/DraftTrackers.py b/src/Mod/Draft/DraftTrackers.py index b0e500b7fb..731012db32 100644 --- a/src/Mod/Draft/DraftTrackers.py +++ b/src/Mod/Draft/DraftTrackers.py @@ -245,6 +245,20 @@ class rectangleTracker(Tracker): def getNormal(self): "returns the normal of the rectangle" return (self.u.cross(self.v)).normalize() + + def isInside(self,point): + "returns True if the given point is inside the rectangle" + vp = point.sub(self.p1()) + uv = self.p2().sub(self.p1()) + vv = self.p4().sub(self.p1()) + uvp = DraftVecUtils.project(vp,uv) + vvp = DraftVecUtils.project(vp,vv) + if uvp.getAngle(uv) < 1: + if vvp.getAngle(vv) < 1: + if uvp.Length <= uv.Length: + if vvp.Length <= vv.Length: + return True + return False class dimTracker(Tracker): "A Dimension tracker, used by the dimension tool" diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 282b5ebcf5..c118df6313 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -76,7 +76,7 @@ class DraftWorkbench (Workbench): "Draft_Trimex", "Draft_Upgrade", "Draft_Downgrade", "Draft_Scale", "Draft_Edit","Draft_WireToBSpline","Draft_AddPoint", "Draft_DelPoint","Draft_Shape2DView","Draft_Draft2Sketch","Draft_Array", - "Draft_PathArray","Draft_Clone","Draft_Drawing","Draft_Mirror"] + "Draft_PathArray","Draft_Clone","Draft_Drawing","Draft_Mirror","Draft_Stretch"] self.treecmdList = ["Draft_ApplyStyle","Draft_ToggleDisplayMode","Draft_AddToGroup", "Draft_SelectGroup","Draft_SelectPlane", "Draft_ShowSnapBar","Draft_ToggleGrid"] diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index 2ade2035be..0bbac2fdb6 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -71,6 +71,7 @@ icons/Draft_Grid.svg icons/Draft_Slope.svg icons/DraftWorkbench.svg + icons/Draft_Stretch.svg patterns/concrete.svg patterns/cross.svg patterns/line.svg diff --git a/src/Mod/Draft/Resources/icons/Draft_Stretch.svg b/src/Mod/Draft/Resources/icons/Draft_Stretch.svg new file mode 100644 index 0000000000..34706be07e --- /dev/null +++ b/src/Mod/Draft/Resources/icons/Draft_Stretch.svg @@ -0,0 +1,279 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Mon Oct 10 13:44:52 2011 +0000 + + + [wmayer] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Scale.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + [agryson] Alexander Gryson + + + + + square + arrow + dotted line + + + + A small square in the bottom left corner of a large dotted box ith an arrow pointing from the top left corner of the inner box to the top left corner of the outer box + + + + diff --git a/src/Mod/Draft/Resources/ui/preferences-draft.ui b/src/Mod/Draft/Resources/ui/preferences-draft.ui index 5eda200189..25a3af1df8 100755 --- a/src/Mod/Draft/Resources/ui/preferences-draft.ui +++ b/src/Mod/Draft/Resources/ui/preferences-draft.ui @@ -222,46 +222,6 @@ - - - - - - Dimensions precision level - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 8 - - - 2 - - - dimPrecision - - - Mod/Draft - - - - - diff --git a/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui b/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui index 4c8629c7e5..213e2cc6a3 100644 --- a/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui +++ b/src/Mod/Draft/Resources/ui/preferences-drafttexts.ui @@ -7,7 +7,7 @@ 0 0 522 - 462 + 473 @@ -153,6 +153,46 @@ such as "Arial:Bold" + + + + + + Number of decimals + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 8 + + + 2 + + + dimPrecision + + + Mod/Draft + + + + + @@ -364,7 +404,7 @@ such as "Arial:Bold" - + 300 @@ -405,6 +445,21 @@ such as "Arial:Bold" qPixmapFromMimeSource + + Gui::FileChooser + QWidget +
    Gui/FileDialog.h
    +     + + Gui::PrefFileChooser + Gui::FileChooser +
    Gui/PrefWidgets.h
    +     + + Gui::PrefSpinBox + QSpinBox +
    Gui/PrefWidgets.h
    +     Gui::PrefCheckBox QCheckBox @@ -425,16 +480,6 @@ such as "Arial:Bold" QDoubleSpinBox
    Gui/PrefWidgets.h
     - - Gui::FileChooser - QWidget -
    Gui/FileDialog.h
    -     - - Gui::PrefFileChooser - Gui::FileChooser -
    Gui/PrefWidgets.h
    -     diff --git a/src/Mod/Draft/WorkingPlane.py b/src/Mod/Draft/WorkingPlane.py index e92bf26d4e..990b582fa0 100644 --- a/src/Mod/Draft/WorkingPlane.py +++ b/src/Mod/Draft/WorkingPlane.py @@ -128,7 +128,7 @@ class plane: self.u = Vector(0,1,0) self.v = Vector(0,0,1) elif axis.getAngle(Vector(-1,0,0)) < 0.00001: - self.axos = Vector(-1,0,0) + self.axis = Vector(-1,0,0) self.u = Vector(0,-1,0) self.v = Vector(0,0,1) elif upvec: diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 9d2b864c1c..9b5a32ff70 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -776,6 +776,8 @@ non-parametric curve""" warn('polygon fallback on %s' %spline) return drawSplineIterpolation(controlpoints,closed=closed,\ forceShape=forceShape,alwaysDiscretize=True) + if fitpoints and not(controlpoints): + return drawSplineIterpolation(fitpoints,closed=closed,forceShape=forceShape) try: bspline=Part.BSplineCurve() bspline.buildFromPolesMultsKnots(poles=controlpoints,mults=multvector,\ diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 4e577578cb..551d956c23 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -68,9 +68,10 @@ SET(FemScripts_SRCS _CommandConstraintSelfWeight.py _CommandFEMMesh2Mesh.py _CommandMaterialMechanicalNonlinear.py - _CommandMechanicalMaterial.py + _CommandMaterial.py _CommandMeshGmshFromShape.py _CommandMeshNetgenFromShape.py + _CommandMeshGroup.py _CommandMeshRegion.py _CommandPrintMeshInfo.py _CommandPurgeResults.py @@ -83,27 +84,30 @@ SET(FemScripts_SRCS _FemConstraintSelfWeight.py _FemMaterialMechanicalNonlinear.py _FemMeshGmsh.py + _FemMeshGroup.py _FemMeshRegion.py _FemShellThickness.py _FemSolverCalculix.py _FemSolverZ88.py - _MechanicalMaterial.py + _FemMaterial.py _TaskPanelFemBeamSection.py _TaskPanelFemMeshGmsh.py + _TaskPanelFemMeshGroup.py _TaskPanelFemMeshRegion.py _TaskPanelFemShellThickness.py _TaskPanelFemSolverCalculix.py - _TaskPanelMechanicalMaterial.py + _TaskPanelFemMaterial.py _TaskPanelShowResult.py _ViewProviderFemBeamSection.py _ViewProviderFemConstraintSelfWeight.py _ViewProviderFemMaterialMechanicalNonlinear.py _ViewProviderFemMeshGmsh.py + _ViewProviderFemMeshGroup.py _ViewProviderFemMeshRegion.py _ViewProviderFemShellThickness.py _ViewProviderFemSolverCalculix.py _ViewProviderFemSolverZ88.py - _ViewProviderMechanicalMaterial.py + _ViewProviderFemMaterial.py ccxDatReader.py ccxFrdReader.py convert2TetGen.py @@ -122,6 +126,7 @@ SET(FemScripts_SRCS FemMaterialMechanicalNonlinear.py FemMesh2Mesh.py FemMeshGmsh.py + FemMeshGroup.py FemMeshRegion.py FemMeshTools.py FemShellThickness.py @@ -130,16 +135,17 @@ SET(FemScripts_SRCS FemTools.py FemToolsCcx.py FemToolsZ88.py - MechanicalMaterial.py + FemMaterial.py FemSelectionObserver.py TestFem.py z88DispReader.py TaskPanelFemBeamSection.ui TaskPanelFemMeshGmsh.ui + TaskPanelFemMeshGroup.ui TaskPanelFemMeshRegion.ui TaskPanelFemShellThickness.ui TaskPanelFemSolverCalculix.ui - TaskPanelMechanicalMaterial.ui + TaskPanelFemMaterial.ui TaskPanelShowResult.ui ) #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS}) diff --git a/src/Mod/Fem/App/FemResultObject.cpp b/src/Mod/Fem/App/FemResultObject.cpp index 20915c4147..5a793f786a 100644 --- a/src/Mod/Fem/App/FemResultObject.cpp +++ b/src/Mod/Fem/App/FemResultObject.cpp @@ -42,6 +42,8 @@ FemResultObject::FemResultObject() ADD_PROPERTY_TYPE(Stats,(0), "Fem",Prop_None,"Statistics of the results"); ADD_PROPERTY_TYPE(DisplacementVectors,(), "Fem",Prop_None,"List of displacement vectors"); ADD_PROPERTY_TYPE(DisplacementLengths,(0), "Fem",Prop_None,"List of displacement lengths"); + ADD_PROPERTY_TYPE(StressVectors,(), "Fem",Prop_None,"List of Stress vectors"); + ADD_PROPERTY_TYPE(StrainVectors,(), "Fem",Prop_None,"List of Strain vectors"); ADD_PROPERTY_TYPE(StressValues,(0), "Fem",Prop_None,"List of Von Misses stress values"); ADD_PROPERTY_TYPE(PrincipalMax,(0), "Fem",Prop_None,"List of First Principal (Max) stress values"); ADD_PROPERTY_TYPE(PrincipalMed,(0), "Fem",Prop_None,"List of Second Principal (Med) stress values"); @@ -59,6 +61,8 @@ FemResultObject::FemResultObject() Stats.setStatus(App::Property::ReadOnly, true); DisplacementVectors.setStatus(App::Property::ReadOnly, true); DisplacementLengths.setStatus(App::Property::ReadOnly, true); + StressVectors.setStatus(App::Property::ReadOnly, true); + StrainVectors.setStatus(App::Property::ReadOnly, true); StressValues.setStatus(App::Property::ReadOnly, true); PrincipalMax.setStatus(App::Property::ReadOnly, true); PrincipalMed.setStatus(App::Property::ReadOnly, true); diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index a6202024ff..1d765385e8 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -49,8 +49,12 @@ public: App::PropertyFloatList Stats; /// Displacement vectors of analysis App::PropertyVectorList DisplacementVectors; - /// Lengths of displacement vestors of analysis + /// Lengths of displacement vectors of analysis App::PropertyFloatList DisplacementLengths; + /// Stress vectors of analysis + App::PropertyVectorList StressVectors; + /// Strain vectors of analysis + App::PropertyVectorList StrainVectors; /// Von Mises Stress values of analysis App::PropertyFloatList StressValues; /// First principal Stress values of analysis diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp index c767beb8c8..c5f8d337bb 100644 --- a/src/Mod/Fem/App/FemVTKTools.cpp +++ b/src/Mod/Fem/App/FemVTKTools.cpp @@ -108,7 +108,7 @@ template void writeVTKFile(const char* filename, vtkSmartPointer< writer->SetInputData(dataset); writer->Write(); } - + void FemVTKTools::importVTKMesh(vtkSmartPointer dataset, FemMesh* mesh) { const vtkIdType nPoints = dataset->GetNumberOfPoints(); @@ -184,7 +184,7 @@ FemMesh* FemVTKTools::readVTKMesh(const char* filename, FemMesh* mesh) Base::TimeInfo Start; Base::Console().Log("Start: read FemMesh from VTK unstructuredGrid ======================\n"); Base::FileInfo f(filename); - + if(f.hasExtension("vtu")) { vtkSmartPointer dataset = readVTKFile(filename); @@ -236,7 +236,7 @@ void exportFemMeshFaces(vtkSmartPointer grid, const SMDS_Fa quad->GetPointIds()->SetId(1, aFace->GetNode(1)->GetID()-1); quad->GetPointIds()->SetId(2, aFace->GetNode(2)->GetID()-1); quad->GetPointIds()->SetId(3, aFace->GetNode(3)->GetID()-1); - + quadArray->InsertNextCell(quad); } //quadratic triangle @@ -263,7 +263,7 @@ void exportFemMeshFaces(vtkSmartPointer grid, const SMDS_Fa quad->GetPointIds()->SetId(5, aFace->GetNode(5)->GetID()-1); quad->GetPointIds()->SetId(6, aFace->GetNode(6)->GetID()-1); quad->GetPointIds()->SetId(7, aFace->GetNode(7)->GetID()-1); - + quadQuadArray->InsertNextCell(quad); } } @@ -275,7 +275,7 @@ void exportFemMeshFaces(vtkSmartPointer grid, const SMDS_Fa if(quadTriangleArray->GetNumberOfCells()>0) grid->SetCells(VTK_QUADRATIC_TRIANGLE, quadTriangleArray); - + if(quadQuadArray->GetNumberOfCells()>0) grid->SetCells(VTK_QUADRATIC_QUAD, quadQuadArray); @@ -291,7 +291,7 @@ void exportFemMeshCells(vtkSmartPointer grid, const SMDS_Vo // quadratic elemnts with 13 and 15 nodes are not added yet vtkSmartPointer quadTetraArray = vtkSmartPointer::New(); vtkSmartPointer quadHexaArray = vtkSmartPointer::New(); - + for (;aVolIter->more();) { const SMDS_MeshVolume* aVol = aVolIter->next(); @@ -314,7 +314,7 @@ void exportFemMeshCells(vtkSmartPointer grid, const SMDS_Vo cell->GetPointIds()->SetId(2, aVol->GetNode(2)->GetID()-1); cell->GetPointIds()->SetId(3, aVol->GetNode(3)->GetID()-1); cell->GetPointIds()->SetId(4, aVol->GetNode(4)->GetID()-1); - + pyramidArray->InsertNextCell(cell); } if(aVol->NbNodes() == 6) { @@ -325,7 +325,7 @@ void exportFemMeshCells(vtkSmartPointer grid, const SMDS_Vo cell->GetPointIds()->SetId(3, aVol->GetNode(3)->GetID()-1); cell->GetPointIds()->SetId(4, aVol->GetNode(4)->GetID()-1); cell->GetPointIds()->SetId(5, aVol->GetNode(5)->GetID()-1); - + wedgeArray->InsertNextCell(cell); } if(aVol->NbNodes() == 8) { @@ -338,7 +338,7 @@ void exportFemMeshCells(vtkSmartPointer grid, const SMDS_Vo cell->GetPointIds()->SetId(5, aVol->GetNode(5)->GetID()-1); cell->GetPointIds()->SetId(6, aVol->GetNode(6)->GetID()-1); cell->GetPointIds()->SetId(7, aVol->GetNode(7)->GetID()-1); - + hexaArray->InsertNextCell(cell); } //quadratic tetrahedra @@ -371,10 +371,10 @@ void exportFemMeshCells(vtkSmartPointer grid, const SMDS_Vo if(hexaArray->GetNumberOfCells()>0) grid->SetCells(VTK_HEXAHEDRON, hexaArray); - + if(quadTetraArray->GetNumberOfCells()>0) grid->SetCells(VTK_QUADRATIC_TETRA, quadTetraArray); - + if(quadHexaArray->GetNumberOfCells()>0) grid->SetCells(VTK_QUADRATIC_HEXAHEDRON, quadHexaArray); @@ -382,11 +382,11 @@ void exportFemMeshCells(vtkSmartPointer grid, const SMDS_Vo void FemVTKTools::exportVTKMesh(const FemMesh* mesh, vtkSmartPointer grid) { - + SMESH_Mesh* smesh = const_cast(mesh->getSMesh()); SMESHDS_Mesh* meshDS = smesh->GetMeshDS(); const SMDS_MeshInfo& info = meshDS->GetMeshInfo(); - + //start with the nodes vtkSmartPointer points = vtkSmartPointer::New(); SMDS_NodeIteratorPtr aNodeIter = meshDS->nodesIterator(); @@ -409,11 +409,11 @@ void FemVTKTools::exportVTKMesh(const FemMesh* mesh, vtkSmartPointer grid = vtkSmartPointer::New(); exportVTKMesh(mesh, grid); //vtkSmartPointer dataset = vtkDataSet::SafeDownCast(grid); @@ -426,7 +426,7 @@ void FemVTKTools::writeVTKMesh(const char* filename, const FemMesh* mesh) else{ Base::Console().Error("file name extension is not supported to write VTK\n"); } - + Base::Console().Log(" %f: Done \n",Base::TimeInfo::diffTimeF(Start, Base::TimeInfo())); } @@ -487,7 +487,7 @@ App::DocumentObject* FemVTKTools::readFluidicResult(const char* filename, App::D Base::TimeInfo Start; Base::Console().Log("Start: read FemResult with FemMesh from VTK file ======================\n"); Base::FileInfo f(filename); - + vtkSmartPointer ds; if(f.hasExtension("vtu")) { @@ -501,7 +501,7 @@ App::DocumentObject* FemVTKTools::readFluidicResult(const char* filename, App::D { Base::Console().Error("file name extension is not supported\n"); } - + App::Document* pcDoc = App::GetApplication().getActiveDocument(); if(!pcDoc) { @@ -532,12 +532,12 @@ App::DocumentObject* FemVTKTools::readFluidicResult(const char* filename, App::D static_cast(mesh->getPropertyByName("FemMesh"))->setValue(*fmesh); static_cast(result->getPropertyByName("Mesh"))->setValue(mesh); // PropertyLink is the property type to store DocumentObject pointer - + importFluidicResult(dataset, result); pcDoc->recompute(); - + Base::Console().Log(" %f: Done \n", Base::TimeInfo::diffTimeF(Start, Base::TimeInfo())); - + return result; } @@ -561,12 +561,12 @@ void FemVTKTools::writeResult(const char* filename, const App::DocumentObject* r Base::TimeInfo Start; Base::Console().Log("Start: write FemResult or CfdResult to VTK unstructuredGrid dataset =======\n"); Base::FileInfo f(filename); - + vtkSmartPointer grid = vtkSmartPointer::New(); App::DocumentObject* mesh = static_cast(res->getPropertyByName("Mesh"))->getValue(); const FemMesh& fmesh = static_cast(mesh->getPropertyByName("FemMesh"))->getValue(); FemVTKTools::exportVTKMesh(&fmesh, grid); - + if(res->getPropertyByName("Velocity")){ FemVTKTools::exportFluidicResult(res, grid); } @@ -576,7 +576,7 @@ void FemVTKTools::writeResult(const char* filename, const App::DocumentObject* r else{ return; } - + //vtkSmartPointer dataset = vtkDataSet::SafeDownCast(grid); if(f.hasExtension("vtu")){ writeVTKFile(filename, grid); @@ -587,7 +587,7 @@ void FemVTKTools::writeResult(const char* filename, const App::DocumentObject* r else{ Base::Console().Error("file name extension is not supported to write VTK\n"); } - + Base::Console().Log(" %f: Done \n",Base::TimeInfo::diffTimeF(Start, Base::TimeInfo())); } @@ -604,7 +604,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: vars["TurbulenceEnergy"] = "k"; vars["TurbulenceDissipationRate"] = "epsilon"; vars["TurbulenceSpecificDissipation"] = "omega"; - + const int max_var_index = 11; std::vector stats(3*max_var_index, 0.0); @@ -620,10 +620,10 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: varids["TurbulenceDissipationRate"] = 8; //varids["TurbulenceThermalDiffusivity"] = 9; //varids["TurbulenceSpecificDissipation"] = 10; - + double ts = 0.0; // t=0.0 for static simulation static_cast(res->getPropertyByName("Time"))->setValue(ts); - + vtkSmartPointer pd = dataset->GetPointData(); const vtkIdType nPoints = dataset->GetNumberOfPoints(); if(pd->GetNumberOfArrays() == 0) { @@ -631,7 +631,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: // if pointData is empty, data may be in cellDate, cellData -> pointData interpolation is possible in VTK return; } - + std::vector nodeIds(nPoints); vtkSmartPointer vel = pd->GetArray(vars["Velocity"]); if(nPoints && vel && vel->GetNumberOfComponents() == 3) { @@ -692,7 +692,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: stats[index*3] = vmin; stats[index*3 + 2] = vmax; stats[index*3 + 1] = vmean/nPoints; - + Base::Console().Message("field \"%s\" has been loaded \n", kv.first); } } @@ -760,6 +760,7 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar const FemResultObject* res = static_cast(obj); if(!res->StressValues.getValues().empty()) { const std::vector& vec = res->StressValues.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfValues(vec.size()); data->SetName("Von Mises stress"); @@ -768,10 +769,11 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar data->SetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - } + }} - if(!res->StressValues.getValues().empty()) { + if(!res->MaxShear.getValues().empty()) { const std::vector& vec = res->MaxShear.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfValues(vec.size()); data->SetName("Max shear stress (Tresca)"); @@ -780,10 +782,11 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar data->SetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - } + }} - if(!res->StressValues.getValues().empty()) { + if(!res->PrincipalMax.getValues().empty()) { const std::vector& vec = res->PrincipalMax.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfValues(vec.size()); data->SetName("Maximum Principal stress"); @@ -792,10 +795,11 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar data->SetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - } + }} - if(!res->StressValues.getValues().empty()) { + if(!res->PrincipalMax.getValues().empty()) { const std::vector& vec = res->PrincipalMin.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfValues(vec.size()); data->SetName("Minimum Principal stress"); @@ -804,10 +808,11 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar data->SetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - } + }} - if(!res->StressValues.getValues().empty()) { + if (!res->Temperature.getValues().empty()) { const std::vector& vec = res->Temperature.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfValues(vec.size()); data->SetName("Temperature"); @@ -816,10 +821,11 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar data->SetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - } + }} - if(!res->StressValues.getValues().empty()) { + if (!res->UserDefined.getValues().empty()) { const std::vector& vec = res->UserDefined.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfValues(vec.size()); data->SetName("User Defined Results"); @@ -828,11 +834,12 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar data->SetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - } + }} - if(!res->StressValues.getValues().empty()) { + if(!res->DisplacementVectors.getValues().empty()) { const std::vector& vec = res->DisplacementVectors.getValues(); + if (vec.size()>1) { vtkSmartPointer data = vtkSmartPointer::New(); data->SetNumberOfComponents(3); data->SetName("Displacement"); @@ -843,7 +850,38 @@ void FemVTKTools::exportMechanicalResult(const App::DocumentObject* obj, vtkSmar } grid->GetPointData()->AddArray(data); - } + }} + + if(!res->StressVectors.getValues().empty()) { + const std::vector& vec = res->StressVectors.getValues(); + if (vec.size()>1) { + vtkSmartPointer data = vtkSmartPointer::New(); + data->SetNumberOfComponents(3); + data->SetName("Stress Vectors"); + + for(std::vector::const_iterator it=vec.begin(); it!=vec.end(); ++it) { + double tuple[] = {it->x, it->y , it->z}; + data->InsertNextTuple(tuple); + } + + grid->GetPointData()->AddArray(data); + }} + + if(!res->StrainVectors.getValues().empty()) { + const std::vector& vec = res->StrainVectors.getValues(); + if (vec.size()>1) { + vtkSmartPointer data = vtkSmartPointer::New(); + data->SetNumberOfComponents(3); + data->SetName("Strain Vectors"); + + for(std::vector::const_iterator it=vec.begin(); it!=vec.end(); ++it) { + double tuple[] = {it->x, it->y, it->z}; + data->InsertNextTuple(tuple); + } + + grid->GetPointData()->AddArray(data); + }} + } } // namespace diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 6f3c59f51f..308e3d580d 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -55,6 +55,13 @@ INSTALL( FemMesh2Mesh.py _CommandFEMMesh2Mesh.py + FemMeshGroup.py + _FemMeshGroup.py + _ViewProviderFemMeshGroup.py + _CommandMeshGroup.py + _TaskPanelFemMeshGroup.py + TaskPanelFemMeshGroup.ui + FemMeshRegion.py _FemMeshRegion.py _ViewProviderFemMeshRegion.py @@ -81,12 +88,12 @@ INSTALL( _ViewProviderFemConstraintSelfWeight.py _CommandConstraintSelfWeight.py - MechanicalMaterial.py - _MechanicalMaterial.py - _ViewProviderMechanicalMaterial.py - _CommandMechanicalMaterial.py - _TaskPanelMechanicalMaterial.py - TaskPanelMechanicalMaterial.ui + FemMaterial.py + _FemMaterial.py + _ViewProviderFemMaterial.py + _CommandMaterial.py + _TaskPanelFemMaterial.py + TaskPanelFemMaterial.ui FemMaterialMechanicalNonlinear.py _FemMaterialMechanicalNonlinear.py diff --git a/src/Mod/Fem/FemGmshTools.py b/src/Mod/Fem/FemGmshTools.py index bd9258dc71..f214c03a67 100644 --- a/src/Mod/Fem/FemGmshTools.py +++ b/src/Mod/Fem/FemGmshTools.py @@ -215,17 +215,39 @@ class FemGmshTools(): print(' ' + self.gmsh_bin) def get_group_data(self): + self.group_elements = {} + # TODO solid, face, edge seam not work together, some print or make it work together + # TODO handle groups for Edges and Vertexes + + # mesh groups and groups of analysis member + if not self.mesh_obj.MeshGroupList: + print (' No mesh group objects.') + else: + print (' Mesh group objects, we need to get the elements.') + for mg in self.mesh_obj.MeshGroupList: + new_group_elements = FemMeshTools.get_mesh_group_elements(mg, self.part_obj) + for ge in new_group_elements: + if ge not in self.group_elements: + self.group_elements[ge] = new_group_elements[ge] + else: + FreeCAD.Console.PrintError(" A group with this name exists already.\n") if self.analysis: print(' Group meshing.') - self.group_elements = FemMeshTools.get_analysis_group_elements(self.analysis, self.part_obj) - print(' {}'.format(self.group_elements)) + new_group_elements = FemMeshTools.get_analysis_group_elements(self.analysis, self.part_obj) + for ge in new_group_elements: + if ge not in self.group_elements: + self.group_elements[ge] = new_group_elements[ge] + else: + FreeCAD.Console.PrintError(" A group with this name exists already.\n") else: - print(' NO group meshing.') + print(' No anlysis members for group meshing.') + print(' {}'.format(self.group_elements)) + # mesh regions self.ele_length_map = {} # { 'ElementString' : element length } self.ele_node_map = {} # { 'ElementString' : [element nodes] } if not self.mesh_obj.MeshRegionList: - print (' No Mesh regions.') + print (' No mesh regions.') else: print (' Mesh regions, we need to get the elements.') if self.part_obj.Shape.ShapeType == 'Compound': @@ -279,7 +301,7 @@ class FemGmshTools(): geo = open(self.temp_file_geo, "w") geo.write('Merge "' + self.temp_file_geometry + '";\n') geo.write("\n") - if self.analysis and self.group_elements: + if self.group_elements: # print(' We gone have found elements to make mesh groups for.') geo.write("// group data\n") # we use the element name of FreeCAD which starts with 1 (example: 'Face1'), same as GMSH diff --git a/src/Mod/Fem/MechanicalMaterial.py b/src/Mod/Fem/FemMaterial.py similarity index 82% rename from src/Mod/Fem/MechanicalMaterial.py rename to src/Mod/Fem/FemMaterial.py index a54ab9ef2a..de91e29651 100644 --- a/src/Mod/Fem/MechanicalMaterial.py +++ b/src/Mod/Fem/FemMaterial.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -__title__ = "MechanicalMaterial" +__title__ = "FemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" @@ -28,17 +28,17 @@ __url__ = "http://www.freecadweb.org" # @{ import FreeCAD -import _MechanicalMaterial +import _FemMaterial -def makeMechanicalMaterial(name): - '''makeMaterial(name): makes an Material - name there fore is a material name or an file name for a FCMat file''' +def makeFemMaterial(name): + '''makeFemMaterial(name): makes an FEM Material + ''' obj = FreeCAD.ActiveDocument.addObject("App::MaterialObjectPython", name) - _MechanicalMaterial._MechanicalMaterial(obj) + _FemMaterial._FemMaterial(obj) if FreeCAD.GuiUp: - import _ViewProviderMechanicalMaterial - _ViewProviderMechanicalMaterial._ViewProviderMechanicalMaterial(obj.ViewObject) + import _ViewProviderFemMaterial + _ViewProviderFemMaterial._ViewProviderFemMaterial(obj.ViewObject) # FreeCAD.ActiveDocument.recompute() return obj diff --git a/src/Mod/Fem/FemMeshGroup.py b/src/Mod/Fem/FemMeshGroup.py new file mode 100644 index 0000000000..d937ca2361 --- /dev/null +++ b/src/Mod/Fem/FemMeshGroup.py @@ -0,0 +1,49 @@ +# *************************************************************************** +# * * +# * Copyright (c) 2016 - Bernd Hahnebach * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +__title__ = "FemMeshGroup" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## \addtogroup FEM +# @{ + +import FreeCAD +import _FemMeshGroup + + +def makeFemMeshGroup(base_mesh, use_label=False, name="FEMMeshGroup"): + '''makeFemMeshGroup([length], [name]): creates a FEM mesh region object to define properties for a regon of a FEM mesh''' + obj = FreeCAD.ActiveDocument.addObject("Fem::FeaturePython", name) + _FemMeshGroup._FemMeshGroup(obj) + obj.UseLabel = use_label + # obj.BaseMesh = base_mesh + # App::PropertyLinkList does not support append, we will use a temporary list to append the mesh group obj. to the list + tmplist = base_mesh.MeshGroupList + tmplist.append(obj) + base_mesh.MeshGroupList = tmplist + if FreeCAD.GuiUp: + import _ViewProviderFemMeshGroup + _ViewProviderFemMeshGroup._ViewProviderFemMeshGroup(obj.ViewObject) + return obj + +# @} diff --git a/src/Mod/Fem/FemMeshTools.py b/src/Mod/Fem/FemMeshTools.py index 4d76e2ed32..e35940d482 100644 --- a/src/Mod/Fem/FemMeshTools.py +++ b/src/Mod/Fem/FemMeshTools.py @@ -402,7 +402,7 @@ def get_femelement_sets_from_group_data(femmesh, fem_objects): def get_elset_short_name(obj, i): - if hasattr(obj, "Proxy") and obj.Proxy.Type == 'MechanicalMaterial': + if hasattr(obj, "Proxy") and obj.Proxy.Type == 'FemMaterial': return 'Mat' + str(i) elif hasattr(obj, "Proxy") and obj.Proxy.Type == 'FemBeamSection': return 'Beam' + str(i) @@ -995,54 +995,43 @@ def get_ref_shape_node_sum_geom_table(node_geom_table): return node_sum_geom_table +def get_mesh_group_elements(mesh_group_obj, aPart): + '''the Reference shapes of the mesh_group_object are searched in the Shape of aPart. If found in shape they are added to a dict + {MeshGroupIdentifier : ['ShapeType of the Elements'], [ElementID, ElementID, ...], ...} + ''' + group_elements = {} # { name : [element, element, ... , element]} + if mesh_group_obj.References: + grp_ele = get_reference_group_elements(mesh_group_obj, aPart) + group_elements[grp_ele[0]] = grp_ele[1] + else: + FreeCAD.Console.PrintError(' Empty reference in mesh group object: ' + mesh_group_obj.Name + ' ' + mesh_group_obj.Label) + return group_elements + + def get_analysis_group_elements(aAnalysis, aPart): ''' all Reference shapes of all Analysis member are searched in the Shape of aPart. If found in shape they are added to a dict {ConstraintName : ['ShapeType of the Elements'], [ElementID, ElementID, ...], ...} ''' - aShape = aPart.Shape group_elements = {} # { name : [element, element, ... , element]} empty_references = [] for m in aAnalysis.Member: if hasattr(m, "References"): - # print(m.Name) - key = m.Name - elements = [] - stype = None if m.References: - for r in m.References: - parent = r[0] - childs = r[1] - # print(parent) - # print(childs) - for child in childs: - ref_shape = get_element(parent, child) # the method getElement(element) does not return Solid elements - if not stype: - stype = ref_shape.ShapeType - elif stype != ref_shape.ShapeType: - FreeCAD.Console.PrintError('Error, two refschapes in References with different ShapeTypes.\n') - # print(ref_shape) - found_element = find_element_in_shape(aShape, ref_shape) - if found_element is not None: - elements.append(found_element) - else: - FreeCAD.Console.PrintError('Problem: No element found for: ' + str(ref_shape) + '\n') - print(' ' + m.Name) - print(' ' + str(m.References)) - print(' ' + r[0].Name) - group_elements[key] = sorted(elements) + grp_ele = get_reference_group_elements(m, aPart) + group_elements[grp_ele[0]] = grp_ele[1] else: print(' Empty reference: ' + m.Name) empty_references.append(m) if empty_references: if len(empty_references) == 1: - group_elements = get_anlysis_empty_references_group_elements(group_elements, aAnalysis, aShape) + group_elements = get_anlysis_empty_references_group_elements(group_elements, aAnalysis, aPart.Shape) else: FreeCAD.Console.PrintError('Problem: more than one object with empty references.\n') print('We gone try to get the empty material references anyway.\n') # ShellThickness and BeamSection could have empty references, but on solid meshes only materials should have empty references for er in empty_references: print(er.Name) - group_elements = get_anlysis_empty_references_group_elements(group_elements, aAnalysis, aShape) + group_elements = get_anlysis_empty_references_group_elements(group_elements, aAnalysis, aPart.Shape) # check if all groups have elements: for g in group_elements: # print(group_elements[g]) @@ -1051,6 +1040,37 @@ def get_analysis_group_elements(aAnalysis, aPart): return group_elements +def get_reference_group_elements(obj, aPart): + aShape = aPart.Shape + if hasattr(obj, "UseLabel") and obj.UseLabel: + key = obj.Label # TODO check the character of the Label, only allow underline and standard english character + else: + key = obj.Name + elements = [] + stype = None + for r in obj.References: + parent = r[0] + childs = r[1] + # print(parent) + # print(childs) + for child in childs: + ref_shape = get_element(parent, child) # the method getElement(element) does not return Solid elements + if not stype: + stype = ref_shape.ShapeType + elif stype != ref_shape.ShapeType: + FreeCAD.Console.PrintError('Error, two refschapes in References with different ShapeTypes.\n') + # print(ref_shape) + found_element = find_element_in_shape(aShape, ref_shape) + if found_element is not None: + elements.append(found_element) + else: + FreeCAD.Console.PrintError('Problem: No element found for: ' + str(ref_shape) + '\n') + print(' ' + obj.Name) + print(' ' + str(obj.References)) + print(' ' + r[0].Name) + return (key, sorted(elements)) + + def get_anlysis_empty_references_group_elements(group_elements, aAnalysis, aShape): '''get the elementIDs if the Reference shape is empty see get_analysis_group_elements() for more informatations diff --git a/src/Mod/Fem/FemTools.py b/src/Mod/Fem/FemTools.py index 3d11fb989d..685ca54bf7 100644 --- a/src/Mod/Fem/FemTools.py +++ b/src/Mod/Fem/FemTools.py @@ -307,6 +307,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject): self.shell_thicknesses.append(shell_thickness_dict) def check_prerequisites(self): + import Units message = "" # analysis if not self.analysis: @@ -352,20 +353,27 @@ class FemTools(QtCore.QRunnable, QtCore.QObject): has_no_references = True for m in self.materials_linear: mat_map = m['Object'].Material - if 'YoungsModulus' not in mat_map: + if 'YoungsModulus' in mat_map: + # print Units.Quantity(mat_map['YoungsModulus']).Value + if not Units.Quantity(mat_map['YoungsModulus']).Value: + message += "Value of YoungsModulus is set to 0.0.\n" + else: message += "No YoungsModulus defined for at least one material.\n" if 'PoissonRatio' not in mat_map: - message += "No PoissonRatio defined for at least one material.\n" + message += "No PoissonRatio defined for at least one material.\n" # PoissonRatio is allowed to be 0.0 (in ccx), but it should be set anyway. if self.analysis_type == "frequency" or self.selfweight_constraints: if 'Density' not in mat_map: message += "No Density defined for at least one material.\n" if self.analysis_type == "thermomech": - if 'ThermalConductivity' not in mat_map: + if 'ThermalConductivity' in mat_map: + if not Units.Quantity(mat_map['ThermalConductivity']).Value: + message += "Value of ThermalConductivity is set to 0.0.\n" + else: message += "Thermomechanical analysis: No ThermalConductivity defined for at least one material.\n" if 'ThermalExpansionCoefficient' not in mat_map: - message += "Thermomechanical analysis: No ThermalExpansionCoefficient defined for at least one material.\n" + message += "Thermomechanical analysis: No ThermalExpansionCoefficient defined for at least one material.\n" # allowed to be 0.0 (in ccx) if 'SpecificHeat' not in mat_map: - message += "Thermomechanical analysis: No SpecificHeat defined for at least one material.\n" + message += "Thermomechanical analysis: No SpecificHeat defined for at least one material.\n" # allowed to be 0.0 (in ccx) for m in self.materials_linear: has_nonlinear_material = False for nlm in self.materials_nonlinear: @@ -378,9 +386,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject): if self.analysis_type == "static": if not (self.fixed_constraints or self.displacement_constraints): message += "Static analysis: Neither constraint fixed nor constraint displacement defined.\n" - if self.analysis_type == "static": - if not (self.force_constraints or self.pressure_constraints or self.selfweight_constraints): - message += "Static analysis: Neither constraint force nor constraint pressure or a constraint selfweight defined.\n" + # no check in the regard of loads (constraint force, pressure, self weight) is done because an analysis without loads at all is an valid analysis too if self.analysis_type == "thermomech": if not self.initialtemperature_constraints: message += "Thermomechanical analysis: No initial temperature defined.\n" diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 1f6779479a..ddf24d761f 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -344,7 +344,6 @@ fc_target_copy_resource(FemGui ${CMAKE_SOURCE_DIR}/src/Mod/Fem ${CMAKE_BINARY_DIR}/Mod/Fem InitGui.py - TaskPanelMechanicalMaterial.ui ) SET(FemGuiIcon_SVG diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts b/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts index bf355426e3..e419c17f60 100755 --- a/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts @@ -32,12 +32,12 @@ Create FEM mesh - Создать МКЭ сетку + Создать МКЭ-сетку Create FEM mesh from shape - Создать МКЭ сетку из формы + Создать МКЭ-сетку из формы @@ -207,7 +207,7 @@ Add a part to the Analysis - Добавить новую часть в Анализ + Добавить новую часть в анализ @@ -225,7 +225,7 @@ Create FEM constraint for a bearing - Создать МКЭ ограничения для подшипника + Создать МКЭ-ограничения для подшипника @@ -292,12 +292,12 @@ Create FEM gear constraint - Создать МКЭ передач с ограничениями + Создать передаточное МКЭ-ограничение Create FEM constraint for a gear - Создать МКЭ с ограничениями для передач + Создать МКЭ-ограничение для передачи @@ -328,12 +328,12 @@ Create FEM pulley constraint - Создать МКЭ с ограничениями для шкивов + Создать шкивовое МКЭ-ограничение Create FEM constraint for a pulley - Create FEM constraint for a pulley + Создать МКЭ-ограничение для шкива @@ -347,7 +347,7 @@ Create a FEM analysis - Создать МКЭ анализ + Создать МКЭ-анализ @@ -358,11 +358,11 @@ Create FEM mesh - Создать МКЭ сетку + Создать МКЭ-сетку Create FEM mesh from shape - Создать МКЭ сетку из формы + Создать МКЭ-сетку из формы @@ -386,7 +386,7 @@ Select a single FEM mesh or nodes set, please. - Select a single FEM mesh or nodes set, please. + Выберите одну МКЭ-сетку или набор узлов, пожалуйста. @@ -488,12 +488,12 @@ High frequency limit - Ограничение высокой частоты + Верхнее ограничение частоты Low frequency limit - Ограничение низкой частоты + Нижнее ограничение частоты @@ -519,7 +519,7 @@ Use materials from user defined directory - Use materials from user defined directory + Использовать материалы из каталога, определённого пользователем @@ -535,7 +535,7 @@ Quadrangle - Четырехугольник + Четырёхугольник Maximum length @@ -645,7 +645,7 @@ Edit FEM mesh - Edit FEM mesh + Редактировать МКЭ-сеть @@ -666,7 +666,7 @@ FEM constraint parameters - Параметры зависимостей МКЭ + Параметры ограничений МКЭ @@ -689,7 +689,7 @@ Please use only a single reference for bearing constraint - Пожалуйста, используйте только одну ссылку для подшипников с ограничениями + Пожалуйста, используйте только одну ссылку для ограничений подшипника @@ -761,12 +761,12 @@ Mixed shape types are not possible. Use a second constraint instead - Не возможны смешанные типы формы. Вместо этого используйте второе ограничение + Не разрешены смешанные типы формы. Вместо этого используйте второе ограничение Only faces, edges and vertices can be picked - Можно выбрать только грани, ребра и вершины + Можно выбрать только грани, рёбра и вершины @@ -803,12 +803,12 @@ Mixed shape types are not possible. Use a second constraint instead - Не возможны смешанные типы формы. Вместо этого используйте второе ограничение + Не разрешены смешанные типы формы. Вместо этого используйте второе ограничение Only faces, edges and vertices can be picked - Можно выбрать только грани, ребра и вершины + Можно выбрать только грани, рёбра и вершины @@ -965,7 +965,7 @@ Leave references blank - Leave references blank + Оставить ссылки пустыми @@ -1000,7 +1000,7 @@ Working directory - Working directory + Рабочий каталог @@ -1010,12 +1010,12 @@ Analysis type - Analysis type + Тип анализа Static - Static + Статический @@ -1025,7 +1025,7 @@ Write .inp file - Write .inp file + Записать файл .inp @@ -1063,7 +1063,7 @@ choose... - выберете... + выберите... @@ -1078,7 +1078,7 @@ Leave references blank - Leave references blank + Оставить ссылки пустыми @@ -1088,7 +1088,7 @@ Add reference - Add reference + Добавить ссылку @@ -1126,7 +1126,7 @@ Pa - ПА + Па @@ -1134,7 +1134,7 @@ No active Analysis - Анализ не активен + Нет активного анализа @@ -1192,7 +1192,7 @@ Combo View - Комбо панель + Комбинированный вид combiTab @@ -1711,7 +1711,7 @@ Max. Size: - Max. Size: + Макс. размер: @@ -1726,17 +1726,17 @@ VeryCoarse - VeryCoarse + ОченьГрубо Coarse - Coarse + Грубо Moderate - Moderate + Средне @@ -1776,7 +1776,7 @@ Node count: - Счетчик узлов: + Счётчик узлов: diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 32e249f297..7f586c73b0 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -71,14 +71,14 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Fem_MeshNetgenFromShape" << "Fem_MeshGmshFromShape" << "Fem_MeshRegion" + << "Fem_MeshGroup" + //<< "Fem_CreateNodesSet" << "Separator" - << "Fem_MechanicalMaterial" + << "Fem_Material" << "Fem_MaterialMechanicalNonlinear" << "Fem_BeamSection" << "Fem_ShellThickness" << "Separator" - //<< "Fem_CreateNodesSet" - << "Separator" << "Fem_ConstraintFixed" << "Fem_ConstraintDisplacement" << "Fem_ConstraintPlaneRotation" @@ -144,14 +144,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Fem_MeshNetgenFromShape" << "Fem_MeshGmshFromShape" << "Fem_MeshRegion" + << "Fem_MeshGroup" + << "Fem_CreateNodesSet" << "Separator" - << "Fem_MechanicalMaterial" + << "Fem_Material" << "Fem_MaterialMechanicalNonlinear" << "Fem_BeamSection" << "Fem_ShellThickness" << "Separator" - << "Fem_CreateNodesSet" - << "Separator" << "Fem_ConstraintFixed" << "Fem_ConstraintDisplacement" << "Fem_ConstraintPlaneRotation" diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index ae33e45f2f..c9832faa7b 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -54,11 +54,12 @@ class FemWorkbench (Workbench): import _CommandFEMMesh2Mesh import _CommandMeshGmshFromShape import _CommandMeshNetgenFromShape + import _CommandMeshGroup import _CommandMeshRegion import _CommandAnalysis import _CommandShellThickness import _CommandBeamSection - import _CommandMechanicalMaterial + import _CommandMaterial import _CommandMaterialMechanicalNonlinear import _CommandSolverCalculix import _CommandSolverZ88 diff --git a/src/Mod/Fem/TaskPanelMechanicalMaterial.ui b/src/Mod/Fem/TaskPanelFemMaterial.ui similarity index 98% rename from src/Mod/Fem/TaskPanelMechanicalMaterial.ui rename to src/Mod/Fem/TaskPanelFemMaterial.ui index a836fec344..9c468f3a11 100644 --- a/src/Mod/Fem/TaskPanelMechanicalMaterial.ui +++ b/src/Mod/Fem/TaskPanelFemMaterial.ui @@ -1,7 +1,7 @@ - ThermalMechanicalMaterial - + FemMaterial + 0 @@ -11,7 +11,7 @@ - Mechanical material + FEM material diff --git a/src/Mod/Fem/TaskPanelFemMeshGroup.ui b/src/Mod/Fem/TaskPanelFemMeshGroup.ui new file mode 100644 index 0000000000..6a7cf9bb90 --- /dev/null +++ b/src/Mod/Fem/TaskPanelFemMeshGroup.ui @@ -0,0 +1,120 @@ + + + Form + + + + 0 + 0 + 350 + 500 + + + + Mesh group + + + + + + + 16777215 + 1677215 + + + + Identifier used for mesh export + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Name + + + true + + + + + + + Label + + + + + + + + + + + + References + + + + + + Add reference + + + + + + + + + + + + Solid + + + + + + + Face, Edge, Vertex + + + true + + + + + + + <html><head/><body><p>Selection</p></body></html> + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + diff --git a/src/Mod/Fem/TaskPanelFemSolverCalculix.ui b/src/Mod/Fem/TaskPanelFemSolverCalculix.ui index 6c2c63452a..9201524420 100644 --- a/src/Mod/Fem/TaskPanelFemSolverCalculix.ui +++ b/src/Mod/Fem/TaskPanelFemSolverCalculix.ui @@ -1,7 +1,7 @@ - MechanicalMaterial - + SolverCalculix + 0 diff --git a/src/Mod/Fem/TaskPanelShowResult.ui b/src/Mod/Fem/TaskPanelShowResult.ui index af2b547d06..4b74bd91e1 100644 --- a/src/Mod/Fem/TaskPanelShowResult.ui +++ b/src/Mod/Fem/TaskPanelShowResult.ui @@ -270,8 +270,38 @@ + + + 0 + 17 + + + + + 16777215 + 16777215 + + + + 1 + - Available: Disp(x,y,z) Principal stresses (P1,P2,P3) + Available: Disp(x,y,z) Principal stresses(P1,P2,P3) Stress(sx,sy,sz) Strain (ex,ey,ez) + + + false + + + Qt::AlignCenter + + + true + + + -1 + + + Qt::NoTextInteraction diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index 4a0f4a6ca3..4c497dbb70 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -29,7 +29,7 @@ import FemToolsCcx import FreeCAD import FemAnalysis import FemSolverCalculix -import MechanicalMaterial +import FemMaterial import csv import tempfile import unittest @@ -52,6 +52,10 @@ frequency_analysis_inp_file = test_file_dir + '/' + frequency_base_name + '.inp' frequency_expected_values = test_file_dir + "/cube_frequency_expected_values" thermomech_analysis_inp_file = test_file_dir + '/' + thermomech_base_name + '.inp' thermomech_expected_values = test_file_dir + "/spine_thermomech_expected_values" +static_save_fc_file = static_analysis_dir + '/' + static_base_name + '.fcstd' +frequency_save_fc_file = frequency_analysis_dir + '/' + frequency_base_name + '.fcstd' +thermomech_save_fc_file = thermomech_analysis_dir + '/' + thermomech_base_name + '.fcstd' + mesh_points_file = test_file_dir + '/mesh_points.csv' mesh_volumes_file = test_file_dir + '/mesh_volumes.csv' spine_points_file = test_file_dir + '/spine_points.csv' @@ -76,7 +80,7 @@ class FemTest(unittest.TestCase): self.active_doc.recompute() def create_new_analysis(self): - self.analysis = FemAnalysis.makeFemAnalysis('MechanicalAnalysis') + self.analysis = FemAnalysis.makeFemAnalysis('Analysis') self.active_doc.recompute() def create_new_solver(self): @@ -109,7 +113,7 @@ class FemTest(unittest.TestCase): self.active_doc.recompute() def create_new_material(self): - self.new_material_object = MechanicalMaterial.makeMechanicalMaterial('MechanicalMaterial') + self.new_material_object = FemMaterial.makeFemMaterial('MechanicalMaterial') mat = self.new_material_object.Material mat['Name'] = "Steel-Generic" mat['YoungsModulus'] = "200000 MPa" @@ -134,6 +138,9 @@ class FemTest(unittest.TestCase): self.pressure_constraint.Pressure = 1000.0 self.pressure_constraint.Reversed = False + def save_file(self, fc_file_name): + self.active_doc.saveAs(fc_file_name) + def force_unix_line_ends(self, line_list): new_line_list = [] for l in line_list: @@ -146,12 +153,12 @@ class FemTest(unittest.TestCase): file1 = open(file_name1, 'r') f1 = file1.readlines() file1.close() - lf1 = [l for l in f1 if not l.startswith('** written ')] + lf1 = [l for l in f1 if not (l.startswith('** written ') or l.startswith('** file '))] lf1 = self.force_unix_line_ends(lf1) file2 = open(file_name2, 'r') f2 = file2.readlines() file2.close() - lf2 = [l for l in f2 if not l.startswith('** written ')] + lf2 = [l for l in f2 if not (l.startswith('** written ') or l.startswith('** file '))] lf2 = self.force_unix_line_ends(lf2) import difflib diff = difflib.unified_diff(lf1, lf2, n=0) @@ -181,6 +188,7 @@ class FemTest(unittest.TestCase): return False def test_new_analysis(self): + # static fcc_print('--------------- Start of FEM tests ---------------') fcc_print('Checking FEM new analysis...') self.create_new_analysis() @@ -263,6 +271,11 @@ class FemTest(unittest.TestCase): ret = self.compare_stats(fea, static_expected_values) self.assertFalse(ret, "Invalid results read from .frd file") + fcc_print('Save FreeCAD file for static analysis to {}...'.format(static_save_fc_file)) + self.save_file(static_save_fc_file) + self.assertTrue(self.save_file, "FemTest saving of file {} failed ...".format(static_save_fc_file)) + + # frequency fcc_print('Setting analysis type to \'frequency\"') fea.set_analysis_type("frequency") self.assertTrue(True if fea.analysis_type == 'frequency' else False, "Setting anlysis type to \'frequency\' failed") @@ -307,7 +320,11 @@ class FemTest(unittest.TestCase): ret = self.compare_stats(fea, frequency_expected_values) self.assertFalse(ret, "Invalid results read from .frd file") - fcc_print('--------------- End of FEM tests ---------------') + fcc_print('Save FreeCAD file for frequency analysis to {}...'.format(frequency_save_fc_file)) + self.save_file(frequency_save_fc_file) + self.assertTrue(self.save_file, "FemTest saving of file {} failed ...".format(frequency_save_fc_file)) + + fcc_print('--------------- End of FEM tests static and frequency analysis ---------------') def tearDown(self): FreeCAD.closeDocument("FemTest") @@ -336,6 +353,7 @@ class TherMechFemTest(unittest.TestCase): def create_new_solver(self): self.solver_object = FemSolverCalculix.makeFemSolverCalculix('CalculiX') + self.solver_object.AnalysisType = 'thermomech' self.solver_object.GeometricalNonlinearity = 'linear' self.solver_object.ThermoMechSteadyState = True self.solver_object.MatrixSolverType = 'default' @@ -362,7 +380,7 @@ class TherMechFemTest(unittest.TestCase): self.active_doc.recompute() def create_new_material(self): - self.new_material_object = MechanicalMaterial.makeMechanicalMaterial('MechanicalMaterial') + self.new_material_object = FemMaterial.makeFemMaterial('MechanicalMaterial') mat = self.new_material_object.Material mat['Name'] = "Steel-Generic" mat['YoungsModulus'] = "200000 MPa" @@ -392,6 +410,9 @@ class TherMechFemTest(unittest.TestCase): self.heatflux_constraint.AmbientTemp = 255.3722 self.heatflux_constraint.FilmCoef = 5.678 + def save_file(self, fc_file_name): + self.active_doc.saveAs(fc_file_name) + def force_unix_line_ends(self, line_list): new_line_list = [] for l in line_list: @@ -518,26 +539,46 @@ class TherMechFemTest(unittest.TestCase): self.assertTrue(True if fea.inp_file_name == thermomech_analysis_inp_file else False, "Setting inp file name to {} failed".format(thermomech_analysis_inp_file)) + fcc_print('Checking FEM frd file read from thermomech analysis...') + fea.load_results() + self.assertTrue(fea.results_present, "Cannot read results from {}.frd frd file".format(fea.base_name)) + + fcc_print('Reading stats from result object for thermomech analysis...') + ret = self.compare_stats(fea, thermomech_expected_values) + self.assertFalse(ret, "Invalid results read from .frd file") + + fcc_print('Save FreeCAD file for thermomech analysis to {}...'.format(thermomech_save_fc_file)) + self.save_file(thermomech_save_fc_file) + self.assertTrue(self.save_file, "FemTest saving of file {} failed ...".format(thermomech_save_fc_file)) + + fcc_print('--------------- End of FEM tests thermomech analysis ---------------') + def tearDown(self): FreeCAD.closeDocument("TherMechFemTest") pass # helpers -def open_cube_test(): - cube_file = test_file_dir + '/cube.fcstd' - FreeCAD.open(cube_file) +def run_fem_unittests(): + import unittest + suite = unittest.TestSuite() + suite.addTest(unittest.defaultTestLoader.loadTestsFromName("TestFem")) + r = unittest.TextTestRunner() + r.run(suite) -def create_cube_test_results(): +def create_test_results(): + # run FEM unit tests + run_fem_unittests() + import os import shutil - cube_file = test_file_dir + '/cube.fcstd' - - FreeCAD.open(cube_file) import FemGui - FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.MechanicalAnalysis) import FemToolsCcx + + # static and frequency cube + FreeCAD.open(static_save_fc_file) + FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis) fea = FemToolsCcx.FemToolsCcx() # static @@ -549,7 +590,7 @@ def create_cube_test_results(): stats_static = [] # we only have one result object so we are fine for s in stat_types: stats_static.append("{}: {}\n".format(s, fea.get_stats(s))) - static_expected_values_file = temp_dir + '/cube_static_expected_values' + static_expected_values_file = static_analysis_dir + '/cube_static_expected_values' f = open(static_expected_values_file, 'w') for s in stats_static: f.write(s) @@ -559,8 +600,8 @@ def create_cube_test_results(): frd_result_file = os.path.splitext(fea.inp_file_name)[0] + '.frd' dat_result_file = os.path.splitext(fea.inp_file_name)[0] + '.dat' - frd_static_test_result_file = temp_dir + '/cube_static.frd' - dat_static_test_result_file = temp_dir + '/cube_static.dat' + frd_static_test_result_file = static_analysis_dir + '/cube_static.frd' + dat_static_test_result_file = static_analysis_dir + '/cube_static.dat' shutil.copyfile(frd_result_file, frd_static_test_result_file) shutil.copyfile(dat_result_file, dat_static_test_result_file) @@ -574,28 +615,55 @@ def create_cube_test_results(): stats_frequency = [] # since we set eigenmodeno. we only have one result object so we are fine for s in stat_types: stats_frequency.append("{}: {}\n".format(s, fea.get_stats(s))) - frequency_expected_values_file = temp_dir + '/cube_frequency_expected_values' + frequency_expected_values_file = frequency_analysis_dir + '/cube_frequency_expected_values' f = open(frequency_expected_values_file, 'w') for s in stats_frequency: f.write(s) f.close() - frd_frequency_test_result_file = temp_dir + '/cube_frequency.frd' - dat_frequency_test_result_file = temp_dir + '/cube_frequency.dat' + frd_frequency_test_result_file = frequency_analysis_dir + '/cube_frequency.frd' + dat_frequency_test_result_file = frequency_analysis_dir + '/cube_frequency.dat' shutil.copyfile(frd_result_file, frd_frequency_test_result_file) shutil.copyfile(dat_result_file, dat_frequency_test_result_file) - print('Results copied to: ' + temp_dir) + # thermomech + FreeCAD.open(thermomech_save_fc_file) + FemGui.setActiveAnalysis(FreeCAD.ActiveDocument.Analysis) + fea = FemToolsCcx.FemToolsCcx() + fea.reset_all() + fea.run() + + fea.load_results() + stat_types = ["U1", "U2", "U3", "Uabs", "Sabs"] + stats_thermomech = [] # we only have one result object so we are fine + for s in stat_types: + stats_thermomech.append("{}: {}\n".format(s, fea.get_stats(s))) + thermomech_expected_values_file = thermomech_analysis_dir + '/expected_values_thermomech' + f = open(thermomech_expected_values_file, 'w') + for s in stats_thermomech: + f.write(s) + f.close() + + # could be added in FemToolsCcx to the self object as an Attribut + frd_result_file = os.path.splitext(fea.inp_file_name)[0] + '.frd' + dat_result_file = os.path.splitext(fea.inp_file_name)[0] + '.dat' + + frd_thermomech_test_result_file = thermomech_analysis_dir + '/spine_thermomech.frd' + dat_thermomech_test_result_file = thermomech_analysis_dir + '/spine_thermomech.dat' + shutil.copyfile(frd_result_file, frd_thermomech_test_result_file) + shutil.copyfile(dat_result_file, dat_thermomech_test_result_file) + + print('Results copied to the appropriate FEM test dirs in: ' + temp_dir) ''' update the results in FEM untit tests: -start FreeCAD import TestFem -TestFem.create_cube_test_results() +TestFem.create_test_results() -copy result files from /tmp into the src dirctory +copy result files from FEM test directories into the src dirctory +compare the results with git difftool run make start FreeCAD and run FEM unit test if FEM unit test is fine --> commit new FEM unit test results diff --git a/src/Mod/Fem/_CommandClearMesh.py b/src/Mod/Fem/_CommandClearMesh.py index d4364bd59d..8d303316d8 100644 --- a/src/Mod/Fem/_CommandClearMesh.py +++ b/src/Mod/Fem/_CommandClearMesh.py @@ -53,4 +53,4 @@ class _CommandClearMesh(FemCommands): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('Fem_ClearMesh',_CommandClearMesh()) +FreeCADGui.addCommand('Fem_ClearMesh', _CommandClearMesh()) diff --git a/src/Mod/Fem/_CommandMechanicalMaterial.py b/src/Mod/Fem/_CommandMaterial.py similarity index 80% rename from src/Mod/Fem/_CommandMechanicalMaterial.py rename to src/Mod/Fem/_CommandMaterial.py index 8976d60694..840f6718c6 100644 --- a/src/Mod/Fem/_CommandMechanicalMaterial.py +++ b/src/Mod/Fem/_CommandMaterial.py @@ -20,11 +20,11 @@ # * * # *************************************************************************** -__title__ = "_CommandMechanicalMaterial" +__title__ = "_CommandMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMechanicalMaterial +## @package CommandMaterial # \ingroup FEM import FreeCAD @@ -34,25 +34,25 @@ import FemGui from PySide import QtCore -class _CommandMechanicalMaterial(FemCommands): - "the Fem_MechanicalMaterial command definition" +class _CommandMaterial(FemCommands): + "the Fem_Material command definition" def __init__(self): - super(_CommandMechanicalMaterial, self).__init__() + super(_CommandMaterial, self).__init__() self.resources = {'Pixmap': 'fem-material', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MechanicalMaterial", "Mechanical material"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_Material", "FEM material"), 'Accel': "M, M", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MechanicalMaterial", "Creates a mechanical material")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_Material", "Creates a FEM material")} self.is_active = 'with_analysis' def Activated(self): femDoc = FemGui.getActiveAnalysis().Document if FreeCAD.ActiveDocument is not femDoc: FreeCADGui.setActiveDocument(femDoc) - FreeCAD.ActiveDocument.openTransaction("Create MechanicalMaterial") - FreeCADGui.addModule("MechanicalMaterial") - FreeCADGui.doCommand("MechanicalMaterial.makeMechanicalMaterial('MechanicalMaterial')") + FreeCAD.ActiveDocument.openTransaction("Create Material") + FreeCADGui.addModule("FemMaterial") + FreeCADGui.doCommand("FemMaterial.makeFemMaterial('FemMaterial')") FreeCADGui.doCommand("App.activeDocument()." + FemGui.getActiveAnalysis().Name + ".Member = App.activeDocument()." + FemGui.getActiveAnalysis().Name + ".Member + [App.ActiveDocument.ActiveObject]") FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") -FreeCADGui.addCommand('Fem_MechanicalMaterial', _CommandMechanicalMaterial()) +FreeCADGui.addCommand('Fem_Material', _CommandMaterial()) diff --git a/src/Mod/Fem/_CommandMeshGroup.py b/src/Mod/Fem/_CommandMeshGroup.py new file mode 100644 index 0000000000..242718ea75 --- /dev/null +++ b/src/Mod/Fem/_CommandMeshGroup.py @@ -0,0 +1,57 @@ +# *************************************************************************** +# * * +# * Copyright (c) 2016 - Bernd Hahnebach * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +__title__ = "_CommandMeshGroup" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package CommandMeshGroup +# \ingroup FEM + +import FreeCAD +from FemCommands import FemCommands +import FreeCADGui +from PySide import QtCore + + +class _CommandMeshGroup(FemCommands): + "The Fem_MeshGroup command definition" + def __init__(self): + super(_CommandMeshGroup, self).__init__() + self.resources = {'Pixmap': 'fem-femmesh-from-shape', + 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGroup", "FEM mesh group"), + 'Accel': "M, G", + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGroup", "Creates a FEM mesh group")} + self.is_active = 'with_gmsh_femmesh' + + def Activated(self): + FreeCAD.ActiveDocument.openTransaction("Create FemMeshGroup") + FreeCADGui.addModule("FemMeshGroup") + sel = FreeCADGui.Selection.getSelection() + if (len(sel) == 1): + sobj = sel[0] + if len(sel) == 1 and hasattr(sobj, "Proxy") and sobj.Proxy.Type == "FemMeshGmsh": + FreeCADGui.doCommand("FemMeshGroup.makeFemMeshGroup(App.ActiveDocument." + sobj.Name + ")") + + FreeCADGui.Selection.clearSelection() + +FreeCADGui.addCommand('Fem_MeshGroup', _CommandMeshGroup()) diff --git a/src/Mod/Fem/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/_CommandMeshNetgenFromShape.py index f497fcb349..ba5f8750b9 100644 --- a/src/Mod/Fem/_CommandMeshNetgenFromShape.py +++ b/src/Mod/Fem/_CommandMeshNetgenFromShape.py @@ -30,6 +30,7 @@ __url__ = "http://www.freecadweb.org" import FreeCAD from FemCommands import FemCommands import FreeCADGui +import FemGui from PySide import QtCore @@ -50,6 +51,9 @@ class _CommandMeshNetgenFromShape(FemCommands): if(sel[0].isDerivedFrom("Part::Feature")): FreeCADGui.doCommand("App.activeDocument().addObject('Fem::FemMeshShapeNetgenObject', '" + sel[0].Name + "_Mesh')") FreeCADGui.doCommand("App.activeDocument().ActiveObject.Shape = App.activeDocument()." + sel[0].Name) + if FemGui.getActiveAnalysis(): + FreeCADGui.addModule("FemGui") + FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [App.ActiveDocument.ActiveObject]") FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") FreeCADGui.Selection.clearSelection() diff --git a/src/Mod/Fem/_CommandPrintMeshInfo.py b/src/Mod/Fem/_CommandPrintMeshInfo.py index e1a2c12c59..fee5b5addc 100644 --- a/src/Mod/Fem/_CommandPrintMeshInfo.py +++ b/src/Mod/Fem/_CommandPrintMeshInfo.py @@ -31,7 +31,6 @@ import FreeCAD from FemCommands import FemCommands import FreeCADGui from PySide import QtCore -from PySide import QtGui class _CommandPrintMeshInfo(FemCommands): @@ -56,4 +55,4 @@ class _CommandPrintMeshInfo(FemCommands): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('Fem_PrintMeshInfo',_CommandPrintMeshInfo()) +FreeCADGui.addCommand('Fem_PrintMeshInfo', _CommandPrintMeshInfo()) diff --git a/src/Mod/Fem/_MechanicalMaterial.py b/src/Mod/Fem/_FemMaterial.py similarity index 92% rename from src/Mod/Fem/_MechanicalMaterial.py rename to src/Mod/Fem/_FemMaterial.py index 48f72dd113..9dd0ab4bcd 100644 --- a/src/Mod/Fem/_MechanicalMaterial.py +++ b/src/Mod/Fem/_FemMaterial.py @@ -20,20 +20,20 @@ # * * # *************************************************************************** -__title__ = "_MechanicalMaterial" +__title__ = "FemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package MechanicalMaterial +## @package FemMaterial # \ingroup FEM -class _MechanicalMaterial: - "The Material object" +class _FemMaterial: + "The FEM Material object" def __init__(self, obj): obj.addProperty("App::PropertyLinkSubList", "References", "Material", "List of material shapes") obj.Proxy = self - self.Type = "MechanicalMaterial" + self.Type = "FemMaterial" def execute(self, obj): return diff --git a/src/Mod/Fem/_FemMeshGmsh.py b/src/Mod/Fem/_FemMeshGmsh.py index ebbffe79ca..0cf2ebbca3 100644 --- a/src/Mod/Fem/_FemMeshGmsh.py +++ b/src/Mod/Fem/_FemMeshGmsh.py @@ -46,6 +46,9 @@ class _FemMeshGmsh(): obj.addProperty("App::PropertyLinkList", "MeshRegionList", "Base", "Mesh regions of the mesh") obj.MeshRegionList = [] + obj.addProperty("App::PropertyLinkList", "MeshGroupList", "Base", "Mesh groups of the mesh") + obj.MeshRegionList = [] + obj.addProperty("App::PropertyLink", "Part", "FEM Mesh", "Part object to mesh") obj.Part = None diff --git a/src/Mod/Fem/_FemMeshGroup.py b/src/Mod/Fem/_FemMeshGroup.py new file mode 100644 index 0000000000..84380dac6a --- /dev/null +++ b/src/Mod/Fem/_FemMeshGroup.py @@ -0,0 +1,40 @@ +# *************************************************************************** +# * * +# * Copyright (c) 2016 - Bernd Hahnebach * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +__title__ = "_FemMeshGroup" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package FemMeshGroup +# \ingroup FEM + + +class _FemMeshGroup: + "The FemMeshGroup object" + def __init__(self, obj): + obj.addProperty("App::PropertyBool", "UseLabel", "MeshGroupProperties", "The identifier used for export (True: Label, False: Name)") + obj.addProperty("App::PropertyLinkSubList", "References", "MeshGroupShapes", "List of FEM mesh group shapes") + obj.Proxy = self + self.Type = "FemMeshGroup" + + def execute(self, obj): + return diff --git a/src/Mod/Fem/_TaskPanelMechanicalMaterial.py b/src/Mod/Fem/_TaskPanelFemMaterial.py similarity index 98% rename from src/Mod/Fem/_TaskPanelMechanicalMaterial.py rename to src/Mod/Fem/_TaskPanelFemMaterial.py index 21f706f1f5..0b87cafc8d 100644 --- a/src/Mod/Fem/_TaskPanelMechanicalMaterial.py +++ b/src/Mod/Fem/_TaskPanelFemMaterial.py @@ -20,11 +20,11 @@ # * * # *************************************************************************** -__title__ = "_TaskPanelMechanicalMaterial" +__title__ = "_TaskPanelFemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package TaskPanelMechanicalMaterial +## @package TaskPanelFemMaterial # \ingroup FEM import FreeCAD @@ -34,8 +34,8 @@ from PySide import QtCore import Units -class _TaskPanelMechanicalMaterial: - '''The editmode TaskPanel for MechanicalMaterial objects''' +class _TaskPanelFemMaterial: + '''The editmode TaskPanel for FemMaterial objects''' def __init__(self, obj): FreeCADGui.Selection.clearSelection() self.sel_server = None @@ -50,7 +50,7 @@ class _TaskPanelMechanicalMaterial: self.get_references() self.references_shape_type = None - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelMechanicalMaterial.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemMaterial.ui") QtCore.QObject.connect(self.form.pushButton_MatWeb, QtCore.SIGNAL("clicked()"), self.goMatWeb) QtCore.QObject.connect(self.form.cb_materials, QtCore.SIGNAL("activated(int)"), self.choose_material) QtCore.QObject.connect(self.form.input_fd_young_modulus, QtCore.SIGNAL("valueChanged(double)"), self.ym_changed) diff --git a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py b/src/Mod/Fem/_TaskPanelFemMeshGmsh.py index 109f6d9314..4e25df5bd4 100644 --- a/src/Mod/Fem/_TaskPanelFemMeshGmsh.py +++ b/src/Mod/Fem/_TaskPanelFemMeshGmsh.py @@ -60,11 +60,16 @@ class _TaskPanelFemMeshGmsh: self.update() def getStandardButtons(self): - return int(QtGui.QDialogButtonBox.Apply | QtGui.QDialogButtonBox.Close) - # show a apply and a close button - # def reject() is called on close button + return int(QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Apply | QtGui.QDialogButtonBox.Cancel) + # show a OK, a apply and a Cancel button + # def reject() is called on Cancel button # def clicked(self, button) is needed, to access the apply button - # def accept() in no longer needed, since there is no OK button + + def accept(self): + self.set_mesh_params() + FreeCADGui.ActiveDocument.resetEdit() + FreeCAD.ActiveDocument.recompute() + return True def reject(self): FreeCADGui.ActiveDocument.resetEdit() @@ -73,6 +78,7 @@ class _TaskPanelFemMeshGmsh: def clicked(self, button): if button == QtGui.QDialogButtonBox.Apply: + self.set_mesh_params() self.run_gmsh() def get_mesh_params(self): @@ -133,7 +139,6 @@ class _TaskPanelFemMeshGmsh: self.gmsh_runs = True self.console_log("We gone start ...") self.get_active_analysis() - self.set_mesh_params() import FemGmshTools gmsh_mesh = FemGmshTools.FemGmshTools(self.obj, self.analysis) self.console_log("Start GMSH ...") diff --git a/src/Mod/Fem/_TaskPanelFemMeshGroup.py b/src/Mod/Fem/_TaskPanelFemMeshGroup.py new file mode 100644 index 0000000000..018d882a35 --- /dev/null +++ b/src/Mod/Fem/_TaskPanelFemMeshGroup.py @@ -0,0 +1,190 @@ +# *************************************************************************** +# * * +# * Copyright (c) 2016 - Bernd Hahnebach * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +__title__ = "_TaskPanelFemMeshGroup" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package TaskPanelFemMeshGroup +# \ingroup FEM + +import FreeCAD +import FreeCADGui +from PySide import QtGui +from PySide import QtCore + + +class _TaskPanelFemMeshGroup: + '''The TaskPanel for editing References property of FemMeshGroup objects''' + def __init__(self, obj): + FreeCADGui.Selection.clearSelection() + self.sel_server = None + self.obj = obj + self.selection_mode_solid = False + self.selection_mode_std_print_message = "Select Faces, Edges and Vertices by single click on them to add them to the list." + self.selection_mode_solid_print_message = "Select Solids by single click on a Face or Edge which belongs to the Solid, to add the Solid to the list." + + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemMeshGroup.ui") + QtCore.QObject.connect(self.form.rb_name, QtCore.SIGNAL("toggled(bool)"), self.choose_exportidentifier_name) + QtCore.QObject.connect(self.form.rb_label, QtCore.SIGNAL("toggled(bool)"), self.choose_exportidentifier_label) + QtCore.QObject.connect(self.form.rb_standard, QtCore.SIGNAL("toggled(bool)"), self.choose_selection_mode_standard) + QtCore.QObject.connect(self.form.rb_solid, QtCore.SIGNAL("toggled(bool)"), self.choose_selection_mode_solid) + QtCore.QObject.connect(self.form.pushButton_Reference, QtCore.SIGNAL("clicked()"), self.add_references) + self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked) + + self.get_meshgroup_props() + self.update() + + def accept(self): + self.set_meshgroup_props() + if self.sel_server: + FreeCADGui.Selection.removeObserver(self.sel_server) + FreeCADGui.ActiveDocument.resetEdit() + FreeCAD.ActiveDocument.recompute() + return True + + def reject(self): + if self.sel_server: + FreeCADGui.Selection.removeObserver(self.sel_server) + FreeCADGui.ActiveDocument.resetEdit() + return True + + def get_meshgroup_props(self): + self.use_label = self.obj.UseLabel + self.references = [] + if self.obj.References: + self.tuplereferences = self.obj.References + self.get_references() + + def set_meshgroup_props(self): + self.obj.References = self.references + self.obj.UseLabel = self.use_label + + def update(self): + 'fills the widgets' + self.form.rb_name.setChecked(not self.use_label) + self.form.rb_label.setChecked(self.use_label) + self.rebuild_list_References() + + def choose_exportidentifier_name(self, state): + self.use_label = not state + + def choose_exportidentifier_label(self, state): + self.use_label = state + + def choose_selection_mode_standard(self, state): + self.selection_mode_solid = not state + if self.sel_server and not self.selection_mode_solid: + print(self.selection_mode_std_print_message) + + def choose_selection_mode_solid(self, state): + self.selection_mode_solid = state + if self.sel_server and self.selection_mode_solid: + print(self.selection_mode_solid_print_message) + + def get_references(self): + for ref in self.tuplereferences: + for elem in ref[1]: + self.references.append((ref[0], elem)) + + def references_list_right_clicked(self, QPos): + self.form.contextMenu = QtGui.QMenu() + menu_item = self.form.contextMenu.addAction("Remove Reference") + if not self.references: + menu_item.setDisabled(True) + self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) + self.form.contextMenu.move(parentPosition + QPos) + self.form.contextMenu.show() + + def remove_reference(self): + if not self.references: + return + currentItemName = str(self.form.list_References.currentItem().text()) + for ref in self.references: + refname_to_compare_listentry = ref[0].Name + ':' + ref[1] + if refname_to_compare_listentry == currentItemName: + self.references.remove(ref) + self.rebuild_list_References() + + def add_references(self): + '''Called if Button add_reference is triggered''' + # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open + # here the addReference button EditTaskPanel has to be triggered to start selection mode + FreeCADGui.Selection.clearSelection() + # start SelectionObserver and parse the function to add the References to the widget + if self.selection_mode_solid: # print message on button click + print_message = self.selection_mode_solid_print_message + else: + print_message = self.selection_mode_std_print_message + import FemSelectionObserver + self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message) + + def selectionParser(self, selection): + print('selection: ', selection[0].Shape.ShapeType, ' ', selection[0].Name, ' ', selection[1]) + if hasattr(selection[0], "Shape") and selection[1]: + elt = selection[0].Shape.getElement(selection[1]) + if self.selection_mode_solid: + # in solid selection mode use edges and faces for selection of a solid + solid_to_add = None + if elt.ShapeType == 'Edge': + found_edge = False + for i, s in enumerate(selection[0].Shape.Solids): + for e in s.Edges: + if elt.isSame(e): + if not found_edge: + solid_to_add = str(i + 1) + else: + FreeCAD.Console.PrintMessage('Edge belongs to more than one solid\n') + solid_to_add = None + found_edge = True + elif elt.ShapeType == 'Face': + found_face = False + for i, s in enumerate(selection[0].Shape.Solids): + for e in s.Faces: + if elt.isSame(e): + if not found_face: + solid_to_add = str(i + 1) + else: + FreeCAD.Console.PrintMessage('Face belongs to more than one solid\n') + solid_to_add = None + found_edge = True + if solid_to_add: + selection = (selection[0], 'Solid' + solid_to_add) + print('selection element changed to Solid: ', selection[0].Shape.ShapeType, ' ', selection[0].Name, ' ', selection[1]) + else: + return + if selection not in self.references: + self.references.append(selection) + self.rebuild_list_References() + else: + FreeCAD.Console.PrintMessage(selection[0].Name + ' --> ' + selection[1] + ' is in reference list already!\n') + + def rebuild_list_References(self): + self.form.list_References.clear() + items = [] + for ref in self.references: + item_name = ref[0].Name + ':' + ref[1] + items.append(item_name) + for listItemName in sorted(items): + self.form.list_References.addItem(listItemName) diff --git a/src/Mod/Fem/_TaskPanelShowResult.py b/src/Mod/Fem/_TaskPanelShowResult.py index 5c713eb979..81b07e0377 100644 --- a/src/Mod/Fem/_TaskPanelShowResult.py +++ b/src/Mod/Fem/_TaskPanelShowResult.py @@ -21,7 +21,7 @@ # *************************************************************************** __title__ = "Result Control Task Panel" -__author__ = "Juergen Riegel" +__author__ = "Juergen Riegel, Michael Hindley" __url__ = "http://www.freecadweb.org" ## @package TaskPanelShowResult @@ -231,7 +231,15 @@ class _TaskPanelShowResult: x = np.array(dispvectors[:, 0]) y = np.array(dispvectors[:, 1]) z = np.array(dispvectors[:, 2]) - userdefined_eq = x + y + z + T + Von + P1 + P2 + P3 # Dummy equation to get around flake8, varibles not being used + stressvectors = np.array(self.result_object.StressVectors) + sx = np.array(stressvectors[:, 0]) + sy = np.array(stressvectors[:, 1]) + sz = np.array(stressvectors[:, 2]) + strainvectors = np.array(self.result_object.StrainVectors) + ex = np.array(strainvectors[:, 0]) + ey = np.array(strainvectors[:, 1]) + ez = np.array(strainvectors[:, 2]) + userdefined_eq = x + y + z + T + Von + P1 + P2 + P3 + sx + sy + sz + ex + ey + ez # Dummy equation to get around flake8, varibles not being used userdefined_eq = self.form.user_def_eq.toPlainText() # Get equation to be used UserDefinedFormula = eval(userdefined_eq).tolist() self.result_object.UserDefined = UserDefinedFormula diff --git a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py b/src/Mod/Fem/_ViewProviderFemMaterial.py similarity index 90% rename from src/Mod/Fem/_ViewProviderMechanicalMaterial.py rename to src/Mod/Fem/_ViewProviderFemMaterial.py index 236c40b2e6..e95e6b919e 100644 --- a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py +++ b/src/Mod/Fem/_ViewProviderFemMaterial.py @@ -20,19 +20,19 @@ # * * # *************************************************************************** -__title__ = "_ViewProviderMechanicalMaterial" +__title__ = "_ViewProviderFemMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package ViewProviderMechanicalMaterial +## @package _ViewProviderFemMaterial # \ingroup FEM import FreeCAD import FreeCADGui -class _ViewProviderMechanicalMaterial: - "A View Provider for the MechanicalMaterial object" +class _ViewProviderFemMaterial: + "A View Provider for the FemMaterial object" def __init__(self, vobj): vobj.Proxy = self @@ -51,8 +51,8 @@ class _ViewProviderMechanicalMaterial: return def setEdit(self, vobj, mode): - import _TaskPanelMechanicalMaterial - taskd = _TaskPanelMechanicalMaterial._TaskPanelMechanicalMaterial(self.Object) + import _TaskPanelFemMaterial + taskd = _TaskPanelFemMaterial._TaskPanelFemMaterial(self.Object) taskd.obj = vobj.Object FreeCADGui.Control.showDialog(taskd) return True diff --git a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/_ViewProviderFemMeshGmsh.py index 2c0b25c0fe..7948933a8e 100644 --- a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py +++ b/src/Mod/Fem/_ViewProviderFemMeshGmsh.py @@ -63,6 +63,7 @@ class _ViewProviderFemMeshGmsh: return def doubleClicked(self, vobj): + FreeCADGui.activateWorkbench('FemWorkbench') # Group meshing is only active on active analysis, we should make sure the analysis the mesh belongs too is active gui_doc = FreeCADGui.getDocument(vobj.Object.Document) if not gui_doc.getInEdit(): @@ -111,7 +112,7 @@ class _ViewProviderFemMeshGmsh: return None def claimChildren(self): - return self.Object.MeshRegionList + return (self.Object.MeshRegionList + self.Object.MeshGroupList) def onDelete(self, feature, subelements): try: diff --git a/src/Mod/Fem/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/_ViewProviderFemMeshGroup.py new file mode 100644 index 0000000000..c03377f0be --- /dev/null +++ b/src/Mod/Fem/_ViewProviderFemMeshGroup.py @@ -0,0 +1,89 @@ +# *************************************************************************** +# * * +# * Copyright (c) 2016 - Bernd Hahnebach * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +__title__ = "_ViewProviderFemMeshGroup" +__author__ = "Bernd Hahnebach" +__url__ = "http://www.freecadweb.org" + +## @package ViewProviderFemMeshGroup +# \ingroup FEM + +import FreeCAD +import FreeCADGui +from pivy import coin + + +class _ViewProviderFemMeshGroup: + "A View Provider for the FemMeshGroup object" + def __init__(self, vobj): + vobj.Proxy = self + + def getIcon(self): + return ":/icons/fem-femmesh-from-shape.svg" + + def attach(self, vobj): + self.ViewObject = vobj + self.Object = vobj.Object + self.standard = coin.SoGroup() + vobj.addDisplayMode(self.standard, "Standard") + + def getDisplayModes(self, obj): + return ["Standard"] + + def getDefaultDisplayMode(self): + return "Standard" + + def updateData(self, obj, prop): + return + + def onChanged(self, vobj, prop): + return + + def setEdit(self, vobj, mode=0): + # hide all meshes + for o in FreeCAD.ActiveDocument.Objects: + if o.isDerivedFrom("Fem::FemMeshObject"): + o.ViewObject.hide() + # show task panel + import _TaskPanelFemMeshGroup + taskd = _TaskPanelFemMeshGroup._TaskPanelFemMeshGroup(self.Object) + taskd.obj = vobj.Object + FreeCADGui.Control.showDialog(taskd) + return True + + def unsetEdit(self, vobj, mode=0): + FreeCADGui.Control.closeDialog() + return + + def doubleClicked(self, vobj): + doc = FreeCADGui.getDocument(vobj.Object.Document) + if not doc.getInEdit(): + doc.setEdit(vobj.Object.Name) + else: + FreeCAD.Console.PrintError('Active Task Dialog found! Please close this one first!\n') + return True + + def __getstate__(self): + return None + + def __setstate__(self, state): + return None diff --git a/src/Mod/Fem/ccxFrdReader.py b/src/Mod/Fem/ccxFrdReader.py index d312ebc81d..768d063b8f 100644 --- a/src/Mod/Fem/ccxFrdReader.py +++ b/src/Mod/Fem/ccxFrdReader.py @@ -54,15 +54,19 @@ def readResult(frd_input): elements_quad4 = {} elements_quad8 = {} elements_seg2 = {} + elements_seg3 = {} results = [] mode_results = {} mode_disp = {} mode_stress = {} + mode_stressv = {} + mode_strain = {} mode_temp = {} mode_disp_found = False nodes_found = False mode_stress_found = False + mode_strain_found = False mode_temp_found = False mode_time_found = False elements_found = False @@ -250,6 +254,14 @@ def readResult(frd_input): nd1 = int(line[3:13]) nd2 = int(line[13:23]) elements_seg2[elem] = (nd1, nd2) + elif elemType == 12: + # B32 CalculiX --> seg3 FreeCAD + # Also D element element number + # N1, N3 ,N2 Order in outpufile is 1,3,2 + nd1 = int(line[3:13]) + nd3 = int(line[13:23]) + nd2 = int(line[23:33]) + elements_seg3[elem] = (nd1, nd2, nd3) # Check if we found new eigenmode if line[5:10] == "PMODE": @@ -266,7 +278,7 @@ def readResult(frd_input): mode_disp[elem] = FreeCAD.Vector(mode_disp_x, mode_disp_y, mode_disp_z) if line[5:11] == "STRESS": mode_stress_found = True - # we found a displacement line in the frd file + # we found a stress line in the frd file if mode_stress_found and (line[1:3] == "-1"): elem = int(line[4:13]) stress_1 = float(line[13:25]) @@ -276,6 +288,19 @@ def readResult(frd_input): stress_5 = float(line[61:73]) stress_6 = float(line[73:85]) mode_stress[elem] = (stress_1, stress_2, stress_3, stress_4, stress_5, stress_6) + mode_stressv[elem] = FreeCAD.Vector(stress_1, stress_2, stress_3) + if line[5:13] == "TOSTRAIN": + mode_strain_found = True + # we found a strain line in the frd file + if mode_strain_found and (line[1:3] == "-1"): + elem = int(line[4:13]) + strain_1 = float(line[13:25]) + strain_2 = float(line[25:37]) + strain_3 = float(line[37:49]) +# strain_4 = float(line[49:61]) #Not used in vector +# strain_5 = float(line[61:73]) +# strain_6 = float(line[73:85]) + mode_strain[elem] = FreeCAD.Vector(strain_1, strain_2, strain_3) # Check if we found a time step if line[4:10] == "1PSTEP": mode_time_found = True @@ -309,6 +334,8 @@ def readResult(frd_input): mode_results['number'] = eigenmode mode_results['disp'] = mode_disp mode_results['stress'] = mode_stress + mode_results['stressv'] = mode_stressv + mode_results['strainv'] = mode_strain mode_results['temp'] = mode_temp mode_results['time'] = timestep results.append(mode_results) @@ -322,6 +349,8 @@ def readResult(frd_input): mode_results['number'] = eigenmode mode_results['disp'] = mode_disp mode_results['stress'] = mode_stress + mode_results['stressv'] = mode_stressv + mode_results['strainv'] = mode_strain mode_results['time'] = 0 # Dont return time if static results.append(mode_results) mode_disp = {} @@ -336,7 +365,7 @@ def readResult(frd_input): return {'Nodes': nodes, 'Hexa8Elem': elements_hexa8, 'Penta6Elem': elements_penta6, 'Tetra4Elem': elements_tetra4, 'Tetra10Elem': elements_tetra10, 'Penta15Elem': elements_penta15, 'Hexa20Elem': elements_hexa20, 'Tria3Elem': elements_tria3, 'Tria6Elem': elements_tria6, - 'Quad4Elem': elements_quad4, 'Quad8Elem': elements_quad8, 'Seg2Elem': elements_seg2, + 'Quad4Elem': elements_quad4, 'Quad8Elem': elements_quad8, 'Seg2Elem': elements_seg2, 'Seg3Elem': elements_seg3, 'Results': results} @@ -421,6 +450,8 @@ def importFrd(filename, analysis=None, result_name_prefix=None): break disp = result_set['disp'] + stressv = result_set['stressv'] + strainv = result_set['strainv'] no_of_values = len(disp) displacement = [] for k, v in disp.iteritems(): @@ -438,6 +469,8 @@ def importFrd(filename, analysis=None, result_name_prefix=None): if len(disp) > 0: results.DisplacementVectors = map((lambda x: x * scale), disp.values()) + results.StressVectors = map((lambda x: x * scale), stressv.values()) + results.StrainVectors = map((lambda x: x * scale), strainv.values()) results.NodeNumbers = disp.keys() if(mesh_object): results.Mesh = mesh_object diff --git a/src/Mod/Fem/test_files/ccx/cube_frequency.fcstd b/src/Mod/Fem/test_files/ccx/cube_frequency.fcstd new file mode 100644 index 0000000000..63876fb2b1 Binary files /dev/null and b/src/Mod/Fem/test_files/ccx/cube_frequency.fcstd differ diff --git a/src/Mod/Fem/test_files/ccx/cube_frequency.inp b/src/Mod/Fem/test_files/ccx/cube_frequency.inp index 3e1d02013c..bb8b5323b0 100644 --- a/src/Mod/Fem/test_files/ccx/cube_frequency.inp +++ b/src/Mod/Fem/test_files/ccx/cube_frequency.inp @@ -525,7 +525,7 @@ S ** written by --> FreeCAD 0.16.5838 +1 (Git) ** written on --> Mon Oct 26 18:34:01 2015 ** file name --> -** analysis name --> MechanicalAnalysis +** analysis name --> Analysis ** ** ** diff --git a/src/Mod/Fem/test_files/ccx/cube_static.fcstd b/src/Mod/Fem/test_files/ccx/cube_static.fcstd new file mode 100644 index 0000000000..15e1a5c451 Binary files /dev/null and b/src/Mod/Fem/test_files/ccx/cube_static.fcstd differ diff --git a/src/Mod/Fem/test_files/ccx/cube_static.inp b/src/Mod/Fem/test_files/ccx/cube_static.inp index 09f6380124..7c44ef7e77 100644 --- a/src/Mod/Fem/test_files/ccx/cube_static.inp +++ b/src/Mod/Fem/test_files/ccx/cube_static.inp @@ -588,7 +588,7 @@ S ** written by --> FreeCAD 0.16.5838 +1 (Git) ** written on --> Mon Oct 26 18:28:42 2015 ** file name --> -** analysis name --> MechanicalAnalysis +** analysis name --> Analysis ** ** ** diff --git a/src/Mod/Fem/test_files/ccx/spine_thermomech.fcstd b/src/Mod/Fem/test_files/ccx/spine_thermomech.fcstd index bb7f674ca5..d93fdaba6e 100644 Binary files a/src/Mod/Fem/test_files/ccx/spine_thermomech.fcstd and b/src/Mod/Fem/test_files/ccx/spine_thermomech.fcstd differ diff --git a/src/Mod/Fem/test_files/ccx/spine_thermomech_expected_values b/src/Mod/Fem/test_files/ccx/spine_thermomech_expected_values index 2bcaec7af2..b86005a1d5 100644 --- a/src/Mod/Fem/test_files/ccx/spine_thermomech_expected_values +++ b/src/Mod/Fem/test_files/ccx/spine_thermomech_expected_values @@ -1,9 +1,5 @@ -U1: (-0.000942455, 0.00305855, 0.00729818) -U2: (-0.00163382, 0.000616589, 0.00222318) -U3: (-0.00185329, 0.000543914, 0.00220675) -Uabs: (0, 0.00364478, 0.00732571) -Sabs: (0.307123, 7.74746, 35.8618) -MaxPrin: (-5.82387, 1.31924, 10.9205) -MidPrin: (-37.7671, -4.87764, 10.9098) -MinPrin: (-39.3672, -7.02358, 6.47377) -MaxShear: (0.168182, 4.17141, 18.1004) \ No newline at end of file +U1: (-0.000942455, 0.0030585454755555556, 0.00729818) +U2: (-0.00163382, 0.0006165889555555556, 0.00222318) +U3: (-0.00185329, 0.0005439136222222222, 0.00220675) +Uabs: (0.0, 0.003644782698151031, 0.007325712241135124) +Sabs: (0.30712297252407333, 7.747458526266711, 35.86180372766652) diff --git a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp index 5b4fd33716..8e1ffe54e0 100644 --- a/src/Mod/Import/App/ImportOCAF.cpp +++ b/src/Mod/Import/App/ImportOCAF.cpp @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -193,21 +194,28 @@ void ImportOCAF::loadShapes(const TDF_Label& label, const TopLoc_Location& loc, void ImportOCAF::createShape(const TDF_Label& label, const TopLoc_Location& loc, const std::string& name) { const TopoDS_Shape& aShape = aShapeTool->GetShape(label); + std::vector lValue; + if (!aShape.IsNull() && aShape.ShapeType() == TopAbs_COMPOUND) { TopExp_Explorer xp; int ctSolids = 0, ctShells = 0; + + Part::Compound *pcCompound = static_cast(doc->addObject + ("Part::Compound",name.c_str() )); for (xp.Init(aShape, TopAbs_SOLID); xp.More(); xp.Next(), ctSolids++) - createShape(xp.Current(), loc, name); + createShape(xp.Current(), loc, name, lValue); for (xp.Init(aShape, TopAbs_SHELL, TopAbs_SOLID); xp.More(); xp.Next(), ctShells++) - createShape(xp.Current(), loc, name); + createShape(xp.Current(), loc, name, lValue); + pcCompound->Links.setValues(lValue); if (ctSolids > 0 || ctShells > 0) return; } - createShape(aShape, loc, name); + createShape(aShape, loc, name, lValue); } -void ImportOCAF::createShape(const TopoDS_Shape& aShape, const TopLoc_Location& loc, const std::string& name) +void ImportOCAF::createShape(const TopoDS_Shape& aShape, const TopLoc_Location& loc, const std::string& name, + std::vector& lvalue) { Part::Feature* part = static_cast(doc->addObject("Part::Feature")); if (!loc.IsIdentity()) @@ -215,6 +223,7 @@ void ImportOCAF::createShape(const TopoDS_Shape& aShape, const TopLoc_Location& else part->Shape.setValue(aShape); part->Label.setValue(name); + lvalue.push_back(part); Quantity_Color aColor; App::Color color(0.8f,0.8f,0.8f); diff --git a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h index c03483ade4..dbf077d90e 100644 --- a/src/Mod/Import/App/ImportOCAF.h +++ b/src/Mod/Import/App/ImportOCAF.h @@ -59,7 +59,7 @@ public: private: void loadShapes(const TDF_Label& label, const TopLoc_Location&, const std::string& partname, const std::string& assembly, bool isRef); void createShape(const TDF_Label& label, const TopLoc_Location&, const std::string&); - void createShape(const TopoDS_Shape& label, const TopLoc_Location&, const std::string&); + void createShape(const TopoDS_Shape& label, const TopLoc_Location&, const std::string&, std::vector &); virtual void applyColors(Part::Feature*, const std::vector&){} private: diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index 4aac4d76eb..18e789f1f3 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include #include #include @@ -419,10 +422,24 @@ float InspectNominalPoints::getDistance(const Base::Vector3f& point) // ---------------------------------------------------------------- -InspectNominalShape::InspectNominalShape(const TopoDS_Shape& shape, float /*radius*/) : _rShape(shape) +InspectNominalShape::InspectNominalShape(const TopoDS_Shape& shape, float /*radius*/) + : _rShape(shape) + , isSolid(false) { distss = new BRepExtrema_DistShapeShape(); distss->LoadS1(_rShape); + + // When having a solid then use its shell because otherwise the distance + // for inner points will always be zero + if (!_rShape.IsNull() && _rShape.ShapeType() == TopAbs_SOLID) { + TopExp_Explorer xp; + xp.Init(_rShape, TopAbs_SHELL); + if (xp.More()) { + distss->LoadS1(xp.Current()); + isSolid = true; + } + + } //distss->SetDeflection(radius); } @@ -433,11 +450,45 @@ InspectNominalShape::~InspectNominalShape() float InspectNominalShape::getDistance(const Base::Vector3f& point) { - BRepBuilderAPI_MakeVertex mkVert(gp_Pnt(point.x,point.y,point.z)); + gp_Pnt pnt3d(point.x,point.y,point.z); + BRepBuilderAPI_MakeVertex mkVert(pnt3d); distss->LoadS2(mkVert.Vertex()); + float fMinDist=FLT_MAX; - if (distss->Perform() && distss->NbSolution() > 0) + if (distss->Perform() && distss->NbSolution() > 0) { fMinDist = (float)distss->Value(); + // the shape is a solid, check if the vertex is inside + if (isSolid) { + const Standard_Real tol = 0.001; + BRepClass3d_SolidClassifier classifier(_rShape); + classifier.Perform(pnt3d, tol); + if (classifier.State() == TopAbs_IN) { + fMinDist = -fMinDist; + } + + } + else if (fMinDist > 0) { + // check if the distance was compued from a face + for (Standard_Integer index = 1; index <= distss->NbSolution(); index++) { + if (distss->SupportTypeShape1(index) == BRepExtrema_IsInFace) { + TopoDS_Shape face = distss->SupportOnShape1(index); + Standard_Real u, v; + distss->ParOnFaceS1(index, u, v); + //gp_Pnt pnt = distss->PointOnShape1(index); + BRepGProp_Face props(TopoDS::Face(face)); + gp_Vec normal; + gp_Pnt center; + props.Normal(u, v, center, normal); + gp_Vec dir(center, pnt3d); + Standard_Real scalar = normal.Dot(dir); + if (scalar < 0) { + fMinDist = -fMinDist; + } + break; + } + } + } + } return fMinDist; } diff --git a/src/Mod/Inspection/App/InspectionFeature.h b/src/Mod/Inspection/App/InspectionFeature.h index d859b7b809..f2fd7761c2 100644 --- a/src/Mod/Inspection/App/InspectionFeature.h +++ b/src/Mod/Inspection/App/InspectionFeature.h @@ -151,6 +151,7 @@ public: private: BRepExtrema_DistShapeShape* distss; const TopoDS_Shape& _rShape; + bool isSolid; }; class InspectionExport PropertyDistanceList: public App::PropertyLists diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index f8a644e34b..42f9c80034 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -54,6 +55,7 @@ #include #include #include +#include #include #include "ViewProviderInspection.h" @@ -191,68 +193,86 @@ void ViewProviderInspection::updateData(const App::Property* prop) Base::Type pointId = Base::Type::fromName("Points::Feature"); Base::Type propId = App::PropertyComplexGeoData::getClassTypeId(); + std::vector points; + std::vector normals; + std::vector faces; + // set the Distance property to the correct size to sync size of material node with number // of vertices/points of the referenced geometry - const Data::ComplexGeoData* data = 0; if (object->getTypeId().isDerivedFrom(meshId)) { App::Property* prop = object->getPropertyByName("Mesh"); if (prop && prop->getTypeId().isDerivedFrom(propId)) { - data = static_cast(prop)->getComplexData(); + const Data::ComplexGeoData* data = static_cast(prop)->getComplexData(); + data->getFaces(points, faces, accuracy); } } else if (object->getTypeId().isDerivedFrom(shapeId)) { App::Property* prop = object->getPropertyByName("Shape"); if (prop && prop->getTypeId().isDerivedFrom(propId)) { - data = static_cast(prop)->getComplexData(); + const Data::ComplexGeoData* data = static_cast(prop)->getComplexData(); ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath ("User parameter:BaseApp/Preferences/Mod/Part"); float deviation = hGrp->GetFloat("MeshDeviation",0.2); Base::BoundBox3d bbox = data->getBoundBox(); accuracy = (float)((bbox.LengthX() + bbox.LengthY() + bbox.LengthZ())/300.0 * deviation); + data->getFaces(points, faces, accuracy); } } else if (object->getTypeId().isDerivedFrom(pointId)) { App::Property* prop = object->getPropertyByName("Points"); if (prop && prop->getTypeId().isDerivedFrom(propId)) { - data = static_cast(prop)->getComplexData(); + const Data::ComplexGeoData* data = static_cast(prop)->getComplexData(); + std::vector normals; + data->getPoints(points, normals, accuracy); + } + App::Property* propN = object->getPropertyByName("Normal"); + if (propN && propN->getTypeId().isDerivedFrom(Points::PropertyNormalList::getClassTypeId())) { + normals = static_cast(propN)->getValues(); } } - if (data) { - this->pcLinkRoot->removeAllChildren(); - std::vector points; - std::vector faces; - data->getFaces(points, faces, accuracy); + this->pcLinkRoot->removeAllChildren(); + this->pcLinkRoot->addChild(this->pcCoords); + this->pcCoords->point.setNum(points.size()); + SbVec3f* pts = this->pcCoords->point.startEditing(); + for (size_t i=0; i < points.size(); i++) { + const Base::Vector3d& p = points[i]; + pts[i].setValue((float)p.x,(float)p.y,(float)p.z); + } + this->pcCoords->point.finishEditing(); - this->pcLinkRoot->addChild(this->pcCoords); - this->pcCoords->point.setNum(points.size()); - SbVec3f* pts = this->pcCoords->point.startEditing(); - for (size_t i=0; i < points.size(); i++) { - const Base::Vector3d& p = points[i]; - pts[i].setValue((float)p.x,(float)p.y,(float)p.z); + if (!faces.empty()) { + SoIndexedFaceSet* face = new SoIndexedFaceSet(); + this->pcLinkRoot->addChild(face); + face->coordIndex.setNum(4*faces.size()); + int32_t* indices = face->coordIndex.startEditing(); + unsigned long j=0; + std::vector::iterator it; + for (it = faces.begin(); it != faces.end(); ++it,j++) { + indices[4*j+0] = it->I1; + indices[4*j+1] = it->I2; + indices[4*j+2] = it->I3; + indices[4*j+3] = SO_END_FACE_INDEX; } - this->pcCoords->point.finishEditing(); + face->coordIndex.finishEditing(); + } + else { + if (!normals.empty() && normals.size() == points.size()) { + SoNormal* normalNode = new SoNormal(); + normalNode->vector.setNum(normals.size()); + SbVec3f* norm = normalNode->vector.startEditing(); - if (!faces.empty()) { - SoIndexedFaceSet* face = new SoIndexedFaceSet(); - this->pcLinkRoot->addChild(face); - face->coordIndex.setNum(4*faces.size()); - int32_t* indices = face->coordIndex.startEditing(); - unsigned long j=0; - std::vector::iterator it; - for (it = faces.begin(); it != faces.end(); ++it,j++) { - indices[4*j+0] = it->I1; - indices[4*j+1] = it->I2; - indices[4*j+2] = it->I3; - indices[4*j+3] = SO_END_FACE_INDEX; + std::size_t i=0; + for (std::vector::const_iterator it = normals.begin(); it != normals.end(); ++it) { + norm[i++].setValue(it->x, it->y, it->z); } - face->coordIndex.finishEditing(); - } - else { - this->pcLinkRoot->addChild(this->pcPointStyle); - this->pcLinkRoot->addChild(new SoPointSet()); + + normalNode->vector.finishEditing(); + this->pcLinkRoot->addChild(normalNode); } + this->pcLinkRoot->addChild(this->pcPointStyle); + this->pcLinkRoot->addChild(new SoPointSet()); } } } diff --git a/src/Mod/OpenSCAD/OpenSCADUtils.py b/src/Mod/OpenSCAD/OpenSCADUtils.py index 26ab35327b..1785d430d0 100644 --- a/src/Mod/OpenSCAD/OpenSCADUtils.py +++ b/src/Mod/OpenSCAD/OpenSCADUtils.py @@ -30,10 +30,10 @@ the module ''' try: + from PySide import QtGui _encoding = QtGui.QApplication.UnicodeUTF8 def translate(context, text): "convenience function for Qt translator" - from PySide import QtGui return QtGui.QApplication.translate(context, text, None, _encoding) except AttributeError: def translate(context, text): diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 6928a3d0c2..1a5b24493d 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -143,20 +143,22 @@ extern const char* BRepBuilderAPI_FaceErrorText(BRepBuilderAPI_FaceError fe); namespace Part { struct EdgePoints { gp_Pnt v1, v2; + std::list::iterator it; TopoDS_Edge edge; }; -static std::list sort_Edges(double tol3d, const std::vector& edges) +static std::list sort_Edges(double tol3d, std::list& edges) { tol3d = tol3d * tol3d; std::list edge_points; TopExp_Explorer xp; - for (std::vector::const_iterator it = edges.begin(); it != edges.end(); ++it) { + for (std::list::iterator it = edges.begin(); it != edges.end(); ++it) { EdgePoints ep; xp.Init(*it,TopAbs_VERTEX); ep.v1 = BRep_Tool::Pnt(TopoDS::Vertex(xp.Current())); xp.Next(); ep.v2 = BRep_Tool::Pnt(TopoDS::Vertex(xp.Current())); + ep.it = it; ep.edge = *it; edge_points.push_back(ep); } @@ -170,6 +172,7 @@ static std::list sort_Edges(double tol3d, const std::vector sort_Edges(double tol3d, const std::vectorv1.SquareDistance(last) <= tol3d) { last = pEI->v2; sorted.push_back(pEI->edge); + edges.erase(pEI->it); edge_points.erase(pEI); pEI = edge_points.begin(); break; @@ -186,6 +190,7 @@ static std::list sort_Edges(double tol3d, const std::vectorv2.SquareDistance(first) <= tol3d) { first = pEI->v1; sorted.push_front(pEI->edge); + edges.erase(pEI->it); edge_points.erase(pEI); pEI = edge_points.begin(); break; @@ -198,6 +203,7 @@ static std::list sort_Edges(double tol3d, const std::vectorReversedParameter(last); TopoDS_Edge edgeReversed = BRepBuilderAPI_MakeEdge(curve->Reversed(), last, first); sorted.push_back(edgeReversed); + edges.erase(pEI->it); edge_points.erase(pEI); pEI = edge_points.begin(); break; @@ -210,6 +216,7 @@ static std::list sort_Edges(double tol3d, const std::vectorReversedParameter(last); TopoDS_Edge edgeReversed = BRepBuilderAPI_MakeEdge(curve->Reversed(), last, first); sorted.push_front(edgeReversed); + edges.erase(pEI->it); edge_points.erase(pEI); pEI = edge_points.begin(); break; @@ -357,6 +364,9 @@ public: "__sortEdges__(list of edges) -- Helper method to sort an unsorted list of edges so that afterwards\n" "two adjacent edges share a common vertex" ); + add_varargs_method("sortEdges",&Module::sortEdges2, + "sortEdges(list of edges) -- Helper method to sort a list of edges into a list of list of connected edges" + ); add_varargs_method("__toPythonOCC__",&Module::toPythonOCC, "__toPythonOCC__(shape) -- Helper method to convert an internal shape to pythonocc shape" ); @@ -1742,7 +1752,7 @@ private: } Py::Sequence list(obj); - std::vector edges; + std::list edges; for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { PyObject* item = (*it).ptr(); if (PyObject_TypeCheck(item, &(Part::TopoShapePy::Type))) { @@ -1766,6 +1776,41 @@ private: return sorted_list; } + Py::Object sortEdges2(const Py::Tuple& args) + { + PyObject *obj; + if (!PyArg_ParseTuple(args.ptr(), "O", &obj)) { + throw Py::Exception(PartExceptionOCCError, "list of edges expected"); + } + + Py::Sequence list(obj); + std::list edges; + for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { + PyObject* item = (*it).ptr(); + if (PyObject_TypeCheck(item, &(Part::TopoShapePy::Type))) { + const TopoDS_Shape& sh = static_cast(item)->getTopoShapePtr()->getShape(); + if (sh.ShapeType() == TopAbs_EDGE) + edges.push_back(TopoDS::Edge(sh)); + else { + throw Py::TypeError("shape is not an edge"); + } + } + else { + throw Py::TypeError("item is not a shape"); + } + } + + Py::List root_list; + while(edges.size()) { + std::list sorted = sort_Edges(Precision::Confusion(), edges); + Py::List sorted_list; + for (std::list::iterator it = sorted.begin(); it != sorted.end(); ++it) { + sorted_list.append(Py::Object(new TopoShapeEdgePy(new TopoShape(*it)),true)); + } + root_list.append(sorted_list); + } + return root_list; + } Py::Object toPythonOCC(const Py::Tuple& args) { PyObject *pcObj; diff --git a/src/Mod/Part/App/AttachExtension.cpp b/src/Mod/Part/App/AttachExtension.cpp index c15cec8e21..ce6e0a773a 100644 --- a/src/Mod/Part/App/AttachExtension.cpp +++ b/src/Mod/Part/App/AttachExtension.cpp @@ -59,7 +59,7 @@ AttachExtension::AttachExtension() EXTENSION_ADD_PROPERTY_TYPE(superPlacement, (Base::Placement()), "Attachment", App::Prop_None, "Extra placement to apply in addition to attachment (in local coordinates)"); setAttacher(new AttachEngine3D);//default attacher - initExtension(AttachExtension::getExtensionClassTypeId()); + initExtensionType(AttachExtension::getExtensionClassTypeId()); } AttachExtension::~AttachExtension() diff --git a/src/Mod/Part/App/BodyBase.cpp b/src/Mod/Part/App/BodyBase.cpp index 15a32f003d..789fe43c81 100644 --- a/src/Mod/Part/App/BodyBase.cpp +++ b/src/Mod/Part/App/BodyBase.cpp @@ -35,19 +35,14 @@ namespace Part { -PROPERTY_SOURCE(Part::BodyBase, Part::Feature) +PROPERTY_SOURCE_WITH_EXTENSIONS(Part::BodyBase, Part::Feature) BodyBase::BodyBase() { - ADD_PROPERTY(Model , (0) ); ADD_PROPERTY(Tip , (0) ); ADD_PROPERTY(BaseFeature , (0) ); -} - -bool BodyBase::hasFeature(const App::DocumentObject* f) const -{ - const std::vector &features = Model.getValues(); - return f == BaseFeature.getValue() || std::find(features.begin(), features.end(), f) != features.end(); + + App::OriginGroupExtension::initExtension(this); } BodyBase* BodyBase::findBodyOf(const App::DocumentObject* f) @@ -57,7 +52,7 @@ BodyBase* BodyBase::findBodyOf(const App::DocumentObject* f) std::vector bodies = doc->getObjectsOfType(BodyBase::getClassTypeId()); for (std::vector::const_iterator b = bodies.begin(); b != bodies.end(); b++) { BodyBase* body = static_cast(*b); - if (body->hasFeature(f)) + if (body->hasObject(f)) return body; } } @@ -73,10 +68,10 @@ bool BodyBase::isAfter(const App::DocumentObject *feature, const App::DocumentOb } if (!target || target == BaseFeature.getValue() ) { - return hasFeature (feature); + return hasObject (feature); } - const std::vector & features = Model.getValues(); + const std::vector & features = Group.getValues(); auto featureIt = std::find(features.begin(), features.end(), feature); auto targetIt = std::find(features.begin(), features.end(), target); diff --git a/src/Mod/Part/App/BodyBase.h b/src/Mod/Part/App/BodyBase.h index 3379344ee5..cf9675bfb2 100644 --- a/src/Mod/Part/App/BodyBase.h +++ b/src/Mod/Part/App/BodyBase.h @@ -25,6 +25,7 @@ #define PART_BodyBase_H #include +#include #include @@ -36,19 +37,16 @@ namespace Part * in edit or active on a workbench, the body shows only the * resulting shape to the outside (Tip link). */ -class PartExport BodyBase : public Part::Feature +class PartExport BodyBase : public Part::Feature, public App::OriginGroupExtension { - PROPERTY_HEADER(Part::BodyBase); + PROPERTY_HEADER_WITH_EXTENSIONS(Part::BodyBase); public: BodyBase(); - /// The list of features - App::PropertyLinkList Model; - /** * The final feature of the body it is associated with. - * Note: tip may either point to the BaseFeature or to some feature inside the Model list. + * Note: tip may either point to the BaseFeature or to some feature inside the Group list. * in case it points to the model the PartDesign::Body guaranties that it is a solid. */ App::PropertyLink Tip; @@ -59,23 +57,16 @@ public: */ App::PropertyLink BaseFeature; - /// Returns all Model objects prepanded by BaseFeature (if any) + /// Returns all Group objects prepanded by BaseFeature (if any) std::vector getFullModel () { std::vector rv; if ( BaseFeature.getValue () ) { rv.push_back ( BaseFeature.getValue () ); } - std::copy ( Model.getValues ().begin (), Model.getValues ().end (), std::back_inserter (rv) ); + std::copy ( Group.getValues ().begin (), Group.getValues ().end (), std::back_inserter (rv) ); return rv; } - // These methods are located here to avoid a dependency of ViewProviderSketchObject on PartDesign - /// Remove the feature from the body - virtual void removeFeature(App::DocumentObject*){} - - /// Return true if the feature belongs to this body or either the body is based on the feature - bool hasFeature(const App::DocumentObject *f) const; - /// Return true if the feature belongs to the body and is located after the target bool isAfter(const App::DocumentObject *feature, const App::DocumentObject *target) const; diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 29f761cdf3..32eb152d58 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -1286,6 +1286,42 @@ TopoDS_Shape TopoShape::cut(TopoDS_Shape shape) const return mkCut.Shape(); } +TopoDS_Shape TopoShape::cut(const std::vector& shapes, Standard_Real tolerance) const +{ + if (this->_Shape.IsNull()) + Standard_Failure::Raise("Base shape is null"); +#if OCC_VERSION_HEX < 0x060900 + (void)shapes; + (void)tolerance; + throw Base::RuntimeError("Multi cut is available only in OCC 6.9.0 and up."); +#else + BRepAlgoAPI_Cut mkCut; + mkCut.SetRunParallel(true); + TopTools_ListOfShape shapeArguments,shapeTools; + shapeArguments.Append(this->_Shape); + for (std::vector::const_iterator it = shapes.begin(); it != shapes.end(); ++it) { + if (it->IsNull()) + throw Base::ValueError("Tool shape is null"); + if (tolerance > 0.0) + // workaround for http://dev.opencascade.org/index.php?q=node/1056#comment-520 + shapeTools.Append(BRepBuilderAPI_Copy(*it).Shape()); + else + shapeTools.Append(*it); + } + + mkCut.SetArguments(shapeArguments); + mkCut.SetTools(shapeTools); + if (tolerance > 0.0) + mkCut.SetFuzzyValue(tolerance); + mkCut.Build(); + if (!mkCut.IsDone()) + throw Base::RuntimeError("Multi cut failed"); + + TopoDS_Shape resShape = mkCut.Shape(); + return resShape; +#endif +} + TopoDS_Shape TopoShape::common(TopoDS_Shape shape) const { if (this->_Shape.IsNull()) @@ -1296,6 +1332,42 @@ TopoDS_Shape TopoShape::common(TopoDS_Shape shape) const return mkCommon.Shape(); } +TopoDS_Shape TopoShape::common(const std::vector& shapes, Standard_Real tolerance) const +{ + if (this->_Shape.IsNull()) + Standard_Failure::Raise("Base shape is null"); +#if OCC_VERSION_HEX < 0x060900 + (void)shapes; + (void)tolerance; + throw Base::RuntimeError("Multi common is available only in OCC 6.9.0 and up."); +#else + BRepAlgoAPI_Common mkCommon; + mkCommon.SetRunParallel(true); + TopTools_ListOfShape shapeArguments,shapeTools; + shapeArguments.Append(this->_Shape); + for (std::vector::const_iterator it = shapes.begin(); it != shapes.end(); ++it) { + if (it->IsNull()) + throw Base::ValueError("Tool shape is null"); + if (tolerance > 0.0) + // workaround for http://dev.opencascade.org/index.php?q=node/1056#comment-520 + shapeTools.Append(BRepBuilderAPI_Copy(*it).Shape()); + else + shapeTools.Append(*it); + } + + mkCommon.SetArguments(shapeArguments); + mkCommon.SetTools(shapeTools); + if (tolerance > 0.0) + mkCommon.SetFuzzyValue(tolerance); + mkCommon.Build(); + if (!mkCommon.IsDone()) + throw Base::RuntimeError("Multi common failed"); + + TopoDS_Shape resShape = mkCommon.Shape(); + return resShape; +#endif +} + TopoDS_Shape TopoShape::fuse(TopoDS_Shape shape) const { if (this->_Shape.IsNull()) @@ -1306,7 +1378,7 @@ TopoDS_Shape TopoShape::fuse(TopoDS_Shape shape) const return mkFuse.Shape(); } -TopoDS_Shape TopoShape::multiFuse(const std::vector& shapes, Standard_Real tolerance) const +TopoDS_Shape TopoShape::fuse(const std::vector& shapes, Standard_Real tolerance) const { if (this->_Shape.IsNull()) Standard_Failure::Raise("Base shape is null"); @@ -1315,7 +1387,7 @@ TopoDS_Shape TopoShape::multiFuse(const std::vector& shapes, Stand Standard_Failure::Raise("Fuzzy Booleans are not supported in this version of OCCT"); TopoDS_Shape resShape = this->_Shape; if (resShape.IsNull()) - throw Base::Exception("Object shape is null"); + throw Base::ValueError("Object shape is null"); for (std::vector::const_iterator it = shapes.begin(); it != shapes.end(); ++it) { if (it->IsNull()) throw Base::Exception("Input shape is null"); @@ -1323,7 +1395,7 @@ TopoDS_Shape TopoShape::multiFuse(const std::vector& shapes, Stand BRepAlgoAPI_Fuse mkFuse(resShape, *it); // Let's check if the fusion has been successful if (!mkFuse.IsDone()) - throw Base::Exception("Fusion failed"); + throw Base::RuntimeError("Fusion failed"); resShape = mkFuse.Shape(); } #else @@ -1348,7 +1420,8 @@ TopoDS_Shape TopoShape::multiFuse(const std::vector& shapes, Stand mkFuse.SetFuzzyValue(tolerance); mkFuse.Build(); if (!mkFuse.IsDone()) - throw Base::Exception("MultiFusion failed"); + throw Base::RuntimeError("Multi fuse failed"); + TopoDS_Shape resShape = mkFuse.Shape(); #endif return resShape; @@ -1374,6 +1447,42 @@ TopoDS_Shape TopoShape::section(TopoDS_Shape shape) const return mkSection.Shape(); } +TopoDS_Shape TopoShape::section(const std::vector& shapes, Standard_Real tolerance) const +{ + if (this->_Shape.IsNull()) + Standard_Failure::Raise("Base shape is null"); +#if OCC_VERSION_HEX < 0x060900 + (void)shapes; + (void)tolerance; + throw Base::RuntimeError("Multi section is available only in OCC 6.9.0 and up."); +#else + BRepAlgoAPI_Section mkSection; + mkSection.SetRunParallel(true); + TopTools_ListOfShape shapeArguments,shapeTools; + shapeArguments.Append(this->_Shape); + for (std::vector::const_iterator it = shapes.begin(); it != shapes.end(); ++it) { + if (it->IsNull()) + throw Base::ValueError("Tool shape is null"); + if (tolerance > 0.0) + // workaround for http://dev.opencascade.org/index.php?q=node/1056#comment-520 + shapeTools.Append(BRepBuilderAPI_Copy(*it).Shape()); + else + shapeTools.Append(*it); + } + + mkSection.SetArguments(shapeArguments); + mkSection.SetTools(shapeTools); + if (tolerance > 0.0) + mkSection.SetFuzzyValue(tolerance); + mkSection.Build(); + if (!mkSection.IsDone()) + throw Base::RuntimeError("Multi section failed"); + + TopoDS_Shape resShape = mkSection.Shape(); + return resShape; +#endif +} + std::list TopoShape::slice(const Base::Vector3d& dir, double d) const { CrossSection cs(dir.x, dir.y, dir.z, this->_Shape); diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index d1ae2c882c..00f5ad1cfc 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -154,11 +154,14 @@ public: /** @name Boolean operation*/ //@{ TopoDS_Shape cut(TopoDS_Shape) const; + TopoDS_Shape cut(const std::vector&, Standard_Real tolerance = 0.0) const; TopoDS_Shape common(TopoDS_Shape) const; + TopoDS_Shape common(const std::vector&, Standard_Real tolerance = 0.0) const; TopoDS_Shape fuse(TopoDS_Shape) const; - TopoDS_Shape multiFuse(const std::vector&, Standard_Real tolerance = 0.0) const; + TopoDS_Shape fuse(const std::vector&, Standard_Real tolerance = 0.0) const; TopoDS_Shape oldFuse(TopoDS_Shape) const; TopoDS_Shape section(TopoDS_Shape) const; + TopoDS_Shape section(const std::vector&, Standard_Real tolerance = 0.0) const; std::list slice(const Base::Vector3d&, double) const; TopoDS_Compound slices(const Base::Vector3d&, const std::vector&) const; /** diff --git a/src/Mod/Part/App/TopoShapePy.xml b/src/Mod/Part/App/TopoShapePy.xml index d2a0f23be0..edc807ca96 100644 --- a/src/Mod/Part/App/TopoShapePy.xml +++ b/src/Mod/Part/App/TopoShapePy.xml @@ -140,14 +140,34 @@ This is a more detailed check as done in isValid(). - Union of this and a given topo shape. + Union of this and a given (list of) topo shape. +fuse(tool) -> Shape + or +fuse((tool1,tool2,...),[tolerance=0.0]) -> Shape + +Union of this and a given list of topo shapes. + +Supports (OCCT 6.9.0 and above): +- Fuzzy Boolean operations (global tolerance for a Boolean operation) +- Support of multiple arguments for a single Boolean operation +- Parallelization of Boolean Operations algorithm + +Beginning from OCCT 6.8.1 a tolerance value can be specified. multiFuse((tool1,tool2,...),[tolerance=0.0]) -> Shape + Union of this and a given list of topo shapes. -Beginning from OCCT 6.8.1 a tolerance value can be specified + +Supports (OCCT 6.9.0 and above): +- Fuzzy Boolean operations (global tolerance for a Boolean operation) +- Support of multiple arguments for a single Boolean operation +- Parallelization of Boolean Operations algorithm + +Beginning from OCCT 6.8.1 a tolerance value can be specified. +Deprecated: use fuse() instead. @@ -157,12 +177,36 @@ Beginning from OCCT 6.8.1 a tolerance value can be specified - Intersection of this and a given topo shape. + Intersection of this and a given (list of) topo shape. +common(tool) -> Shape + or +common((tool1,tool2,...),[tolerance=0.0]) -> Shape + +Intersection of this and a given list of topo shapes. + +Supports: +- Fuzzy Boolean operations (global tolerance for a Boolean operation) +- Support of multiple arguments for a single Boolean operation (s1 AND (s2 OR s3)) +- Parallelization of Boolean Operations algorithm + +OCC 6.9.0 or later is required. - Section of this with a given topo shape. + Section of this with a given (list of) topo shape. +section(tool) -> Shape + or +section((tool1,tool2,...),[tolerance=0.0]) -> Shape + +Section of this and a given list of topo shapes. + +Supports: +- Fuzzy Boolean operations (global tolerance for a Boolean operation) +- Support of multiple arguments for a single Boolean operation (s1 AND (s2 OR s3)) +- Parallelization of Boolean Operations algorithm + +OCC 6.9.0 or later is required. @@ -177,7 +221,19 @@ Beginning from OCCT 6.8.1 a tolerance value can be specified - Difference of this and a given topo shape. + Difference of this and a given (list of) topo shape +cut(tool) -> Shape + or +cut((tool1,tool2,...),[tolerance=0.0]) -> Shape + +Substraction of this and a given list of topo shapes. + +Supports: +- Fuzzy Boolean operations (global tolerance for a Boolean operation) +- Support of multiple arguments for a single Boolean operation +- Parallelization of Boolean Operations algorithm + +OCC 6.9.0 or later is required. @@ -203,6 +259,8 @@ shape of this, and the rest are those that come from corresponding shapes in list_of_other_shapes. hint: use isSame method to test shape equality +Parallelization of Boolean Operations algorithm + OCC 6.9.0 or later is required. diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp index 0414b4460f..dcc1cd385b 100644 --- a/src/Mod/Part/App/TopoShapePyImp.cpp +++ b/src/Mod/Part/App/TopoShapePyImp.cpp @@ -759,24 +759,56 @@ PyObject* TopoShapePy::check(PyObject *args) PyObject* TopoShapePy::fuse(PyObject *args) { PyObject *pcObj; - if (!PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) - return NULL; + if (PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) { + TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); + try { + // Let's call algorithm computing a fuse operation: + TopoDS_Shape fusShape = this->getTopoShapePtr()->fuse(shape); + return new TopoShapePy(new TopoShape(fusShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } + } - TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); - try { - // Let's call algorithm computing a fuse operation: - TopoDS_Shape fusShape = this->getTopoShapePtr()->fuse(shape); - return new TopoShapePy(new TopoShape(fusShape)); - } - catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); - PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); - return NULL; - } - catch (const std::exception& e) { - PyErr_SetString(PartExceptionOCCError, e.what()); - return NULL; + PyErr_Clear(); + double tolerance = 0.0; + if (PyArg_ParseTuple(args, "O|d", &pcObj, &tolerance)) { + std::vector shapeVec; + Py::Sequence shapeSeq(pcObj); + for (Py::Sequence::iterator it = shapeSeq.begin(); it != shapeSeq.end(); ++it) { + PyObject* item = (*it).ptr(); + if (PyObject_TypeCheck(item, &(Part::TopoShapePy::Type))) { + shapeVec.push_back(static_cast(item)->getTopoShapePtr()->getShape()); + } + else { + PyErr_SetString(PyExc_TypeError, "non-shape object in sequence"); + return 0; + } + } + try { + TopoDS_Shape multiFusedShape = this->getTopoShapePtr()->fuse(shapeVec,tolerance); + return new TopoShapePy(new TopoShape(multiFusedShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } } + + PyErr_SetString(PyExc_TypeError, "shape or sequence of shape expected"); + return 0; } PyObject* TopoShapePy::multiFuse(PyObject *args) @@ -798,7 +830,7 @@ PyObject* TopoShapePy::multiFuse(PyObject *args) } } try { - TopoDS_Shape multiFusedShape = this->getTopoShapePtr()->multiFuse(shapeVec,tolerance); + TopoDS_Shape multiFusedShape = this->getTopoShapePtr()->fuse(shapeVec,tolerance); return new TopoShapePy(new TopoShape(multiFusedShape)); } catch (Standard_Failure) { @@ -838,47 +870,111 @@ PyObject* TopoShapePy::oldFuse(PyObject *args) PyObject* TopoShapePy::common(PyObject *args) { PyObject *pcObj; - if (!PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) - return NULL; + if (PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) { + TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); + try { + // Let's call algorithm computing a common operation: + TopoDS_Shape comShape = this->getTopoShapePtr()->common(shape); + return new TopoShapePy(new TopoShape(comShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } + } - TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); - try { - // Let's call algorithm computing a common operation: - TopoDS_Shape comShape = this->getTopoShapePtr()->common(shape); - return new TopoShapePy(new TopoShape(comShape)); - } - catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); - PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); - return NULL; - } - catch (const std::exception& e) { - PyErr_SetString(PartExceptionOCCError, e.what()); - return NULL; + PyErr_Clear(); + double tolerance = 0.0; + if (PyArg_ParseTuple(args, "O|d", &pcObj, &tolerance)) { + std::vector shapeVec; + Py::Sequence shapeSeq(pcObj); + for (Py::Sequence::iterator it = shapeSeq.begin(); it != shapeSeq.end(); ++it) { + PyObject* item = (*it).ptr(); + if (PyObject_TypeCheck(item, &(Part::TopoShapePy::Type))) { + shapeVec.push_back(static_cast(item)->getTopoShapePtr()->getShape()); + } + else { + PyErr_SetString(PyExc_TypeError, "non-shape object in sequence"); + return 0; + } + } + try { + TopoDS_Shape multiCommonShape = this->getTopoShapePtr()->common(shapeVec,tolerance); + return new TopoShapePy(new TopoShape(multiCommonShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } } + + PyErr_SetString(PyExc_TypeError, "shape or sequence of shape expected"); + return 0; } PyObject* TopoShapePy::section(PyObject *args) { PyObject *pcObj; - if (!PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) - return NULL; + if (PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) { + TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); + try { + // Let's call algorithm computing a section operation: + TopoDS_Shape secShape = this->getTopoShapePtr()->section(shape); + return new TopoShapePy(new TopoShape(secShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } + } - TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); - try { - // Let's call algorithm computing a section operation: - TopoDS_Shape secShape = this->getTopoShapePtr()->section(shape); - return new TopoShapePy(new TopoShape(secShape)); - } - catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); - PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); - return NULL; - } - catch (const std::exception& e) { - PyErr_SetString(PartExceptionOCCError, e.what()); - return NULL; + PyErr_Clear(); + double tolerance = 0.0; + if (PyArg_ParseTuple(args, "O|d", &pcObj, &tolerance)) { + std::vector shapeVec; + Py::Sequence shapeSeq(pcObj); + for (Py::Sequence::iterator it = shapeSeq.begin(); it != shapeSeq.end(); ++it) { + PyObject* item = (*it).ptr(); + if (PyObject_TypeCheck(item, &(Part::TopoShapePy::Type))) { + shapeVec.push_back(static_cast(item)->getTopoShapePtr()->getShape()); + } + else { + PyErr_SetString(PyExc_TypeError, "non-shape object in sequence"); + return 0; + } + } + try { + TopoDS_Shape multiSectionShape = this->getTopoShapePtr()->section(shapeVec,tolerance); + return new TopoShapePy(new TopoShape(multiSectionShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } } + + PyErr_SetString(PyExc_TypeError, "shape or sequence of shape expected"); + return 0; } PyObject* TopoShapePy::slice(PyObject *args) @@ -939,24 +1035,56 @@ PyObject* TopoShapePy::slices(PyObject *args) PyObject* TopoShapePy::cut(PyObject *args) { PyObject *pcObj; - if (!PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) - return NULL; + if (PyArg_ParseTuple(args, "O!", &(TopoShapePy::Type), &pcObj)) { + TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); + try { + // Let's call algorithm computing a cut operation: + TopoDS_Shape cutShape = this->getTopoShapePtr()->cut(shape); + return new TopoShapePy(new TopoShape(cutShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } + } - TopoDS_Shape shape = static_cast(pcObj)->getTopoShapePtr()->getShape(); - try { - // Let's call algorithm computing a cut operation: - TopoDS_Shape cutShape = this->getTopoShapePtr()->cut(shape); - return new TopoShapePy(new TopoShape(cutShape)); - } - catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); - PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); - return NULL; - } - catch (const std::exception& e) { - PyErr_SetString(PartExceptionOCCError, e.what()); - return NULL; + PyErr_Clear(); + double tolerance = 0.0; + if (PyArg_ParseTuple(args, "O|d", &pcObj, &tolerance)) { + std::vector shapeVec; + Py::Sequence shapeSeq(pcObj); + for (Py::Sequence::iterator it = shapeSeq.begin(); it != shapeSeq.end(); ++it) { + PyObject* item = (*it).ptr(); + if (PyObject_TypeCheck(item, &(Part::TopoShapePy::Type))) { + shapeVec.push_back(static_cast(item)->getTopoShapePtr()->getShape()); + } + else { + PyErr_SetString(PyExc_TypeError, "non-shape object in sequence"); + return 0; + } + } + try { + TopoDS_Shape multiCutShape = this->getTopoShapePtr()->cut(shapeVec,tolerance); + return new TopoShapePy(new TopoShape(multiCutShape)); + } + catch (Standard_Failure) { + Handle_Standard_Failure e = Standard_Failure::Caught(); + PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); + return NULL; + } + catch (const std::exception& e) { + PyErr_SetString(PartExceptionOCCError, e.what()); + return NULL; + } } + + PyErr_SetString(PyExc_TypeError, "shape or sequence of shape expected"); + return 0; } PyObject* TopoShapePy::generalFuse(PyObject *args) diff --git a/src/Mod/Part/BOPTools/SplitFeatures.py b/src/Mod/Part/BOPTools/SplitFeatures.py index 5e9afcec9f..1d639c72a3 100644 --- a/src/Mod/Part/BOPTools/SplitFeatures.py +++ b/src/Mod/Part/BOPTools/SplitFeatures.py @@ -37,18 +37,18 @@ if FreeCAD.GuiUp: #-------------------------- translation-related code ---------------------------------------- #(see forum thread "A new Part tool is being born... JoinFeatures!" #http://forum.freecadweb.org/viewtopic.php?f=22&t=11112&start=30#p90239 ) -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except Exception: - def _fromUtf8(s): - return s -try: - _encoding = QtGui.QApplication.UnicodeUTF8 - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig, _encoding) -except AttributeError: - def _translate(context, text, disambig): - return QtGui.QApplication.translate(context, text, disambig) + try: + _fromUtf8 = QtCore.QString.fromUtf8 + except Exception: + def _fromUtf8(s): + return s + try: + _encoding = QtGui.QApplication.UnicodeUTF8 + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig, _encoding) + except AttributeError: + def _translate(context, text, disambig): + return QtGui.QApplication.translate(context, text, disambig) #--------------------------/translation-related code ---------------------------------------- def getIconPath(icon_dot_svg): diff --git a/src/Mod/Part/Gui/Resources/translations/Part_ru.ts b/src/Mod/Part/Gui/Resources/translations/Part_ru.ts index cc6a30d06b..5e50c917ae 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part_ru.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part_ru.ts @@ -7,7 +7,7 @@ Any Attacher reference type - + Любое @@ -37,7 +37,7 @@ Curve Attacher reference type - + Кривая @@ -61,13 +61,13 @@ Parabola Attacher reference type - + Парабола Hyperbola Attacher reference type - + Гипербола @@ -109,13 +109,13 @@ Object Attacher reference type - + Объект Solid Attacher reference type - Твердотельная модель + Твёрдотельная модель @@ -154,25 +154,25 @@ Focus1 AttachmentPoint mode caption - + Фокус1 Focus of ellipse, parabola, hyperbola. AttachmentPoint mode tooltip - + Фокус эллипса, параболы, гиперболы Focus2 AttachmentPoint mode caption - + Фокус2 Second focus of ellipse and hyperbola. AttachmentPoint mode tooltip - + Второй фокус эллипса и гиперболы @@ -184,13 +184,13 @@ Point is put on edge, MapPathParametr controls where. Additionally, vertex can be linked in for making a projection. AttachmentPoint mode tooltip - + Точка установлена на ребро, положение контролируется MapMathParametr. Дополнительно, можно прикрепить вершину для проецирования. Center of curvature AttachmentPoint mode caption - + Центр кривизны @@ -202,7 +202,7 @@ Center of mass AttachmentPoint mode caption - + Центр масс @@ -214,13 +214,13 @@ Intersection AttachmentPoint mode caption - Пересечение + Пересечение Not implemented AttachmentPoint mode tooltip - + Не реализовано @@ -277,7 +277,7 @@ Object's X AttachmentLine mode caption - + X объекта @@ -290,7 +290,7 @@ Object's Y AttachmentLine mode caption - + Y объекта @@ -302,13 +302,13 @@ Object's Z AttachmentLine mode caption - + Z объекта Axis of curvature AttachmentLine mode caption - + Ось кривизны @@ -320,67 +320,67 @@ Directrix1 AttachmentLine mode caption - + Директриса1 Directrix line for ellipse, parabola, hyperbola. AttachmentLine mode tooltip - + Директриса эллипса, параболы, гиперболы. Directrix2 AttachmentLine mode caption - + Директриса2 Second directrix line for ellipse and hyperbola. AttachmentLine mode tooltip - + Вторая директриса для эллипса и гиперболы Asymptote1 AttachmentLine mode caption - + Асимптота1 Asymptote of a hyperbola. AttachmentLine mode tooltip - + Асимптота гиперболы Asymptote2 AttachmentLine mode caption - + Асимптота2 Second asymptote of hyperbola. AttachmentLine mode tooltip - + Вторая асимптота гиперболы Tangent AttachmentLine mode caption - Тангенс + Касательная Line tangent to an edge. Optional vertex link defines where. AttachmentLine mode tooltip - + Касательная к ребру. Необязательная вершина определяет место касания. Normal AttachmentLine mode caption - + Нормаль @@ -423,13 +423,13 @@ Through two points AttachmentLine mode caption - + Через две точки Line that passes through two vertices. AttachmentLine mode tooltip - + Линия, проходящая через две вершины. @@ -441,7 +441,7 @@ Not implemented. AttachmentLine mode tooltip - + Не реализовано. @@ -453,7 +453,7 @@ Line that spans the shortest distance between shapes. AttachmentLine mode tooltip - + Линия, покрывающая кратчайшее расстояние между фигурами. @@ -522,7 +522,7 @@ Object's XY AttachmentPlane mode caption - + XY объекта @@ -534,7 +534,7 @@ Object's XZ AttachmentPlane mode caption - + XZ объекта @@ -546,7 +546,7 @@ Object's YZ AttachmentPlane mode caption - + YZ объекта @@ -570,13 +570,13 @@ Tangent to surface AttachmentPlane mode caption - + Касательная к поверхности Plane is made tangent to surface at vertex. AttachmentPlane mode tooltip - + Плоскость сделана касательной к поверхности в вершине. @@ -644,7 +644,7 @@ Plane by 3 points AttachmentPlane mode caption - + Плоскость по трём точкам @@ -656,13 +656,13 @@ Normal to 3 points AttachmentPlane mode caption - + Нормаль по трём точкам Plane will pass through first two vertices, and perpendicular to plane that passes through three vertices. AttachmentPlane mode tooltip - + Плоскость будет проходить через первые две вершины, перпендикулярно плоскости, проходящей через три. @@ -719,7 +719,7 @@ Object's X Y Z Attachment3D mode caption - + X Y Z объекта @@ -731,31 +731,31 @@ Object's X Z-Y Attachment3D mode caption - + X Z-Y объекта X', Y', Z' axes are matched with object's local X, Z, -Y, respectively. Attachment3D mode tooltip - + Оси X', Y', Z' сопоставляются с локальными X, Z, -Y объекта соответственно. Object's Y Z X Attachment3D mode caption - + Y Z X объекта X', Y', Z' axes are matched with object's local Y, Z, X, respectively. Attachment3D mode tooltip - + Оси X', Y', Z' сопоставляются с локальными Y, Z, X объекта соответственно. XY on plane Attachment3D mode caption - + XY на плоскости @@ -773,19 +773,19 @@ X' Y' plane is made tangent to surface at vertex. Attachment3D mode tooltip - + Плоскость X'Y' сделана касательной в вершине. Z tangent to edge Attachment3D mode caption - + Z-касательная к ребру. Z' axis is aligned to be tangent to edge. Optional vertex link defines where. Attachment3D mode tooltip - + Ось Z распологается касательно к ребру. Необязательная вершина определяет точку касания. @@ -859,7 +859,7 @@ Align XZ plane to pass through 3 points; X axis will pass through two first points. Attachment3D mode tooltip - + Расположить плоскость XZ так, чтобы проходила через три точки. Ось X пройдёт через первые две. @@ -1102,7 +1102,7 @@ Toggle 3d - Переключить 3d + Переключить 3d @@ -1168,7 +1168,7 @@ Create a cube solid - Создать твердотельный куб + Создать твёрдотельный куб Box @@ -1176,7 +1176,7 @@ Create a box solid - Создать твердотельный параллелепипед + Создать твёрдотельный параллелепипед @@ -1194,7 +1194,7 @@ Create a box solid without dialog - Создать твердотельный параллелепипед без диалога + Создать твёрдотельный параллелепипед без диалога @@ -1212,7 +1212,7 @@ Create a box solid without dialog - Создать твердотельный параллелепипед без диалога + Создать твёрдотельный параллелепипед без диалога @@ -1297,7 +1297,7 @@ Offset: - + Смещение: @@ -1358,7 +1358,7 @@ Create a cone solid - Создать твердотельный конус + Создать твёрдотельный конус @@ -1394,7 +1394,7 @@ Make a cut of two shapes - Выполнить обрезку двух фигур + Отсечь фигуру по фигуре @@ -1583,7 +1583,7 @@ Convert to solid - Преобразовать в твердые + Преобразовать в твёрдые @@ -1753,7 +1753,7 @@ Create ruled surface - Создать линейчатую ​​поверхность + Создать линейчатую поверхность @@ -1762,7 +1762,7 @@ Create a ruled surface from two curves - Создать линейчатую ​​поверхность из двух кривых + Создать линейчатую поверхность из двух кривых @@ -1829,12 +1829,12 @@ Create Cylinder... - Создайте цилиндр ... + Создать цилиндр ... Create a Cylinder - Создайте цилиндр + Создать цилиндр @@ -1842,7 +1842,7 @@ Create a sphere solid - Создать твердотельную сферу + Создать твёрдотельную сферу @@ -1914,7 +1914,7 @@ Create a torus solid - Создать твердотельный тор + Создать твёрдотельный тор @@ -1944,7 +1944,7 @@ DlgRevolution Select a shape for revolution, first. - Сначала выберите фигуру для революции. + Сначала выберите фигуру для вращения. @@ -2008,32 +2008,32 @@ X: - X: + X: Y: - Y: + Y: Z: - Z: + Z: Yaw: - + Угол рыска: Pitch: - Шаг: + Угол атаки: Roll: - + Угол крена: @@ -2173,7 +2173,7 @@ Select a shape on the left side, first - Сначала выберите фигуру на левой стороне + Сначала выберите фигуру слева @@ -2193,17 +2193,17 @@ Performing union on non-solids is not possible - Выполнение объединения без твердых тел не представляется возможным + Выполнение объединения без твёрдых тел не представляется возможным Performing intersection on non-solids is not possible - Выполнение пересечения без твердых тел не представляется возможным + Выполнение пересечения без твёрдых тел не представляется возможным Performing difference on non-solids is not possible - Выполнение вычитания без твердых тел не представляется возможным + Выполнение вычитания без твёрдых тел не представляется возможным @@ -2229,27 +2229,27 @@ If checked, direction of extrusion is reversed. - + Если включено, направление выдавливания обратное. Reversed - + Реверс Specify direction manually using X,Y,Z values. - + Указать направление вручную с использованием значений X, Y и Z. Custom direction: - + Произвольное направление: Extrude perpendicularly to plane of input shape. - + Выдавить перпендикулярно плоскости входной фигуры. @@ -2271,7 +2271,7 @@ Create solid - Создать твердое тело + Создать твёрдое тело @@ -2281,7 +2281,7 @@ Click to start selecting an edge in 3d view. - + Щёлкните, чтобы начать выделение ребра в трёхмерном виде. @@ -2297,7 +2297,7 @@ Along edge: - + Вдоль ребра: @@ -2307,7 +2307,7 @@ Along: - + Вдоль: @@ -2332,7 +2332,7 @@ Symmetric - + Симметрично @@ -2371,7 +2371,7 @@ Select a shape for extrusion, first. - Сначала выберите фигуру для экструзии. + Сначала выберите фигуру для выдавливания. @@ -2381,7 +2381,7 @@ The document '%1' doesn't exist. - The document '%1' doesn't exist. + Документ «%1» не существует. @@ -2389,17 +2389,19 @@ Creating Extrusion failed. %1 - + Выдавливание не удалось + +%1 Object not found: %1 - + Объект не найден: %1 No shapes selected for extrusion. Select some, first. - + Не выбрано фигур для выдавливания. Сначала выберите. @@ -2411,24 +2413,26 @@ Direction mode is to use an edge, but no edge is linked. - + Режим направления должен использовать ребро, но ребро не указано. Can't determine normal vector of shape to be extruded. Please use other mode. (%1) - + Не могу определить вектор нормали фигуры для выдавливания. Используйте другой режим + +(%1) Extrusion direction is zero-length. It must be non-zero. - + Направление выдавливания нулевой длины. Не должно быть так. Total extrusion length is zero (length1 == -length2). It must be nonzero. - + Нулевая суммарная длина выдавливания (длина1 == -длина2). Должна быть ненулевая. Succeeded @@ -2459,7 +2463,7 @@ Select faces - Выберете грани + Выберите грани @@ -2469,7 +2473,7 @@ Select edges - Выберете ребра + Выберите ребра @@ -2509,7 +2513,7 @@ Constant Length - Постоянная длинна + Постоянная длина @@ -2561,7 +2565,7 @@ No edge selected - Нет выбранных ребер + Нет выбранных рёбер @@ -2584,7 +2588,7 @@ Please check one or more edge entities first. Edge%1 - Грань%1 + Край%1 @@ -2595,7 +2599,7 @@ Please check one or more edge entities first. No valid shape is selected. Please select a valid shape in the drop-down box first. - Допустимый профиль не выбран. Пожалуйста сначала выберите допустимый профиль в выпадающем списке. + Допустимый профиль не выбран. Сначала выберите допустимый профиль в выпадающем списке, пожалуйста. @@ -2613,7 +2617,7 @@ Please select a valid shape in the drop-down box first. Units for export of IGES - Единицы для экспорта IGE + Единицы для экспорта IGE @@ -2657,7 +2661,7 @@ Please select a valid shape in the drop-down box first. Skip blank entities - Пропускать пустые сущностей + Пропускать пустые сущности @@ -2925,7 +2929,7 @@ Please select a valid shape in the drop-down box first. Step input file - Шаг входного файла + Входной файл STEP @@ -3007,7 +3011,7 @@ Please select a valid shape in the drop-down box first. Angle - 0 for cyl - Угол - 0 для цилиндра + Угол — 0 для цилиндра Angle0 @@ -3402,43 +3406,43 @@ Please select a valid shape in the drop-down box first. Revolution axis - + Ось вращения Center X: - + X центра: Center Y: - + Y центра: Center Z: - + Z центра: Click to set this as axis - + Щёлкнуть, чтобы выбрать эту ось вращения. Dir. X: - + X направления: Dir. Y: - + Y направления: Dir. Z: - + Z направления: @@ -3489,17 +3493,17 @@ Please select a valid shape in the drop-down box first. Create Solid - Создать твердое тело + Создать твёрдое тело Object not found: %1 - + Объект не найден: %1 Select a shape for revolution, first. - Сначала выберите фигуру для революции. + Сначала выберите фигуру для вращения. @@ -3508,12 +3512,14 @@ Please select a valid shape in the drop-down box first. Revolution axis link is invalid. %1 - + Неверная ссылка на ось вращения. + +%1 Revolution axis direction is zero-length. It must be non-zero. - + Нулевая длина оси вращения. Должна быть ненулевая. @@ -3526,7 +3532,9 @@ Please select a valid shape in the drop-down box first. Creating Revolve failed. %1 - + Создание тела вращения не удалось. + +%1 @@ -3559,12 +3567,12 @@ Please select a valid shape in the drop-down box first. Shape view - Форма представления + Представление формы Tessellation - Мозаика + Тесселяция @@ -3620,7 +3628,7 @@ Please select a valid shape in the drop-down box first. Setting a too small deviation causes the tessellation to take longerand thus freezes or slows down the GUI. - Setting a too small deviation causes the tessellation to take longerand thus freezes or slows down the GUI. + Установка слишком малого отклонения делает тесселяцию долгой и, тем самым, замедляет отзывчивость интерфейса. @@ -3628,7 +3636,7 @@ Please select a valid shape in the drop-down box first. General - Главный + Общий Export @@ -3691,7 +3699,7 @@ Please select a valid shape in the drop-down box first. Default Part colors - Цвета Деталей по умолчанию + Цвета деталей по умолчанию @@ -3772,7 +3780,7 @@ Please select a valid shape in the drop-down box first. Do you really want to cancel? - Вы действительно хотите отменить? + Вы действительно хотите прервать? @@ -3790,7 +3798,7 @@ Please select a valid shape in the drop-down box first. 3D View - 3D Вид + 3D-вид @@ -3803,7 +3811,7 @@ Please select a valid shape in the drop-down box first. Vertex/Edge/Wire/Face - Точка/Ребро/Ломаная/грань + Точка/ребро/ломаная/грань @@ -3870,7 +3878,7 @@ Please select a valid shape in the drop-down box first. Base point - Base point + Базовая точка Base point: @@ -3899,7 +3907,7 @@ Please select a valid shape in the drop-down box first. No such document '%1'. - Нет такого документа '%1'. + Нет документа «%1». @@ -3958,7 +3966,7 @@ Please select a valid shape in the drop-down box first. Select one or more edges - Выберите одино или несколько ребер + Выберите одино или несколько рёбер @@ -3983,7 +3991,7 @@ Please select a valid shape in the drop-down box first. Select a closed set of edges - Выберите ребра, образующие замкнутый контур + Выберите рёбра, образующие замкнутый контур @@ -4012,7 +4020,7 @@ Please select a valid shape in the drop-down box first. Vertex/Edge/Wire/Face - Точка/Ребро/Ломаная/грань + Точка/ребро/ломаная/грань @@ -4023,12 +4031,12 @@ Please select a valid shape in the drop-down box first. Select an edge or wire you want to sweep along. - Выбрать грани или направляющие для связи вместе. + Выбрать грани или направляющие для сдвига вдоль. Select one or more connected edges you want to sweep along. - Select one or more connected edges you want to sweep along. + Выберите одно или более связанных рёбер, вдоль которых нужно осуществить сдвиг. @@ -4038,7 +4046,7 @@ Please select a valid shape in the drop-down box first. At least one edge or wire is required. - Требуется по крайней мере одна или последовательность граней. + Требуется по крайней мере одно ребро или ломаная. @@ -4048,7 +4056,7 @@ Please select a valid shape in the drop-down box first. '%1' cannot be used as profile and path. - '%1' не может использоваться в качестве профиля и пути. + «%1» не может использоваться в качестве профиля и пути. @@ -4063,7 +4071,7 @@ Please select a valid shape in the drop-down box first. Select one or more connected edges in the 3d view and press 'Done' - Выберите один или несколько подключенных краев в 3d и нажмите «OK» + Выберите один или несколько подключенных краёв в 3d и нажмите «OK» @@ -4082,27 +4090,27 @@ Please select a valid shape in the drop-down box first. Selection accepted - + Выбор принят Reference 1 - + Ссылка 1 Reference 2 - + Ссылка 2 Reference 3 - + Ссылка 3 Reference 4 - + Ссылка 4 @@ -4123,32 +4131,32 @@ Please select a valid shape in the drop-down box first. X: - X: + X: Y: - Y: + Y: Z: - Z: + Z: Yaw: - + Угол рыска: Pitch: - Шаг: + Угол тангажа: Roll: - + Угол крена: @@ -4163,7 +4171,7 @@ Please select a valid shape in the drop-down box first. unknown error - + неизвестная ошибка @@ -4188,17 +4196,17 @@ Please select a valid shape in the drop-down box first. Face - Поверхность + Грань Edge - Ребро + Ребро Vertex - Вершина + Вершина @@ -4208,7 +4216,7 @@ Please select a valid shape in the drop-down box first. Reference%1 - + Ссылка%1 @@ -4429,7 +4437,7 @@ Please select a valid shape in the drop-down box first. Click on the faces in the 3d view to select them. - Нажмите на грани в 3D виде, чтобы выделить их. + Нажмите на грани в 3D-виде, чтобы выделить их. @@ -4444,7 +4452,7 @@ Please select a valid shape in the drop-down box first. Box selection - Выделить область + Выделить прямоугольный объём @@ -4493,7 +4501,7 @@ Please select a valid shape in the drop-down box first. Create solid - Создать твердое тело + Создать твёрдое тело @@ -4532,7 +4540,7 @@ Please select a valid shape in the drop-down box first. RectoVerso - Туда - Сюда + Туда-сюда @@ -4547,7 +4555,7 @@ Please select a valid shape in the drop-down box first. Tangent - Тангенс + Касательная @@ -4558,7 +4566,7 @@ Please select a valid shape in the drop-down box first. Self-intersection - Авто-перекрытее + Авто-перекрытие @@ -4587,7 +4595,7 @@ Please select a valid shape in the drop-down box first. Edge from vertices - Ребро из вершинам + Ребро из вершин @@ -4597,7 +4605,7 @@ Please select a valid shape in the drop-down box first. Face from edges - Грань из ребер + Грань из рёбер @@ -4612,7 +4620,7 @@ Please select a valid shape in the drop-down box first. Solid from shell - Твердое тело из оболочки + Твёрдое тело из оболочки @@ -4645,7 +4653,7 @@ Please select a valid shape in the drop-down box first. Create solid - Создать твердое тело + Создать твёрдое тело @@ -4656,7 +4664,7 @@ Please select a valid shape in the drop-down box first. Select one or more profiles and select an edge or wire in the 3D view for the sweep path. - Выбрать один или более профилей, а также выбрать грань или последовательность граней в 3D виде для очистки пути. + Выберите один или более профилей, а также грань или последовательность граней в 3D-виде для очистки пути. @@ -4671,7 +4679,7 @@ in the 3D view for the sweep path. Select faces of the source object and press 'Done' - Выбрать поверхность исходного объекта и нажать "Продолжить" + Выбрать поверхность исходного объекта и нажать «Продолжить» @@ -4750,7 +4758,7 @@ in the 3D view for the sweep path. Non-solids selected - Выбраны не твердотельные + Выбраны не твёрдотельные @@ -4758,7 +4766,7 @@ in the 3D view for the sweep path. The use of non-solids for boolean operations may lead to unexpected results. Do you want to continue? - Использование твердых тел для булевых операций может привести к непредвиденным результатам. Вы хотите продолжить? + Использование твёрдых тел для булевых операций может привести к непредвиденным результатам. Вы хотите продолжить? @@ -4803,7 +4811,7 @@ Do you want to continue? Enter tolerance for sewing shape: - Введите допустимость для шитья формы: + Введите допуск для шитья формы: @@ -4848,7 +4856,7 @@ Do you want to continue? Select two shapes or more, please. - Пожалуйста выберите несколько форм. + Пожалуйста, выберите несколько форм. @@ -4868,7 +4876,7 @@ Do you want to continue? Edit fillet edges - Изменение краев ленты + Изменение краёв ленты @@ -4888,7 +4896,7 @@ Do you want to continue? Solid - Твердотельная модель + Твёрдотельная модель @@ -4932,7 +4940,7 @@ Do you want to continue? No Error - Ошибок нет + Ошибки нет @@ -4952,17 +4960,17 @@ Do you want to continue? No 3D Curve - Отсутствует 3D искривление + Отсутствует 3D-искривление Multiple 3D Curve - Множественное 3D искривление + Множественное 3D-искривление Invalid 3D Curve - Недопустимое 3D искривление + Недопустимое 3D-искривление @@ -5022,12 +5030,12 @@ Do you want to continue? Self Intersecting Wire - Авто-пересекающаяся связб + Авто-пересекающаяся связь No Surface - Не поверхность + Нет поверхности @@ -5067,17 +5075,17 @@ Do you want to continue? Not Closed - Не закрыт + Не замкнут Not Connected - Не подключен + Не подсоединён Sub Shape Not In Shape - Подфигура не находится в форме + Подфигура не находится в фигуре @@ -5107,17 +5115,17 @@ Do you want to continue? Out Of Enum Range: - Пределы Enum: + Пределы перечисления: BOPAlgo CheckUnknown - BOPAlgo ПроверитьНеизвестную + BOPAlgo ПроверитьНеизвестную BOPAlgo BadType - BOPAlgo ЛожныйТип + BOPAlgo ЛожныйТип @@ -5132,7 +5140,7 @@ Do you want to continue? BOPAlgo NonRecoverableFace - BOPAlgo НеВосстанавимаяПоверхность + BOPAlgo НеВосстановимаяПоверхность @@ -5195,7 +5203,7 @@ Do you want to continue? Toggle 3d - Переключить 3d + Переключить 3d diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 4910412b5a..30822e6085 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -99,7 +99,7 @@ public: ~TaskCheckGeometryResults(); QString getShapeContentString(); -private slots: +private Q_SLOTS: void currentRowChanged (const QModelIndex ¤t, const QModelIndex &previous); private: diff --git a/src/Mod/Part/Gui/TaskDimension.h b/src/Mod/Part/Gui/TaskDimension.h index 15f766c0b1..6e05179f52 100644 --- a/src/Mod/Part/Gui/TaskDimension.h +++ b/src/Mod/Part/Gui/TaskDimension.h @@ -198,7 +198,7 @@ protected: QPixmap *stepActive; QPixmap *stepDone; -private slots: +private Q_SLOTS: void selectionSlot(bool checked); void buildPixmaps(); @@ -229,7 +229,7 @@ class DimensionControl : public QWidget public: explicit DimensionControl(QWidget* parent); QPushButton *resetButton; -public slots: +public Q_SLOTS: void toggle3dSlot(bool); void toggleDeltaSlot(bool); void clearAllSlot(bool); @@ -250,7 +250,7 @@ public: protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); -protected slots: +protected Q_SLOTS: void selection1Slot(bool checked); void selection2Slot(bool checked); void resetDialogSlot(bool); @@ -326,7 +326,7 @@ public: protected: virtual void onSelectionChanged(const Gui::SelectionChanges& msg); -protected slots: +protected Q_SLOTS: void selection1Slot(bool checked); void selection2Slot(bool checked); void resetDialogSlot(bool); diff --git a/src/Mod/PartDesign/App/Body.cpp b/src/Mod/PartDesign/App/Body.cpp index 016150321c..ad6ee76390 100644 --- a/src/Mod/PartDesign/App/Body.cpp +++ b/src/Mod/PartDesign/App/Body.cpp @@ -60,15 +60,15 @@ Body::Body() { /* // Note: The following code will catch Python Document::removeObject() modifications. If the object removed is -// a member of the Body::Model, then it will be automatically removed from the Model property which triggers the +// a member of the Body::Group, then it will be automatically removed from the Group property which triggers the // following two methods -// But since we require the Python user to call both Document::addObject() and Body::addFeature(), we should +// But since we require the Python user to call both Document::addObject() and Body::addObject(), we should // also require calling both Document::removeObject and Body::removeFeature() in order to be consistent void Body::onBeforeChange(const App::Property *prop) { // Remember the feature before the current Tip. If the Tip is already at the first feature, remember the next feature - if (prop == &Model) { - std::vector features = Model.getValues(); + if (prop == &Group) { + std::vector features = Group.getValues(); if (features.empty()) { rememberTip = NULL; } else { @@ -91,8 +91,8 @@ void Body::onBeforeChange(const App::Property *prop) void Body::onChanged(const App::Property *prop) { - if (prop == &Model) { - std::vector features = Model.getValues(); + if (prop == &Group) { + std::vector features = Group.getValues(); if (features.empty()) { Tip.setValue(NULL); } else { @@ -119,7 +119,7 @@ short Body::mustExecute() const App::DocumentObject* Body::getPrevFeature(App::DocumentObject *start) const { - std::vector features = Model.getValues(); + std::vector features = Group.getValues(); if (features.empty()) return NULL; App::DocumentObject* st = (start == NULL ? Tip.getValue() : start); if (st == NULL) @@ -146,9 +146,9 @@ App::DocumentObject* Body::getPrevSolidFeature(App::DocumentObject *start) return nullptr; } - assert ( hasFeature ( start ) ); + assert ( hasObject ( start ) ); - const std::vector & features = Model.getValues(); + const std::vector & features = Group.getValues(); auto startIt = std::find ( features.rbegin(), features.rend(), start ); assert ( startIt != features.rend() ); @@ -169,13 +169,13 @@ App::DocumentObject* Body::getNextSolidFeature(App::DocumentObject *start) start = Tip.getValue(); } - if ( !start ) { // no tip + if ( !start || !hasObject(start) ) { // no or faulty tip return nullptr; } - assert ( hasFeature ( start ) ); + assert ( hasObject ( start ) ); - const std::vector & features = Model.getValues(); + const std::vector & features = Group.getValues(); std::vector::const_iterator startIt; if ( start == baseFeature ) { @@ -264,9 +264,17 @@ Body* Body::findBodyOf(const App::DocumentObject* feature) } -void Body::addFeature(App::DocumentObject *feature) +void Body::addObject(App::DocumentObject *feature) { - insertFeature (feature, getNextSolidFeature (), /*after = */ false); + if(!isAllowed(feature)) + throw Base::Exception("Body: object is not allowed"); + + //only one group per object + auto *group = App::GroupExtension::getGroupOfObject(feature); + if(group && group != getExtendedObject()) + group->getExtensionByType()->removeObject(feature); + + insertObject (feature, getNextSolidFeature (), /*after = */ false); // Move the Tip if we added a solid if (isSolidFeature(feature)) { Tip.setValue (feature); @@ -274,7 +282,7 @@ void Body::addFeature(App::DocumentObject *feature) } -void Body::insertFeature(App::DocumentObject* feature, App::DocumentObject* target, bool after) +void Body::insertObject(App::DocumentObject* feature, App::DocumentObject* target, bool after) { if (target) { if (target == BaseFeature.getValue()) { @@ -284,13 +292,16 @@ void Body::insertFeature(App::DocumentObject* feature, App::DocumentObject* targ } else { throw Base::Exception("Body: impossible to insert before the base object"); } - } else if (!hasFeature (target)) { + } else if (!hasObject (target)) { // Check if the target feature belongs to the body throw Base::Exception("Body: the feature we should insert relative to is not part of that body"); } } + + //ensure that all origin links are ok + relinkToOrigin(feature); - std::vector model = Model.getValues(); + std::vector model = Group.getValues(); std::vector::iterator insertInto; // Find out the position there to insert the feature @@ -313,7 +324,7 @@ void Body::insertFeature(App::DocumentObject* feature, App::DocumentObject* targ // Insert the new feature after the given model.insert (insertInto, feature); - Model.setValues (model); + Group.setValues (model); // Set the BaseFeature property if (Body::isSolidFeature(feature)) { @@ -333,7 +344,7 @@ void Body::insertFeature(App::DocumentObject* feature, App::DocumentObject* targ } -void Body::removeFeature(App::DocumentObject* feature) +void Body::removeObject(App::DocumentObject* feature) { App::DocumentObject* nextSolidFeature = getNextSolidFeature(feature); App::DocumentObject* prevSolidFeature = getPrevSolidFeature(feature); @@ -348,7 +359,7 @@ void Body::removeFeature(App::DocumentObject* feature) } } - std::vector model = Model.getValues(); + std::vector model = Group.getValues(); std::vector::iterator it = std::find(model.begin(), model.end(), feature); // Adjust Tip feature if it is pointing to the deleted object @@ -360,9 +371,9 @@ void Body::removeFeature(App::DocumentObject* feature) } } - // Erase feature from Model + // Erase feature from Group model.erase(it); - Model.setValues(model); + Group.setValues(model); } @@ -372,8 +383,8 @@ App::DocumentObjectExecReturn *Body::execute(void) Base::Console().Error("Body '%s':\n", getNameInDocument()); App::DocumentObject* tip = Tip.getValue(); Base::Console().Error(" Tip: %s\n", (tip == NULL) ? "None" : tip->getNameInDocument()); - std::vector model = Model.getValues(); - Base::Console().Error(" Model:\n"); + std::vector model = Group.getValues(); + Base::Console().Error(" Group:\n"); for (std::vector::const_iterator m = model.begin(); m != model.end(); m++) { if (*m == NULL) continue; Base::Console().Error(" %s", (*m)->getNameInDocument()); @@ -422,14 +433,6 @@ void Body::onSettingDocument() { Part::BodyBase::onSettingDocument(); } -void Body::removeModelFromDocument() { - //delete all child objects if needed - std::set grp ( Model.getValues().begin (), Model.getValues().end() ); - for (auto obj : grp) { - this->getDocument()->remObject(obj->getNameInDocument()); - } -} - void Body::onChanged (const App::Property* prop) { if ( prop == &BaseFeature ) { App::DocumentObject *baseFeature = BaseFeature.getValue(); @@ -443,45 +446,11 @@ void Body::onChanged (const App::Property* prop) { Part::BodyBase::onChanged ( prop ); } -App::Origin *Body::getOrigin () const { - App::DocumentObject *originObj = Origin.getValue (); - - if ( !originObj ) { - std::stringstream err; - err << "Can't find Origin for \"" << getNameInDocument () << "\""; - throw Base::Exception ( err.str().c_str () ); - - } else if (! originObj->isDerivedFrom ( App::Origin::getClassTypeId() ) ) { - std::stringstream err; - err << "Bad object \"" << originObj->getNameInDocument () << "\"(" << originObj->getTypeId().getName() - << ") linked to the Origin of \"" << getNameInDocument () << "\""; - throw Base::Exception ( err.str().c_str () ); - } else { - return static_cast ( originObj ); - } -} - void Body::setupObject () { - // NOTE: the code shared with App::OriginGroup - App::Document *doc = getDocument (); - - std::string objName = std::string ( getNameInDocument() ).append ( "Origin" ); - - App::DocumentObject *originObj = doc->addObject ( "App::Origin", objName.c_str () ); - - assert ( originObj && originObj->isDerivedFrom ( App::Origin::getClassTypeId () ) ); - Origin.setValue ( originObj ); - Part::BodyBase::setupObject (); } void Body::unsetupObject () { - App::DocumentObject *origin = Origin.getValue (); - - if (origin && !origin->isDeleting ()) { - origin->getDocument ()->remObject (origin->getNameInDocument()); - } - Part::BodyBase::unsetupObject (); } diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index 0ad429eb9e..a73ab7003a 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -68,7 +68,7 @@ public: * Add the feature into the body at the current insert point. * The insertion poin is the before next solid after the Tip feature */ - void addFeature(App::DocumentObject* feature); + virtual void addObject(App::DocumentObject*) override; /** * Insert the feature into the body after the given feature. @@ -79,15 +79,12 @@ public: * and into the begin if where is InsertAfter. * @param after if true insert the feature after the target. Default is false. * - * @note the methode doesn't modifies the Tip unlike addFeature() + * @note the methode doesn't modifies the Tip unlike addObject() */ - void insertFeature(App::DocumentObject* feature, App::DocumentObject* target, bool after=false); + void insertObject(App::DocumentObject* feature, App::DocumentObject* target, bool after=false); /// Remove the feature from the body - void removeFeature(App::DocumentObject* feature); - - /// Delets all the objects linked to the model. - void removeModelFromDocument(); + virtual void removeObject(DocumentObject* obj) override; /** * Checks if the given document object lays after the current insert point @@ -110,6 +107,7 @@ public: * all features derived from PartDesign::Feature and Part::Datum and sketches */ static bool isAllowed(const App::DocumentObject* f); + virtual bool allowObject(DocumentObject* f) {return isAllowed(f);}; /** * Return the body which this feature belongs too, or NULL @@ -117,13 +115,8 @@ public: */ static Body *findBodyOf(const App::DocumentObject* feature); - /// Returns the origin link or throws an exception - App::Origin *getOrigin () const; - PyObject *getPyObject(void); - /// Origin linked to the property, please use getOrigin () to access it - App::PropertyLink Origin; protected: virtual void onSettingDocument(); diff --git a/src/Mod/PartDesign/App/BodyPy.xml b/src/Mod/PartDesign/App/BodyPy.xml index 9569b1acc6..b4889eb42a 100644 --- a/src/Mod/PartDesign/App/BodyPy.xml +++ b/src/Mod/PartDesign/App/BodyPy.xml @@ -13,14 +13,9 @@ PartDesign body class - + - addFeature(feat) - Add the given feature after the current Tip feature - - - - - insertFeatureAfter(feature, target, after=False) + insertObject(feature, target, after=False) Insert the feature into the body after the given feature. @param feature The feature to insert into the body @@ -29,19 +24,9 @@ and into the begin if where is InsertAfter. @param after if true insert the feature after the target. Default is false. - @note the methode doesn't modifies the Tip unlike addFeature() + @note the methode doesn't modifies the Tip unlike addObject() - - - removeFeature(feat) - Remove the given feature from the Body - - - - - Delets all the objects linked to the model. - - diff --git a/src/Mod/PartDesign/App/BodyPyImp.cpp b/src/Mod/PartDesign/App/BodyPyImp.cpp index 1c80173260..1650bb8fde 100644 --- a/src/Mod/PartDesign/App/BodyPyImp.cpp +++ b/src/Mod/PartDesign/App/BodyPyImp.cpp @@ -52,32 +52,7 @@ int BodyPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) return 0; } -PyObject* BodyPy::addFeature(PyObject *args) -{ - PyObject* featurePy; - if (!PyArg_ParseTuple(args, "O!", &(App::DocumentObjectPy::Type), &featurePy)) - return 0; - - App::DocumentObject* feature = static_cast(featurePy)->getDocumentObjectPtr(); - - if (!Body::isAllowed(feature)) { - PyErr_SetString(PyExc_SystemError, "Only PartDesign features, datum features and sketches can be inserted into a Body"); - return 0; - } - - Body* body = this->getBodyPtr(); - - try { - body->addFeature(feature); - } catch (Base::Exception& e) { - PyErr_SetString(PyExc_SystemError, e.what()); - return 0; - } - - Py_Return; -} - -PyObject* BodyPy::insertFeature(PyObject *args) +PyObject* BodyPy::insertObject(PyObject *args) { PyObject* featurePy; PyObject* targetPy; @@ -107,7 +82,7 @@ PyObject* BodyPy::insertFeature(PyObject *args) Body* body = this->getBodyPtr(); try { - body->insertFeature(feature, target, after); + body->insertObject(feature, target, after); } catch (Base::Exception& e) { PyErr_SetString(PyExc_SystemError, e.what()); return 0; @@ -115,32 +90,3 @@ PyObject* BodyPy::insertFeature(PyObject *args) Py_Return; } - -PyObject* BodyPy::removeFeature(PyObject *args) -{ - PyObject* featurePy; - if (!PyArg_ParseTuple(args, "O!", &(App::DocumentObjectPy::Type), &featurePy)) - return 0; - - App::DocumentObject* feature = static_cast(featurePy)->getDocumentObjectPtr(); - Body* body = this->getBodyPtr(); - - try { - body->removeFeature(feature); - } catch (Base::Exception& e) { - PyErr_SetString(PyExc_SystemError, e.what()); - return 0; - } - - Py_Return; -} - -PyObject* BodyPy::removeModelFromDocument(PyObject *args) -{ - if (!PyArg_ParseTuple(args, "")) - return 0; - - getBodyPtr()->removeModelFromDocument(); - Py_Return; -} - diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp index 6c0a67f486..3d46c85cb9 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.cpp +++ b/src/Mod/PartDesign/App/ShapeBinder.cpp @@ -142,7 +142,7 @@ Part::TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std:: try { if(!operators.empty() && !base.isNull()) - return base.multiFuse(operators); + return base.fuse(operators); } catch(...) { return base; diff --git a/src/Mod/PartDesign/FeatureHole/TaskHole.py b/src/Mod/PartDesign/FeatureHole/TaskHole.py index 1f5a8c0652..db05f339b1 100644 --- a/src/Mod/PartDesign/FeatureHole/TaskHole.py +++ b/src/Mod/PartDesign/FeatureHole/TaskHole.py @@ -54,18 +54,18 @@ class TaskHole: sketch = groove.Sketch plane = sketch.Support[0] axis = plane.References[0][0] - body.removeFeature(self.feature) + body.removeObject(self.feature) document.removeObject(self.feature.Name) - body.removeFeature(groove) + body.removeObject(groove) document.removeObject(groove.Name) - body.removeFeature(sketch) + body.removeObject(sketch) try: document.removeObject(sketch.Name) except: pass # This always throws an exception: "Sketch support has been deleted" from SketchObject::execute() - body.removeFeature(plane) + body.removeObject(plane) document.removeObject(plane.Name) - body.removeFeature(axis) + body.removeObject(axis) document.removeObject(axis.Name) FreeCADGui.ActiveDocument.resetEdit() FreeCADGui.Control.closeDialog(self) diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 5cf7f4af6b..0c5e398cf1 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -125,7 +125,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name) } } if (pcActiveBody) { - cmd.doCommand(Gui::Command::Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + cmd.doCommand(Gui::Command::Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), FeatName.c_str()); } cmd.doCommand(Gui::Command::Doc,"App.activeDocument().recompute()"); // recompute the feature based on its references @@ -278,7 +278,7 @@ void CmdPartDesignShapeBinder::activated(int iMsg) doCommand(Gui::Command::Doc,"App.activeDocument().%s.Support = %s", FeatName.c_str(), support.getPyReprString().c_str()); } - doCommand(Gui::Command::Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + doCommand(Gui::Command::Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), FeatName.c_str()); doCommand(Gui::Command::Doc,"App.activeDocument().recompute()"); // recompute the feature based on its references doCommand(Gui::Command::Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); @@ -385,7 +385,7 @@ void CmdPartDesignNewSketch::activated(int iMsg) supportString = std::string("(App.activeDocument().") + obj->getNameInDocument() + ", '')"; } - if (!pcActiveBody->hasFeature(obj)) { + if (!pcActiveBody->hasObject(obj)) { if ( !obj->isDerivedFrom ( App::Plane::getClassTypeId() ) ) { // TODO check here if the plane associated with right part/body (2015-09-01, Fat-Zer) @@ -409,7 +409,7 @@ void CmdPartDesignNewSketch::activated(int iMsg) auto copy = PartDesignGui::TaskFeaturePick::makeCopy(obj, sub, dlg.radioIndependent->isChecked()); if(pcActiveBody) - pcActiveBody->addFeature(copy); + pcActiveBody->addObject(copy); else if (pcActivePart) pcActivePart->addObject(copy); @@ -429,7 +429,7 @@ void CmdPartDesignNewSketch::activated(int iMsg) doCommand(Doc,"App.activeDocument().addObject('Sketcher::SketchObject','%s')",FeatName.c_str()); doCommand(Doc,"App.activeDocument().%s.Support = %s",FeatName.c_str(),supportString.c_str()); doCommand(Doc,"App.activeDocument().%s.MapMode = '%s'",FeatName.c_str(),Attacher::AttachEngine::getModeName(Attacher::mmFlatFace).c_str()); - doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + doCommand(Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), FeatName.c_str()); doCommand(Gui,"App.activeDocument().recompute()"); // recompute the sketch placement based on its support //doCommand(Gui,"Gui.activeDocument().activeView().setCamera('%s')",cam.c_str()); @@ -466,7 +466,7 @@ void CmdPartDesignNewSketch::activated(int iMsg) for (auto plane: datumPlanes) { planes.push_back ( plane ); // Check whether this plane belongs to the active body - if ( pcActiveBody && pcActiveBody->hasFeature(plane) ) { + if ( pcActiveBody && pcActiveBody->hasObject(plane) ) { if ( !pcActiveBody->isAfterInsertPoint ( plane ) ) { validPlanes++; status.push_back(PartDesignGui::TaskFeaturePick::validFeature); @@ -521,7 +521,7 @@ void CmdPartDesignNewSketch::activated(int iMsg) Gui::Command::doCommand(Doc,"App.activeDocument().%s.Support = %s",FeatName.c_str(),supportString.c_str()); Gui::Command::doCommand(Doc,"App.activeDocument().%s.MapMode = '%s'",FeatName.c_str(),Attacher::AttachEngine::getModeName(Attacher::mmFlatFace).c_str()); Gui::Command::updateActive(); // Make sure the Support's Placement property is updated - Gui::Command::doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + Gui::Command::doCommand(Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), FeatName.c_str()); //doCommand(Gui,"Gui.activeDocument().activeView().setCamera('%s')",cam.c_str()); Gui::Command::doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); @@ -584,13 +584,13 @@ void finishFeature(const Gui::Command* cmd, const std::string& FeatName, App::DocumentObject* lastSolidFeature = pcActiveBody->Tip.getValue(); if (!prevSolidFeature || prevSolidFeature == lastSolidFeature) { // If the previous feature not given or is the Tip add Feature after it. - cmd->doCommand(cmd->Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + cmd->doCommand(cmd->Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), FeatName.c_str()); prevSolidFeature = lastSolidFeature; } else { // Insert the feature into the body after the given one. cmd->doCommand(cmd->Doc, - "App.activeDocument().%s.insertFeature(App.activeDocument().%s, App.activeDocument().%s, True)", + "App.activeDocument().%s.insertObject(App.activeDocument().%s, App.activeDocument().%s, True)", pcActiveBody->getNameInDocument(), FeatName.c_str(), prevSolidFeature->getNameInDocument()); } } @@ -640,7 +640,7 @@ unsigned validateSketches(std::vector& sketches, status.push_back(PartDesignGui::TaskFeaturePick::otherPart); continue; } - } else if (!pcActiveBody->hasFeature(*s)) { + } else if (!pcActiveBody->hasObject(*s)) { // Check whether this plane belongs to a body of the same part PartDesign::Body* b = PartDesign::Body::findBodyOf(*s); if(!b) @@ -807,7 +807,7 @@ void prepareProfileBased(Gui::Command* cmd, const std::string& which, auto copy = PartDesignGui::TaskFeaturePick::makeCopy(sketches[0], "", dlg.radioIndependent->isChecked()); auto oBody = PartDesignGui::getBodyFor(sketches[0], false); if(oBody) - pcActiveBody->addFeature(copy); + pcActiveBody->addObject(copy); else pcActivePart->addObject(copy); @@ -1855,7 +1855,7 @@ void CmdPartDesignMultiTransform::activated(int iMsg) // Remove the Transformed feature from the Body if(pcActiveBody) - doCommand(Doc, "App.activeDocument().%s.removeFeature(App.activeDocument().%s)", + doCommand(Doc, "App.activeDocument().%s.removeObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), trFeat->getNameInDocument()); // Create a MultiTransform feature and move the Transformed feature inside it diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 322fb0386c..cfc4c23476 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -401,7 +401,7 @@ void CmdPartDesignMigrate::activated(int iMsg) PartDesign::ProfileBased *sketchBased = static_cast ( feature ); Part::Part2DObject *sketch = sketchBased->getVerifiedSketch( /*silent =*/ true); if ( sketch ) { - doCommand ( Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + doCommand ( Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", bodyName.c_str (), sketch->getNameInDocument() ); if ( sketch->isDerivedFrom ( Sketcher::SketchObject::getClassTypeId() ) ) { @@ -419,7 +419,7 @@ void CmdPartDesignMigrate::activated(int iMsg) } } } - doCommand ( Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + doCommand ( Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", bodyName.c_str (), feature->getNameInDocument() ); PartDesignGui::relinkToBody ( feature ); @@ -552,7 +552,7 @@ void CmdPartDesignDuplicateSelection::activated(int iMsg) for (auto feature : newFeatures) { if (PartDesign::Body::isAllowed(feature)) { - doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + doCommand(Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", pcActiveBody->getNameInDocument(), feature->getNameInDocument()); doCommand(Gui,"Gui.activeDocument().hide(\"%s\")", feature->getNameInDocument()); } @@ -658,14 +658,14 @@ void CmdPartDesignMoveFeature::activated(int iMsg) // Remove from the source body if the feature belonged to a body if (source) { featureWasTip = (source->Tip.getValue() == feat); - doCommand(Doc,"App.activeDocument().%s.removeFeature(App.activeDocument().%s)", + doCommand(Doc,"App.activeDocument().%s.removeObject(App.activeDocument().%s)", source->getNameInDocument(), (feat)->getNameInDocument()); } App::DocumentObject* targetOldTip = target->Tip.getValue(); // Add to target body (always at the Tip) - doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + doCommand(Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", target->getNameInDocument(), (feat)->getNameInDocument()); // Recompute to update the shape doCommand(Gui,"App.activeDocument().recompute()"); @@ -742,7 +742,7 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) if ( body ) { bodyBase= body->BaseFeature.getValue(); for ( auto feat: features ) { - if ( !body->hasFeature ( feat ) ) { + if ( !body->hasObject ( feat ) ) { allFeaturesFromSameBody = false; break; } @@ -760,7 +760,7 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) } // Create a list of all features in this body - const std::vector & model = body->Model.getValues(); + const std::vector & model = body->Group.getValues(); // Ask user to select the target feature bool ok; @@ -798,9 +798,9 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg) // Remove and re-insert the feature to/from the Body // TODO if tip was moved the new position of tip is quite undetermined (2015-08-07, Fat-Zer) // TODO warn the user if we are moving an object to some place before the object's link (2015-08-07, Fat-Zer) - doCommand ( Doc,"App.activeDocument().%s.removeFeature(App.activeDocument().%s)", + doCommand ( Doc,"App.activeDocument().%s.removeObject(App.activeDocument().%s)", body->getNameInDocument(), feat->getNameInDocument() ); - doCommand ( Doc, "App.activeDocument().%s.insertFeature(App.activeDocument().%s, %s, True)", + doCommand ( Doc, "App.activeDocument().%s.insertObject(App.activeDocument().%s, %s, True)", body->getNameInDocument(), feat->getNameInDocument(), targetStr.c_str () ); } diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index 9c21237f20..feccacc70c 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -133,7 +133,7 @@ void CmdPrimtiveCompAdditive::activated(int iMsg) } - Gui::Command::doCommand(Doc,"App.ActiveDocument.%s.addFeature(App.activeDocument().%s)" + Gui::Command::doCommand(Doc,"App.ActiveDocument.%s.addObject(App.activeDocument().%s)" ,pcActiveBody->getNameInDocument(), FeatName.c_str()); Gui::Command::updateActive(); @@ -322,7 +322,7 @@ void CmdPrimtiveCompSubtractive::activated(int iMsg) FeatName.c_str()); } - Gui::Command::doCommand(Doc,"App.ActiveDocument.%s.addFeature(App.activeDocument().%s)" + Gui::Command::doCommand(Doc,"App.ActiveDocument.%s.addObject(App.activeDocument().%s)" ,pcActiveBody->getNameInDocument(), FeatName.c_str()); Gui::Command::updateActive(); diff --git a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp index 71ad246428..f05ccb0dee 100644 --- a/src/Mod/PartDesign/Gui/ReferenceSelection.cpp +++ b/src/Mod/PartDesign/Gui/ReferenceSelection.cpp @@ -115,7 +115,7 @@ bool ReferenceSelection::allow(App::Document* pDoc, App::DocumentObject* pObj, c if (!body) { // Allow selecting Part::Datum features from the active Body return false; - } else if (!allowOtherBody && !body->hasFeature(pObj)) { + } else if (!allowOtherBody && !body->hasObject(pObj)) { return false; } @@ -229,7 +229,7 @@ void getReferencedSelection(const App::DocumentObject* thisObj, const Gui::Selec auto copy = PartDesignGui::TaskFeaturePick::makeCopy(selObj, subname, dlg.radioIndependent->isChecked()); if(selBody) - body->addFeature(copy); + body->addObject(copy); else pcActivePart->addObject(copy); diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp index 46a8eed0ce..8d27dfddd2 100644 --- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp @@ -136,7 +136,7 @@ bool TaskDlgDatumParameters::accept() { //the user has to decide which option we should take if external references are used bool ext = false; for(App::DocumentObject* obj : pcDatum->Support.getValues()) { - if(!pcActiveBody->hasFeature(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) + if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) ext = true; } if(ext) { @@ -155,7 +155,7 @@ bool TaskDlgDatumParameters::accept() { int index = 0; for(App::DocumentObject* obj : pcDatum->Support.getValues()) { - if(!pcActiveBody->hasFeature(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) { + if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) { objs.push_back(PartDesignGui::TaskFeaturePick::makeCopy(obj, subs[index], dlg.radioIndependent->isChecked())); copies.push_back(objs.back()); subs[index] = ""; @@ -176,7 +176,7 @@ bool TaskDlgDatumParameters::accept() { //we need to add the copied features to the body after the command action, as otherwise freecad crashs unexplainable for(auto obj : copies) { if(pcActiveBody) - pcActiveBody->addFeature(obj); + pcActiveBody->addObject(obj); else if (pcActivePart) pcActivePart->addObject(obj); } diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp index 8c28822d67..86758368b2 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp @@ -235,17 +235,17 @@ std::vector TaskFeaturePick::buildFeatures() auto copy = makeCopy(obj, "", ui->radioIndependent->isChecked()); if (*st == otherBody) { - activeBody->addFeature(copy); + activeBody->addObject(copy); } else if (*st == otherPart) { auto oBody = PartDesignGui::getBodyFor(obj, false); if (!oBody) activePart->addObject(copy); else - activeBody->addFeature(copy); + activeBody->addObject(copy); } else if (*st == notInBody) { - activeBody->addFeature(copy); + activeBody->addObject(copy); // doesn't supposed to get here anything but sketch but to be on the safe side better to check if (copy->getTypeId().isDerivedFrom(Sketcher::SketchObject::getClassTypeId())) { Sketcher::SketchObject *sketch = static_cast(copy); diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index c991d1b87c..663fd0f47d 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -720,13 +720,13 @@ bool TaskDlgPipeParameters::accept() std::vector copies; bool ext = false; - if(!pcActiveBody->hasFeature(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue())) + if(!pcActiveBody->hasObject(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue())) ext = true; - else if(!pcActiveBody->hasFeature(pcPipe->AuxillerySpine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->AuxillerySpine.getValue())) + else if(!pcActiveBody->hasObject(pcPipe->AuxillerySpine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->AuxillerySpine.getValue())) ext = true; else { for(App::DocumentObject* obj : pcPipe->Sections.getValues()) { - if(!pcActiveBody->hasFeature(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) + if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) ext = true; } } @@ -741,12 +741,12 @@ bool TaskDlgPipeParameters::accept() return false; else if(!dlg.radioXRef->isChecked()) { - if(!pcActiveBody->hasFeature(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue())) { + if(!pcActiveBody->hasObject(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue())) { pcPipe->Spine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(pcPipe->Spine.getValue(), "", dlg.radioIndependent->isChecked()), pcPipe->Spine.getSubValues()); copies.push_back(pcPipe->Spine.getValue()); } - else if(!pcActiveBody->hasFeature(pcPipe->AuxillerySpine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->AuxillerySpine.getValue())){ + else if(!pcActiveBody->hasObject(pcPipe->AuxillerySpine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->AuxillerySpine.getValue())){ pcPipe->AuxillerySpine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(pcPipe->AuxillerySpine.getValue(), "", dlg.radioIndependent->isChecked()), pcPipe->AuxillerySpine.getSubValues()); copies.push_back(pcPipe->AuxillerySpine.getValue()); @@ -756,7 +756,7 @@ bool TaskDlgPipeParameters::accept() int index = 0; for(App::DocumentObject* obj : pcPipe->Sections.getValues()) { - if(!pcActiveBody->hasFeature(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) { + if(!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) { objs.push_back(PartDesignGui::TaskFeaturePick::makeCopy(obj, "", dlg.radioIndependent->isChecked())); copies.push_back(objs.back()); } @@ -781,7 +781,7 @@ bool TaskDlgPipeParameters::accept() for(auto obj : copies) { //Dead code: pcActiveBody was previously used without checking for null, so it won't be null here either. //if(pcActiveBody) - pcActiveBody->addFeature(obj); + pcActiveBody->addObject(obj); //else if (pcActivePart) // pcActivePart->addObject(obj); } diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp index 2ab3738cea..a74e331800 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp @@ -36,13 +36,16 @@ #include "ViewProviderDatumCS.h" #include #include +#include #include #include #include #include #include +#include #include #include +#include #include using namespace PartDesignGui; @@ -217,6 +220,19 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent) if(i != index) ui.widgetStack->widget(i)->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored)); } + + //show the parts coordinate system axis for selection + PartDesign::Body * body = PartDesign::Body::findBodyOf(vp->getObject()); + if(body) { + try { + App::Origin *origin = body->getOrigin(); + Gui::ViewProviderOrigin* vpOrigin; + vpOrigin = static_cast(Gui::Application::Instance->getViewProvider(origin)); + vpOrigin->setTemporaryVisibility(true, true); + } catch (const Base::Exception &ex) { + Base::Console().Error ("%s\n", ex.what () ); + } + } } /* @@ -224,6 +240,18 @@ TaskBoxPrimitives::TaskBoxPrimitives(ViewProviderPrimitive* vp, QWidget* parent) */ TaskBoxPrimitives::~TaskBoxPrimitives() { + //hide the parts coordinate system axis for selection + PartDesign::Body * body = PartDesign::Body::findBodyOf ( vp->getObject() ); + if(body) { + try { + App::Origin *origin = body->getOrigin(); + Gui::ViewProviderOrigin* vpOrigin; + vpOrigin = static_cast(Gui::Application::Instance->getViewProvider(origin)); + vpOrigin->resetTemporaryVisibility(); + } catch (const Base::Exception &ex) { + Base::Console().Error ("%s\n", ex.what () ); + } + } } void TaskBoxPrimitives::onBoxHeightChanged(double v) { diff --git a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp index 3f2607c21f..af21fdf5e2 100644 --- a/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp @@ -147,7 +147,7 @@ const QByteArray TaskSketchBasedParameters::onFaceName(const QString& text) // everything is OK (we assume a Part can only have exactly 3 App::Plane objects located at the base of the feature tree) return QByteArray(); } else if (obj->getTypeId().isDerivedFrom(Part::Datum::getClassTypeId())) { - if (!activeBody->hasFeature(obj)) + if (!activeBody->hasObject(obj)) return QByteArray(); return QByteArray(); } else { diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 18f3ed8a50..4e3740322a 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -88,7 +88,7 @@ PartDesign::Body *getBodyFor(const App::DocumentObject* obj, bool messageIfNot) return nullptr; PartDesign::Body * rv = getBody( /*messageIfNot =*/ false); - if(rv && rv->hasFeature(obj)) + if(rv && rv->hasObject(obj)) return rv; rv = PartDesign::Body::findBodyOf(obj); @@ -221,7 +221,7 @@ void fixSketchSupport (Sketcher::SketchObject* sketch) Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.superPlacement.Base.z = %f", Datum.c_str(), offset); Gui::Command::doCommand(Gui::Command::Doc, - "App.activeDocument().%s.insertFeature(App.activeDocument().%s, App.activeDocument().%s)", + "App.activeDocument().%s.insertObject(App.activeDocument().%s, App.activeDocument().%s)", body->getNameInDocument(), Datum.c_str(), sketch->getNameInDocument()); Gui::Command::doCommand(Gui::Command::Doc, "App.activeDocument().%s.Support = (App.activeDocument().%s,[''])", diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index d6fa1302d8..dd525e2e5d 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -179,7 +179,7 @@ void ViewProvider::onChanged(const App::Property* prop) { if(body) { //hide all features in the body other than this object - for(App::DocumentObject* obj : body->Model.getValues()) { + for(App::DocumentObject* obj : body->Group.getValues()) { if(obj->isDerivedFrom(PartDesign::Feature::getClassTypeId()) && obj != getObject()) { Gui::ViewProvider* vp = Gui::Application::Instance->activeDocument()->getViewProvider(obj); diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp index 831a6e7e98..ee278b8409 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp @@ -61,22 +61,20 @@ using namespace PartDesignGui; const char* PartDesignGui::ViewProviderBody::BodyModeEnum[] = {"Through","Tip",NULL}; -PROPERTY_SOURCE(PartDesignGui::ViewProviderBody,PartGui::ViewProviderPart) +PROPERTY_SOURCE_WITH_EXTENSIONS(PartDesignGui::ViewProviderBody,PartGui::ViewProviderPart) ViewProviderBody::ViewProviderBody() { ADD_PROPERTY(DisplayModeBody,((long)0)); DisplayModeBody.setEnums(BodyModeEnum); - - pcBodyChildren = new SoSeparator(); - pcBodyChildren->ref(); sPixmap = "PartDesign_Body_Tree.svg"; + + Gui::ViewProviderOriginGroupExtension::initExtension(this); } ViewProviderBody::~ViewProviderBody() { - pcBodyChildren->unref (); connectChangedObjectApp.disconnect(); connectChangedObjectGui.disconnect(); } @@ -85,9 +83,9 @@ void ViewProviderBody::attach(App::DocumentObject *pcFeat) { // call parent attach method ViewProviderPart::attach(pcFeat); - - addDisplayMaskMode(pcBodyChildren, "Through"); - setDisplayMaskMode("Through"); + + //set default display mode + onChanged(&DisplayModeBody); App::Document *adoc = pcObject->getDocument (); Gui::Document *gdoc = Gui::Application::Instance->getDocument ( adoc ) ; @@ -183,7 +181,7 @@ bool ViewProviderBody::doubleClicked(void) std::vector ViewProviderBody::claimChildren(void)const { PartDesign::Body* body= static_cast ( getObject () ); - const std::vector &model = body->Model.getValues (); + const std::vector &model = body->Group.getValues (); std::set outSet; //< set of objects not to claim (childrens of childrens) // search for objects handled (claimed) by the features @@ -217,26 +215,47 @@ std::vector ViewProviderBody::claimChildren(void)const std::vector ViewProviderBody::claimChildren3D(void)const + { + PartDesign::Body* body = static_cast(getObject()); - const std::vector & features = body->Model.getValues(); + + + const std::vector & features = body->Group.getValues(); + + std::vector rv; + + if ( body->Origin.getValue() ) { // Add origin + rv.push_back (body->Origin.getValue()); + } + if ( body->BaseFeature.getValue() ) { // Add Base Feature + rv.push_back (body->BaseFeature.getValue()); + } + + // Add all other stuff + std::copy (features.begin(), features.end(), std::back_inserter (rv) ); + + return rv; + } + + // TODO To be deleted (2015-09-08, Fat-Zer) //void ViewProviderBody::updateTree() //{ @@ -248,7 +267,7 @@ std::vector ViewProviderBody::claimChildren3D(void)const // bool active = body->IsActive.getValue(); // //Base::Console().Error("Body is %s\n", active ? "active" : "inactive"); // ActiveGuiDoc->signalHighlightObject(*this, Gui::Blue, active); -// std::vector features = body->Model.getValues(); +// std::vector features = body->Group.getValues(); // bool highlight = true; // App::DocumentObject* tip = body->Tip.getValue(); // for (std::vector::const_iterator f = features.begin(); f != features.end(); f++) { @@ -264,7 +283,7 @@ std::vector ViewProviderBody::claimChildren3D(void)const bool ViewProviderBody::onDelete ( const std::vector &) { // TODO May be do it conditionally? (2015-09-05, Fat-Zer) Gui::Command::doCommand(Gui::Command::Doc, - "App.getDocument(\"%s\").getObject(\"%s\").removeModelFromDocument()" + "App.getDocument(\"%s\").getObject(\"%s\").removeObjectsFromDocument()" ,getObject()->getDocument()->getName(), getObject()->getNameInDocument()); return true; } @@ -273,7 +292,7 @@ void ViewProviderBody::updateData(const App::Property* prop) { PartDesign::Body* body = static_cast(getObject()); - if (prop == &body->Model || prop == &body->BaseFeature) { + if (prop == &body->Group || prop == &body->BaseFeature) { // update sizes of origins and datums updateOriginDatumSize (); //ensure all model features are in visual body mode @@ -298,7 +317,7 @@ void ViewProviderBody::slotChangedObjectApp ( const App::DocumentObject& obj, co } PartDesign::Body *body = static_cast ( getObject() ); - if ( body && body->hasFeature (&obj ) ) { + if ( body && body->hasObject (&obj ) ) { updateOriginDatumSize (); } } @@ -320,7 +339,7 @@ void ViewProviderBody::slotChangedObjectGui ( PartDesign::Body *body = static_cast ( getObject() ); App::DocumentObject *obj = vp.getObject (); - if ( body && obj && body->hasFeature ( obj ) ) { + if ( body && obj && body->hasObject ( obj ) ) { updateOriginDatumSize (); } } @@ -408,7 +427,7 @@ void ViewProviderBody::onChanged(const App::Property* prop) { ViewProvider::setOverrideMode("As Is"); overrideMode = mode; } - setDisplayMaskMode("Through"); + setDisplayMaskMode("Group"); } else { if(getOverrideMode() == "As Is") @@ -436,7 +455,7 @@ void ViewProviderBody::unifyVisualProperty(const App::Property* prop) { Gui::Document *gdoc = Gui::Application::Instance->getDocument ( pcObject->getDocument() ) ; PartDesign::Body *body = static_cast ( getObject() ); - auto features = body->Model.getValues(); + auto features = body->Group.getValues(); for(auto feature : features) { if(!feature->isDerivedFrom(PartDesign::Feature::getClassTypeId())) @@ -453,7 +472,7 @@ void ViewProviderBody::setVisualBodyMode(bool bodymode) { Gui::Document *gdoc = Gui::Application::Instance->getDocument ( pcObject->getDocument() ) ; PartDesign::Body *body = static_cast ( getObject() ); - auto features = body->Model.getValues(); + auto features = body->Group.getValues(); for(auto feature : features) { if(!feature->isDerivedFrom(PartDesign::Feature::getClassTypeId())) @@ -463,3 +482,11 @@ void ViewProviderBody::setVisualBodyMode(bool bodymode) { } } +std::vector< std::string > ViewProviderBody::getDisplayModes(void) const { + + //we get all dislay modes and remove the "Group" mode, as this is what we use for "Through" + //body display mode + std::vector< std::string > modes = ViewProviderPart::getDisplayModes(); + modes.erase(modes.begin()); + return modes; +} diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index f6fcc7f524..00e5aa5c06 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -25,6 +25,7 @@ #define PARTGUI_ViewProviderBody_H #include +#include #include class SoGroup; @@ -39,10 +40,10 @@ namespace PartDesignGui { * If the Body is not active it shows only the result shape (tip). * \author jriegel */ -class PartDesignGuiExport ViewProviderBody : public PartGui::ViewProviderPart +class PartDesignGuiExport ViewProviderBody : public PartGui::ViewProviderPart, public Gui::ViewProviderOriginGroupExtension { Q_DECLARE_TR_FUNCTIONS(PartDesignGui::ViewProviderBody) - PROPERTY_HEADER(PartDesignGui::ViewProviderBody); + PROPERTY_HEADER_WITH_EXTENSIONS(PartDesignGui::ViewProviderBody); public: /// constructor @@ -59,8 +60,9 @@ public: virtual std::vector claimChildren(void)const; // returns the root node where the children gets collected(3D) - virtual SoGroup* getChildRoot(void) const {return pcBodyChildren;} virtual std::vector claimChildren3D(void)const; + + virtual std::vector< std::string > getDisplayModes(void) const; virtual void setDisplayMode(const char* ModeName); virtual void setOverrideMode(const std::string& mode); @@ -89,9 +91,6 @@ protected: /// Set Feature viewprovider into visual body mode void setVisualBodyMode(bool bodymode); private: - /// group used to store children collected by claimChildren3D() in the through (edit) mode. - SoGroup *pcBodyChildren; - static const char* BodyModeEnum[]; boost::signals::connection connectChangedObjectApp; diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index 16729ac427..d051d0bc0d 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -151,7 +151,7 @@ void Workbench::slotNewObject(const App::DocumentObject& obj) if ((obj.getDocument() == ActiveAppDoc) && (ActivePartObject != NULL)) { // Add the new object to the active Body // Note: Will this break Undo? But how else can we catch Edit->Duplicate selection? - Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)", + Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)", ActivePartObject->getNameInDocument(), obj.getNameInDocument()); } } @@ -193,7 +193,7 @@ void Workbench::setupContextMenu(const char* recipient, Gui::MenuItem* item) con } // if all at lest one selected feature doesn't belongs to the same body // disable the menu entry - if ( addMoveFeatureInTree && !body->hasFeature ( sel.pObject ) ) { + if ( addMoveFeatureInTree && !body->hasObject ( sel.pObject ) ) { addMoveFeatureInTree = false; } diff --git a/src/Mod/PartDesign/TestPartDesignGui.py b/src/Mod/PartDesign/TestPartDesignGui.py index ab158b91e9..1ba4ce4b4c 100644 --- a/src/Mod/PartDesign/TestPartDesignGui.py +++ b/src/Mod/PartDesign/TestPartDesignGui.py @@ -72,14 +72,14 @@ class PartDesignGuiTestCases(unittest.TestCase): self.BoxObj.Length=10.0 self.BoxObj.Width=10.0 self.BoxObj.Height=10.0 - self.BodySource.addFeature(self.BoxObj) + self.BodySource.addObject(self.BoxObj) App.ActiveDocument.recompute() self.Sketch = self.Doc.addObject('Sketcher::SketchObject','Sketch') self.Sketch.Support = (self.BoxObj, ('Face3',)) self.Sketch.MapMode = 'FlatFace' - self.BodySource.addFeature(self.Sketch) + self.BodySource.addObject(self.Sketch) geoList = [] geoList.append(Part.LineSegment(App.Vector(2.0,8.0,0),App.Vector(8.0,8.0,0))) @@ -108,7 +108,7 @@ class PartDesignGuiTestCases(unittest.TestCase): self.Pad.Midplane = 0 self.Pad.Offset = 0.000000 - self.BodySource.addFeature(self.Pad) + self.BodySource.addObject(self.Pad) self.Doc.recompute() Gui.SendMsgToActiveView("ViewFit") @@ -120,8 +120,8 @@ class PartDesignGuiTestCases(unittest.TestCase): QtCore.QTimer.singleShot(500, cobj) Gui.runCommand('PartDesign_MoveFeature') #assert depenedencies of the Sketch - self.assertEqual(len(self.BodySource.Model), 3, "Source body feature count is wrong") - self.assertEqual(len(self.BodyTarget.Model), 0, "Target body feature count is wrong") + self.assertEqual(len(self.BodySource.Group), 3, "Source body feature count is wrong") + self.assertEqual(len(self.BodyTarget.Group), 0, "Target body feature count is wrong") def testMoveSingleFeature(self): FreeCAD.Console.PrintMessage('Testing moving one feature from one body to another\n') @@ -131,7 +131,7 @@ class PartDesignGuiTestCases(unittest.TestCase): self.Sketch = self.Doc.addObject('Sketcher::SketchObject','Sketch') self.Sketch.Support = (self.Doc.XY_Plane, ['']) self.Sketch.MapMode = 'FlatFace' - self.BodySource.addFeature(self.Sketch) + self.BodySource.addObject(self.Sketch) geoList = [] geoList.append(Part.LineSegment(App.Vector(-10.000000,10.000000,0),App.Vector(10.000000,10.000000,0))) @@ -160,7 +160,7 @@ class PartDesignGuiTestCases(unittest.TestCase): self.Pad.Midplane = 0 self.Pad.Offset = 0.000000 - self.BodySource.addFeature(self.Pad) + self.BodySource.addObject(self.Pad) self.Doc.recompute() Gui.SendMsgToActiveView("ViewFit") @@ -176,8 +176,8 @@ class PartDesignGuiTestCases(unittest.TestCase): self.assertFalse(self.Sketch.Support[0][0] in self.BodySource.Origin.OriginFeatures) self.assertTrue(self.Sketch.Support[0][0] in self.BodyTarget.Origin.OriginFeatures) - self.assertEqual(len(self.BodySource.Model), 0, "Source body feature count is wrong") - self.assertEqual(len(self.BodyTarget.Model), 2, "Target body feature count is wrong") + self.assertEqual(len(self.BodySource.Group), 0, "Source body feature count is wrong") + self.assertEqual(len(self.BodyTarget.Group), 2, "Target body feature count is wrong") def tearDown(self): FreeCAD.closeDocument("SketchGuiTest") diff --git a/src/Mod/Path/App/TooltablePyImp.cpp b/src/Mod/Path/App/TooltablePyImp.cpp index d339b61950..0b2ad66070 100644 --- a/src/Mod/Path/App/TooltablePyImp.cpp +++ b/src/Mod/Path/App/TooltablePyImp.cpp @@ -121,12 +121,12 @@ int ToolPy::PyInit(PyObject* args, PyObject* kwd) else getToolPtr()->Material = Tool::MATUNDEFINED; - getToolPtr()->Diameter = PyFloat_AsDouble(dia); - getToolPtr()->LengthOffset = PyFloat_AsDouble(len); - getToolPtr()->FlatRadius = PyFloat_AsDouble(fla); - getToolPtr()->CornerRadius = PyFloat_AsDouble(cor); - getToolPtr()->CuttingEdgeAngle = PyFloat_AsDouble(ang); - getToolPtr()->CuttingEdgeHeight = PyFloat_AsDouble(hei); + getToolPtr()->Diameter = dia ? PyFloat_AsDouble(dia) : 0.0; + getToolPtr()->LengthOffset = len ? PyFloat_AsDouble(len) : 0.0; + getToolPtr()->FlatRadius = fla ? PyFloat_AsDouble(fla) : 0.0; + getToolPtr()->CornerRadius = cor ? PyFloat_AsDouble(cor) : 0.0; + getToolPtr()->CuttingEdgeAngle = ang ? PyFloat_AsDouble(ang) : 0.0; + getToolPtr()->CuttingEdgeHeight = hei ? PyFloat_AsDouble(hei) : 0.0; return 0; } diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 1e996f47ee..aecf79d898 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -26,6 +26,7 @@ SET(PathScripts_SRCS PathScripts/PathDressup.py PathScripts/PathDressupDogbone.py PathScripts/PathDressupDragknife.py + PathScripts/PathDressupHoldingTags.py PathScripts/PathDrilling.py PathScripts/PathEngrave.py PathScripts/PathFacePocket.py @@ -44,6 +45,7 @@ SET(PathScripts_SRCS PathScripts/PathPost.py PathScripts/PathPostProcessor.py PathScripts/PathPreferences.py + PathScripts/PathPreferencesPathDressup.py PathScripts/PathPreferencesPathJob.py PathScripts/PathProfile.py PathScripts/PathProfileEdges.py @@ -75,6 +77,7 @@ SET(PathScripts_SRCS PathScripts/slic3r_pre.py PathTests/PathTestUtils.py PathTests/TestPathDepthParams.py + PathTests/TestPathDressupHoldingTags.py PathTests/TestPathGeom.py PathTests/TestPathPost.py PathTests/__init__.py diff --git a/src/Mod/Path/Gui/Resources/Path.qrc b/src/Mod/Path/Gui/Resources/Path.qrc index 59e8f3ce1e..b6800333c6 100644 --- a/src/Mod/Path/Gui/Resources/Path.qrc +++ b/src/Mod/Path/Gui/Resources/Path.qrc @@ -54,9 +54,11 @@ panels/DogboneEdit.ui panels/DrillingEdit.ui panels/EngraveEdit.ui + panels/HoldingTagsEdit.ui panels/JobEdit.ui panels/MillFaceEdit.ui panels/PocketEdit.ui + panels/PointEdit.ui panels/ProfileEdgesEdit.ui panels/ProfileEdit.ui panels/RemoteEdit.ui @@ -64,6 +66,7 @@ panels/ToolControl.ui panels/ToolEdit.ui panels/ToolLibraryEditor.ui + preferences/PathDressupHoldingTags.ui preferences/PathJob.ui translations/Path_af.qm translations/Path_cs.qm diff --git a/src/Mod/Path/Gui/Resources/icons/Path-Helix.svg b/src/Mod/Path/Gui/Resources/icons/Path-Helix.svg index 48b2ed309e..83bd5ba614 100644 --- a/src/Mod/Path/Gui/Resources/icons/Path-Helix.svg +++ b/src/Mod/Path/Gui/Resources/icons/Path-Helix.svg @@ -14,10 +14,109 @@ height="64px" id="svg2816" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="Path-Helix.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="Path-Helix.svg" + inkscape:export-filename="C:\Users\Alex Gryson\Desktop\Path-Helix_64.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + showguides="false" + inkscape:snap-nodes="true" + inkscape:snap-global="false"> + dotted="false" + spacingx="1px" + spacingy="1px" + empspacing="2" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> @@ -522,7 +1393,32 @@ image/svg+xml - + + + + [Lorenz Hüdepohl] + + + Path-Helix + 2016-05-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Path/Gui/Resources/icons/Path-Helix.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + @@ -530,19 +1426,99 @@ id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer"> - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui index d5f3c8c822..9826a41d93 100644 --- a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui @@ -23,7 +23,7 @@ - 3 + 2 @@ -31,7 +31,7 @@ 0 0 334 - 313 + 347     @@ -98,7 +98,7 @@ 0 0 334 - 313 + 347     @@ -142,71 +142,13 @@ - - - - 0 - 0 - 334 - 313 - - - - Holding - - - - - - Add New - - - - - - - Delete - - - - - - - - Tag - - - - - Location - - - - - Height - - - - - Length - - - - - Angle - - - - - - 0 0 334 - 313 + 347 @@ -277,30 +219,6 @@ - - - - - - - Plunge Angle - - - - - - - Roll Radius - - - - - - - Segment Length - - - @@ -309,7 +227,14 @@ - + + + 0.000000000000000 + + + mm + + @@ -321,13 +246,10 @@ - - - - 0.000000000000000 - - - mm + + + + Roll Radius diff --git a/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui b/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui index 6b7f57f88e..d628b7e3d7 100644 --- a/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui @@ -6,7 +6,7 @@ 0 0 - 352 + 376 387 @@ -27,8 +27,8 @@ 0 0 - 334 - 340 + 358 + 333 diff --git a/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui b/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui index 09df3c50d7..79e1071ee7 100644 --- a/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/DrillingEdit.ui @@ -34,7 +34,7 @@ 0 0 304 - 367 + 375     @@ -111,8 +111,8 @@ 0 0 - 304 - 367 + 109 + 82 @@ -172,8 +172,8 @@ 0 0 - 304 - 367 + 144 + 82 @@ -233,8 +233,8 @@ 0 0 - 304 - 367 + 223 + 31 diff --git a/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui b/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui index 024577e345..e9874ee821 100644 --- a/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/EngraveEdit.ui @@ -34,7 +34,7 @@ 0 0 303 - 366 + 374     @@ -111,8 +111,8 @@ 0 0 - 303 - 366 + 109 + 56 @@ -158,8 +158,8 @@ 0 0 - 303 - 366 + 144 + 56 @@ -205,8 +205,8 @@ 0 0 - 303 - 366 + 223 + 31 diff --git a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui new file mode 100644 index 0000000000..0fca680a75 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui @@ -0,0 +1,212 @@ + + + TaskPanel + + + + 0 + 0 + 399 + 564 + + + + Holding Tags + + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + 0 + + + + + 0 + 0 + 381 + 510 + + + + Tags + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Width + + + + + + + Height + + + + + + + Angle + + + + + + + <html><head/><body><p>Width of the resulting holding tag.</p></body></html> + + + + + + + <html><head/><body><p>Height of holding tag.</p><p>Note that resulting tag might be smaller if the tag's width and angle result in a triangular shape.</p></body></html> + + + + + + + <html><head/><body><p>Plunge angle for ascent and descent of holding tag.</p></body></html> + + + 5.000000000000000 + + + 90.000000000000000 + + + 15.000000000000000 + + + 45.000000000000000 + + + + + + + Radius + + + + + + + <html><head/><body><p>Radius of the fillet at the top.</p><p>If the radius is too big for the tag shape it gets reduced to the maximum possible radius - resulting in a spherical shape.</p></body></html> + + + + + + + + + + <html><head/><body><p>List of current tags. Edit coordinates by double click or Edit button.</p><p>Tags are automatically disabled if they overlap with the previous tag, or don't lie on the base wire.</p></body></html> + + + + + + + + + + false + + + Delete + + + + + + + Add... + + + + + + + false + + + Edit... + + + + + + + + + + Auto Generate + + + + + + 2 + + + + + + + false + + + Replace All + + + + + + + Number of Tags + + + Qt::AlignCenter + + + + + + + + + + + + + + + Gui::InputField + QLineEdit +
    Gui/InputField.h
    +     +     + + +     diff --git a/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui index 2795ac19c6..917164e99c 100644 --- a/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/MillFaceEdit.ui @@ -6,7 +6,7 @@ 0 0 - 374 + 340 453 @@ -33,8 +33,8 @@ 0 0 - 340 - 277 + 322 + 259 @@ -111,8 +111,8 @@ 0 0 - 356 - 124 + 322 + 108 @@ -123,6 +123,9 @@ Depths + + QFormLayout::ExpandingFieldsGrow + @@ -165,19 +168,6 @@ - - - - 3 - - - 0.100000000000000 - - - 1.000000000000000 - - - @@ -185,6 +175,16 @@ + + + + 0 mm + + + mm + + + @@ -192,8 +192,8 @@ 0 0 - 356 - 95 + 144 + 56 @@ -242,8 +242,8 @@ 0 0 - 356 - 296 + 261 + 191 @@ -309,6 +309,13 @@ QFrame::Raised + + + + + + + @@ -316,16 +323,6 @@ - - - - ZigZag Angle - - - - - - @@ -333,6 +330,13 @@ + + + + ZigZag Angle + + + @@ -409,6 +413,11 @@ QLineEdit
    Gui/InputField.h
    + + Gui::QuantitySpinBox + QWidget +
    Gui/QuantitySpinBox.h
    +     diff --git a/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui b/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui index c4ebd835a0..ab29884266 100644 --- a/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PocketEdit.ui @@ -29,7 +29,7 @@ - 5 + 0 @@ -40,7 +40,7 @@ 0 0 334 - 321 + 343     @@ -117,8 +117,8 @@ 0 0 - 334 - 321 + 114 + 108 @@ -195,8 +195,8 @@ 0 0 - 334 - 321 + 144 + 56 @@ -245,8 +245,8 @@ 0 0 - 334 - 321 + 94 + 24 @@ -259,8 +259,8 @@ 0 0 - 334 - 321 + 178 + 120 @@ -299,6 +299,9 @@ QFrame::Raised + + QFormLayout::ExpandingFieldsGrow + @@ -313,9 +316,6 @@ - - - @@ -323,6 +323,13 @@ + + + + + + + @@ -334,7 +341,7 @@ 0 0 334 - 321 + 343 diff --git a/src/Mod/Path/Gui/Resources/panels/PointEdit.ui b/src/Mod/Path/Gui/Resources/panels/PointEdit.ui new file mode 100644 index 0000000000..454bcabaf3 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/panels/PointEdit.ui @@ -0,0 +1,78 @@ + + + Form + + + + 0 + 0 + 362 + 182 + + + + Point Edit + + + + + + + + + Global X + + + + + + + + + + Global Y + + + + + + + + + + false + + + Global Z + + + + + + + false + + + + + + + + + + QDialogButtonBox::Save + + + + + + + + Gui::InputField + QLineEdit +
    Gui/InputField.h
    +     +     + + +     diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui index 200acefd70..9b96b1ba22 100644 --- a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui @@ -23,7 +23,7 @@ - 4 + 0 @@ -34,7 +34,7 @@ 0 0 334 - 313 + 348 @@ -112,7 +112,7 @@ 0 0 334 - 313 + 348 @@ -182,7 +182,7 @@ 0 0 334 - 313 + 348 @@ -226,71 +226,13 @@ - + 0 0 334 - 313 - - - - Holding - - - - - - Add New - - - - - - - Delete - - - - - - - - Tag - - - - - Location - - - - - Height - - - - - Length - - - - - Angle - - - - - - - - - - 0 - -15 - 320 - 338 + 348 @@ -304,93 +246,6 @@ QFormLayout::AllNonFixedFieldsGrow - - - - - - - Use Start Point - - - - - - - Use Compensation - - - - - - - Use End Point - - - - - - - - - - - - - - - - 0.000000000000000 - - - mm - - - - - - - Segment Length - - - - - - - Roll Radius - - - - - - - Plunge Angle - - - - - - - - - - Extra Offset - - - - - - - 0.000000000000000 - - - mm - - - - - - @@ -447,6 +302,46 @@ + + + + + + + Use Start Point + + + + + + + Use Compensation + + + + + + + Use End Point + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui index 74293db727..8bcf2b04bd 100644 --- a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui @@ -23,7 +23,7 @@ - 4 + 0 @@ -34,7 +34,7 @@ 0 0 381 - 346 + 381 @@ -112,7 +112,7 @@ 0 0 381 - 346 + 381 @@ -179,7 +179,7 @@ 0 0 381 - 346 + 381 @@ -223,71 +223,13 @@ - + 0 0 381 - 346 - - - - Holding - - - - - - Add New - - - - - - - Delete - - - - - - - - Tag - - - - - Location - - - - - Height - - - - - Length - - - - - Angle - - - - - - - - - - 0 - -28 - 367 - 384 + 381 @@ -345,13 +287,6 @@ - - - - Plunge Angle - - - @@ -360,22 +295,12 @@ - - - Segment Length - - - - Roll Radius - - - @@ -387,9 +312,6 @@ - - - 0.000000000000000 diff --git a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui index ccb092a4b5..97e3b1ad79 100644 --- a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui @@ -34,7 +34,7 @@ 0 0 334 - 387 + 395 @@ -112,7 +112,7 @@ 0 0 334 - 387 + 395 @@ -165,19 +165,6 @@ - - - - 3 - - - 0.100000000000000 - - - 1.000000000000000 - - - @@ -185,6 +172,13 @@ + + + + mm + + + @@ -192,8 +186,8 @@ 0 0 - 334 - 387 + 144 + 56 @@ -242,8 +236,8 @@ 0 0 - 334 - 387 + 203 + 31 diff --git a/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui b/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui new file mode 100644 index 0000000000..c5085d5fa8 --- /dev/null +++ b/src/Mod/Path/Gui/Resources/preferences/PathDressupHoldingTags.ui @@ -0,0 +1,147 @@ + + + Form + + + + 0 + 0 + 477 + 478 + + + + Form + + + + + + Tag Parameters + + + + + + <html><head/><body><p>Set the default width of holding tags.</p><p>If the width is set to 0 the dressup will try to guess a reasonable value based on the path itself.</p></body></html> + + + + + + + Default Width + + + + + + + <html><head/><body><p>Plunge angle for the holding tags ascent and descent.</p></body></html> + + + 5.000000000000000 + + + 90.000000000000000 + + + 15.000000000000000 + + + 45.000000000000000 + + + + + + + <html><head/><body><p>Default height of holding tags.</p><p>If the specified height is 0 the dressup will use half the height of the part. Should the height be bigger than the height of the part the dressup will reduce the height to the height of the part.</p></body></html> + + + + + + + Default Angle + + + + + + + Default Height + + + + + + + <html><head/><body><p>Radius of the fillet on the tag's top edge.</p><p>If the radius is bigger than than the tag shape itself supports the resulting shape will be that of a dome.</p></body></html> + + + + + + + Default Radius + + + + + + + + + + Tag Generation + + + + + + Initial # Tags + + + + + + + <html><head/><body><p>Specify the number of tags generated when a new dressup is created.</p></body></html> + + + 2 + + + 4 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Gui::InputField + QLineEdit +
    Gui/InputField.h
    +     +     + + +     diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index e2c4322f8c..74e1df6906 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -52,6 +52,9 @@ #include #include + +#define ARC_MIN_SEGMENTS 20.0 // minimum # segements to interpolate an arc + #ifndef M_PI #define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846 /* pi */ @@ -306,8 +309,9 @@ void ViewProviderPath::updateData(const App::Property* prop) angle = M_PI * 2 - angle; if (angle == 0) angle = M_PI * 2; - int segments = 3/(deviation/angle); //we use a rather simple rule here, provisorily + int segments = std::max(ARC_MIN_SEGMENTS, 3.0/(deviation/angle)); //we use a rather simple rule here, provisorily double dZ = (next.z - last.z)/segments; //How far each segment will helix in Z + for (int j = 1; j < segments; j++) { //std::cout << "vector " << j << std::endl; Base::Vector3d inter; diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index 397c1d818a..dd0c1d6f3c 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -31,8 +31,9 @@ class PathWorkbench (Workbench): def Initialize(self): # Add preferences pages - before loading PathGui to properly order pages of Path group - from PathScripts import PathPreferencesPathJob - FreeCADGui.addPreferencePage(PathPreferencesPathJob.Page, "Path") + from PathScripts import PathPreferencesPathJob, PathPreferencesPathDressup + FreeCADGui.addPreferencePage(PathPreferencesPathJob.JobPreferencesPage, "Path") + FreeCADGui.addPreferencePage(PathPreferencesPathDressup.DressupPreferencesPage, "Path") # load the builtin modules import Path @@ -74,6 +75,7 @@ class PathWorkbench (Workbench): from PathScripts import PathProfileEdges from PathScripts import PathDressupDogbone from PathScripts import PathMillFace + from PathScripts import PathDressupHoldingTags import PathCommands # build commands list @@ -83,7 +85,7 @@ class PathWorkbench (Workbench): twodopcmdlist = ["Path_Contour", "Path_Profile", "Path_Profile_Edges", "Path_Pocket", "Path_Drilling", "Path_Engrave", "Path_MillFace", "Path_Helix"] threedopcmdlist = ["Path_Surfacing"] modcmdlist = ["Path_Copy", "Path_CompoundExtended", "Path_Array", "Path_SimpleCopy" ] - dressupcmdlist = ["PathDressup_Dogbone", "PathDressup_DragKnife"] + dressupcmdlist = ["PathDressup_Dogbone", "PathDressup_DragKnife", "PathDressup_HoldingTags"] extracmdlist = ["Path_SelectLoop"] #modcmdmore = ["Path_Hop",] #remotecmdlist = ["Path_Remote"] @@ -135,8 +137,8 @@ class PathWorkbench (Workbench): if len(FreeCADGui.Selection.getSelection()) == 1: if FreeCADGui.Selection.getSelection()[0].isDerivedFrom("Path::Feature"): self.appendContextMenu("", ["Path_Inspect"]) - if FreeCADGui.Selection.getSelection()[0].Name in ["Profile", "Contour"]: - self.appendContextMenu("", ["Add_Tag"]) + if "Profile" or "Contour" in FreeCADGui.Selection.getSelection()[0].Name: + #self.appendContextMenu("", ["Add_Tag"]) self.appendContextMenu("", ["Set_StartPoint"]) self.appendContextMenu("", ["Set_EndPoint"]) if "Remote" in FreeCADGui.Selection.getSelection()[0].Name: diff --git a/src/Mod/Path/PathScripts/PathContour.py b/src/Mod/Path/PathScripts/PathContour.py index f113e720f4..9e954cde03 100644 --- a/src/Mod/Path/PathScripts/PathContour.py +++ b/src/Mod/Path/PathScripts/PathContour.py @@ -36,6 +36,7 @@ if FreeCAD.GuiUp: # Qt tanslation handling try: _encoding = QtGui.QApplication.UnicodeUTF8 + def translate(context, text, disambig=None): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: @@ -51,66 +52,49 @@ __url__ = "http://www.freecadweb.org" """Path Contour object and FreeCAD command""" + class ObjectContour: def __init__(self, obj): - obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","Make False, to prevent operation from generating code")) + obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make False, to prevent operation from generating code")) obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "An optional comment for this Contour")) - obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","User Assigned Label")) + obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "User Assigned Label")) - obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The tool number in use")) + obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The tool number in use")) obj.ToolNumber = (0, 0, 1000, 1) obj.setEditorMode('ToolNumber', 1) # make this read only - obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The description of the tool ")) - obj.setEditorMode('ToolDescription', 1) # make this read only + obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The description of the tool ")) + obj.setEditorMode('ToolDescription', 1) # make this read only # Depth Properties - obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations.")) - obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool")) - #obj.StepDown = (1, 0.01, 1000, 0.5) - obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z")) - obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z")) + obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Rapid Safety Height between locations.")) + obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Incremental Step Down of Tool")) + obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Starting Depth of Tool- first cut depth in Z")) + obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) # Start Point Properties - obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The start point of this path")) - obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying a Start Point")) - obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path before start of part edge")) - obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to first part edge")) + obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The start point of this path")) + obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying a Start Point")) + obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path before start of part edge")) + obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to first part edge")) # End Point Properties - obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying an End Point")) - obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path after end of part edge")) - obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to last part edge")) - obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The end point of this path")) + obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying an End Point")) + obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path after end of part edge")) + obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to last part edge")) + obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The end point of this path")) # Contour Properties - obj.addProperty("App::PropertyEnumeration", "Direction", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) obj.Direction = ['CW', 'CCW'] # this is the direction that the Contour runs - obj.addProperty("App::PropertyBool", "UseComp", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if using Cutter Radius Compensation")) + obj.addProperty("App::PropertyBool", "UseComp", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if using Cutter Radius Compensation")) obj.addProperty("App::PropertyEnumeration", "Side", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Left', 'Right', 'On'] # side of profile that cutter is on in relation to direction of profile - obj.setEditorMode('Side', 2) # hide + obj.setEditorMode('Side', 2) # hide - obj.addProperty("App::PropertyDistance", "RollRadius", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Radius at start and end")) - obj.addProperty("App::PropertyDistance", "OffsetExtra", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final Contour- good for roughing toolpath")) - obj.addProperty("App::PropertyLength", "SegLen", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation value for tool paths made from beziers, bsplines, and ellipses")) - obj.addProperty("App::PropertyAngle", "PlungeAngle", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn")) - - obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations")) - - obj.addProperty("App::PropertyFloatList", "angles", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "heights", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "lengths", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - locations = [] - angles = [] - lengths = [] - heights = [] - - obj.locs = locations - obj.angles = angles - obj.lengths = lengths - obj.heights = heights + obj.addProperty("App::PropertyDistance", "RollRadius", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "Radius at start and end")) + obj.addProperty("App::PropertyDistance", "OffsetExtra", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra value to stay away from final Contour- good for roughing toolpath")) obj.Proxy = self @@ -151,8 +135,8 @@ class ObjectContour: def _buildPathLibarea(self, obj, edgelist): import PathScripts.PathKurveUtils as PathKurveUtils - import math - import area + # import math + # import area output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -188,14 +172,6 @@ class ObjectContour: else: obj.Side = 'Right' - PathKurveUtils.clear_tags() - for i in range(len(obj.locs)): - tag = obj.locs[i] - h = obj.heights[i] - l = obj.lengths[i] - a = math.radians(obj.angles[i]) - PathKurveUtils.add_tag(area.Point(tag.x, tag.y), l, a, h) - depthparams = depth_params( obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0, @@ -251,7 +227,7 @@ class ObjectContour: baseobject = parentJob.Base if baseobject is None: return - contourwire = TechDraw.findShapeOutline(baseobject.Shape,1, Vector(0,0,1)) + contourwire = TechDraw.findShapeOutline(baseobject.Shape, 1, Vector(0, 0, 1)) edgelist = contourwire.Edges edgelist = Part.__sortEdges__(edgelist) @@ -298,45 +274,9 @@ class _ViewProviderContour: return None -class _CommandAddTag: - def GetResources(self): - return {'Pixmap': 'Path-Holding', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Add Holding Tag"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Add Holding Tag")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def setpoint(self, point, o): - obj = FreeCADGui.Selection.getSelection()[0] - obj.StartPoint.x = point.x - obj.StartPoint.y = point.y - loc = obj.locs - h = obj.heights - l = obj.lengths - a = obj.angles - - x = point.x - y = point.y - z = float(0.0) - loc.append(Vector(x, y, z)) - h.append(4.0) - l.append(5.0) - a.append(45.0) - - obj.locs = loc - obj.heights = h - obj.lengths = l - obj.angles = a - - def Activated(self): - - FreeCADGui.Snapper.getPoint(callback=self.setpoint) - - class _CommandSetStartPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick Start Point")} @@ -355,7 +295,7 @@ class _CommandSetStartPoint: class _CommandSetEndPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-EndPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick End Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick End Point")} @@ -407,7 +347,6 @@ class CommandPathContour: FreeCADGui.doCommand('obj.OffsetExtra = 0.0') FreeCADGui.doCommand('obj.Direction = "CW"') FreeCADGui.doCommand('obj.UseComp = True') - FreeCADGui.doCommand('obj.PlungeAngle = 90.0') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') FreeCADGui.doCommand('PathScripts.PathContour.ObjectContour.setDepths(obj.Proxy, obj)') @@ -420,7 +359,7 @@ class CommandPathContour: class TaskPanel: def __init__(self): self.form = FreeCADGui.PySideUic.loadUi(":/panels/ContourEdit.ui") - #self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ContourEdit.ui") + # self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ContourEdit.ui") self.updating = False def accept(self): @@ -439,23 +378,19 @@ class TaskPanel: def getFields(self): if self.obj: if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "StepDown"): - self.obj.StepDown = self.form.stepDown.text() + self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "OffsetExtra"): - self.obj.OffsetExtra = self.form.extraOffset.text() - if hasattr(self.obj, "SegLen"): - self.obj.SegLen = self.form.segLen.value() + self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value if hasattr(self.obj, "RollRadius"): - self.obj.RollRadius = self.form.rollRadius.text() - if hasattr(self.obj, "PlungeAngle"): - self.obj.PlungeAngle = str(self.form.plungeAngle.value()) + self.obj.RollRadius = FreeCAD.Units.Quantity(self.form.rollRadius.text()).Value if hasattr(self.obj, "UseComp"): self.obj.UseComp = self.form.useCompensation.isChecked() if hasattr(self.obj, "UseStartPoint"): @@ -467,15 +402,13 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) - self.form.stepDown.setText(str(self.obj.StepDown.Value)) - self.form.extraOffset.setText(str(self.obj.OffsetExtra.Value)) - self.form.segLen.setValue(self.obj.SegLen.Value) - self.form.rollRadius.setText(str(self.obj.RollRadius.Value)) - self.form.plungeAngle.setValue(self.obj.PlungeAngle.Value) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) + self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) + self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) + self.form.rollRadius.setText(FreeCAD.Units.Quantity(self.obj.RollRadius.Value, FreeCAD.Units.Length).UserString) self.form.useCompensation.setChecked(self.obj.UseComp) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useEndPoint.setChecked(self.obj.UseEndPoint) @@ -485,112 +418,14 @@ class TaskPanel: if index >= 0: self.form.direction.setCurrentIndex(index) - self.form.tagTree.blockSignals(True) - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x)+", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.form.tagTree.blockSignals(False) - def open(self): self.s = SelObserver() # install the function mode resident FreeCADGui.Selection.addObserver(self.s) - def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Ok) - def edit(self, item, column): - if not self.updating: - self.resetObject() - - def resetObject(self, remove=None): - "transfers the values from the widget to the object" - loc = [] - h = [] - l = [] - a = [] - - for i in range(self.form.tagTree.topLevelItemCount()): - it = self.form.tagTree.findItems( - str(i+1), QtCore.Qt.MatchExactly, 0)[0] - if (remove is None) or (remove != i): - if it.text(1): - x = float(it.text(1).split()[0].rstrip(",")) - y = float(it.text(1).split()[1].rstrip(",")) - z = float(it.text(1).split()[2].rstrip(",")) - loc.append(Vector(x, y, z)) - - else: - loc.append(0.0) - if it.text(2): - h.append(float(it.text(2))) - else: - h.append(4.0) - if it.text(3): - l.append(float(it.text(3))) - else: - l.append(5.0) - if it.text(4): - a.append(float(it.text(4))) - else: - a.append(45.0) - - self.obj.locs = loc - self.obj.heights = h - self.obj.lengths = l - self.obj.angles = a - - self.obj.touch() - FreeCAD.ActiveDocument.recompute() - - def addElement(self): - self.updating = True - - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(self.form.tagTree.topLevelItemCount())) - item.setText(1, "0.0, 0.0, 0.0") - item.setText(2, str(float(4.0))) - item.setText(3, str(float(10.0))) - item.setText(4, str(float(45.0))) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - self.updating = False - - self.resetObject() - - def removeElement(self): - it = self.form.tagTree.currentItem() - if it: - nr = int(it.text(0))-1 - self.resetObject(remove=nr) - self.update() - - def update(self): - 'fills the treewidget' - self.updating = True - self.form.tagTree.clear() - if self.obj: - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x) + ", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.updating = False - return - - def setupUi(self): # Connect Signals and Slots @@ -609,17 +444,8 @@ class TaskPanel: self.form.useStartPoint.clicked.connect(self.getFields) self.form.useEndPoint.clicked.connect(self.getFields) self.form.extraOffset.editingFinished.connect(self.getFields) - self.form.segLen.editingFinished.connect(self.getFields) self.form.rollRadius.editingFinished.connect(self.getFields) - # Tag Form - QtCore.QObject.connect( - self.form.tagTree, - QtCore.SIGNAL("itemChanged(QTreeWidgetItem *, int)"), - self.edit) - self.form.addTag.clicked.connect(self.addElement) - self.form.deleteTag.clicked.connect(self.removeElement) - self.setFields() @@ -640,7 +466,6 @@ class SelObserver: if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Contour', CommandPathContour()) - FreeCADGui.addCommand('Add_Tag', _CommandAddTag()) FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) diff --git a/src/Mod/Path/PathScripts/PathDressupDogbone.py b/src/Mod/Path/PathScripts/PathDressupDogbone.py index 23e56841ba..9aa008b7b7 100644 --- a/src/Mod/Path/PathScripts/PathDressupDogbone.py +++ b/src/Mod/Path/PathScripts/PathDressupDogbone.py @@ -275,7 +275,7 @@ class Chord (object): return dir == 'Back' or dir == side def connectsTo(self, chord): - return PathGeom.isRoughly(self.End, chord.Start) + return PathGeom.pointsCoincide(self.End, chord.Start) class Bone: def __init__(self, boneId, obj, lastCommand, inChord, outChord, smooth): diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py new file mode 100644 index 0000000000..7bb01d6caf --- /dev/null +++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py @@ -0,0 +1,1415 @@ +# -*- coding: utf-8 -*- + +# *************************************************************************** +# * * +# * Copyright (c) 2016 sliptonic * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** +import FreeCAD +import FreeCADGui +import Draft +import DraftGeomUtils +import DraftGui +import Path +import PathScripts.PathPreferencesPathDressup as PathPreferencesPathDressup +import Part +import copy +import math + +import cProfile +import time + +from DraftGui import todo +from PathScripts import PathUtils +from PathScripts.PathGeom import * +from PathScripts.PathPreferences import * +from PySide import QtCore, QtGui +from pivy import coin + +"""Holding Tags Dressup object and FreeCAD command""" + +# Qt tanslation handling +def translate(text, context = "PathDressup_HoldingTags", disambig=None): + return QtCore.QCoreApplication.translate(context, text, disambig) + +debugDressup = False + +def debugPrint(msg): + if debugDressup: + print(msg) + +def debugEdge(edge, prefix, force = False): + pf = edge.valueAt(edge.FirstParameter) + pl = edge.valueAt(edge.LastParameter) + if force or debugDressup: + if type(edge.Curve) == Part.Line or type(edge.Curve) == Part.LineSegment: + print("%s %s((%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f))" % (prefix, type(edge.Curve), pf.x, pf.y, pf.z, pl.x, pl.y, pl.z)) + else: + pm = edge.valueAt((edge.FirstParameter+edge.LastParameter)/2) + print("%s %s((%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f))" % (prefix, type(edge.Curve), pf.x, pf.y, pf.z, pm.x, pm.y, pm.z, pl.x, pl.y, pl.z)) + +def debugMarker(vector, label, color = None, radius = 0.5): + if debugDressup: + obj = FreeCAD.ActiveDocument.addObject("Part::Sphere", label) + obj.Label = label + obj.Radius = radius + obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0)) + if color: + obj.ViewObject.ShapeColor = color + +def debugCylinder(vector, r, height, label, color = None): + if debugDressup: + obj = FreeCAD.ActiveDocument.addObject("Part::Cylinder", label) + obj.Label = label + obj.Radius = r + obj.Height = height + obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0)) + obj.ViewObject.Transparency = 90 + if color: + obj.ViewObject.ShapeColor = color + +def debugCone(vector, r1, r2, height, label, color = None): + if debugDressup: + obj = FreeCAD.ActiveDocument.addObject("Part::Cone", label) + obj.Label = label + obj.Radius1 = r1 + obj.Radius2 = r2 + obj.Height = height + obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0)) + obj.ViewObject.Transparency = 90 + if color: + obj.ViewObject.ShapeColor = color + + +class HoldingTagsPreferences: + DefaultHoldingTagWidth = 'DefaultHoldingTagWidth' + DefaultHoldingTagHeight = 'DefaultHoldingTagHeight' + DefaultHoldingTagAngle = 'DefaultHoldingTagAngle' + DefaultHoldingTagRadius = 'DefaultHoldingTagRadius' + DefaultHoldingTagCount = 'DefaultHoldingTagCount' + + @classmethod + def defaultWidth(cls, ifNotSet): + value = PathPreferences.preferences().GetFloat(cls.DefaultHoldingTagWidth, ifNotSet) + if value == 0.0: + return ifNotSet + return value + + @classmethod + def defaultHeight(cls, ifNotSet): + value = PathPreferences.preferences().GetFloat(cls.DefaultHoldingTagHeight, ifNotSet) + if value == 0.0: + return ifNotSet + return value + + @classmethod + def defaultAngle(cls, ifNotSet = 45.0): + value = PathPreferences.preferences().GetFloat(cls.DefaultHoldingTagAngle, ifNotSet) + if value < 10.0: + return ifNotSet + return value + + @classmethod + def defaultCount(cls, ifNotSet = 4): + value = PathPreferences.preferences().GetUnsigned(cls.DefaultHoldingTagCount, ifNotSet) + if value < 2: + return float(ifNotSet) + return float(value) + + @classmethod + def defaultRadius(cls, ifNotSet = 0.0): + return PathPreferences.preferences().GetFloat(cls.DefaultHoldingTagRadius, ifNotSet) + + + def __init__(self): + self.form = FreeCADGui.PySideUic.loadUi(":/preferences/PathDressupHoldingTags.ui") + self.label = translate('Holding Tags') + + def loadSettings(self): + self.form.ifWidth.setText(FreeCAD.Units.Quantity(self.defaultWidth(0), FreeCAD.Units.Length).UserString) + self.form.ifHeight.setText(FreeCAD.Units.Quantity(self.defaultHeight(0), FreeCAD.Units.Length).UserString) + self.form.dsbAngle.setValue(self.defaultAngle()) + self.form.ifRadius.setText(FreeCAD.Units.Quantity(self.defaultRadius(), FreeCAD.Units.Length).UserString) + self.form.sbCount.setValue(self.defaultCount()) + + def saveSettings(self): + pref = PathPreferences.preferences() + pref.SetFloat(self.DefaultHoldingTagWidth, FreeCAD.Units.Quantity(self.form.ifWidth.text()).Value) + pref.SetFloat(self.DefaultHoldingTagHeight, FreeCAD.Units.Quantity(self.form.ifHeight.text()).Value) + pref.SetFloat(self.DefaultHoldingTagAngle, self.form.dsbAngle.value()) + pref.SetFloat(self.DefaultHoldingTagRadius, FreeCAD.Units.Quantity(self.form.ifRadius.text())) + pref.SetUnsigned(self.DefaultHoldingTagCount, self.form.sbCount.value()) + + @classmethod + def preferencesPage(cls): + return HoldingTagsPreferences() + +class Tag: + def __init__(self, x, y, width, height, angle, radius, enabled=True): + debugPrint("Tag(%.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %d)" % (x, y, width, height, angle, radius, enabled)) + self.x = x + self.y = y + self.width = math.fabs(width) + self.height = math.fabs(height) + self.actualHeight = self.height + self.angle = math.fabs(angle) + self.radius = radius + self.enabled = enabled + + def fullWidth(self): + return 2 * self.toolRadius + self.width + + def originAt(self, z): + return FreeCAD.Vector(self.x, self.y, z) + + def bottom(self): + return self.z + + def top(self): + return self.z + self.actualHeight + + def createSolidsAt(self, z, R): + self.z = z + self.toolRadius = R + r1 = self.fullWidth() / 2 + self.r1 = r1 + self.r2 = r1 + height = self.height * 1.01 + radius = 0 + if self.angle == 90 and height > 0: + # cylinder + self.solid = Part.makeCylinder(r1, height) + radius = min(min(self.radius, r1), self.height) + debugPrint("Part.makeCone(%f, %f)" % (r1, height)) + elif self.angle > 0.0 and height > 0.0: + # cone + rad = math.radians(self.angle) + tangens = math.tan(rad) + dr = height / tangens + if dr < r1: + # with top + r2 = r1 - dr + s = height / math.sin(rad) + radius = min(r2, s) * math.tan((math.pi - rad)/2) * 0.95 + else: + # triangular + r2 = 0 + height = r1 * tangens * 1.01 + self.actualHeight = height + self.r2 = r2 + debugPrint("Part.makeCone(%f, %f, %f)" % (r1, r2, height)) + self.solid = Part.makeCone(r1, r2, height) + else: + # degenerated case - no tag + debugPrint("Part.makeSphere(%f / 10000)" % (r1)) + self.solid = Part.makeSphere(r1 / 10000) + if not R == 0: # testing is easier if the solid is not rotated + angle = -PathGeom.getAngle(self.originAt(0)) * 180 / math.pi + debugPrint("solid.rotate(%f)" % angle) + self.solid.rotate(FreeCAD.Vector(0,0,0), FreeCAD.Vector(0,0,1), angle) + debugPrint("solid.translate(%s)" % self.originAt(z)) + self.solid.translate(self.originAt(z - 0.01 * height)) + self.realRadius = radius + if radius != 0: + debugPrint("makeFillet(%.4f)" % radius) + self.solid = self.solid.makeFillet(radius, [self.solid.Edges[0]]) + + def filterIntersections(self, pts, face): + if type(face.Surface) == Part.Cone or type(face.Surface) == Part.Cylinder or type(face.Surface) == Part.Toroid: + #print("it's a cone/cylinder, checking z") + return filter(lambda pt: pt.z >= self.bottom() and pt.z <= self.top(), pts) + if type(face.Surface) == Part.Plane: + #print("it's a plane, checking R") + c = face.Edges[0].Curve + if (type(c) == Part.Circle): + return filter(lambda pt: (pt - c.Center).Length <= c.Radius or PathGeom.isRoughly((pt - c.Center).Length, c.Radius), pts) + print("==== we got a %s" % face.Surface) + + def isPointOnEdge(self, pt, edge): + param = edge.Curve.parameter(pt) + if edge.FirstParameter <= param <= edge.LastParameter: + return True + if edge.LastParameter <= param <= edge.FirstParameter: + return True + if PathGeom.isRoughly(edge.FirstParameter, param) or PathGeom.isRoughly(edge.LastParameter, param): + return True + #print("-------- X %.2f <= %.2f <=%.2f (%.2f, %.2f, %.2f) %.2f:%.2f" % (edge.FirstParameter, param, edge.LastParameter, pt.x, pt.y, pt.z, edge.Curve.parameter(edge.valueAt(edge.FirstParameter)), edge.Curve.parameter(edge.valueAt(edge.LastParameter)))) + p1 = edge.Vertexes[0] + f1 = edge.Curve.parameter(FreeCAD.Vector(p1.X, p1.Y, p1.Z)) + p2 = edge.Vertexes[1] + f2 = edge.Curve.parameter(FreeCAD.Vector(p2.X, p2.Y, p2.Z)) + return False + + + def nextIntersectionClosestTo(self, edge, solid, refPt): + ef = edge.valueAt(edge.FirstParameter) + em = edge.valueAt((edge.FirstParameter+edge.LastParameter)/2) + el = edge.valueAt(edge.LastParameter) + #print("-------- intersect %s (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f) refp=(%.2f, %.2f, %.2f)" % (type(edge.Curve), ef.x, ef.y, ef.z, em.x, em.y, em.z, el.x, el.y, el.z, refPt.x, refPt.y, refPt.z)) + + vertexes = edge.common(solid).Vertexes + if vertexes: + return sorted(vertexes, key=lambda v: (v.Point - refPt).Length)[0].Point + return None + + def intersects(self, edge, param): + if self.enabled: + if edge.valueAt(edge.FirstParameter).z < self.top() or edge.valueAt(edge.LastParameter).z < self.top(): + return self.nextIntersectionClosestTo(edge, self.solid, edge.valueAt(param)) + return None + + def bbEdges(self): + edges = [] + for i in range(12): + p1, p2 = self.solid.BoundBox.getEdge(i) + edges.append(Part.Edge(Part.LineSegment(p1, p2))) + return edges + + def bbShow(self): + for e in self.bbEdges(): + Part.show(e) + + +class MapWireToTag: + def __init__(self, edge, tag, i, segm): + debugEdge(edge, 'MapWireToTag(%.2f, %.2f, %.2f)' % (i.x, i.y, i.z)) + self.tag = tag + self.segm = segm + if PathGeom.pointsCoincide(edge.valueAt(edge.FirstParameter), i): + tail = edge + self.commands = [] + debugEdge(tail, '.........=') + elif PathGeom.pointsCoincide(edge.valueAt(edge.LastParameter), i): + debugEdge(edge, '++++++++ .') + self.commands = PathGeom.cmdsForEdge(edge, segm=segm) + tail = None + else: + e, tail = PathGeom.splitEdgeAt(edge, i) + debugEdge(e, '++++++++ .') + self.commands = PathGeom.cmdsForEdge(e, segm=segm) + debugEdge(tail, '.........-') + self.initialEdge = edge + self.tail = tail + self.edges = [] + self.entry = i + if tail: + debugPrint("MapWireToTag(%s - %s)" % (i, tail.valueAt(tail.FirstParameter))) + else: + debugPrint("MapWireToTag(%s - )" % i) + self.complete = False + self.haveProblem = False + + def addEdge(self, edge): + debugEdge(edge, '..........') + self.edges.append(edge) + + def needToFlipEdge(self, edge, p): + if PathGeom.pointsCoincide(edge.valueAt(edge.LastParameter), p): + return True, edge.valueAt(edge.FirstParameter) + return False, edge.valueAt(edge.LastParameter) + + def isEntryOrExitStrut(self, e): + p1 = e.valueAt(e.FirstParameter) + p2 = e.valueAt(e.LastParameter) + if PathGeom.pointsCoincide(p1, self.entry) and p2.z >= self.entry.z: + return 1 + if PathGeom.pointsCoincide(p2, self.entry) and p1.z >= self.entry.z: + return 1 + if PathGeom.pointsCoincide(p1, self.exit) and p2.z >= self.exit.z: + return 2 + if PathGeom.pointsCoincide(p2, self.exit) and p1.z >= self.exit.z: + return 2 + return 0 + + def cleanupEdges(self, edges): + # want to remove all edges from the wire itself, and all internal struts + #print("+cleanupEdges") + #print(" edges:") + for e in edges: + debugEdge(e, ' ') + #print(":") + self.edgesCleanup = [copy.copy(edges)] + + # remove any edge that has a point inside the tag solid + # and collect all edges that are connected to the entry and/or exit + self.entryEdges = [] + self.exitEdges = [] + self.edgePoints = [] + for e in copy.copy(edges): + p1 = e.valueAt(e.FirstParameter) + p2 = e.valueAt(e.LastParameter) + self.edgePoints.append(p1) + self.edgePoints.append(p2) + if self.tag.solid.isInside(p1, PathGeom.Tolerance, False) or self.tag.solid.isInside(p2, PathGeom.Tolerance, False): + edges.remove(e) + debugEdge(e, '......... X0', False) + else: + if PathGeom.pointsCoincide(p1, self.entry) or PathGeom.pointsCoincide(p2, self.entry): + self.entryEdges.append(e) + if PathGeom.pointsCoincide(p1, self.exit) or PathGeom.pointsCoincide(p2, self.exit): + self.exitEdges.append(e) + self.edgesCleanup.append(copy.copy(edges)) + + # if there are no edges connected to entry/exit, it means the plunge in/out is vertical + # we need to add in the missing segment and collect the new entry/exit edges. + if not self.entryEdges: + print("fill entryEdges ...") + self.realEntry = sorted(self.edgePoints, key=lambda p: (p - self.entry).Length)[0] + self.entryEdges = filter(lambda e: PathGeom.edgeConnectsTo(e, self.realEntry), edges) + edges.append(Part.Edge(Part.LineSegment(self.entry, self.realEntry))) + else: + self.realEntry = None + if not self.exitEdges: + print("fill exitEdges ...") + self.realExit = sorted(self.edgePoints, key=lambda p: (p - self.exit).Length)[0] + self.exitEdges = filter(lambda e: PathGeom.edgeConnectsTo(e, self.realExit), edges) + edges.append(Part.Edge(Part.LineSegment(self.realExit, self.exit))) + else: + self.realExit = None + self.edgesCleanup.append(copy.copy(edges)) + + # if there are 2 edges attached to entry/exit, throw away the one that is "lower" + if len(self.entryEdges) > 1: + debugEdge(self.entryEdges[0], ' entry[0]', False) + debugEdge(self.entryEdges[1], ' entry[1]', False) + if self.entryEdges[0].BoundBox.ZMax < self.entryEdges[1].BoundBox.ZMax: + edges.remove(self.entryEdges[0]) + debugEdge(e, '......... X1', False) + else: + edges.remove(self.entryEdges[1]) + debugEdge(e, '......... X2', False) + if len(self.exitEdges) > 1: + debugEdge(self.exitEdges[0], ' exit[0]', False) + debugEdge(self.exitEdges[1], ' exit[1]', False) + if self.exitEdges[0].BoundBox.ZMax < self.exitEdges[1].BoundBox.ZMax: + if self.exitEdges[0] in edges: + edges.remove(self.exitEdges[0]) + debugEdge(e, '......... X3', False) + else: + if self.exitEdges[1] in edges: + edges.remove(self.exitEdges[1]) + debugEdge(e, '......... X4', False) + + self.edgesCleanup.append(copy.copy(edges)) + return edges + + def orderAndFlipEdges(self, edges): + #print("entry(%.2f, %.2f, %.2f), exit(%.2f, %.2f, %.2f)" % (self.entry.x, self.entry.y, self.entry.z, self.exit.x, self.exit.y, self.exit.z)) + self.edgesOrder = [] + outputEdges = [] + p0 = self.entry + lastP = p0 + while edges: + #print("(%.2f, %.2f, %.2f) %d %d" % (p0.x, p0.y, p0.z)) + for e in edges: + p1 = e.valueAt(e.FirstParameter) + p2 = e.valueAt(e.LastParameter) + if PathGeom.pointsCoincide(p1, p0): + outputEdges.append((e, False)) + edges.remove(e) + lastP = None + p0 = p2 + debugEdge(e, ">>>>> no flip") + break + elif PathGeom.pointsCoincide(p2, p0): + outputEdges.append((e, True)) + edges.remove(e) + lastP = None + p0 = p1 + debugEdge(e, ">>>>> flip") + break + else: + debugEdge(e, "<<<<< (%.2f, %.2f, %.2f)" % (p0.x, p0.y, p0.z)) + if lastP == p0: + self.edgesOrder.append(outputEdges) + self.edgesOrder.append(edges) + print('ordered edges:') + for e, flip in outputEdges: + debugEdge(e, ' %c ' % ('<' if flip else '>'), False) + print('remaining edges:') + for e in edges: + debugEdge(e, ' ', False) + raise ValueError("No connection to %s" % (p0)) + elif lastP: + debugPrint("xxxxxx (%.2f, %.2f, %.2f) (%.2f, %.2f, %.2f)" % (p0.x, p0.y, p0.z, lastP.x, lastP.y, lastP.z)) + else: + debugPrint("xxxxxx (%.2f, %.2f, %.2f) -" % (p0.x, p0.y, p0.z)) + lastP = p0 + #print("-cleanupEdges") + return outputEdges + + def isStrut(self, edge): + p1 = PathGeom.xy(edge.valueAt(edge.FirstParameter)) + p2 = PathGeom.xy(edge.valueAt(edge.LastParameter)) + return PathGeom.pointsCoincide(p1, p2) + + def shell(self): + if len(self.edges) > 1: + wire = Part.Wire(self.initialEdge) + else: + edge = self.edges[0] + if PathGeom.pointsCoincide(edge.valueAt(edge.FirstParameter), self.finalEdge.valueAt(self.finalEdge.FirstParameter)): + wire = Part.Wire(self.finalEdge) + elif hasattr(self, 'initialEdge') and PathGeom.pointsCoincide(edge.valueAt(edge.FirstParameter), self.initialEdge.valueAt(self.initialEdge.FirstParameter)): + wire = Part.Wire(self.initialEdge) + else: + wire = Part.Wire(edge) + + for edge in self.edges[1:]: + if PathGeom.pointsCoincide(edge.valueAt(edge.FirstParameter), self.finalEdge.valueAt(self.finalEdge.FirstParameter)): + wire.add(self.finalEdge) + else: + wire.add(edge) + + shell = wire.extrude(FreeCAD.Vector(0, 0, self.tag.height + 1)) + return shell.removeShape(filter(lambda f: PathGeom.isRoughly(f.Area, 0), shell.Faces)) + + def commandsForEdges(self): + if self.edges: + shape = self.shell().common(self.tag.solid) + commands = [] + for e,flip in self.orderAndFlipEdges(self.cleanupEdges(shape.Edges)): + debugEdge(e, '++++++++ %s' % ('<' if flip else '>'), False) + commands.extend(PathGeom.cmdsForEdge(e, flip, False, self.segm)) + return commands + return [] + + def add(self, edge): + self.tail = None + self.finalEdge = edge + if self.tag.solid.isInside(edge.valueAt(edge.LastParameter), PathGeom.Tolerance, True): + self.addEdge(edge) + else: + i = self.tag.intersects(edge, edge.LastParameter) + if not i: + self.offendingEdge = edge + debugEdge(edge, 'offending Edge:', False) + o = self.tag.originAt(self.tag.z) + print('originAt: (%.2f, %.2f, %.2f)' % (o.x, o.y, o.z)) + i = edge.valueAt(edge.FirstParameter) + if PathGeom.pointsCoincide(i, edge.valueAt(edge.FirstParameter)): + self.tail = edge + else: + e, tail = PathGeom.splitEdgeAt(edge, i) + self.addEdge(e) + self.tail = tail + self.exit = i + self.complete = True + self.commands.extend(self.commandsForEdges()) + + def mappingComplete(self): + return self.complete + +class _RapidEdges: + def __init__(self, rapid): + self.rapid = rapid + + def isRapid(self, edge): + if type(edge.Curve) == Part.Line or type(edge.Curve) == Part.LineSegment: + v0 = edge.Vertexes[0] + v1 = edge.Vertexes[1] + for r in self.rapid: + r0 = r.Vertexes[0] + r1 = r.Vertexes[1] + if PathGeom.isRoughly(r0.X, v0.X) and PathGeom.isRoughly(r0.Y, v0.Y) and PathGeom.isRoughly(r0.Z, v0.Z) and PathGeom.isRoughly(r1.X, v1.X) and PathGeom.isRoughly(r1.Y, v1.Y) and PathGeom.isRoughly(r1.Z, v1.Z): + return True + return False + + def debugPrint(self): + debugPrint('rapid:') + for r in self.rapid: + debugEdge(r, ' ') + +class PathData: + def __init__(self, obj): + debugPrint("PathData(%s)" % obj.Base.Name) + self.obj = obj + self.wire, rapid = PathGeom.wireForPath(obj.Base.Path) + self.rapid = _RapidEdges(rapid) + self.edges = self.wire.Edges + self.base = self.findBottomWire(self.edges) + # determine overall length + self.length = self.base.Length + + def findBottomWire(self, edges): + (minZ, maxZ) = self.findZLimits(edges) + self.minZ = minZ + self.maxZ = maxZ + bottom = [e for e in edges if e.Vertexes[0].Point.z == minZ and e.Vertexes[1].Point.z == minZ] + wire = Part.Wire(bottom) + if wire.isClosed(): + return wire + # if we get here there are already holding tags, or we're not looking at a profile + # let's try and insert the missing pieces - another day + raise ValueError("Selected path doesn't seem to be a Profile operation.") + + def findZLimits(self, edges): + # not considering arcs and spheres in Z direction, find the highes and lowest Z values + minZ = 99999999999 + maxZ = -99999999999 + for e in edges: + if self.rapid.isRapid(e): + continue + for v in e.Vertexes: + if v.Point.z < minZ: + minZ = v.Point.z + if v.Point.z > maxZ: + maxZ = v.Point.z + return (minZ, maxZ) + + def shortestAndLongestPathEdge(self): + edges = sorted(self.base.Edges, key=lambda e: e.Length) + return (edges[0], edges[-1]) + + def generateTags(self, obj, count, width=None, height=None, angle=None, radius=None, spacing=None): + debugPrint("generateTags(%s, %s, %s, %s, %s)" % (count, width, height, angle, spacing)) + #for e in self.base.Edges: + # debugMarker(e.Vertexes[0].Point, 'base', (0.0, 1.0, 1.0), 0.2) + + if spacing: + tagDistance = spacing + else: + tagDistance = self.base.Length / (count if count else 4) + + W = width if width else self.defaultTagWidth() + H = height if height else self.defaultTagHeight() + A = angle if angle else self.defaultTagAngle() + R = radius if radius else self.defaultTagRadius() + + + # start assigning tags on the longest segment + (shortestEdge, longestEdge) = self.shortestAndLongestPathEdge() + startIndex = 0 + for i in range(0, len(self.base.Edges)): + edge = self.base.Edges[i] + debugPrint(' %d: %.2f' % (i, edge.Length)) + if edge.Length == longestEdge.Length: + startIndex = i + break + + startEdge = self.base.Edges[startIndex] + startCount = int(startEdge.Length / tagDistance) + if (longestEdge.Length - shortestEdge.Length) > shortestEdge.Length: + startCount = int(startEdge.Length / tagDistance) + 1 + + lastTagLength = (startEdge.Length + (startCount - 1) * tagDistance) / 2 + currentLength = startEdge.Length + + minLength = min(2. * W, longestEdge.Length) + + debugPrint("length=%.2f shortestEdge=%.2f(%.2f) longestEdge=%.2f(%.2f) minLength=%.2f" % (self.base.Length, shortestEdge.Length, shortestEdge.Length/self.base.Length, longestEdge.Length, longestEdge.Length / self.base.Length, minLength)) + debugPrint(" start: index=%-2d count=%d (length=%.2f, distance=%.2f)" % (startIndex, startCount, startEdge.Length, tagDistance)) + debugPrint(" -> lastTagLength=%.2f)" % lastTagLength) + debugPrint(" -> currentLength=%.2f)" % currentLength) + + edgeDict = { startIndex: startCount } + + for i in range(startIndex + 1, len(self.base.Edges)): + edge = self.base.Edges[i] + (currentLength, lastTagLength) = self.processEdge(i, edge, currentLength, lastTagLength, tagDistance, minLength, edgeDict) + for i in range(0, startIndex): + edge = self.base.Edges[i] + (currentLength, lastTagLength) = self.processEdge(i, edge, currentLength, lastTagLength, tagDistance, minLength, edgeDict) + + tags = [] + + for (i, count) in edgeDict.iteritems(): + edge = self.base.Edges[i] + debugPrint(" %d: %d" % (i, count)) + #debugMarker(edge.Vertexes[0].Point, 'base', (1.0, 0.0, 0.0), 0.2) + #debugMarker(edge.Vertexes[1].Point, 'base', (0.0, 1.0, 0.0), 0.2) + if 0 != count: + distance = (edge.LastParameter - edge.FirstParameter) / count + for j in range(0, count): + tag = edge.Curve.value((j+0.5) * distance) + tags.append(Tag(tag.x, tag.y, W, H, A, R, True)) + + return tags + + def processEdge(self, index, edge, currentLength, lastTagLength, tagDistance, minLength, edgeDict): + tagCount = 0 + currentLength += edge.Length + if edge.Length >= minLength: + while lastTagLength + tagDistance < currentLength: + tagCount += 1 + lastTagLength += tagDistance + if tagCount > 0: + debugPrint(" index=%d -> count=%d" % (index, tagCount)) + edgeDict[index] = tagCount + else: + debugPrint(" skipping=%-2d (%.2f)" % (index, edge.Length)) + + return (currentLength, lastTagLength) + + def defaultTagHeight(self): + if hasattr(self.obj, 'Base') and hasattr(self.obj.Base, 'StartDepth') and hasattr(self.obj.Base, 'FinalDepth'): + pathHeight = (self.obj.Base.StartDepth - self.obj.Base.FinalDepth).Value + else: + pathHeight = self.maxZ - self.minZ + height = HoldingTagsPreferences.defaultHeight(pathHeight / 2) + if height > pathHeight: + return pathHeight + return height + + def defaultTagWidth(self): + width = self.shortestAndLongestPathEdge()[1].Length / 10 + return HoldingTagsPreferences.defaultWidth(width) + + def defaultTagAngle(self): + return HoldingTagsPreferences.defaultAngle() + + def defaultTagRadius(self): + return HoldingTagsPreferences.defaultRadius() + + def sortedTags(self, tags): + ordered = [] + for edge in self.base.Edges: + ts = [t for t in tags if DraftGeomUtils.isPtOnEdge(t.originAt(self.minZ), edge)] + for t in sorted(ts, key=lambda t: (t.originAt(self.minZ) - edge.valueAt(edge.FirstParameter)).Length): + tags.remove(t) + ordered.append(t) + # disable all tags that are not on the base wire. + for tag in tags: + FreeCAD.Console.PrintMessage("Tag #%d not on base wire - disabling\n" % len(ordered)) + tag.enabled = False + ordered.append(tag) + return ordered + + def pointIsOnPath(self, p): + for e in self.edges: + if DraftGeomUtils.isPtOnEdge(p, e): + return True + return False + + +class ObjectDressup: + + def __init__(self, obj): + self.obj = obj + obj.addProperty("App::PropertyLink", "Base","Base", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "The base path to modify")) + obj.addProperty("App::PropertyLength", "Width", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Width of tags.")) + obj.addProperty("App::PropertyLength", "Height", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Height of tags.")) + obj.addProperty("App::PropertyAngle", "Angle", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Angle of tag plunge and ascent.")) + obj.addProperty("App::PropertyLength", "Radius", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Radius of the fillet for the tag.")) + obj.addProperty("App::PropertyVectorList", "Positions", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Locations of insterted holding tags")) + obj.addProperty("App::PropertyIntegerList", "Disabled", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Ids of disabled holding tags")) + obj.addProperty("App::PropertyInteger", "SegmentationFactor", "Tag", QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Factor determining the # segments used to approximate rounded tags.")) + obj.Proxy = self + + def __getstate__(self): + return None + + def __setstate__(self, state): + return None + + def generateTags(self, obj, count): + if hasattr(self, "pathData"): + self.tags = self.pathData.generateTags(obj, count, obj.Width.Value, obj.Height.Value, obj.Angle, obj.Radius.Value, None) + obj.Positions = [tag.originAt(0) for tag in self.tags] + obj.Disabled = [] + return False + else: + self.setup(obj, count) + self.execute(obj) + return True + + def isValidTagStartIntersection(self, edge, i): + if PathGeom.pointsCoincide(i, edge.valueAt(edge.LastParameter)): + return False + p1 = edge.valueAt(edge.FirstParameter) + p2 = edge.valueAt(edge.LastParameter) + if PathGeom.pointsCoincide(PathGeom.xy(p1), PathGeom.xy(p2)): + # if this vertical goes up, it can't be the start of a tag intersection + if p1.z < p2.z: + return False + return True + + def createPath(self, obj, edges, tags, rapid): + #print("createPath") + commands = [] + lastEdge = 0 + lastTag = 0 + sameTag = None + t = 0 + inters = None + edge = None + + segm = 50 + if hasattr(obj, 'SegmentationFactor'): + segm = obj.SegmentationFactor + if segm <= 0: + segm = 50 + obj.SegmentationFactor = 50 + + self.mappers = [] + mapper = None + + while edge or lastEdge < len(edges): + debugPrint("------- lastEdge = %d/%d.%d/%d" % (lastEdge, lastTag, t, len(tags))) + if not edge: + edge = edges[lastEdge] + debugEdge(edge, "======= new edge: %d/%d" % (lastEdge, len(edges))) + lastEdge += 1 + sameTag = None + + if mapper: + mapper.add(edge) + if mapper.mappingComplete(): + commands.extend(mapper.commands) + edge = mapper.tail + mapper = None + else: + edge = None + + if edge: + tIndex = (t + lastTag) % len(tags) + t += 1 + i = tags[tIndex].intersects(edge, edge.FirstParameter) + if i and self.isValidTagStartIntersection(edge, i): + mapper = MapWireToTag(edge, tags[tIndex], i, segm) + self.mappers.append(mapper) + edge = mapper.tail + + + if not mapper and t >= len(tags): + # gone through all tags, consume edge and move on + if edge: + debugEdge(edge, '++++++++') + if rapid.isRapid(edge): + v = edge.Vertexes[1] + commands.append(Path.Command('G0', {'X': v.X, 'Y': v.Y, 'Z': v.Z})) + else: + commands.extend(PathGeom.cmdsForEdge(edge, segm=segm)) + edge = None + t = 0 + + #for cmd in commands: + # print(cmd) + return Path.Path(commands) + + def problems(self): + return filter(lambda m: m.haveProblem, self.mappers) + + def createTagsPositionDisabled(self, obj, positionsIn, disabledIn): + rawTags = [] + for i, pos in enumerate(positionsIn): + tag = Tag(pos.x, pos.y, obj.Width.Value, obj.Height.Value, obj.Angle, obj.Radius, not i in disabledIn) + tag.createSolidsAt(self.pathData.minZ, self.toolRadius) + rawTags.append(tag) + # disable all tags that intersect with their previous tag + prev = None + tags = [] + positions = [] + disabled = [] + for i, tag in enumerate(self.pathData.sortedTags(rawTags)): + if tag.enabled: + if prev: + if prev.solid.common(tag.solid).Faces: + FreeCAD.Console.PrintMessage("Tag #%d intersects with previous tag - disabling\n" % i) + debugPrint("this tag = %d [%s]" % (i, tag.solid.BoundBox)) + tag.enabled = False + elif self.pathData.edges: + e = self.pathData.edges[0] + p0 = e.valueAt(e.FirstParameter) + p1 = e.valueAt(e.LastParameter) + if tag.solid.isInside(p0, PathGeom.Tolerance, True) or tag.solid.isInside(p1, PathGeom.Tolerance, True): + FreeCAD.Console.PrintMessage("Tag #%d intersects with starting point - disabling\n" % i) + tag.enabled = False + if tag.enabled: + prev = tag + debugPrint("previousTag = %d [%s]" % (i, prev)) + else: + disabled.append(i) + tags.append(tag) + positions.append(tag.originAt(0)) + return (tags, positions, disabled) + + def execute(self, obj): + #pr = cProfile.Profile() + #pr.enable() + self.doExecute(obj) + #pr.disable() + #pr.print_stats() + + def doExecute(self,obj): + if not obj.Base: + return + if not obj.Base.isDerivedFrom("Path::Feature"): + return + if not obj.Base.Path: + return + if not obj.Base.Path.Commands: + return + + pathData = self.setup(obj) + if not pathData: + print("execute - no pathData") + return + + self.tags = [] + if hasattr(obj, "Positions"): + self.tags, positions, disabled = self.createTagsPositionDisabled(obj, obj.Positions, obj.Disabled) + if obj.Disabled != disabled: + debugPrint("Updating properties.... %s vs. %s" % (obj.Disabled, disabled)) + obj.Positions = positions + obj.Disabled = disabled + + if not self.tags: + print("execute - no tags") + obj.Path = obj.Base.Path + return + + self.processTags(obj) + + def processTags(self, obj): + tagID = 0 + if debugDressup: + for tag in self.tags: + tagID += 1 + if tag.enabled: + debugPrint("x=%s, y=%s, z=%s" % (tag.x, tag.y, self.pathData.minZ)) + #debugMarker(FreeCAD.Vector(tag.x, tag.y, self.pathData.minZ), "tag-%02d" % tagID , (1.0, 0.0, 1.0), 0.5) + #if tag.angle != 90: + # debugCone(tag.originAt(self.pathData.minZ), tag.r1, tag.r2, tag.actualHeight, "tag-%02d" % tagID) + #else: + # debugCylinder(tag.originAt(self.pathData.minZ), tag.fullWidth()/2, tag.actualHeight, "tag-%02d" % tagID) + + obj.Path = self.createPath(obj, self.pathData.edges, self.tags, self.pathData.rapid) + #print("execute - done") + + def setup(self, obj, generate=False): + debugPrint("setup") + self.obj = obj + try: + pathData = PathData(obj) + except ValueError: + FreeCAD.Console.PrintError(translate("Cannot insert holding tags for this path - please select a Profile path\n")) + return None + + self.toolRadius = 5 + toolLoad = PathUtils.getLastToolLoad(obj) + if toolLoad is None or toolLoad.ToolNumber == 0: + self.toolRadius = 5 + else: + tool = PathUtils.getTool(obj, toolLoad.ToolNumber) + if not tool or tool.Diameter == 0: + self.toolRadius = 5 + else: + self.toolRadius = tool.Diameter / 2 + self.pathData = pathData + if generate: + obj.Height = self.pathData.defaultTagHeight() + obj.Width = self.pathData.defaultTagWidth() + obj.Angle = self.pathData.defaultTagAngle() + obj.Radius = self.pathData.defaultTagRadius() + count = HoldingTagsPreferences.defaultCount() + self.generateTags(obj, count) + return self.pathData + + def setXyEnabled(self, triples): + debugPrint("setXyEnabled") + if not hasattr(self, 'pathData'): + self.setup(self.obj) + positions = [] + disabled = [] + for i, (x, y, enabled) in enumerate(triples): + #print("%d: (%.2f, %.2f) %d" % (i, x, y, enabled)) + positions.append(FreeCAD.Vector(x, y, 0)) + if not enabled: + disabled.append(i) + self.tags, self.obj.Positions, self.obj.Disabled = self.createTagsPositionDisabled(self.obj, positions, disabled) + self.processTags(self.obj) + + def pointIsOnPath(self, obj, point): + if not hasattr(self, 'pathData'): + self.setup(obj) + return self.pathData.pointIsOnPath(point) + + @classmethod + def preferencesPage(cls): + return HoldingTagsPreferences() + +PathPreferencesPathDressup.RegisterDressup(ObjectDressup) + +class TaskPanel: + DataX = QtCore.Qt.ItemDataRole.UserRole + DataY = QtCore.Qt.ItemDataRole.UserRole + 1 + DataID = QtCore.Qt.ItemDataRole.UserRole + 2 + + def __init__(self, obj, viewProvider, jvoVisibility=None): + self.obj = obj + self.obj.Proxy.obj = obj + self.viewProvider = viewProvider + self.form = QtGui.QWidget() + self.formTags = FreeCADGui.PySideUic.loadUi(":/panels/HoldingTagsEdit.ui") + self.formPoint = FreeCADGui.PySideUic.loadUi(":/panels/PointEdit.ui") + self.layout = QtGui.QVBoxLayout(self.form) + #self.form.setGeometry(self.formTags.geometry()) + self.form.setWindowTitle(self.formTags.windowTitle()) + self.form.setSizePolicy(self.formTags.sizePolicy()) + self.formTags.setParent(self.form) + self.formPoint.setParent(self.form) + self.layout.addWidget(self.formTags) + self.layout.addWidget(self.formPoint) + self.formPoint.hide() + self.jvo = PathUtils.findParentJob(obj).ViewObject + if jvoVisibility is None: + FreeCAD.ActiveDocument.openTransaction(translate("Edit HoldingTags Dress-up")) + self.jvoVisible = self.jvo.isVisible() + if self.jvoVisible: + self.jvo.hide() + else: + self.jvoVisible = jvoVisibility + self.pt = FreeCAD.Vector(0, 0, 0) + + def reject(self): + FreeCAD.ActiveDocument.abortTransaction() + self.cleanup() + + def accept(self): + self.getFields() + FreeCAD.ActiveDocument.commitTransaction() + self.cleanup() + FreeCAD.ActiveDocument.recompute() + + def cleanup(self): + self.removeGlobalCallbacks() + self.viewProvider.clearTaskPanel() + FreeCADGui.ActiveDocument.resetEdit() + FreeCADGui.Control.closeDialog() + FreeCAD.ActiveDocument.recompute() + if self.jvoVisible: + self.jvo.show() + + def getTags(self, includeCurrent): + tags = [] + index = self.formTags.lwTags.currentRow() + for i in range(0, self.formTags.lwTags.count()): + item = self.formTags.lwTags.item(i) + enabled = item.checkState() == QtCore.Qt.CheckState.Checked + x = item.data(self.DataX) + y = item.data(self.DataY) + #print("(%.2f, %.2f) i=%d/%s" % (x, y, i, index)) + if includeCurrent or i != index: + tags.append((x, y, enabled)) + return tags + + def getTagParameters(self): + self.obj.Width = FreeCAD.Units.Quantity(self.formTags.ifWidth.text()).Value + self.obj.Height = FreeCAD.Units.Quantity(self.formTags.ifHeight.text()).Value + self.obj.Angle = self.formTags.dsbAngle.value() + self.obj.Radius = FreeCAD.Units.Quantity(self.formTags.ifRadius.text()).Value + + def getFields(self): + self.getTagParameters() + tags = self.getTags(True) + self.obj.Proxy.setXyEnabled(tags) + + def updateTagsView(self): + #print("updateTagsView") + self.formTags.lwTags.blockSignals(True) + self.formTags.lwTags.clear() + for i, pos in enumerate(self.obj.Positions): + lbl = "%d: (%.2f, %.2f)" % (i, pos.x, pos.y) + item = QtGui.QListWidgetItem(lbl) + item.setData(self.DataX, pos.x) + item.setData(self.DataY, pos.y) + item.setData(self.DataID, i) + if i in self.obj.Disabled: + item.setCheckState(QtCore.Qt.CheckState.Unchecked) + else: + item.setCheckState(QtCore.Qt.CheckState.Checked) + flags = QtCore.Qt.ItemFlag.ItemIsSelectable + flags |= QtCore.Qt.ItemFlag.ItemIsEnabled + flags |= QtCore.Qt.ItemFlag.ItemIsUserCheckable + item.setFlags(flags) + self.formTags.lwTags.addItem(item) + self.formTags.lwTags.blockSignals(False) + self.whenTagSelectionChanged() + + def generateNewTags(self): + count = self.formTags.sbCount.value() + if not self.obj.Proxy.generateTags(self.obj, count): + self.obj.Proxy.execute(self.obj) + + self.updateTagsView() + #if debugDressup: + # # this causes a big of an echo and a double click on the spin buttons, don't know why though + # FreeCAD.ActiveDocument.recompute() + + + def updateModel(self): + self.getFields() + self.updateTagsView() + #FreeCAD.ActiveDocument.recompute() + + def whenCountChanged(self): + count = self.formTags.sbCount.value() + self.formTags.pbGenerate.setEnabled(count) + + def selectTagWithId(self, index): + self.formTags.lwTags.setCurrentRow(index) + + def whenTagSelectionChanged(self): + index = self.formTags.lwTags.currentRow() + count = self.formTags.lwTags.count() + self.formTags.pbDelete.setEnabled(index != -1 and count > 2) + self.formTags.pbEdit.setEnabled(index != -1) + self.viewProvider.selectTag(index) + + def deleteSelectedTag(self): + self.obj.Proxy.setXyEnabled(self.getTags(False)) + self.updateTagsView() + + def addNewTagAt(self, point, obj): + if self.obj.Proxy.pointIsOnPath(self.obj, point): + #print("addNewTagAt(%s)" % (point)) + tags = self.tags + tags.append((point.x, point.y, True)) + self.obj.Proxy.setXyEnabled(tags) + self.updateTagsView() + else: + print("ignore new tag at %s" % (point)) + self.formPoint.hide() + self.formTags.show() + + def addNewTag(self): + self.tags = self.getTags(True) + self.getPoint(self.addNewTagAt) + + def editTagAt(self, point, obj): + if (obj or point != FreeCAD.Vector()) and self.obj.Proxy.pointIsOnPath(self.obj, point): + tags = [] + for i, (x, y, enabled) in enumerate(self.tags): + if i == self.editItem: + tags.append((point.x, point.y, enabled)) + else: + tags.append((x, y, enabled)) + self.obj.Proxy.setXyEnabled(tags) + self.updateTagsView() + self.formPoint.hide() + self.formTags.show() + + def editTag(self, item): + if item: + self.tags = self.getTags(True) + self.editItem = item.data(self.DataID) + x = item.data(self.DataX) + y = item.data(self.DataY) + self.getPoint(self.editTagAt, FreeCAD.Vector(x, y, 0)) + + def editSelectedTag(self): + self.editTag(self.formTags.lwTags.currentItem()) + + def removeGlobalCallbacks(self): + if hasattr(self, 'view') and self.view: + if self.pointCbClick: + self.view.removeEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), self.pointCbClick) + self.pointCbClick = None + if self.pointCbMove: + self.view.removeEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), self.pointCbMove) + self.pointCbMove = None + self.view = None + + def getPoint(self, whenDone, start=None): + + def displayPoint(p): + self.formPoint.ifValueX.setText(FreeCAD.Units.Quantity(p.x, FreeCAD.Units.Length).UserString) + self.formPoint.ifValueY.setText(FreeCAD.Units.Quantity(p.y, FreeCAD.Units.Length).UserString) + self.formPoint.ifValueZ.setText(FreeCAD.Units.Quantity(p.z, FreeCAD.Units.Length).UserString) + self.formPoint.ifValueX.setFocus() + self.formPoint.ifValueX.selectAll() + + def mouseMove(cb): + event = cb.getEvent() + pos = event.getPosition() + cntrl = event.wasCtrlDown() + shift = event.wasShiftDown() + self.pt = FreeCADGui.Snapper.snap(pos, lastpoint=start, active=cntrl, constrain=shift) + plane = FreeCAD.DraftWorkingPlane + p = plane.getLocalCoords(self.pt) + displayPoint(p) + + def click(cb): + event = cb.getEvent() + if event.getButton() == 1 and event.getState() == coin.SoMouseButtonEvent.DOWN: + accept() + + def accept(): + self.pointAccept() + + def cancel(): + self.pointCancel() + + self.pointWhenDone = whenDone + self.formTags.hide() + self.formPoint.show() + if start: + displayPoint(start) + else: + displayPoint(FreeCAD.Vector(0,0,0)) + + self.view = Draft.get3DView() + self.pointCbClick = self.view.addEventCallbackPivy(coin.SoMouseButtonEvent.getClassTypeId(), click) + self.pointCbMove = self.view.addEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), mouseMove) + + def setupSpinBox(self, widget, val, decimals = 2): + if decimals: + widget.setDecimals(decimals) + widget.setValue(val) + + def setFields(self): + self.updateTagsView() + self.formTags.sbCount.setValue(len(self.obj.Positions)) + self.formTags.ifHeight.setText(FreeCAD.Units.Quantity(self.obj.Height, FreeCAD.Units.Length).UserString) + self.formTags.ifWidth.setText(FreeCAD.Units.Quantity(self.obj.Width, FreeCAD.Units.Length).UserString) + self.formTags.dsbAngle.setValue(self.obj.Angle) + self.formTags.ifRadius.setText(FreeCAD.Units.Quantity(self.obj.Radius, FreeCAD.Units.Length).UserString) + + def setupUi(self): + self.setFields() + self.whenCountChanged() + + self.formTags.sbCount.valueChanged.connect(self.whenCountChanged) + self.formTags.pbGenerate.clicked.connect(self.generateNewTags) + + self.formTags.ifHeight.editingFinished.connect(self.updateModel) + self.formTags.ifWidth.editingFinished.connect(self.updateModel) + self.formTags.dsbAngle.editingFinished.connect(self.updateModel) + self.formTags.ifRadius.editingFinished.connect(self.updateModel) + self.formTags.lwTags.itemChanged.connect(self.updateModel) + self.formTags.lwTags.itemSelectionChanged.connect(self.whenTagSelectionChanged) + self.formTags.lwTags.itemActivated.connect(self.editTag) + + self.formTags.pbDelete.clicked.connect(self.deleteSelectedTag) + self.formTags.pbEdit.clicked.connect(self.editSelectedTag) + self.formTags.pbAdd.clicked.connect(self.addNewTag) + + self.formPoint.buttonBox.accepted.connect(self.pointAccept) + self.formPoint.ifValueX.editingFinished.connect(self.updatePoint) + self.formPoint.ifValueY.editingFinished.connect(self.updatePoint) + self.formPoint.ifValueZ.editingFinished.connect(self.updatePoint) + + self.viewProvider.turnMarkerDisplayOn(True) + + def pointFinish(self, ok): + self.removeGlobalCallbacks(); + obj = FreeCADGui.Snapper.lastSnappedObject + FreeCADGui.Snapper.off() + self.pointWhenDone(self.pt if ok else None, obj if ok else None) + + def pointReject(self): + self.pointFinish(False) + + def pointAccept(self): + self.pointFinish(True) + + def updatePoint(self): + x = FreeCAD.Units.Quantity(self.formPoint.ifValueX.text()).Value + y = FreeCAD.Units.Quantity(self.formPoint.ifValueY.text()).Value + z = FreeCAD.Units.Quantity(self.formPoint.ifValueZ.text()).Value + self.pt = FreeCAD.Vector(x, y, z) + +class HoldingTagMarker: + def __init__(self, point, colors): + self.point = point + self.color = colors + self.sep = coin.SoSeparator() + self.pos = coin.SoTranslation() + self.pos.translation = (point.x, point.y, point.z) + self.sphere = coin.SoSphere() + self.material = coin.SoMaterial() + self.sep.addChild(self.pos) + self.sep.addChild(self.material) + self.sep.addChild(self.sphere) + self.enabled = True + self.selected = False + + def setSelected(self, select): + self.selected = select + self.sphere.radius = 1.5 if select else 1.0 + self.setEnabled(self.enabled) + + def setEnabled(self, enabled): + self.enabled = enabled + if enabled: + self.material.diffuseColor = self.color[0] if not self.selected else self.color[2] + self.material.transparency = 0.0 + else: + self.material.diffuseColor = self.color[1] if not self.selected else self.color[2] + self.material.transparency = 0.6 + +class ViewProviderDressup: + + def __init__(self, vobj): + vobj.Proxy = self + + def setupColors(self): + def colorForColorValue(val): + v = [((val >> n) & 0xff) / 255. for n in [24, 16, 8, 0]] + return coin.SbColor(v[0], v[1], v[2]) + + pref = PathPreferences.preferences() + # R G B A + npc = pref.GetUnsigned("DefaultPathMarkerColor", (( 85*256 + 255)*256 + 0)*256 + 255) + hpc = pref.GetUnsigned("DefaultHighlightPathColor", ((255*256 + 125)*256 + 0)*256 + 255) + dpc = pref.GetUnsigned("DefaultDisabledPathColor", ((205*256 + 205)*256 + 205)*256 + 154) + self.colors = [colorForColorValue(npc), colorForColorValue(dpc), colorForColorValue(hpc)] + + def attach(self, vobj): + self.setupColors() + self.obj = vobj.Object + self.tags = [] + self.switch = coin.SoSwitch() + vobj.RootNode.addChild(self.switch) + self.turnMarkerDisplayOn(False) + + def turnMarkerDisplayOn(self, display): + sw = coin.SO_SWITCH_ALL if display else coin.SO_SWITCH_NONE + self.switch.whichChild = sw + + + def claimChildren(self): + for i in self.obj.Base.InList: + if hasattr(i, "Group"): + group = i.Group + for g in group: + if g.Name == self.obj.Base.Name: + group.remove(g) + i.Group = group + #print i.Group + #FreeCADGui.ActiveDocument.getObject(obj.Base.Name).Visibility = False + return [self.obj.Base] + + def setEdit(self, vobj, mode=0): + panel = TaskPanel(vobj.Object, self) + self.setupTaskPanel(panel) + return True + + def setupTaskPanel(self, panel): + self.panel = panel + FreeCADGui.Control.closeDialog() + FreeCADGui.Control.showDialog(panel) + panel.setupUi() + FreeCADGui.Selection.addSelectionGate(self) + FreeCADGui.Selection.addObserver(self) + + def clearTaskPanel(self): + self.panel = None + FreeCADGui.Selection.removeObserver(self) + FreeCADGui.Selection.removeSelectionGate() + self.turnMarkerDisplayOn(False) + + def __getstate__(self): + return None + + def __setstate__(self, state): + return None + + def onDelete(self, arg1=None, arg2=None): + '''this makes sure that the base operation is added back to the project and visible''' + FreeCADGui.ActiveDocument.getObject(arg1.Object.Base.Name).Visibility = True + PathUtils.addToJob(arg1.Object.Base) + return True + + def updateData(self, obj, propName): + if 'Disabled' == propName: + for tag in self.tags: + self.switch.removeChild(tag.sep) + tags = [] + for i, p in enumerate(obj.Positions): + tag = HoldingTagMarker(p, self.colors) + tag.setEnabled(not i in obj.Disabled) + tags.append(tag) + self.switch.addChild(tag.sep) + self.tags = tags + + def selectTag(self, index): + #print("selectTag(%s)" % index) + for i, tag in enumerate(self.tags): + tag.setSelected(i == index) + + def tagAtPoint(self, point): + p = FreeCAD.Vector(point[0], point[1], point[2]) + for i, tag in enumerate(self.tags): + if PathGeom.pointsCoincide(p, tag.point, tag.sphere.radius.getValue() * 1.1): + return i + return -1 + + # SelectionObserver interface + def allow(self, doc, obj, sub): + if obj == self.obj: + return True + return False + + def addSelection(self, doc, obj, sub, point): + i = self.tagAtPoint(point) + if self.panel: + self.panel.selectTagWithId(i) + FreeCADGui.updateGui() + +class CommandPathDressupHoldingTags: + + def GetResources(self): + return {'Pixmap': 'Path-Dressup', + 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "HoldingTags Dress-up"), + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathDressup_HoldingTags", "Creates a HoldingTags Dress-up object from a selected path")} + + def IsActive(self): + if FreeCAD.ActiveDocument is not None: + for o in FreeCAD.ActiveDocument.Objects: + if o.Name[:3] == "Job": + return True + return False + + def Activated(self): + + # check that the selection contains exactly what we want + selection = FreeCADGui.Selection.getSelection() + if len(selection) != 1: + FreeCAD.Console.PrintError(translate("Please select one path object\n")) + return + baseObject = selection[0] + if not baseObject.isDerivedFrom("Path::Feature"): + FreeCAD.Console.PrintError(translate("The selected object is not a path\n")) + return + if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): + FreeCAD.Console.PrintError(translate("Please select a Profile object")) + return + + # everything ok! + FreeCAD.ActiveDocument.openTransaction(translate("Create HoldingTags Dress-up")) + FreeCADGui.addModule("PathScripts.PathDressupHoldingTags") + FreeCADGui.addModule("PathScripts.PathUtils") + FreeCADGui.doCommand('obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "HoldingTagsDressup")') + FreeCADGui.doCommand('dbo = PathScripts.PathDressupHoldingTags.ObjectDressup(obj)') + FreeCADGui.doCommand('obj.Base = FreeCAD.ActiveDocument.' + selection[0].Name) + FreeCADGui.doCommand('PathScripts.PathDressupHoldingTags.ViewProviderDressup(obj.ViewObject)') + FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') + FreeCADGui.doCommand('Gui.ActiveDocument.getObject(obj.Base.Name).Visibility = False') + FreeCADGui.doCommand('dbo.setup(obj, True)') + FreeCAD.ActiveDocument.commitTransaction() + FreeCAD.ActiveDocument.recompute() + + +if FreeCAD.GuiUp: + # register the FreeCAD command + FreeCADGui.addCommand('PathDressup_HoldingTags', CommandPathDressupHoldingTags()) + +FreeCAD.Console.PrintLog("Loading PathDressupHoldingTags... done\n") diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index 2cd9b79e87..345c9c4e12 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -400,27 +400,27 @@ class TaskPanel: def getFields(self): if self.obj: if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "PeckDepth"): - self.obj.PeckDepth = self.form.peckDepth.text() + self.obj.PeckDepth = FreeCAD.Units.Quantity(self.form.peckDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "RetractHeight"): - self.obj.RetractHeight = self.form.retractHeight.text() + self.obj.RetractHeight = FreeCAD.Units.Quantity(self.form.retractHeight.text()).Value self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.peckDepth.setText(str(self.obj.PeckDepth.Value)) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) - self.form.retractHeight.setText(str(self.obj.RetractHeight.Value)) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.peckDepth.setText(FreeCAD.Units.Quantity(self.obj.PeckDepth.Value, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) + self.form.retractHeight.setText(FreeCAD.Units.Quantity(self.obj.RetractHeight.Value, FreeCAD.Units.Length).UserString) self.form.baseList.clear() for i in self.obj.Base: diff --git a/src/Mod/Path/PathScripts/PathEngrave.py b/src/Mod/Path/PathScripts/PathEngrave.py index 638788da8d..96ca2e3f21 100644 --- a/src/Mod/Path/PathScripts/PathEngrave.py +++ b/src/Mod/Path/PathScripts/PathEngrave.py @@ -320,18 +320,18 @@ class TaskPanel: def getFields(self): if self.obj: if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) self.form.baseList.clear() for i in self.obj.Base: diff --git a/src/Mod/Path/PathScripts/PathGeom.py b/src/Mod/Path/PathScripts/PathGeom.py index 3effa097f5..b78bd7f45f 100644 --- a/src/Mod/Path/PathScripts/PathGeom.py +++ b/src/Mod/Path/PathScripts/PathGeom.py @@ -29,6 +29,8 @@ import Path from FreeCAD import Vector +PathGeomTolerance = 0.000001 + class Side: """Class to determine and define the side a Path is on, or Vectors are in relation to each other.""" Left = +1 @@ -63,39 +65,53 @@ class Side: class PathGeom: """Class to transform Path Commands into Edges and Wire and back again. The interface might eventuallly become part of Path itself.""" - CmdMoveFast = ['G0', 'G00'] + CmdMoveRapid = ['G0', 'G00'] CmdMoveStraight = ['G1', 'G01'] CmdMoveCW = ['G2', 'G02'] CmdMoveCCW = ['G3', 'G03'] CmdMoveArc = CmdMoveCW + CmdMoveCCW CmdMove = CmdMoveStraight + CmdMoveArc + Tolerance = PathGeomTolerance + @classmethod - def isRoughly(cls, float1, float2, error=0.0000001): - """(float1, float2, [error=0.0000001]) - Returns true if the two values are the same within a given error.""" + def isRoughly(cls, float1, float2, error=PathGeomTolerance): + """(float1, float2, [error=%s]) + Returns true if the two values are the same within a given error.""" % PathGeomTolerance return math.fabs(float1 - float2) <= error @classmethod - def pointsCoincide(cls, p1, p2, error=0.0000001): - """(p1, p2, [error=0.0000001]) - Return True if two points are roughly identical (see also isRoughly).""" + def pointsCoincide(cls, p1, p2, error=PathGeomTolerance): + """(p1, p2, [error=%s]) + Return True if two points are roughly identical (see also isRoughly).""" % PathGeomTolerance return cls.isRoughly(p1.x, p2.x, error) and cls.isRoughly(p1.y, p2.y, error) and cls.isRoughly(p1.z, p2.z, error) @classmethod - def edgeConnectsTo(cls, edge, vector): - """(edge, vector) - Returns True if edge connects to given vector.""" + def edgesMatch(cls, e0, e1, error=PathGeomTolerance): + """(e0, e1, [error=%s] + Return true if the edges start and end at the same point and have the same type of curve.""" % PathGeomTolerance + if type(e0.Curve) != type(e1.Curve): + return False + if not cls.pointsCoincide(e0.valueAt(e0.FirstParameter), e1.valueAt(e1.FirstParameter)): + return False + if not cls.pointsCoincide(e0.valueAt(e0.LastParameter), e1.valueAt(e1.LastParameter)): + return False + return True + + @classmethod + def edgeConnectsTo(cls, edge, vector, error=PathGeomTolerance): + """(edge, vector, error=%f) + Returns True if edge connects to given vector.""" % PathGeomTolerance return cls.pointsCoincide(edge.valueAt(edge.FirstParameter), vector) or cls.pointsCoincide(edge.valueAt(edge.LastParameter), vector) @classmethod - def getAngle(cls, vertex): - """(vertex) - Returns the angle [-pi,pi] of a vertex using the X-axis as the reference. + def getAngle(cls, vector): + """(vector) + Returns the angle [-pi,pi] of a vector using the X-axis as the reference. Positive angles for vertexes in the upper hemishpere (positive y values) and negative angles for the lower hemishpere.""" - a = vertex.getAngle(FreeCAD.Vector(1,0,0)) - if vertex.y < 0: + a = vector.getAngle(Vector(1,0,0)) + if vector.y < 0: return -a return a @@ -120,7 +136,7 @@ class PathGeom: x = cmd.Parameters.get(X, defaultPoint.x) y = cmd.Parameters.get(Y, defaultPoint.y) z = cmd.Parameters.get(Z, defaultPoint.z) - return FreeCAD.Vector(x, y, z) + return Vector(x, y, z) @classmethod def xy(cls, point): @@ -128,13 +144,76 @@ class PathGeom: Convenience function to return the projection of the Vector in the XY-plane.""" return Vector(point.x, point.y, 0) + @classmethod + def cmdsForEdge(cls, edge, flip = False, useHelixForBSpline = True, segm = 50): + """(edge, flip=False, useHelixForBSpline=True, segm=50) -> List(Path.Command) + Returns a list of Path.Command representing the given edge. + If flip is True the edge is considered to be backwards. + If useHelixForBSpline is True an Edge based on a BSplineCurve is considered + to represent a helix and results in G2 or G3 command. Otherwise edge has + no direct Path.Command mapping and will be approximated by straight segments. + segm is a factor for the segmentation of arbitrary curves not mapped to G1/2/3 + commands. The higher the value the more segments will be used.""" + pt = edge.valueAt(edge.LastParameter) if not flip else edge.valueAt(edge.FirstParameter) + params = {'X': pt.x, 'Y': pt.y, 'Z': pt.z} + if type(edge.Curve) == Part.Line or type(edge.Curve) == Part.LineSegment: + commands = [Path.Command('G1', params)] + else: + if not flip: + p1 = edge.valueAt(edge.FirstParameter) + p3 = pt + else: + p1 = pt + p3 = edge.valueAt(edge.LastParameter) + p2 = edge.valueAt((edge.FirstParameter + edge.LastParameter)/2) + if (type(edge.Curve) == Part.Circle and cls.isRoughly(edge.Curve.Axis.x, 0) and cls.isRoughly(edge.Curve.Axis.y, 0)) or (useHelixForBSpline and type(edge.Curve) == Part.BSplineCurve): + if Side.Left == Side.of(p2 - p1, p3 - p2): + cmd = 'G3' + else: + cmd = 'G2' + #print("**** (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f)" % (p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, p3.x, p3.y, p3.z)) + pd = Part.Circle(PathGeom.xy(p1), PathGeom.xy(p2), PathGeom.xy(p3)).Center + + pa = PathGeom.xy(p1) + pb = PathGeom.xy(p2) + pc = PathGeom.xy(p3) + #print("**** (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f)" % (pa.x, pa.y, pa.z, pc.x, pc.y, pc.z)) + #print("**** (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f)" % (pb.x, pb.y, pb.z, pd.x, pd.y, pd.z)) + offset = Part.Circle(PathGeom.xy(p1), PathGeom.xy(p2), PathGeom.xy(p3)).Center - p1 + #print("**** (%.2f, %.2f, %.2f)" % (offset.x, offset.y, offset.z)) + params.update({'I': offset.x, 'J': offset.y, 'K': (p3.z - p1.z)/2}) + commands = [ Path.Command(cmd, params) ] + else: + eStraight = Part.Edge(Part.LineSegment(p1, p3)) + esP2 = eStraight.valueAt((eStraight.FirstParameter + eStraight.LastParameter)/2) + deviation = (p2 - esP2).Length + if cls.isRoughly(deviation, 0): + return [ Path.Command('G1', {'X': p3.x, 'Y': p3.y, 'Z': p3.z}) ] + # at this point pixellation is all we can do + commands = [] + segments = int(math.ceil((deviation / eStraight.Length) * segm)) + #print("**** pixellation with %d segments" % segments) + dParameter = (edge.LastParameter - edge.FirstParameter) / segments + for i in range(0, segments): + if flip: + p = edge.valueAt(edge.LastParameter - (i + 1) * dParameter) + else: + p = edge.valueAt(edge.FirstParameter + (i + 1) * dParameter) + cmd = Path.Command('G1', {'X': p.x, 'Y': p.y, 'Z': p.z}) + #print("***** %s" % cmd) + commands.append(cmd) + #print commands + return commands + @classmethod def edgeForCmd(cls, cmd, startPoint): """(cmd, startPoint). Returns an Edge representing the given command, assuming a given startPoint.""" endPoint = cls.commandEndPoint(cmd, startPoint) - if (cmd.Name in cls.CmdMoveStraight) or (cmd.Name in cls.CmdMoveFast): + if (cmd.Name in cls.CmdMoveStraight) or (cmd.Name in cls.CmdMoveRapid): + if cls.pointsCoincide(startPoint, endPoint): + return None return Part.Edge(Part.LineSegment(startPoint, endPoint)) if cmd.Name in cls.CmdMoveArc: @@ -157,7 +236,7 @@ class PathGeom: #print("arc: A=(%.2f, %.2f) B=(%.2f, %.2f) -> d=%.2f" % (A.x, A.y, B.x, B.y, d)) #print("arc: R=%.2f angle=%.2f" % (R, angle/math.pi)) if startPoint.z == endPoint.z: - midPoint = center + FreeCAD.Vector(math.cos(angle), math.sin(angle), 0) * R + midPoint = center + Vector(math.cos(angle), math.sin(angle), 0) * R return Part.Edge(Part.Arc(startPoint, midPoint, endPoint)) # It's a Helix @@ -180,20 +259,23 @@ class PathGeom: return None @classmethod - def wireForPath(cls, path, startPoint = FreeCAD.Vector(0, 0, 0)): + def wireForPath(cls, path, startPoint = Vector(0, 0, 0)): """(path, [startPoint=Vector(0,0,0)]) Returns a wire representing all move commands found in the given path.""" edges = [] + rapid = [] if hasattr(path, "Commands"): for cmd in path.Commands: edge = cls.edgeForCmd(cmd, startPoint) if edge: + if cmd.Name in cls.CmdMoveRapid: + rapid.append(edge) edges.append(edge) startPoint = cls.commandEndPoint(cmd, startPoint) - return Part.Wire(edges) + return (Part.Wire(edges), rapid) @classmethod - def wiresForPath(cls, path, startPoint = FreeCAD.Vector(0, 0, 0)): + def wiresForPath(cls, path, startPoint = Vector(0, 0, 0)): """(path, [startPoint=Vector(0,0,0)]) Returns a collection of wires, each representing a continuous cutting Path in path.""" wires = [] @@ -203,7 +285,7 @@ class PathGeom: if cmd.Name in cls.CmdMove: edges.append(cls.edgeForCmd(cmd, startPoint)) startPoint = cls.commandEndPoint(cmd, startPoint) - elif cmd.Name in cls.CmdMoveFast: + elif cmd.Name in cls.CmdMoveRapid: wires.append(Part.Wire(edges)) edges = [] startPoint = cls.commandEndPoint(cmd, startPoint) @@ -211,3 +293,81 @@ class PathGeom: wires.append(Part.Wire(edges)) return wires + @classmethod + def arcToHelix(cls, edge, z0, z1): + """(edge, z0, z1) + Assuming edge is an arc it'll return a helix matching the arc starting at z0 and rising/falling to z1.""" + + + p1 = edge.valueAt(edge.FirstParameter) + p2 = edge.valueAt(edge.LastParameter) + + cmd = cls.cmdsForEdge(edge)[0] + params = cmd.Parameters + params.update({'Z': z1, 'K': (z1 - z0)/2}) + command = Path.Command(cmd.Name, params) + + #print("- (%.2f, %.2f, %.2f) - (%.2f, %.2f, %.2f): %.2f:%.2f" % (edge.Vertexes[0].X, edge.Vertexes[0].Y, edge.Vertexes[0].Z, edge.Vertexes[1].X, edge.Vertexes[1].Y, edge.Vertexes[1].Z, z0, z1)) + #print("- %s -> %s" % (cmd, command)) + + return cls.edgeForCmd(command, Vector(p1.x, p1.y, z0)) + + + @classmethod + def helixToArc(cls, edge, z = 0): + """(edge, z=0) + Returns the projection of the helix onto the XY-plane with a given offset.""" + p1 = edge.valueAt(edge.FirstParameter) + p2 = edge.valueAt((edge.FirstParameter + edge.LastParameter)/2) + p3 = edge.valueAt(edge.LastParameter) + p01 = Vector(p1.x, p1.y, z) + p02 = Vector(p2.x, p2.y, z) + p03 = Vector(p3.x, p3.y, z) + return Part.Edge(Part.Arc(p01, p02, p03)) + + @classmethod + def splitArcAt(cls, edge, pt): + """(edge, pt) + Returns a list of 2 edges which together form the original arc split at the given point. + The Vector pt has to represnt a point on the given arc.""" + p1 = edge.valueAt(edge.FirstParameter) + p2 = pt + p3 = edge.valueAt(edge.LastParameter) + edges = [] + + p = edge.Curve.parameter(p2) + #print("splitArcAt(%.2f, %.2f, %.2f): %.2f - %.2f - %.2f" % (pt.x, pt.y, pt.z, edge.FirstParameter, p, edge.LastParameter)) + + p12 = edge.Curve.value((edge.FirstParameter + p)/2) + p23 = edge.Curve.value((p + edge.LastParameter)/2) + #print("splitArcAt: p12=(%.2f, %.2f, %.2f) p23=(%.2f, %.2f, %.2f)" % (p12.x, p12.y, p12.z, p23.x, p23.y, p23.z)) + + edges.append(Part.Edge(Part.Arc(p1, p12, p2))) + edges.append(Part.Edge(Part.Arc(p2, p23, p3))) + + return edges + + @classmethod + def splitEdgeAt(cls, edge, pt): + """(edge, pt) + Returns a list of 2 edges, forming the original edge split at the given point. + The results are undefined if the Vector representing the point is not part of the edge.""" + # I could not get the OCC parameterAt and split to work ... + # pt HAS to be on the edge, otherwise the results are undefined + p1 = edge.valueAt(edge.FirstParameter) + p2 = pt + p3 = edge.valueAt(edge.LastParameter) + edges = [] + + if type(edge.Curve) == Part.Line or type(edge.Curve) == Part.LineSegment: + # it's a line + return [Part.Edge(Part.LineSegment(p1, p2)), Part.Edge(Part.LineSegment(p2, p3))] + elif type(edge.Curve) == Part.Circle: + # it's an arc + return cls.splitArcAt(edge, pt) + else: + # it's a helix + arc = cls.helixToArc(edge, 0) + aes = cls.splitArcAt(arc, Vector(pt.x, pt.y, 0)) + return [cls.arcToHelix(aes[0], p1.z, p2.z), cls.arcToHelix(aes[1], p2.z, p3.z)] + diff --git a/src/Mod/Path/PathScripts/PathMillFace.py b/src/Mod/Path/PathScripts/PathMillFace.py index d27c1adf5c..13747fe432 100644 --- a/src/Mod/Path/PathScripts/PathMillFace.py +++ b/src/Mod/Path/PathScripts/PathMillFace.py @@ -420,19 +420,20 @@ class TaskPanel: def getFields(self): if self.obj: if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "FinishDepth"): - self.obj.FinishDepth = self.form.finishDepth.text() + self.obj.FinishDepth = FreeCAD.Units.Quantity(self.form.finishDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "StepDown"): - self.obj.StepDown = self.form.stepDown.value() + self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "PassExtension"): - self.obj.PassExtension = self.form.extraOffset.value() + self.obj.PassExtension = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value + # if hasattr(self.obj, "UseStartPoint"): # self.obj.UseStartPoint = self.form.useStartPoint.isChecked() if hasattr(self.obj, "CutMode"): @@ -442,7 +443,9 @@ class TaskPanel: if hasattr(self.obj, "ZigUnidirectional"): self.obj.ZigUnidirectional = self.form.zigZagUnidirectional.isChecked() if hasattr(self.obj, "ZigZagAngle"): - self.obj.ZigZagAngle = self.form.zigZagAngle.value() + self.obj.ZigZagAngle = FreeCAD.Units.Quantity(self.form.zigZagAngle.text()).Value +# if hasattr(self.obj, "ZigZagAngle"): +# self.obj.ZigZagAngle = self.form.zigZagAngle.value() if hasattr(self.obj, "StepOver"): self.obj.StepOver = self.form.stepOverPercent.value() if hasattr(self.obj, "BoundaryShape"): @@ -451,16 +454,18 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.finishDepth.setText(str(self.obj.FinishDepth.Value)) - self.form.stepDown.setValue(self.obj.StepDown) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finishDepth.setText(FreeCAD.Units.Quantity(self.obj.FinishDepth.Value, FreeCAD.Units.Length).UserString) + self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) + self.form.stepOverPercent.setValue(self.obj.StepOver) self.form.useZigZag.setChecked(self.obj.UseZigZag) self.form.zigZagUnidirectional.setChecked(self.obj.ZigUnidirectional) - self.form.zigZagAngle.setValue(self.obj.ZigZagAngle) + self.form.zigZagAngle.setValue(FreeCAD.Units.Quantity(self.obj.ZigZagAngle, FreeCAD.Units.Angle)) +# self.form.zigZagAngle.setValue(self.obj.ZigZagAngle) #self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.extraOffset.setValue(self.obj.PassExtension.Value) diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py index 6689e178ed..441a72790e 100644 --- a/src/Mod/Path/PathScripts/PathPocket.py +++ b/src/Mod/Path/PathScripts/PathPocket.py @@ -338,7 +338,7 @@ class ObjectPocket: else: output += "G3" output += " X" + fmt(point.x) + " Y" + fmt(point.y) + " Z" + fmt(vpos) - output += " I" + fmt(relcenter.x) + " J" + fmt(relcenter.y) + " K" + fmt(relcenter.z) + " F" + fmt(self.horizFeed) + output += " I" + fmt(relcenter.x) + " J" + fmt(relcenter.y) + " K" + fmt(relcenter.z) + " F" + fmt(self.horizFeed) output += "\n" last = point else: @@ -545,17 +545,17 @@ class TaskPanel: def getFields(self): if self.obj: if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "StepDown"): - self.obj.StepDown = self.form.stepDown.text() + self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "MaterialAllowance"): - self.obj.MaterialAllowance = self.form.extraOffset.text() + self.obj.MaterialAllowance = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value if hasattr(self.obj, "UseStartPoint"): self.obj.UseStartPoint = self.form.useStartPoint.isChecked() if hasattr(self.obj, "Algorithm"): @@ -567,23 +567,23 @@ class TaskPanel: if hasattr(self.obj, "ZigUnidirectional"): self.obj.ZigUnidirectional = self.form.zigZagUnidirectional.isChecked() if hasattr(self.obj, "ZigZagAngle"): - self.obj.ZigZagAngle = self.form.zigZagAngle.value() + self.obj.ZigZagAngle = FreeCAD.Units.Quantity(self.form.zigZagAngle.text()).Value if hasattr(self.obj, "StepOver"): self.obj.StepOver = self.form.stepOverPercent.value() self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) - self.form.stepDown.setText(str(self.obj.StepDown)) - self.form.extraOffset.setText(str(self.obj.MaterialAllowance.Value)) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) + self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) + self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.MaterialAllowance, FreeCAD.Units.Length).UserString) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useZigZag.setChecked(self.obj.UseZigZag) self.form.zigZagUnidirectional.setChecked(self.obj.ZigUnidirectional) - self.form.zigZagAngle.setValue(self.obj.ZigZagAngle) + self.form.zigZagAngle.setText(FreeCAD.Units.Quantity(self.obj.ZigZagAngle, FreeCAD.Units.Angle).UserString) self.form.stepOverPercent.setValue(self.obj.StepOver) index = self.form.algorithmSelect.findText(self.obj.Algorithm, QtCore.Qt.MatchFixedString) diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py index ab155ab2f7..e1fe309120 100644 --- a/src/Mod/Path/PathScripts/PathPreferences.py +++ b/src/Mod/Path/PathScripts/PathPreferences.py @@ -31,6 +31,10 @@ class PathPreferences: PostProcessorDefaultArgs = "PostProcessorDefaultArgs" PostProcessorBlacklist = "PostProcessorBlacklist" + @classmethod + def preferences(cls): + return FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") + @classmethod def allAvailablePostProcessors(cls): path = FreeCAD.getHomePath() + ("Mod/Path/PathScripts/") @@ -58,28 +62,28 @@ class PathPreferences: @classmethod def defaultPostProcessor(cls): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - return preferences.GetString(cls.PostProcessorDefault, "") + pref = cls.preferences() + return pref.GetString(cls.PostProcessorDefault, "") @classmethod def defaultPostProcessorArgs(cls): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - return preferences.GetString(cls.PostProcessorDefaultArgs, "") + pref = cls.preferences() + return pref.GetString(cls.PostProcessorDefaultArgs, "") @classmethod def postProcessorBlacklist(cls): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - blacklist = preferences.GetString(cls.PostProcessorBlacklist, "") + pref = cls.preferences() + blacklist = pref.GetString(cls.PostProcessorBlacklist, "") if not blacklist: return [] return eval(blacklist) @classmethod def savePostProcessorDefaults(cls, processor, args, blacklist): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - preferences.SetString(cls.PostProcessorDefault, processor) - preferences.SetString(cls.PostProcessorDefaultArgs, args) - preferences.SetString(cls.PostProcessorBlacklist, "%s" % (blacklist)) + pref = cls.preferences() + pref.SetString(cls.PostProcessorDefault, processor) + pref.SetString(cls.PostProcessorDefaultArgs, args) + pref.SetString(cls.PostProcessorBlacklist, "%s" % (blacklist)) DefaultOutputFile = "DefaultOutputFile" @@ -87,16 +91,16 @@ class PathPreferences: @classmethod def saveOutputFileDefaults(cls, file, policy): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - preferences.SetString(cls.DefaultOutputFile, file) - preferences.SetString(cls.DefaultOutputPolicy, policy) + pref = cls.preferences() + pref.SetString(cls.DefaultOutputFile, file) + pref.SetString(cls.DefaultOutputPolicy, policy) @classmethod def defaultOutputFile(cls): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - return preferences.GetString(cls.DefaultOutputFile, "") + pref = cls.preferences() + return pref.GetString(cls.DefaultOutputFile, "") @classmethod def defaultOutputPolicy(cls): - preferences = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Path") - return preferences.GetString(cls.DefaultOutputPolicy, "") + pref = cls.preferences() + return pref.GetString(cls.DefaultOutputPolicy, "") diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py b/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py new file mode 100644 index 0000000000..a23b370e89 --- /dev/null +++ b/src/Mod/Path/PathScripts/PathPreferencesPathDressup.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- + +# *************************************************************************** +# * * +# * Copyright (c) 2016 sliptonic * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +import FreeCAD +import FreeCADGui +from PySide import QtCore, QtGui +from PathScripts.PathPreferences import PathPreferences + +# Qt tanslation handling +try: + _encoding = QtGui.QApplication.UnicodeUTF8 + + def translate(context, text, disambig=None): + return QtGui.QApplication.translate(context, text, disambig, _encoding) + +except AttributeError: + + def translate(context, text, disambig=None): + return QtGui.QApplication.translate(context, text, disambig) + +_dressups = [] + +def RegisterDressup(dressup): + _dressups.append(dressup) + +class DressupPreferencesPage: + def __init__(self, parent=None): + self.form = QtGui.QToolBox() + self.form.setWindowTitle(translate('PathPreferencesPathDressup', 'Dressups')) + pages = [] + for dressup in _dressups: + page = dressup.preferencesPage() + if hasattr(page, 'icon') and page.icon: + self.form.addItem(page.form, page.icon, page.label) + else: + self.form.addItem(page.form, page.label) + pages.append(page) + self.pages = pages + + def saveSettings(self): + for page in self.pages: + page.saveSettings() + + def loadSettings(self): + for page in self.pages: + page.loadSettings() + diff --git a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py index 25e12f28ac..cb374133d7 100644 --- a/src/Mod/Path/PathScripts/PathPreferencesPathJob.py +++ b/src/Mod/Path/PathScripts/PathPreferencesPathJob.py @@ -29,7 +29,7 @@ from PathScripts.PathPreferences import PathPreferences from PathScripts.PathPostProcessor import PostProcessor -class Page: +class JobPreferencesPage: def __init__(self, parent=None): self.form = FreeCADGui.PySideUic.loadUi(":preferences/PathJob.ui") diff --git a/src/Mod/Path/PathScripts/PathProfile.py b/src/Mod/Path/PathScripts/PathProfile.py index 2ac149e8b9..6265ec6e37 100644 --- a/src/Mod/Path/PathScripts/PathProfile.py +++ b/src/Mod/Path/PathScripts/PathProfile.py @@ -36,6 +36,7 @@ if FreeCAD.GuiUp: # Qt tanslation handling try: _encoding = QtGui.QApplication.UnicodeUTF8 + def translate(context, text, disambig=None): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: @@ -51,68 +52,51 @@ __url__ = "http://www.freecadweb.org" """Path Profile object and FreeCAD command""" + class ObjectProfile: def __init__(self, obj): - obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","The base geometry of this toolpath")) - obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","Make False, to prevent operation from generating code")) - obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","An optional comment for this profile")) - obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","User Assigned Label")) + obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "The base geometry of this toolpath")) + obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make False, to prevent operation from generating code")) + obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "An optional comment for this profile")) + obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "User Assigned Label")) obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", "The tool number in use") obj.ToolNumber = (0, 0, 1000, 1) obj.setEditorMode('ToolNumber', 1) # make this read only obj.addProperty("App::PropertyString", "ToolDescription", "Tool", "The description of the tool ") - obj.setEditorMode('ToolDescription', 1) # make this read only + obj.setEditorMode('ToolDescription', 1) # make this read only # Depth Properties - obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations.")) - obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool")) - #obj.StepDown = (1, 0.01, 1000, 0.5) - obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z")) - obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z")) + obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Rapid Safety Height between locations.")) + obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Incremental Step Down of Tool")) + obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Starting Depth of Tool- first cut depth in Z")) + obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) # Start Point Properties - obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The start point of this path")) - obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying a Start Point")) - obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path before start of part edge")) - obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to first part edge")) + obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The start point of this path")) + obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying a Start Point")) + obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path before start of part edge")) + obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to first part edge")) # End Point Properties - obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying an End Point")) - obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path after end of part edge")) - obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to last part edge")) - obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The end point of this path")) + obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying an End Point")) + obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path after end of part edge")) + obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to last part edge")) + obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The end point of this path")) # Profile Properties - obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Side of edge that tool should cut")) + obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Left', 'Right', 'On'] # side of profile that cutter is on in relation to direction of profile - obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) obj.Direction = ['CW', 'CCW'] # this is the direction that the profile runs - obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if using Cutter Radius Compensation")) + obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if using Cutter Radius Compensation")) - obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Radius at start and end")) - obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final profile- good for roughing toolpath")) - obj.addProperty("App::PropertyLength", "SegLen", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation value for tool paths made from beziers, bsplines, and ellipses")) - obj.addProperty("App::PropertyAngle", "PlungeAngle", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn")) - obj.addProperty("App::PropertyBool", "processHoles", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile holes as well as the outline")) - obj.addProperty("App::PropertyBool", "processPerimeter", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile the outline")) - - obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations")) - - obj.addProperty("App::PropertyFloatList", "angles", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "heights", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "lengths", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - locations = [] - angles = [] - lengths = [] - heights = [] - - obj.locs = locations - obj.angles = angles - obj.lengths = lengths - obj.heights = heights + obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Radius at start and end")) + obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra value to stay away from final profile- good for roughing toolpath")) + obj.addProperty("App::PropertyBool", "processHoles", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Profile holes as well as the outline")) + obj.addProperty("App::PropertyBool", "processPerimeter", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Profile the outline")) obj.Proxy = self @@ -145,7 +129,7 @@ class ObjectProfile: obj.FinalDepth = fbb.ZMin elif fbb.ZMax == fbb.ZMin and fbb.ZMax > bb.ZMin: # face/shelf obj.FinalDepth = fbb.ZMin - else: #catch all + else: # catch all obj.FinalDepth = bb.ZMin except: obj.StartDepth = 5.0 @@ -167,8 +151,8 @@ class ObjectProfile: def _buildPathLibarea(self, obj, edgelist, isHole): import PathScripts.PathKurveUtils as PathKurveUtils - import math - import area + # import math + # import area output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -220,14 +204,6 @@ print "y - " + str(point.y) I need to access the location vector, length, angle in radians and height. ''' - PathKurveUtils.clear_tags() - for i in range(len(obj.locs)): - tag = obj.locs[i] - h = obj.heights[i] - l = obj.lengths[i] - a = math.radians(obj.angles[i]) - PathKurveUtils.add_tag(area.Point(tag.x, tag.y), l, a, h) - depthparams = depth_params( obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0, @@ -286,7 +262,7 @@ print "y - " + str(point.y) for b in obj.Base: for sub in b[1]: shape = getattr(b[0].Shape, sub) - if isinstance (shape, Part.Face): + if isinstance(shape, Part.Face): faces.append(shape) if numpy.isclose(abs(shape.normalAt(0, 0).z), 1): # horizontal face holes += shape.Wires[1:] @@ -295,7 +271,7 @@ print "y - " + str(point.y) print ("found a base object which is not a face. Can't continue.") return profileshape = Part.makeCompound(faces) - profilewire = TechDraw.findShapeOutline(profileshape, 1, Vector(0,0,1)) + profilewire = TechDraw.findShapeOutline(profileshape, 1, Vector(0, 0, 1)) if obj.processHoles: for wire in holes: @@ -346,45 +322,9 @@ class _ViewProviderProfile: return None -class _CommandAddTag: - def GetResources(self): - return {'Pixmap': 'Path-Holding', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def setpoint(self, point, o): - obj = FreeCADGui.Selection.getSelection()[0] - obj.StartPoint.x = point.x - obj.StartPoint.y = point.y - loc = obj.locs - h = obj.heights - l = obj.lengths - a = obj.angles - - x = point.x - y = point.y - z = float(0.0) - loc.append(Vector(x, y, z)) - h.append(4.0) - l.append(5.0) - a.append(45.0) - - obj.locs = loc - obj.heights = h - obj.lengths = l - obj.angles = a - - def Activated(self): - - FreeCADGui.Snapper.getPoint(callback=self.setpoint) - - class _CommandSetStartPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point")} @@ -403,7 +343,7 @@ class _CommandSetStartPoint: class _CommandSetEndPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-EndPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point")} @@ -457,7 +397,6 @@ class CommandPathProfile: FreeCADGui.doCommand('obj.UseComp = False') FreeCADGui.doCommand('obj.processHoles = False') FreeCADGui.doCommand('obj.processPerimeter = True') - FreeCADGui.doCommand('obj.PlungeAngle = 90.0') FreeCADGui.doCommand('PathScripts.PathProfile._ViewProviderProfile(obj.ViewObject)') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') @@ -486,24 +425,21 @@ class TaskPanel: def getFields(self): if self.obj: + if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "StepDown"): - self.obj.StepDown = self.form.stepDown.text() + self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "OffsetExtra"): - self.obj.OffsetExtra = self.form.extraOffset.text() - if hasattr(self.obj, "SegLen"): - self.obj.SegLen = self.form.segLen.value() + self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value if hasattr(self.obj, "RollRadius"): - self.obj.RollRadius = self.form.rollRadius.text() - if hasattr(self.obj, "PlungeAngle"): - self.obj.PlungeAngle = str(self.form.plungeAngle.value()) + self.obj.RollRadius = FreeCAD.Units.Quantity(self.form.rollRadius.text()).Value if hasattr(self.obj, "UseComp"): self.obj.UseComp = self.form.useCompensation.isChecked() if hasattr(self.obj, "UseStartPoint"): @@ -521,15 +457,13 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) - self.form.stepDown.setText(str(self.obj.StepDown)) - self.form.extraOffset.setText(str(self.obj.OffsetExtra.Value)) - self.form.segLen.setValue(self.obj.SegLen.Value) - self.form.rollRadius.setText(str(self.obj.RollRadius.Value)) - self.form.plungeAngle.setValue(self.obj.PlungeAngle.Value) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) + self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) + self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) + self.form.rollRadius.setText(FreeCAD.Units.Quantity(self.obj.RollRadius.Value, FreeCAD.Units.Length).UserString) self.form.useCompensation.setChecked(self.obj.UseComp) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useEndPoint.setChecked(self.obj.UseEndPoint) @@ -556,21 +490,8 @@ class TaskPanel: self.form.baseList.addItem(i[0].Name + "." + sub) self.form.baseList.blockSignals(False) - self.form.tagTree.blockSignals(True) - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x)+", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.form.tagTree.blockSignals(False) self.form.update() - def open(self): self.s = SelObserver() # install the function mode resident @@ -601,7 +522,6 @@ class TaskPanel: for sub in i[1]: self.form.baseList.addItem(i[0].Name + "." + sub) - def deleteBase(self): dlist = self.form.baseList.selectedItems() newlist = [] @@ -644,90 +564,6 @@ class TaskPanel: def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Ok) - def edit(self, item, column): - if not self.updating: - self.resetObject() - - def resetObject(self, remove=None): - "transfers the values from the widget to the object" - loc = [] - h = [] - l = [] - a = [] - - for i in range(self.form.tagTree.topLevelItemCount()): - it = self.form.tagTree.findItems( - str(i+1), QtCore.Qt.MatchExactly, 0)[0] - if (remove is None) or (remove != i): - if it.text(1): - x = float(it.text(1).split()[0].rstrip(",")) - y = float(it.text(1).split()[1].rstrip(",")) - z = float(it.text(1).split()[2].rstrip(",")) - loc.append(Vector(x, y, z)) - - else: - loc.append(0.0) - if it.text(2): - h.append(float(it.text(2))) - else: - h.append(4.0) - if it.text(3): - l.append(float(it.text(3))) - else: - l.append(5.0) - if it.text(4): - a.append(float(it.text(4))) - else: - a.append(45.0) - - self.obj.locs = loc - self.obj.heights = h - self.obj.lengths = l - self.obj.angles = a - - self.obj.touch() - FreeCAD.ActiveDocument.recompute() - - def addElement(self): - self.updating = True - - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(self.form.tagTree.topLevelItemCount())) - item.setText(1, "0.0, 0.0, 0.0") - item.setText(2, str(float(4.0))) - item.setText(3, str(float(10.0))) - item.setText(4, str(float(45.0))) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - self.updating = False - - self.resetObject() - - def removeElement(self): - it = self.form.tagTree.currentItem() - if it: - nr = int(it.text(0))-1 - self.resetObject(remove=nr) - self.update() - - def update(self): - 'fills the treewidget' - self.updating = True - self.form.tagTree.clear() - if self.obj: - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x) + ", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.updating = False - return - - def setupUi(self): # Connect Signals and Slots @@ -753,19 +589,10 @@ class TaskPanel: self.form.useStartPoint.clicked.connect(self.getFields) self.form.useEndPoint.clicked.connect(self.getFields) self.form.extraOffset.editingFinished.connect(self.getFields) - self.form.segLen.editingFinished.connect(self.getFields) self.form.rollRadius.editingFinished.connect(self.getFields) self.form.processHoles.clicked.connect(self.getFields) self.form.processPerimeter.clicked.connect(self.getFields) - # Tag Form - QtCore.QObject.connect( - self.form.tagTree, - QtCore.SIGNAL("itemChanged(QTreeWidgetItem *, int)"), - self.edit) - self.form.addTag.clicked.connect(self.addElement) - self.form.deleteTag.clicked.connect(self.removeElement) - self.setFields() sel = FreeCADGui.Selection.getSelectionEx() @@ -790,7 +617,6 @@ class SelObserver: if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Profile', CommandPathProfile()) - FreeCADGui.addCommand('Add_Tag', _CommandAddTag()) FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py index 2c71d6adfc..213bfaacdd 100644 --- a/src/Mod/Path/PathScripts/PathProfileEdges.py +++ b/src/Mod/Path/PathScripts/PathProfileEdges.py @@ -24,7 +24,6 @@ import FreeCAD import Path -from FreeCAD import Vector from PathScripts import PathUtils from PathScripts.PathUtils import depth_params from DraftGeomUtils import findWires @@ -50,70 +49,49 @@ __url__ = "http://www.freecadweb.org" """Path Profile object and FreeCAD command for operating on sets of edges""" + class ObjectProfile: def __init__(self, obj): - obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","The base geometry of this toolpath")) - obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","Make False, to prevent operation from generating code")) - obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","An optional comment for this profile")) - obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","User Assigned Label")) + obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "The base geometry of this toolpath")) + obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make False, to prevent operation from generating code")) + obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "An optional comment for this profile")) + obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "User Assigned Label")) - # obj.addProperty("App::PropertyEnumeration", "Algorithm", "Algorithm", "The library or algorithm used to generate the path") - # obj.Algorithm = ['OCC Native', 'libarea'] - - obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The tool number in use")) + obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The tool number in use")) obj.ToolNumber = (0, 0, 1000, 1) obj.setEditorMode('ToolNumber', 1) # make this read only - obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The description of the tool")) - obj.setEditorMode('ToolDescription', 1) # make this read onlyt + obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The description of the tool")) + obj.setEditorMode('ToolDescription', 1) # make this read onlyt # Depth Properties - obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations")) - obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool")) - #obj.StepDown = (1, 0.01, 1000, 0.5) - obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z")) - obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z")) + obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Rapid Safety Height between locations")) + obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Incremental Step Down of Tool")) + obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Starting Depth of Tool- first cut depth in Z")) + obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) # Start Point Properties - obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The start point of this path")) - obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying a Start Point")) - obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path before start of part edge")) - obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to first part edge")) + obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The start point of this path")) + obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying a Start Point")) + obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path before start of part edge")) + obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to first part edge")) # End Point Properties - obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying an End Point")) - obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path after end of part edge")) - obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to last part edge")) - obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The end point of this path")) + obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying an End Point")) + obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path after end of part edge")) + obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to last part edge")) + obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The end point of this path")) # Profile Properties - obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Side of edge that tool should cut")) + obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Left', 'Right', 'On'] # side of profile that cutter is on in relation to direction of profile - obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) obj.Direction = ['CW', 'CCW'] # this is the direction that the profile runs - obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if using Cutter Radius Compensation")) + obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if using Cutter Radius Compensation")) - obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Radius at start and end")) - obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final profile- good for roughing toolpath")) - obj.addProperty("App::PropertyLength", "SegLen", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation value for tool paths made from beziers, bsplines, and ellipses")) - obj.addProperty("App::PropertyAngle", "PlungeAngle", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn")) - - obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations")) - - obj.addProperty("App::PropertyFloatList", "angles", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "heights", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "lengths", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - locations = [] - angles = [] - lengths = [] - heights = [] - - obj.locs = locations - obj.angles = angles - obj.lengths = lengths - obj.heights = heights - #obj.ToolDescription = "UNDEFINED" + obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Radius at start and end")) + obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra value to stay away from final profile- good for roughing toolpath")) obj.Proxy = self @@ -146,18 +124,13 @@ class ObjectProfile: obj.FinalDepth = fbb.ZMin elif fbb.ZMax == fbb.ZMin and fbb.ZMax > bb.ZMin: # face/shelf obj.FinalDepth = fbb.ZMin - else: #catch all + else: # catch all obj.FinalDepth = bb.ZMin except: obj.StartDepth = 5.0 obj.ClearanceHeight = 10.0 obj.SafeHeight = 8.0 - # if bb.XLength == fbb.XLength and bb.YLength == fbb.YLength: - # obj.Side = "Left" - # else: - # obj.Side = "Right" - item = (ss, sub) if item in baselist: FreeCAD.Console.PrintWarning("this object already in the list" + "\n") @@ -168,8 +141,8 @@ class ObjectProfile: def _buildPathLibarea(self, obj, edgelist): import PathScripts.PathKurveUtils as PathKurveUtils - import math - import area + # import math + # import area output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -216,14 +189,6 @@ print "y - " + str(point.y) I need to access the location vector, length, angle in radians and height. ''' - PathKurveUtils.clear_tags() - for i in range(len(obj.locs)): - tag = obj.locs[i] - h = obj.heights[i] - l = obj.lengths[i] - a = math.radians(obj.angles[i]) - PathKurveUtils.add_tag(area.Point(tag.x, tag.y), l, a, h) - depthparams = depth_params( obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0, @@ -243,8 +208,6 @@ print "y - " + str(point.y) output = "" toolLoad = PathUtils.getLastToolLoad(obj) - # obj.ToolController = PathUtils.getToolControllers(obj) - # toolLoad = PathUtils.getToolLoad(obj, obj.ToolController) if toolLoad is None or toolLoad.ToolNumber == 0: self.vertFeed = 100 @@ -279,8 +242,6 @@ print "y - " + str(point.y) output += "(Uncompensated Tool Path)" if obj.Base: - # hfaces = [] - # vfaces = [] wires = [] for b in obj.Base: @@ -332,45 +293,9 @@ class _ViewProviderProfile: return None -class _CommandAddTag: - def GetResources(self): - return {'Pixmap': 'Path-Holding', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def setpoint(self, point, o): - obj = FreeCADGui.Selection.getSelection()[0] - obj.StartPoint.x = point.x - obj.StartPoint.y = point.y - loc = obj.locs - h = obj.heights - l = obj.lengths - a = obj.angles - - x = point.x - y = point.y - z = float(0.0) - loc.append(Vector(x, y, z)) - h.append(4.0) - l.append(5.0) - a.append(45.0) - - obj.locs = loc - obj.heights = h - obj.lengths = l - obj.angles = a - - def Activated(self): - - FreeCADGui.Snapper.getPoint(callback=self.setpoint) - - class _CommandSetStartPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point")} @@ -389,7 +314,7 @@ class _CommandSetStartPoint: class _CommandSetEndPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-EndPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point")} @@ -442,8 +367,6 @@ class CommandPathProfileEdges: FreeCADGui.doCommand('obj.OffsetExtra = 0.0') FreeCADGui.doCommand('obj.Direction = "CW"') FreeCADGui.doCommand('obj.UseComp = False') - FreeCADGui.doCommand('obj.PlungeAngle = 90.0') - #FreeCADGui.doCommand('obj.ActiveTC = None') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') FreeCAD.ActiveDocument.commitTransaction() @@ -454,7 +377,7 @@ class CommandPathProfileEdges: class TaskPanel: def __init__(self): self.form = FreeCADGui.PySideUic.loadUi(":/panels/ProfileEdgesEdit.ui") - #self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ProfileEdgesEdit.ui") + # self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ProfileEdgesEdit.ui") self.updating = False @@ -473,32 +396,27 @@ class TaskPanel: def getFields(self): if self.obj: + if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "StepDown"): - self.obj.StepDown = self.form.stepDown.text() + self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "OffsetExtra"): - self.obj.OffsetExtra = self.form.extraOffset.text() - if hasattr(self.obj, "SegLen"): - self.obj.SegLen = self.form.segLen.value() + self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value if hasattr(self.obj, "RollRadius"): - self.obj.RollRadius = self.form.rollRadius.text() - if hasattr(self.obj, "PlungeAngle"): - self.obj.PlungeAngle = str(self.form.plungeAngle.value()) + self.obj.RollRadius = FreeCAD.Units.Quantity(self.form.rollRadius.text()).Value if hasattr(self.obj, "UseComp"): self.obj.UseComp = self.form.useCompensation.isChecked() if hasattr(self.obj, "UseStartPoint"): self.obj.UseStartPoint = self.form.useStartPoint.isChecked() if hasattr(self.obj, "UseEndPoint"): self.obj.UseEndPoint = self.form.useEndPoint.isChecked() - # if hasattr(self.obj, "Algorithm"): - # self.obj.Algorithm = str(self.form.algorithmSelect.currentText()) if hasattr(self.obj, "Side"): self.obj.Side = str(self.form.cutSide.currentText()) if hasattr(self.obj, "Direction"): @@ -506,15 +424,13 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) - self.form.stepDown.setText(str(self.obj.StepDown.Value)) - self.form.extraOffset.setText(str(self.obj.OffsetExtra.Value)) - self.form.segLen.setValue(self.obj.SegLen.Value) - self.form.rollRadius.setText(str(self.obj.RollRadius.Value)) - self.form.plungeAngle.setValue(self.obj.PlungeAngle.Value) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) + self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) + self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) + self.form.rollRadius.setText(FreeCAD.Units.Quantity(self.obj.RollRadius.Value, FreeCAD.Units.Length).UserString) self.form.useCompensation.setChecked(self.obj.UseComp) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useEndPoint.setChecked(self.obj.UseEndPoint) @@ -534,20 +450,6 @@ class TaskPanel: self.form.baseList.addItem(i[0].Name + "." + sub) self.form.baseList.blockSignals(False) - self.form.tagTree.blockSignals(True) - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x)+", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.form.tagTree.blockSignals(False) - - def open(self): self.s = SelObserver() # install the function mode resident @@ -620,90 +522,6 @@ class TaskPanel: def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Ok) - def edit(self, item, column): - if not self.updating: - self.resetObject() - - def resetObject(self, remove=None): - "transfers the values from the widget to the object" - loc = [] - h = [] - l = [] - a = [] - - for i in range(self.form.tagTree.topLevelItemCount()): - it = self.form.tagTree.findItems( - str(i+1), QtCore.Qt.MatchExactly, 0)[0] - if (remove is None) or (remove != i): - if it.text(1): - x = float(it.text(1).split()[0].rstrip(",")) - y = float(it.text(1).split()[1].rstrip(",")) - z = float(it.text(1).split()[2].rstrip(",")) - loc.append(Vector(x, y, z)) - - else: - loc.append(0.0) - if it.text(2): - h.append(float(it.text(2))) - else: - h.append(4.0) - if it.text(3): - l.append(float(it.text(3))) - else: - l.append(5.0) - if it.text(4): - a.append(float(it.text(4))) - else: - a.append(45.0) - - self.obj.locs = loc - self.obj.heights = h - self.obj.lengths = l - self.obj.angles = a - - self.obj.touch() - FreeCAD.ActiveDocument.recompute() - - def addElement(self): - self.updating = True - - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(self.form.tagTree.topLevelItemCount())) - item.setText(1, "0.0, 0.0, 0.0") - item.setText(2, str(float(4.0))) - item.setText(3, str(float(10.0))) - item.setText(4, str(float(45.0))) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - self.updating = False - - self.resetObject() - - def removeElement(self): - it = self.form.tagTree.currentItem() - if it: - nr = int(it.text(0))-1 - self.resetObject(remove=nr) - self.update() - - def update(self): - 'fills the treewidget' - self.updating = True - self.form.tagTree.clear() - if self.obj: - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x) + ", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.updating = False - return - - def setupUi(self): # Connect Signals and Slots @@ -729,17 +547,7 @@ class TaskPanel: self.form.useStartPoint.clicked.connect(self.getFields) self.form.useEndPoint.clicked.connect(self.getFields) self.form.extraOffset.editingFinished.connect(self.getFields) - self.form.segLen.editingFinished.connect(self.getFields) self.form.rollRadius.editingFinished.connect(self.getFields) - - # Tag Form - QtCore.QObject.connect( - self.form.tagTree, - QtCore.SIGNAL("itemChanged(QTreeWidgetItem *, int)"), - self.edit) - self.form.addTag.clicked.connect(self.addElement) - self.form.deleteTag.clicked.connect(self.removeElement) - self.setFields() sel = FreeCADGui.Selection.getSelectionEx() @@ -764,8 +572,7 @@ class SelObserver: if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Profile_Edges', CommandPathProfileEdges()) - # FreeCADGui.addCommand('Add_Tag', _CommandAddTag()) - # FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) - # FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) + FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) + FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) FreeCAD.Console.PrintLog("Loading PathProfileEdges... done\n") diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py index 613fdd46de..4dd334298c 100644 --- a/src/Mod/Path/PathScripts/PathSurface.py +++ b/src/Mod/Path/PathScripts/PathSurface.py @@ -442,19 +442,19 @@ class TaskPanel: def getFields(self): if self.obj: - if hasattr(self.obj, "StartDepth"): - self.obj.StartDepth = self.form.startDepth.text() - if hasattr(self.obj, "FinalDepth"): - self.obj.FinalDepth = self.form.finalDepth.text() - if hasattr(self.obj, "FinishDepth"): - self.obj.FinishDepth = self.form.finishDepth.text() - if hasattr(self.obj, "StepDown"): - self.obj.StepDown = self.form.stepDown.value() + if hasattr(self.obj, "StartDepth"): + self.obj.StartDepth = FreeCAD.Units.Quantity(self.form.startDepth.text()).Value + if hasattr(self.obj, "FinalDepth"): + self.obj.FinalDepth = FreeCAD.Units.Quantity(self.form.finalDepth.text()).Value + if hasattr(self.obj, "FinishDepth"): + self.obj.FinishDepth = FreeCAD.Units.Quantity(self.form.finishDepth.text()).Value + if hasattr(self.obj, "StepDown"): + self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "SafeHeight"): - self.obj.SafeHeight = self.form.safeHeight.text() + self.obj.SafeHeight = FreeCAD.Units.Quantity(self.form.safeHeight.text()).Value if hasattr(self.obj, "ClearanceHeight"): - self.obj.ClearanceHeight = self.form.clearanceHeight.text() + self.obj.ClearanceHeight = FreeCAD.Units.Quantity(self.form.clearanceHeight.text()).Value if hasattr(self.obj, "Algorithm"): self.obj.Algorithm = str( self.form.algorithmSelect.currentText()) @@ -462,13 +462,12 @@ class TaskPanel: self.obj.Proxy.execute(self.obj) def setFields(self): - self.form.startDepth.setText(str(self.obj.StartDepth.Value)) - self.form.finalDepth.setText(str(self.obj.FinalDepth.Value)) - self.form.finishDepth.setText(str(self.obj.FinishDepth.Value)) - self.form.stepDown.setValue(self.obj.StepDown) - - self.form.safeHeight.setText(str(self.obj.SafeHeight.Value)) - self.form.clearanceHeight.setText(str(self.obj.ClearanceHeight.Value)) + self.form.startDepth.setText(FreeCAD.Units.Quantity(self.obj.StartDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finalDepth.setText(FreeCAD.Units.Quantity(self.obj.FinalDepth.Value, FreeCAD.Units.Length).UserString) + self.form.finishDepth.setText(FreeCAD.Units.Quantity(self.obj.FinishDepth.Value, FreeCAD.Units.Length).UserString) + self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown, FreeCAD.Units.Length).UserString) + self.form.safeHeight.setText(FreeCAD.Units.Quantity(self.obj.SafeHeight.Value, FreeCAD.Units.Length).UserString) + self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) for i in self.obj.Base: self.form.baseList.addItem(i[0].Name) diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index 2f6763b4df..4e75ef0898 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -35,6 +35,7 @@ from DraftGeomUtils import geomType import PathScripts from PathScripts import PathJob # import itertools +import numpy def cleanedges(splines, precision): '''cleanedges([splines],precision). Convert BSpline curves, Beziers, to arcs that can be used for cnc paths. @@ -840,27 +841,53 @@ class depth_params: '''returns a list of depths to be used in order from first to last. equalstep=True: all steps down before the finish pass will be equalized.''' - depths = [] if self.user_depths is not None: - depths = self.user_depths - else: - total_depth = self.start_depth - self.final_depth - if total_depth <= 0: - return depths - layers_required = int((total_depth - self.z_finish_step) / self.step_down) - partial_steplayer = (total_depth - self.z_finish_step) % self.step_down - if equalstep is True and partial_steplayer > 0: - layerstep = float((total_depth - self.z_finish_step) / (layers_required + 1)) + return self.user_depths + + total_depth = self.start_depth - self.final_depth + + if total_depth < 0: + return [] + + depths = [self.final_depth] + + # apply finish step if necessary + if self.z_finish_step > 0: + if self.z_finish_step < total_depth: + depths.append(self.z_finish_step + self.final_depth) else: - layerstep = self.step_down + return depths - for step in range(layers_required): - d = self.start_depth - ((step +1) * layerstep) - depths.append(d) - - if self.z_finish_step != 0 and depths[-1] != self.final_depth + self.z_finish_step: - depths.append(self.final_depth + self.z_finish_step) - if depths[-1] != self.final_depth: - depths.append(self.final_depth) + if equalstep: + depths += self.__equal_steps(self.start_depth, depths[-1], self.step_down)[1:] + else: + depths += self.__fixed_steps(self.start_depth, depths[-1], self.step_down)[1:] + depths.reverse() return depths + + def __equal_steps(self, start, stop, max_size): + '''returns a list of depths beginning with the bottom (included), ending + with the top (not included). + all steps are of equal size, which is as big as possible but not bigger + than max_size.''' + + steps_needed = math.ceil((start - stop) / max_size) + depths = numpy.linspace(stop, start, steps_needed, endpoint=False) + + return depths.tolist() + + def __fixed_steps(self, start, stop, size): + '''returns a list of depths beginning with the bottom (included), ending + with the top (not included). + all steps are of size 'size' except the one at the bottom wich can be + smaller.''' + + fullsteps = int((start - stop) / size) + last_step = start - (fullsteps * size) + depths = numpy.linspace(last_step, start, fullsteps, endpoint=False) + + if last_step == stop: + return depths.tolist() + else: + return [stop] + depths.tolist() diff --git a/src/Mod/Path/PathTests/PathTestUtils.py b/src/Mod/Path/PathTests/PathTestUtils.py index 30b56024ec..518eeb90cb 100644 --- a/src/Mod/Path/PathTests/PathTestUtils.py +++ b/src/Mod/Path/PathTests/PathTestUtils.py @@ -27,6 +27,7 @@ import Part import math import unittest +from FreeCAD import Vector from PathScripts.PathGeom import Side class PathTestBase(unittest.TestCase): @@ -44,28 +45,39 @@ class PathTestBase(unittest.TestCase): def assertLine(self, edge, pt1, pt2): """Verify that edge is a line from pt1 to pt2.""" - self.assertIs(type(edge.Curve), Part.LineSegment) - self.assertCoincide(edge.Curve.StartPoint, pt1) - self.assertCoincide(edge.Curve.EndPoint, pt2) + self.assertIs(type(edge.Curve), Part.Line) + self.assertCoincide(edge.valueAt(edge.FirstParameter), pt1) + self.assertCoincide(edge.valueAt(edge.LastParameter), pt2) + + def assertLines(self, edgs, tail, points): + """Verify that the edges match the polygon resulting from points.""" + edges = list(edgs) + if tail: + edges.append(tail) + self.assertEqual(len(edges), len(points) - 1) + + for i in range(0, len(edges)): + self.assertLine(edges[i], points[i], points[i+1]) def assertArc(self, edge, pt1, pt2, direction = 'CW'): """Verify that edge is an arc between pt1 and pt2 with the given direction.""" - # If an Arc is wrapped into edge, then it's curve is represented as a circle - # and not as an Arc (GeomTrimmedCurve) - #self.assertIs(type(edge.Curve), Part.Arc) self.assertIs(type(edge.Curve), Part.Circle) self.assertCoincide(edge.valueAt(edge.FirstParameter), pt1) self.assertCoincide(edge.valueAt(edge.LastParameter), pt2) ptm = edge.valueAt((edge.LastParameter + edge.FirstParameter)/2) side = Side.of(pt2 - pt1, ptm - pt1) - #print("(%.2f, %.2f) (%.2f, %.2f) (%.2f, %.2f)" % (pt1.x, pt1.y, ptm.x, ptm.y, pt2.x, pt2.y)) - #print(" (%.2f, %.2f) (%.2f, %.2f) -> %s" % ((pt2-pt1).x, (pt2-pt1).y, (ptm-pt1).x, (ptm-pt1).y, Side.toString(side))) - #print(" (%.2f, %.2f) (%.2f, %.2f) -> (%.2f, %.2f)" % (pf.x,pf.y, pl.x,pl.y, pm.x, pmy)) if 'CW' == direction: self.assertEqual(side, Side.Left) else: self.assertEqual(side, Side.Right) + def assertCircle(self, edge, pt, r): + """Verivy that edge is a circle at given location.""" + curve = edge.Curve + self.assertIs(type(curve), Part.Circle) + self.assertCoincide(curve.Center, Vector(pt.x, pt.y, pt.z)) + self.assertRoughly(curve.Radius, r) + def assertCurve(self, edge, p1, p2, p3): """Verify that the edge goes through the given 3 points, representing start, mid and end point respectively.""" @@ -73,3 +85,27 @@ class PathTestBase(unittest.TestCase): self.assertCoincide(edge.valueAt(edge.LastParameter), p3) self.assertCoincide(edge.valueAt((edge.FirstParameter + edge.LastParameter)/2), p2) + def assertCylinderAt(self, solid, pt, r, h): + """Verify that solid is a cylinder at the specified location.""" + self.assertEqual(len(solid.Edges), 3) + + lid = solid.Edges[0] + hull = solid.Edges[1] + base = solid.Edges[2] + + self.assertCircle(lid, Vector(pt.x, pt.y, pt.z+h), r) + self.assertLine(hull, Vector(pt.x+r, pt.y, pt.z), Vector(pt.x+r, pt.y, pt.z+h)) + self.assertCircle(base, Vector(pt.x, pt.y, pt.z), r) + + def assertConeAt(self, solid, pt, r1, r2, h): + """Verify that solid is a cone at the specified location.""" + self.assertEqual(len(solid.Edges), 3) + + lid = solid.Edges[0] + hull = solid.Edges[1] + base = solid.Edges[2] + + self.assertCircle(lid, Vector(pt.x, pt.y, pt.z+h), r2) + self.assertLine(hull, Vector(pt.x+r1, pt.y, pt.z), Vector(pt.x+r2, pt.y, pt.z+h)) + self.assertCircle(base, Vector(pt.x, pt.y, pt.z), r1) + diff --git a/src/Mod/Path/PathTests/TestPathCore.py b/src/Mod/Path/PathTests/TestPathCore.py new file mode 100644 index 0000000000..da9ee3cfcd --- /dev/null +++ b/src/Mod/Path/PathTests/TestPathCore.py @@ -0,0 +1,155 @@ +# -*- coding: utf-8 -*- + +# *************************************************************************** +# * * +# * Copyright (c) 2016 sliptonic * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +import FreeCAD +import Path +from PathTests.PathTestUtils import PathTestBase + +class TestPathCore(PathTestBase): + + def test00(self): + """Test Path command core functionality""" + #create empty command + c=Path.Command() + self.assertIsInstance(c, Path.Command) + + #change name + c.Name = "G1" + self.assertEqual(c.Name, "G1") + + #Assign Parameters + c.Parameters= {"X":1,"Y":0} + self.assertEqual(c.Parameters, {'Y': 0.0, 'X': 1.0}) + + #change parameters + c.Parameters= {"X":1,"Y":0.5} + self.assertEqual(c.Parameters, {'Y': 0.5, 'X': 1}) + + #output gcode + self.assertEqual(c.toGCode(), 'G1 X1.000000 Y0.500000') + + #create and assign name in one + c2=Path.Command("G2") + self.assertEqual(c2.Name, "G2") + + #Create Path and parameters in one + c3=Path.Command("G1",{"X":34,"Y":1.2}) + self.assertEqual(str(c3), 'Command G1 [ X:34 Y:1.2 ]') + c4 = Path.Command("G1X4Y5") + self.assertEqual(str(c4), 'Command G1 [ X:4 Y:5 ]') + + #use placement + self.assertEqual( str(c3.Placement), 'Placement [Pos=(34,1.2,0), Yaw-Pitch-Roll=(0,0,0)]') + self.assertEqual( c3.toGCode(), 'G1 X34.000000 Y1.200000') + p1 = FreeCAD.Placement() + p1.Base = FreeCAD.Vector(3,2,1) + self.assertEqual(str(p1), 'Placement [Pos=(3,2,1), Yaw-Pitch-Roll=(0,0,0)]') + c5=Path.Command("g1",p1) + self.assertEqual(str(c5), 'Command G1 [ X:3 Y:2 Z:1 ]') + p2=FreeCAD.Placement() + p2.Base = FreeCAD.Vector(5,0,0) + + #overwrite placement + c5.Placement=p2 + self.assertEqual(str(c5), 'Command G1 [ X:5 ]') + self.assertEqual(c5.x, 5.0) + + #overwrite individual parameters + c5.x=10 + self.assertEqual(c5.x, 10.0) + c5.y=2 + self.assertEqual (str(c5), 'Command G1 [ X:10 Y:2 ]') + + #set from gcode + c3.setFromGCode("G1X1Y0") + self.assertEqual(str(c3), 'Command G1 [ X:1 Y:0 ]') + + def test10(self): + """Test Path Object core functionality""" + + c1=Path.Command("g1",{"x":1,"y":0}) + c2=Path.Command("g1",{"x":0,"y":2}) + p=Path.Path([c1,c2]) + self.assertAlmostEqual(str(p), 'Path [ size:2 length:3.2361 ]', places=4) + + self.assertEqual(str(p.Commands), '[Command G1 [ X:1 Y:0 ], Command G1 [ X:0 Y:2 ]]') + self.assertAlmostEqual( p.Length, 3.2361, places=4) + p.addCommands(c1) + self.assertEqual(p.toGCode(), 'G1 X1.000000 Y0.000000\nG1 X0.000000 Y2.000000\nG1 X1.000000 Y0.000000\n') + + lines = ''' +G0X-0.5905Y-0.3937S3000M03 +G0Z0.125 +G1Z-0.004F3 +G1X0.9842Y-0.3937F14.17 +G1X0.9842Y0.433 +G1X-0.5905Y0.433 +G1X-0.5905Y-0.3937 +G0Z0.5 +''' + + output = '''G0 S3000.000000 X-0.590500 Y-0.393700 +M03 +G0 Z0.125000 +G1 F3.000000 Z-0.004000 +G1 F14.170000 X0.984200 Y-0.393700 +G1 X0.984200 Y0.433000 +G1 X-0.590500 Y0.433000 +G1 X-0.590500 Y-0.393700 +G0 Z0.500000 +''' + #create a path directly form a piece of gcode. + p = Path.Path() + p.setFromGCode(lines) + self.assertEqual (p.toGCode(), output) + + def test20(self): + """Test Path Tool and ToolTable object core functionality""" + + t1=Path.Tool() + self.assertIsInstance(t1, Path.Tool) + + t1.Name = "12.7mm Drill Bit" + self.assertEqual(t1.Name, "12.7mm Drill Bit") + self.assertEqual(t1.ToolType, "Undefined") + t1.ToolType = "Drill" + self.assertEqual(t1.ToolType, "Drill") + t1.Diameter= 12.7 + t1.LengthOffset = 127 + t1.CuttingEdgeAngle = 59 + t1.CuttingEdgeHeight = 50.8 + + self.assertEqual(t1.Diameter, 12.7) + self.assertEqual(t1.LengthOffset, 127) + self.assertEqual(t1.CuttingEdgeAngle, 59) + self.assertEqual(t1.CuttingEdgeHeight, 50.8) + + t2 = Path.Tool("my other tool",tooltype="EndMill",diameter=10) + table = Path.Tooltable() + self.assertIsInstance(table, Path.Tooltable) + table.addTools(t1) + table.addTools(t2) + + self.assertEqual(len(table.Tools), 2) + self.assertEqual(str(table.Tools), '{1: Tool 12.7mm Drill Bit, 2: Tool my other tool}' ) diff --git a/src/Mod/Path/PathTests/TestPathDepthParams.py b/src/Mod/Path/PathTests/TestPathDepthParams.py index 244bb700eb..57e51a5d02 100644 --- a/src/Mod/Path/PathTests/TestPathDepthParams.py +++ b/src/Mod/Path/PathTests/TestPathDepthParams.py @@ -73,7 +73,7 @@ class depthTestCases(unittest.TestCase): final_depth = 10 user_depths = None - expected =[] + expected =[10] d = PU.depth_params(clearance_height, rapid_safety_space, start_depth, step_down, z_finish_step, final_depth, user_depths) r = d.get_depths() @@ -109,7 +109,7 @@ class depthTestCases(unittest.TestCase): self.assertListEqual (r, expected) def test40(self): - '''Finish depth passed in.''' + '''z_finish_step passed in.''' clearance_height= 10 rapid_safety_space = 5 @@ -161,3 +161,23 @@ class depthTestCases(unittest.TestCase): r = d.get_depths(equalstep=True) self.assertListEqual (r, expected) + def test70(self): + '''stepping down with stepdown greater than total depth''' + clearance_height= 10 + rapid_safety_space = 5 + + start_depth = 10 + step_down = 20 + z_finish_step = 1 + final_depth = 0 + user_depths = None + + expected =[1.0, 0] + + d = PU.depth_params(clearance_height, rapid_safety_space, start_depth, step_down, z_finish_step, final_depth, user_depths) + r = d.get_depths(equalstep=True) + self.assertListEqual (r, expected) + + d = PU.depth_params(clearance_height, rapid_safety_space, start_depth, step_down, z_finish_step, final_depth, user_depths) + r = d.get_depths() + self.assertListEqual (r, expected) diff --git a/src/Mod/Path/PathTests/TestPathDressupHoldingTags.py b/src/Mod/Path/PathTests/TestPathDressupHoldingTags.py new file mode 100644 index 0000000000..2d74688da6 --- /dev/null +++ b/src/Mod/Path/PathTests/TestPathDressupHoldingTags.py @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- + +# *************************************************************************** +# * * +# * Copyright (c) 2016 sliptonic * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU Lesser General Public License (LGPL) * +# * as published by the Free Software Foundation; either version 2 of * +# * the License, or (at your option) any later version. * +# * for detail see the LICENCE text file. * +# * * +# * This program is distributed in the hope that it will be useful, * +# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# * GNU Library General Public License for more details. * +# * * +# * You should have received a copy of the GNU Library General Public * +# * License along with this program; if not, write to the Free Software * +# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * +# * USA * +# * * +# *************************************************************************** + +import FreeCAD +import Part +import Path +import PathScripts +import math +import unittest + +from FreeCAD import Vector +from PathScripts.PathDressupHoldingTags import * +from PathTests.PathTestUtils import PathTestBase + +class TestHoldingTags(PathTestBase): + """Unit tests for the HoldingTags dressup.""" + + def test00(self): + """Check Tag origin, serialization and de-serialization.""" + tag = Tag(77, 13, 4, 5, 90, True) + self.assertCoincide(tag.originAt(3), Vector(77, 13, 3)) + s = tag.toString() + tagCopy = Tag.FromString(s) + self.assertEqual(tag.x, tagCopy.x) + self.assertEqual(tag.y, tagCopy.y) + self.assertEqual(tag.height, tagCopy.height) + self.assertEqual(tag.width, tagCopy.width) + self.assertEqual(tag.enabled, tagCopy.enabled) + + + def test01(self): + """Verify solid for a 90 degree tag is a cylinder.""" + tag = Tag(100, 200, 4, 5, 90, True) + tag.createSolidsAt(17, 0) + + self.assertIsNotNone(tag.solid) + self.assertCylinderAt(tag.solid, Vector(100, 200, 17), 2, 5) + + def test02(self): + """Verify trapezoidal tag has a cone shape with a lid.""" + tag = Tag(0, 0, 18, 5, 45, True) + tag.createSolidsAt(0, 0) + + self.assertIsNotNone(tag.solid) + self.assertConeAt(tag.solid, Vector(0,0,0), 9, 4, 5) + + def test03(self): + """Verify pointy cone shape of tag with pointy end if width, angle and height match up.""" + tag = Tag(0, 0, 10, 5, 45, True) + tag.createSolidsAt(0, 0) + self.assertIsNotNone(tag.solid) + self.assertConeAt(tag.solid, Vector(0,0,0), 5, 0, 5) + + def test04(self): + """Verify height adjustment if tag isn't wide eough for angle.""" + tag = Tag(0, 0, 5, 17, 60, True) + tag.createSolidsAt(0, 0) + self.assertIsNotNone(tag.solid) + self.assertConeAt(tag.solid, Vector(0,0,0), 2.5, 0, 2.5 * math.tan((60/180.0)*math.pi)) + diff --git a/src/Mod/Path/PathTests/TestPathGeom.py b/src/Mod/Path/PathTests/TestPathGeom.py index 1b72b7edfd..b6a3703c58 100644 --- a/src/Mod/Path/PathTests/TestPathGeom.py +++ b/src/Mod/Path/PathTests/TestPathGeom.py @@ -130,12 +130,14 @@ class TestPathGeom(PathTestBase): commands.append(Path.Command('G0', {'X': 0})) commands.append(Path.Command('G1', {'Y': 0})) - wire = PathGeom.wireForPath(Path.Path(commands)) + wire,rapid = PathGeom.wireForPath(Path.Path(commands)) self.assertEqual(len(wire.Edges), 4) self.assertLine(wire.Edges[0], Vector(0,0,0), Vector(1,0,0)) self.assertLine(wire.Edges[1], Vector(1,0,0), Vector(1,1,0)) self.assertLine(wire.Edges[2], Vector(1,1,0), Vector(0,1,0)) self.assertLine(wire.Edges[3], Vector(0,1,0), Vector(0,0,0)) + self.assertEqual(len(rapid), 1) + self.assertTrue(PathGeom.edgesMatch(rapid[0], wire.Edges[2])) wires = PathGeom.wiresForPath(Path.Path(commands)) self.assertEqual(len(wires), 2) @@ -145,3 +147,96 @@ class TestPathGeom(PathTestBase): self.assertEqual(len(wires[1].Edges), 1) self.assertLine(wires[1].Edges[0], Vector(0,1,0), Vector(0,0,0)) + + def test60(self): + """Verify arcToHelix returns proper helix.""" + p1 = Vector(10,-10,0) + p2 = Vector(0,0,0) + p3 = Vector(10,10,0) + + e = PathGeom.arcToHelix(Part.Edge(Part.Arc(p1, p2, p3)), 0, 2) + self.assertCurve(e, p1, p2 + Vector(0,0,1), p3 + Vector(0,0,2)) + + e = PathGeom.arcToHelix(Part.Edge(Part.Arc(p1, p2, p3)), 3, 7) + self.assertCurve(e, p1 + Vector(0,0,3), p2 + Vector(0,0,5), p3 + Vector(0,0,7)) + + e = PathGeom.arcToHelix(Part.Edge(Part.Arc(p1, p2, p3)), 9, 1) + self.assertCurve(e, p1 + Vector(0,0,9), p2 + Vector(0,0,5), p3 + Vector(0,0,1)) + + dz = Vector(0,0,3) + p11 = p1 + dz + p12 = p2 + dz + p13 = p3 + dz + + e = PathGeom.arcToHelix(Part.Edge(Part.Arc(p11, p12, p13)), 0, 8) + self.assertCurve(e, p1, p2 + Vector(0,0,4), p3 + Vector(0,0,8)) + + e = PathGeom.arcToHelix(Part.Edge(Part.Arc(p11, p12, p13)), 2, -2) + self.assertCurve(e, p1 + Vector(0,0,2), p2, p3 + Vector(0,0,-2)) + + o = 10*math.sin(math.pi/4) + p1 = Vector(10, -10, 1) + p2 = Vector(10 - 10*math.sin(math.pi/4), -10*math.cos(math.pi/4), 1) + p3 = Vector(0, 0, 1) + e = PathGeom.arcToHelix(Part.Edge(Part.Arc(p1, p2, p3)), 0, 5) + self.assertCurve(e, Vector(10,-10,0), Vector(p2.x,p2.y,2.5), Vector(0, 0, 5)) + + + def test62(self): + """Verify splitArcAt returns proper subarcs.""" + p1 = Vector(10,-10,0) + p2 = Vector(0,0,0) + p3 = Vector(10,10,0) + + arc = Part.Edge(Part.Arc(p1, p2, p3)) + + o = 10*math.sin(math.pi/4) + p12 = Vector(10 - o, -o, 0) + p23 = Vector(10 - o, +o, 0) + + e = PathGeom.splitArcAt(arc, p2) + self.assertCurve(e[0], p1, p12, p2) + self.assertCurve(e[1], p2, p23, p3) + + p34 = Vector(10 - 10*math.sin(1*math.pi/8), -10*math.cos(1*math.pi/8), 0) + p45 = Vector(10 - 10*math.sin(5*math.pi/8), -10*math.cos(5*math.pi/8), 0) + + e = PathGeom.splitArcAt(arc, p12) + self.assertCurve(e[0], p1, p34, p12) + self.assertCurve(e[1], p12, p45, p3) + + + def test65(self): + """Verify splitEdgeAt.""" + e = PathGeom.splitEdgeAt(Part.Edge(Part.LineSegment(Vector(), Vector(2, 4, 6))), Vector(1, 2, 3)) + self.assertLine(e[0], Vector(), Vector(1,2,3)) + self.assertLine(e[1], Vector(1,2,3), Vector(2,4,6)) + + # split an arc + p1 = Vector(10,-10,1) + p2 = Vector(0,0,1) + p3 = Vector(10,10,1) + arc = Part.Edge(Part.Arc(p1, p2, p3)) + e = PathGeom.splitEdgeAt(arc, p2) + o = 10*math.sin(math.pi/4) + p12 = Vector(10 - o, -o, 1) + p23 = Vector(10 - o, +o, 1) + self.assertCurve(e[0], p1, p12, p2) + self.assertCurve(e[1], p2, p23, p3) + + + # split a helix + p1 = Vector(10,-10,0) + p2 = Vector(0,0,5) + p3 = Vector(10,10,10) + h = PathGeom.arcToHelix(arc, 0, 10) + self.assertCurve(h, p1, p2, p3) + + e = PathGeom.splitEdgeAt(h, p2) + o = 10*math.sin(math.pi/4) + p12 = Vector(10 - o, -o, 2.5) + p23 = Vector(10 - o, +o, 7.5) + pf = e[0].valueAt((e[0].FirstParameter + e[0].LastParameter)/2) + pl = e[1].valueAt((e[1].FirstParameter + e[1].LastParameter)/2) + self.assertCurve(e[0], p1, p12, p2) + self.assertCurve(e[1], p2, p23, p3) diff --git a/src/Mod/Path/TestPathApp.py b/src/Mod/Path/TestPathApp.py index 9886b77d57..074643ad36 100644 --- a/src/Mod/Path/TestPathApp.py +++ b/src/Mod/Path/TestPathApp.py @@ -24,8 +24,10 @@ import TestApp +from PathTests.TestPathCore import TestPathCore from PathTests.TestPathPost import PathPostTestCases from PathTests.TestPathGeom import TestPathGeom from PathTests.TestPathDepthParams import depthTestCases +from PathTests.TestPathDressupHoldingTags import TestHoldingTags diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Camera.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Camera.svg index 6b59026505..ee46d40383 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Camera.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Camera.svg @@ -1,309 +1,159 @@ - - - - - - - + + + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + - + image/svg+xml - + + + + $committer + + + Raytrace_Camera + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Camera.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + - - - diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Export.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Export.svg index 020e14a31e..f3189a7b09 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Export.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Export.svg @@ -1,176 +1,97 @@ - - - - - + + + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + - + image/svg+xml - + + + + $committer + + + Raytrace_Export + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Export.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - + + + + + + - - + + + + + + + + + - - diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ExportProject.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ExportProject.svg index 5a0314fd77..a0daa5dab3 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ExportProject.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ExportProject.svg @@ -1,1368 +1,281 @@ - - - - - - - + + + + + + - - - - - + + + - - - - + + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + - - - - + + + + - + image/svg+xml - - + + - Jakub Steiner + [agryson] Alexander Gryson - http://jimmac.musichall.cz - + http://agryson.net + + Raytrace_ExportProject + 2012-02-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ExportProject.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Lux.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Lux.svg index 74371f3f5e..9d0a80c2ff 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Lux.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Lux.svg @@ -1,743 +1,134 @@ - - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + + + - + image/svg+xml - - + + - Jakub Steiner + [agryson] Alexander Gryson - http://jimmac.musichall.cz - + http://agryson.net + + Raytrace_Lux + 2013-09-27 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Lux.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg index d9935bf77d..841a584b61 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg @@ -1,575 +1,134 @@ - - - - - - - + + + + + + - - - - - + + + - - - - + + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + - Jakub Steiner + [agryson] Alexander Gryson - http://jimmac.musichall.cz - + http://agryson.net + + Raytrace_New + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_NewPartSegment.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_NewPartSegment.svg index d772967576..c2f3c5393b 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_NewPartSegment.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_NewPartSegment.svg @@ -1,1293 +1,277 @@ - - - - - - - + + + + + + - - - - - + + + - - - - + + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - + image/svg+xml - - + + - Jakub Steiner + [agryson] Alexander Gryson - http://jimmac.musichall.cz - + http://agryson.net + + Raytrace_NewPartSegment + 2012-02-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_NewPartSegment.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Part.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Part.svg index 42935cff37..61c4eaaabe 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Part.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Part.svg @@ -1,318 +1,135 @@ - - - - - + + + + + - - - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - + + + + $committer + + + Raytrace_Part + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Part.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - + + + + + + + - - - - + + + + + + + + + + + + - - diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg index 0226ca54ed..cb69e2ed3e 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg @@ -1,320 +1,137 @@ - - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - - - - + + + - - - - - - - + + + + + - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + $committer + + + Raytrace_Render + 2013-09-17 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ResetCamera.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ResetCamera.svg index d170cb0049..adfd136803 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ResetCamera.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ResetCamera.svg @@ -1,533 +1,166 @@ - - - - - - - + + + + + - - - - - + + + - - - - + + + + - - - - + + + - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + - Jakub Steiner + [agryson] Alexander Gryson - http://jimmac.musichall.cz - + http://agryson.net + + Raytrace_ResetCamera + 2013-10-01 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_ResetCamera.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg index ec9db97b1e..cad3ec758f 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg @@ -1,176 +1,85 @@ - - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + $committer + + + RaytracingWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + diff --git a/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg b/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg index ec9db97b1e..6d36825d98 100644 --- a/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg +++ b/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg @@ -1,176 +1,85 @@ - - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + $committer + + + preferences-raytracing + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - + + + + + + diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 84165edd4d..553abf3a42 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -29,10 +29,12 @@ #endif #include +#include #include #include #include #include +#include #include #include #include @@ -44,6 +46,7 @@ #include #include "ViewProviderSketch.h" +#include "DrawSketchHandler.h" #include "ui_InsertDatum.h" #include "EditDatumDialog.h" #include "CommandConstraints.h" @@ -63,6 +66,10 @@ namespace SketcherGui ConstraintCreationMode constraintCreationMode=Driving; +void ActivateHandler(Gui::Document *doc,DrawSketchHandler *handler); + +bool isCreateGeoActive(Gui::Document *doc); + bool isCreateConstraintActive(Gui::Document *doc) { if (doc) { @@ -927,6 +934,173 @@ bool CmdSketcherConstrainVertical::isActive(void) } +// ====================================================================================== + +namespace SketcherGui { + class LockConstraintSelection : public Gui::SelectionFilterGate + { + App::DocumentObject* object; + public: + LockConstraintSelection(App::DocumentObject* obj) + : Gui::SelectionFilterGate((Gui::SelectionFilter*)0), object(obj) + {} + + bool allow(App::Document *, App::DocumentObject *pObj, const char *sSubName) + { + if (pObj != this->object) + return false; + if (!sSubName || sSubName[0] == '\0') + return false; + std::string element(sSubName); + if (element.substr(0,6) == "Vertex") + return true; + return false; + } + }; +} + +/* XPM */ +static const char *cursor_createlock[]={ +"32 32 3 1", +"+ c white", +"# c red", +". c None", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"................................", +"+++++...+++++...................", +"................................", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"......+..........###............", +"................######..........", +"...............##....##.........", +"..............##......##........", +"..............##......##........", +".............############.......", +".............############.......", +".............############.......", +".............############.......", +".............############.......", +".............############.......", +".............############.......", +".............############.......", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................"}; + +/** + * @brief The DrawSketchHandlerLock class + * + * Hacking along the lines of the functions in CommandCreateGeo.cpp to make lock + * constraints on the fly. + */ +class DrawSketchHandlerLock: public DrawSketchHandler +{ +public: + DrawSketchHandlerLock() : selectionDone(false) {} + virtual ~DrawSketchHandlerLock() + { + Gui::Selection().rmvSelectionGate(); + } + + virtual void activated(ViewProviderSketch *) + { + Gui::Selection().rmvSelectionGate(); + Gui::Selection().addSelectionGate(new LockConstraintSelection(sketchgui->getObject())); + setCursor(QPixmap(cursor_createlock),7,7); + } + + virtual void mouseMove(Base::Vector2d /*onSketchPos*/) + { + // If preselection Point + //int preSelPnt = sketchgui->getPreselectPoint(); +// if (sketchgui->getPreselectPoint() != -1) { +// setPositionText(onSketchPos); +// return; +// } +// resetPositionText(); +// applyCursor(); + } + + virtual bool pressButton(Base::Vector2d onSketchPos) + { + Q_UNUSED(onSketchPos); + // Get Preselection Point + int preSelPnt = sketchgui->getPreselectPoint(); + if (preSelPnt != -1) { + pointGeoId = Constraint::GeoUndef; + pointPosId = Sketcher::none; + sketchgui->getSketchObject()->getGeoVertexIndex(preSelPnt, pointGeoId, pointPosId); + selectionDone = true; + return true; + } + return true; + } + + virtual bool releaseButton(Base::Vector2d onSketchPos) + { + Q_UNUSED(onSketchPos); + if (selectionDone) { + unsetCursor(); + resetPositionText(); + + Sketcher::SketchObject* Obj = static_cast(sketchgui->getObject()); + + Base::Vector3d pnt = Obj->getPoint(pointGeoId,pointPosId); + + // undo command open + Gui::Command::openCommand("add fixed constraint"); + Gui::Command::doCommand( + Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('DistanceX',%d,%d,%f)) ", + sketchgui->getObject()->getNameInDocument(),pointGeoId,pointPosId,pnt.x); + Gui::Command::doCommand( + Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%f)) ", + sketchgui->getObject()->getNameInDocument(),pointGeoId,pointPosId,pnt.y); + + if (pointGeoId <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) { + // it is a constraint on a external line, make it non-driving + const std::vector &ConStr = Obj->Constraints.getValues(); + + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.setDriving(%i,%s)", + sketchgui->getObject()->getNameInDocument(),ConStr.size()-2,"False"); + + Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.setDriving(%i,%s)", + sketchgui->getObject()->getNameInDocument(),ConStr.size()-1,"False"); + } + + // finish the transaction and update + Gui::Command::commitCommand(); + + ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher"); + bool autoRecompute = hGrp->GetBool("AutoRecompute",false); + + if(autoRecompute) + Gui::Command::updateActive(); + + // clear the selection (convenience) + Gui::Selection().clearSelection(); + + } + return true; + } + +protected: + bool selectionDone; + int pointGeoId; + Sketcher::PointPos pointPosId; + std::vector sugConstr; +}; + DEF_STD_CMD_AU(CmdSketcherConstrainLock); CmdSketcherConstrainLock::CmdSketcherConstrainLock() @@ -945,13 +1119,14 @@ CmdSketcherConstrainLock::CmdSketcherConstrainLock() void CmdSketcherConstrainLock::activated(int iMsg) { Q_UNUSED(iMsg); + ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerLock()); // get the selection std::vector selection = getSelection().getSelectionEx(); // only one sketch with its subelements are allowed to be selected if (selection.size() != 1) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select entities from the sketch.")); +// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), +// QObject::tr("Select entities from the sketch.")); return; } @@ -962,6 +1137,8 @@ void CmdSketcherConstrainLock::activated(int iMsg) if (SubNames.size() != 1) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select exactly one entity from the sketch.")); + // clear the selection (convenience) + getSelection().clearSelection(); return; } @@ -972,6 +1149,8 @@ void CmdSketcherConstrainLock::activated(int iMsg) if (isEdge(GeoId,PosId) || (GeoId < 0 && GeoId >= Sketcher::GeoEnum::VAxis)) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), QObject::tr("Select one vertex from the sketch other than the origin.")); + // clear the selection (convenience) + getSelection().clearSelection(); return; } @@ -986,7 +1165,8 @@ void CmdSketcherConstrainLock::activated(int iMsg) Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%f)) ", selection[0].getFeatName(),GeoId,PosId,pnt.y); - if (GeoId <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) { // it is a constraint on a external line, make it non-driving + if (GeoId <= Sketcher::GeoEnum::RefExt || constraintCreationMode==Reference) { + // it is a constraint on a external line, make it non-driving const std::vector &ConStr = Obj->Constraints.getValues(); Gui::Command::doCommand(Doc,"App.ActiveDocument.%s.setDriving(%i,%s)", @@ -1025,9 +1205,151 @@ void CmdSketcherConstrainLock::updateAction(int mode) bool CmdSketcherConstrainLock::isActive(void) { - return isCreateConstraintActive( getActiveGuiDocument() ); + // return isCreateConstraintActive( getActiveGuiDocument() ); + return isCreateGeoActive( getActiveGuiDocument() ); } +// ====================================================================================== + +namespace SketcherGui { + class CoincidentConstraintSelection : public Gui::SelectionFilterGate + { + App::DocumentObject* object; + public: + CoincidentConstraintSelection(App::DocumentObject* obj) + : Gui::SelectionFilterGate((Gui::SelectionFilter*)0), object(obj) + {} + + bool allow(App::Document *, App::DocumentObject *pObj, const char *sSubName) + { + if (pObj != this->object) + return false; + if (!sSubName || sSubName[0] == '\0') + return false; + std::string element(sSubName); + if (element.substr(0,6) == "Vertex" || element.substr(0,9) == "RootPoint") + return true; + return false; + } + }; +} + +/* XPM */ +static const char *cursor_createcoincident[]={ +"32 32 3 1", +"+ c white", +"# c red", +". c None", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"................................", +"+++++...+++++...................", +"................................", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"......+.........................", +"................................", +"................................", +"................................", +".................####...........", +"................######..........", +"...............########.........", +"...............########.........", +"...............########.........", +"...............########.........", +"................######..........", +".................####...........", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................"}; + +class DrawSketchHandlerCoincident: public DrawSketchHandler +{ +public: + DrawSketchHandlerCoincident() + { + GeoId1 = GeoId2 = Constraint::GeoUndef; + PosId1 = PosId2 = Sketcher::none; + } + virtual ~DrawSketchHandlerCoincident() + { + Gui::Selection().rmvSelectionGate(); + } + + virtual void activated(ViewProviderSketch *) + { + Gui::Selection().rmvSelectionGate(); + Gui::Selection().addSelectionGate(new CoincidentConstraintSelection(sketchgui->getObject())); + setCursor(QPixmap(cursor_createcoincident), 7, 7); + } + + virtual void mouseMove(Base::Vector2d onSketchPos) {Q_UNUSED(onSketchPos);} + + virtual bool pressButton(Base::Vector2d onSketchPos) + { + Q_UNUSED(onSketchPos); + return true; + } + + virtual bool releaseButton(Base::Vector2d onSketchPos) + { + Q_UNUSED(onSketchPos); + int VtId = sketchgui->getPreselectPoint(); + if (VtId != -1) { + if (GeoId1 == Constraint::GeoUndef) { + sketchgui->getSketchObject()->getGeoVertexIndex(VtId,GeoId1,PosId1); + std::stringstream ss; + ss << "Vertex" << VtId + 1; + Gui::Selection().addSelection(sketchgui->getSketchObject()->getDocument()->getName(), + sketchgui->getSketchObject()->getNameInDocument(), + ss.str().c_str(), + onSketchPos.x, + onSketchPos.y, + 0.f); + } + else { + sketchgui->getSketchObject()->getGeoVertexIndex(VtId,GeoId2,PosId2); + + // Apply the constraint + Sketcher::SketchObject* Obj = static_cast(sketchgui->getObject()); + + // undo command open + Gui::Command::openCommand("add coincident constraint"); + + // check if this coincidence is already enforced (even indirectly) + bool constraintExists = Obj->arePointsCoincident(GeoId1,PosId1,GeoId2,PosId2); + if (!constraintExists && (GeoId1 != GeoId2)) { + Gui::Command::doCommand( + Gui::Command::Doc,"App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('Coincident',%d,%d,%d,%d)) ", + sketchgui->getObject()->getNameInDocument(),GeoId1,PosId1,GeoId2,PosId2); + Gui::Command::commitCommand(); + } + else { + Gui::Command::abortCommand(); + } + } + } + else { + GeoId1 = GeoId2 = Constraint::GeoUndef; + PosId1 = PosId2 = Sketcher::none; + Gui::Selection().clearSelection(); + } + return true; + } +protected: + int GeoId1, GeoId2; + Sketcher::PointPos PosId1, PosId2; +}; DEF_STD_CMD_A(CmdSketcherConstrainCoincident); @@ -1048,13 +1370,15 @@ CmdSketcherConstrainCoincident::CmdSketcherConstrainCoincident() void CmdSketcherConstrainCoincident::activated(int iMsg) { Q_UNUSED(iMsg); + ActivateHandler(getActiveGuiDocument(), new DrawSketchHandlerCoincident()); + // get the selection std::vector selection = getSelection().getSelectionEx(); // only one sketch with its subelements are allowed to be selected if (selection.size() != 1) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select vertexes from the sketch.")); +// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), +// QObject::tr("Select vertexes from the sketch.")); return; } @@ -1118,7 +1442,8 @@ void CmdSketcherConstrainCoincident::activated(int iMsg) bool CmdSketcherConstrainCoincident::isActive(void) { - return isCreateConstraintActive( getActiveGuiDocument() ); + // return isCreateConstraintActive( getActiveGuiDocument() ); + return isCreateGeoActive( getActiveGuiDocument() ); } @@ -2924,18 +3249,39 @@ void CmdSketcherConstrainAngle::activated(int iMsg) // find the two closest line ends Sketcher::PointPos PosId1,PosId2; - Base::Vector3d p1a = lineSeg1->getStartPoint(); - Base::Vector3d p1b = lineSeg1->getEndPoint(); - Base::Vector3d p2a = lineSeg2->getStartPoint(); - Base::Vector3d p2b = lineSeg2->getEndPoint(); - double length = DBL_MAX; - for (int i=0; i <= 1; i++) { - for (int j=0; j <= 1; j++) { - double tmp = ((j?p2a:p2b)-(i?p1a:p1b)).Length(); - if (tmp < length) { - length = tmp; - PosId1 = i ? Sketcher::start : Sketcher::end; - PosId2 = j ? Sketcher::start : Sketcher::end; + Base::Vector3d p1[2], p2[2]; + p1[0] = lineSeg1->getStartPoint(); + p1[1] = lineSeg1->getEndPoint(); + p2[0] = lineSeg2->getStartPoint(); + p2[1] = lineSeg2->getEndPoint(); + + // Get the intersection point in 2d of the two lines if possible + Base::Line2d line1(Base::Vector2d(p1[0].x, p1[0].y), Base::Vector2d(p1[1].x, p1[1].y)); + Base::Line2d line2(Base::Vector2d(p2[0].x, p2[0].y), Base::Vector2d(p2[1].x, p2[1].y)); + Base::Vector2d s; + if (line1.Intersect(line2, s)) { + // get the end points of the line segments that are closest to the intersection point + Base::Vector3d s3d(s.x, s.y, p1[0].z); + if (Base::DistanceP2(s3d, p1[0]) < Base::DistanceP2(s3d, p1[1])) + PosId1 = Sketcher::start; + else + PosId1 = Sketcher::end; + if (Base::DistanceP2(s3d, p2[0]) < Base::DistanceP2(s3d, p2[1])) + PosId2 = Sketcher::start; + else + PosId2 = Sketcher::end; + } + else { + // if all points are collinear + double length = DBL_MAX; + for (int i=0; i <= 1; i++) { + for (int j=0; j <= 1; j++) { + double tmp = Base::DistanceP2(p2[j], p1[i]); + if (tmp < length) { + length = tmp; + PosId1 = i ? Sketcher::end : Sketcher::start; + PosId2 = j ? Sketcher::end : Sketcher::start; + } } } } @@ -2948,7 +3294,7 @@ void CmdSketcherConstrainAngle::activated(int iMsg) // check if the two lines are parallel, in this case an angle is not possible Base::Vector3d dir3 = dir1 % dir2; if (dir3.Length() < Precision::Intersection()) { - Base::Vector3d dist = (p1a - p2a) % dir1; + Base::Vector3d dist = (p1[0] - p2[0]) % dir1; if (dist.Sqr() > Precision::Intersection()) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Parallel lines"), QObject::tr("An angle constraint cannot be set for two parallel lines.")); @@ -2956,8 +3302,8 @@ void CmdSketcherConstrainAngle::activated(int iMsg) } } - double ActAngle = atan2(-dir1.y*dir2.x+dir1.x*dir2.y, - dir1.x*dir2.x+dir1.y*dir2.y); + double ActAngle = atan2(dir1.x*dir2.y-dir1.y*dir2.x, + dir1.y*dir2.y+dir1.x*dir2.x); if (ActAngle < 0) { ActAngle *= -1; std::swap(GeoId1,GeoId2); diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index dbbdb61989..18cf11d541 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -4729,7 +4729,6 @@ public: else static_cast(sketchgui->getObject())->solve(); - //ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher"); bool continuousMode = hGrp->GetBool("ContinuousCreationMode",true); if(continuousMode){ @@ -4746,6 +4745,7 @@ public: } return true; } + protected: bool selectionDone; Base::Vector2d EditPoint; @@ -4877,7 +4877,7 @@ namespace SketcherGui { return false; } }; -}; +} /* XPM */ diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index 4bc10b60d3..fb4554e7ae 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -61,16 +61,9 @@ using namespace Sketcher; //************************************************************************** // Construction/Destruction -DrawSketchHandler::DrawSketchHandler() - : sketchgui(0) -{ +DrawSketchHandler::DrawSketchHandler() : sketchgui(0) {} -} - -DrawSketchHandler::~DrawSketchHandler() -{ - -} +DrawSketchHandler::~DrawSketchHandler() {} void DrawSketchHandler::quit(void) { diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 1a3e38021a..4a88f16270 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -27,6 +27,7 @@ # include # include # include +# include # include #endif @@ -231,6 +232,8 @@ void ElementView::keyPressEvent(QKeyEvent * event) // ---------------------------------------------------------------------------- +/* TRANSLATOR SketcherGui::TaskSketcherElements */ + TaskSketcherElements::TaskSketcherElements(ViewProviderSketch *sketchView) : TaskBox(Gui::BitmapFactory().pixmap("document-new"),tr("Elements"),true, 0) , sketchView(sketchView) @@ -244,6 +247,18 @@ TaskSketcherElements::TaskSketcherElements(ViewProviderSketch *sketchView) // we need a separate container widget to add all controls to proxy = new QWidget(this); ui->setupUi(proxy); +#ifdef Q_OS_MAC + QString cmdKey = QString::fromUtf8("\xe2\x8c\x98"); // U+2318 +#else + // translate the text (it's offered by Qt's translation files) + // but avoid being picked up by lupdate + const char* ctrlKey = "Ctrl"; + QString cmdKey = QShortcut::tr(ctrlKey); +#endif + QString zKey = QString::fromLatin1("Z"); + ui->Explanation->setText(tr("

    "%1": multiple selection

    " + "

    "%2": switch to next valid type

    ") + .arg(cmdKey).arg(zKey)); ui->listWidgetElements->setSelectionMode(QAbstractItemView::ExtendedSelection); ui->listWidgetElements->setEditTriggers(QListWidget::NoEditTriggers); ui->listWidgetElements->setMouseTracking(true); diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.ui b/src/Mod/Sketcher/Gui/TaskSketcherElements.ui index 394068927b..0a78b25b22 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.ui +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.ui @@ -91,7 +91,7 @@ - <html><head/><body><p>&quot;Ctrl&quot;: multiple selection</p><p>&quot;Z&quot;: switch to next valid type</p></body></html> + <html><head/><body><p>&quot;Ctrl&quot;: multiple selection</p><p>&quot;Z&quot;: switch to next valid type</p></body></html> diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index c3d16c3690..4a3d4ec8e5 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -1283,6 +1283,7 @@ void ViewProviderSketch::moveConstraint(int constNum, const Base::Vector2d &toPo else if (Constr->Type == Angle) { Base::Vector3d p0(0.,0.,0.); + double factor = 0.5; if (Constr->Second != Constraint::GeoUndef) { // line to line angle Base::Vector3d dir1, dir2; if(Constr->Third == Constraint::GeoUndef) { //angle between two lines @@ -1310,7 +1311,11 @@ void ViewProviderSketch::moveConstraint(int constNum, const Base::Vector2d &toPo double c2 = dir2.y*pnt2.x - dir2.x*pnt2.y; double x = (dir1.x*c2 - dir2.x*c1)/det; double y = (dir1.y*c2 - dir2.y*c1)/det; + // intersection point p0 = Base::Vector3d(x,y,0); + + Base::Vector3d vec = Base::Vector3d(toPos.x, toPos.y, 0) - p0; + factor = factor * Base::sgn((dir1+dir2) * vec); } } else {//angle-via-point Base::Vector3d p = getSketchObject()->getSolvedSketch().getPoint(Constr->Third, Constr->ThirdPos); @@ -1319,6 +1324,9 @@ void ViewProviderSketch::moveConstraint(int constNum, const Base::Vector2d &toPo dir1.RotateZ(-M_PI/2);//convert to vector of tangency by rotating dir2 = getSketchObject()->getSolvedSketch().calculateNormalAtPoint(Constr->Second, p.x, p.y); dir2.RotateZ(-M_PI/2); + + Base::Vector3d vec = Base::Vector3d(toPos.x, toPos.y, 0) - p0; + factor = factor * Base::sgn((dir1+dir2) * vec); } } else if (Constr->First != Constraint::GeoUndef) { // line/arc angle @@ -1338,7 +1346,7 @@ void ViewProviderSketch::moveConstraint(int constNum, const Base::Vector2d &toPo return; Base::Vector3d vec = Base::Vector3d(toPos.x, toPos.y, 0) - p0; - Constr->LabelDistance = vec.Length()/2; + Constr->LabelDistance = factor * vec.Length(); } // delete the cloned objects @@ -4090,7 +4098,7 @@ Restart: } startangle = atan2(dir1.y,dir1.x); - range = atan2(-dir1.y*dir2.x+dir1.x*dir2.y, + range = atan2(dir1.x*dir2.y-dir1.y*dir2.x, dir1.x*dir2.x+dir1.y*dir2.y); endangle = startangle + range; diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/Spreadsheet.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/Spreadsheet.svg index 9249d108a7..f15eab6536 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/Spreadsheet.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/Spreadsheet.svg @@ -1,144 +1,64 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + Spreadsheet + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/Spreadsheet.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlias.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlias.svg index baecbac2db..50e451ce87 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlias.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlias.svg @@ -1,171 +1,68 @@ - - - - - - - - + + + + + - - - - - - + + + + + + + + + + + + + - - + + - + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlias + 2015-09-30 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlias.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignBottom.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignBottom.svg index 77bd08bd31..e4408a031a 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignBottom.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignBottom.svg @@ -1,139 +1,62 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlignBottom + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignBottom.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignCenter.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignCenter.svg index ace3fd97a1..ea0f6fed4d 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignCenter.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignCenter.svg @@ -1,149 +1,64 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlignCenter + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignCenter.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignLeft.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignLeft.svg index 35c7c1b28f..0068da7318 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignLeft.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignLeft.svg @@ -1,149 +1,64 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlignLeft + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignLeft.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignRight.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignRight.svg index 5df917396b..8ea3df1c73 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignRight.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignRight.svg @@ -1,149 +1,64 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlignRight + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignRight.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignTop.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignTop.svg index d1165f169b..a66bb52d2f 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignTop.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignTop.svg @@ -1,139 +1,62 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlignTop + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignTop.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignVCenter.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignVCenter.svg index 50ece07c4b..0792618211 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignVCenter.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignVCenter.svg @@ -1,139 +1,62 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetAlignVCenter + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetAlignVCenter.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetController.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetController.svg index b0170884ba..996141052a 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetController.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetController.svg @@ -1,163 +1,66 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetController + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetController.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - + + + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetExport.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetExport.svg index ed68e6721c..17c264f3eb 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetExport.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetExport.svg @@ -1,411 +1,97 @@ - - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - + + + + - + image/svg+xml - - + + Jakub Steiner @@ -420,235 +106,78 @@ store - - + + http://jimmac.musichall.cz + SpreadsheetExport + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetExport.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetImport.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetImport.svg index b6be03dfbb..68730de480 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetImport.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetImport.svg @@ -1,299 +1,77 @@ - - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - + + + + - + image/svg+xml - - + + 2005-01-31 Jakub Steiner - + http://jimmac.musichall.cz Active state - when files are being dragged to. @@ -301,254 +79,74 @@ Novell, Inc. + SpreadsheetImport + http://www.freecadweb.org/wiki/index.php?title=Artwork + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetImport.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetMergeCells.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetMergeCells.svg index e3768c846b..2ec1fecb8c 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetMergeCells.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetMergeCells.svg @@ -1,166 +1,87 @@ - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetMergeCells + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetMergeCells.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetSplitCell.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetSplitCell.svg index df0b9c4fa5..f6350cb26b 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetSplitCell.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetSplitCell.svg @@ -1,192 +1,102 @@ - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Eivind Kvedalen] + + + SpreadsheetSplitCell + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetSplitCell.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg index 9268d4ea60..160f442536 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleBold.svg @@ -1,5 +1,6 @@ + + inkscape:showpageshadow="false" + borderlayer="true" + inkscape:window-maximized="1"> + empspacing="2" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> @@ -285,17 +290,18 @@ inkscape:groupmode="layer" id="layer5" inkscape:label="Shadow" - style="display:inline"> + style="display:inline" + transform="translate(0,16)"> @@ -303,25 +309,30 @@ inkscape:groupmode="layer" id="layer4" inkscape:label="A" - style="display:inline"> + style="display:inline" + transform="translate(0,16)"> + transform="matrix(1.3801775,0,0,1.4054054,-1.1405326,-11.702703)" + style="stroke-width:1.43602406"> + d="m 18,0.5 -15,37 10.143623,0 2.173633,-5.692307 17.269027,0 L 34.879958,37.5 45,37.5 30,0.5 l -3,0 -6,0 z m 6.01179,8.5384618 5.796356,14.2307692 -11.592712,0 z" + style="fill:url(#linearGradient2475);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2477);stroke-width:1.43602407;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + sodipodi:nodetypes="ccccccccccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccccc" + inkscape:connector-curvature="0" /> + d="m 16.041801,24.692308 15.939979,0 -7.96999,-19.2115385 z" + style="opacity:0.7;fill:none;stroke:url(#linearGradient2481);stroke-width:1.43602407;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg index 3a4bc363a0..6bb54c2da5 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg @@ -1,265 +1,57 @@ - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + image/svg+xml - + Italic 2006-01-04 @@ -278,57 +70,38 @@ letter - + + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleItalic.svg + + + FreeCAD LGPL2+ + + + + + [agryson] Alexander Gryson + + - - - - + + + + - - + + - - - - + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg index 22131f6c2b..26d53f1836 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg @@ -1,340 +1,89 @@ - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + image/svg+xml - + Format Text - Underlined - + Lapo Calamandrei @@ -352,83 +101,41 @@ strike-though - + - jakub Steiner + jakub Steiner, [agryson] Alexander Gryson + 2013-09-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetStyleUnderline.svg + + + FreeCAD LGPL2+ + + - - - - + + + + - - + + - - - - - - + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg index 9249d108a7..85c337b618 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg +++ b/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg @@ -1,144 +1,64 @@ - - - - - - - - + + + + + - - + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [triplus] + + + SpreadsheetWorkbench + 2016-02-26 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Gui/Resources/icons/SpreadsheetWorkbench.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - + + + + + + + diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp index ea222095c5..d40584f9ed 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp @@ -1,17 +1,17 @@ /**************************************************************************** ** ** This file is part of a Qt Solutions component. -** +** ** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -** +** ** Contact: Qt Software Information (qt-info@nokia.com) -** -** Commercial Usage +** +** Commercial Usage ** Licensees holding valid Qt Commercial licenses may use this file in ** accordance with the Qt Solutions Commercial License Agreement provided ** with the Software or, alternatively, in accordance with the terms ** contained in a written agreement between you and Nokia. -** +** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,29 +19,29 @@ ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** +** ** In addition, as a special exception, Nokia gives you certain ** additional rights. These rights are described in the Nokia Qt LGPL ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ** package. -** -** GNU General Public License Usage +** +** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3.0 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. Please review the following information to ** ensure the GNU General Public License version 3.0 requirements will be ** met: http://www.gnu.org/copyleft/gpl.html. -** +** ** Please note Third Party Software included with Qt Solutions may impose ** additional restrictions and it is the user's responsibility to ensure ** that they have met the licensing requirements of the GPL, LGPL, or Qt ** Solutions Commercial license and the relevant license of the Third ** Party Software they are using. -** +** ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. -** +** ****************************************************************************/ #include @@ -169,7 +169,7 @@ class ColorPickerItem : public QFrame public: ColorPickerItem(const QColor &color = Qt::white, const QString &text = QString::null, - QWidget *parent = 0); + QWidget *parent = 0); ~ColorPickerItem(); QColor color() const; @@ -181,7 +181,7 @@ signals: void clicked(); void selected(); -public slots: +public Q_SLOTS: void setColor(const QColor &color, const QString &text = QString()); protected: @@ -205,7 +205,7 @@ class ColorPickerPopup : public QFrame public: ColorPickerPopup(int width, bool withColorDialog, - QWidget *parent = 0); + QWidget *parent = 0); ~ColorPickerPopup(); void insertColor(const QColor &col, const QString &text, int index); @@ -217,17 +217,17 @@ public: ColorPickerItem *find(const QColor &col) const; QColor color(int index) const; - + void setLastSel(const QColor & col); signals: void selected(const QColor &); void hid(); -public slots: +public Q_SLOTS: void getColorFromDialog(); -protected slots: +protected Q_SLOTS: void updateSelected(); protected: @@ -268,7 +268,7 @@ private: \sa QFrame */ QtColorPicker::QtColorPicker(QWidget *parent, - int cols, bool enableColorDialog) + int cols, bool enableColorDialog) : QPushButton(parent), popup(0), withColorDialog(enableColorDialog) { setFocusPolicy(Qt::StrongFocus); @@ -288,7 +288,7 @@ QtColorPicker::QtColorPicker(QWidget *parent, // Create color grid popup and connect to it. popup = new ColorPickerPopup(cols, withColorDialog, this); connect(popup, SIGNAL(selected(const QColor &)), - SLOT(setCurrentColor(const QColor &))); + SLOT(setCurrentColor(const QColor &))); connect(popup, SIGNAL(hid()), SLOT(popupClosed())); // Connect this push button's pressed() signal. @@ -434,18 +434,18 @@ void QtColorPicker::setStandardColors() void QtColorPicker::setCurrentColor(const QColor &color) { if (color.isValid() && col == color) { - emit colorSet(color); + Q_EMIT colorSet(color); return; } if (col == color || !color.isValid()) - return; + return; ColorPickerItem *item = popup->find(color); if (!item) { - insertColor(color, tr("Custom")); - item = popup->find(color); + insertColor(color, tr("Custom")); + item = popup->find(color); } - + popup->setLastSel(color); col = color; @@ -457,8 +457,8 @@ void QtColorPicker::setCurrentColor(const QColor &color) repaint(); item->setSelected(true); - emit colorChanged(color); - emit colorSet(color); + Q_EMIT colorChanged(color); + Q_EMIT colorSet(color); } /*! @@ -471,9 +471,9 @@ void QtColorPicker::insertColor(const QColor &color, const QString &text, int in { popup->insertColor(color, text, index); if (!firstInserted) { - col = color; - setText(text); - firstInserted = true; + col = color; + setText(text); + firstInserted = true; } } @@ -504,7 +504,7 @@ bool QtColorPicker::colorDialogEnabled() const \code void Drawer::mouseReleaseEvent(QMouseEvent *e) { - if (e->button() & RightButton) { + if (e->button() & RightButton) { QColor color = QtColorPicker::getColor(mapToGlobal(e->pos())); } } @@ -542,7 +542,7 @@ QColor QtColorPicker::getColor(const QPoint &point, bool allowCustomColors) Constructs the popup widget. */ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog, - QWidget *parent) + QWidget *parent) : QFrame(parent, Qt::Popup) { setFrameStyle(QFrame::StyledPanel); @@ -553,13 +553,13 @@ ColorPickerPopup::ColorPickerPopup(int width, bool withColorDialog, cols = width; if (withColorDialog) { - moreButton = new ColorPickerButton(this); - moreButton->setFixedWidth(24); - moreButton->setFixedHeight(21); - moreButton->setFrameRect(QRect(2, 2, 20, 17)); - connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog())); + moreButton = new ColorPickerButton(this); + moreButton->setFixedWidth(24); + moreButton->setFixedHeight(21); + moreButton->setFrameRect(QRect(2, 2, 20, 17)); + connect(moreButton, SIGNAL(clicked()), SLOT(getColorFromDialog())); } else { - moreButton = 0; + moreButton = 0; } eventLoop = 0; @@ -586,8 +586,8 @@ ColorPickerPopup::~ColorPickerPopup() ColorPickerItem *ColorPickerPopup::find(const QColor &col) const { for (int i = 0; i < items.size(); ++i) { - if (items.at(i) && items.at(i)->color() == col) - return items.at(i); + if (items.at(i) && items.at(i)->color() == col) + return items.at(i); } return 0; @@ -626,7 +626,7 @@ void ColorPickerPopup::insertColor(const QColor &col, const QString &text, int i connect(item, SIGNAL(selected()), SLOT(updateSelected())); if (index == -1) - index = items.count(); + index = items.count(); items.insert((unsigned int)index, item); regenerateGrid(); @@ -667,19 +667,19 @@ void ColorPickerPopup::updateSelected() QLayoutItem *layoutItem; int i = 0; while ((layoutItem = grid->itemAt(i)) != 0) { - QWidget *w = layoutItem->widget(); - if (w && w->inherits("ColorPickerItem")) { - ColorPickerItem *litem = reinterpret_cast(layoutItem->widget()); - if (litem != sender()) - litem->setSelected(false); - } - ++i; + QWidget *w = layoutItem->widget(); + if (w && w->inherits("ColorPickerItem")) { + ColorPickerItem *litem = reinterpret_cast(layoutItem->widget()); + if (litem != sender()) + litem->setSelected(false); + } + ++i; } if (sender() && sender()->inherits("ColorPickerItem")) { - ColorPickerItem *item = (ColorPickerItem *)sender(); - lastSel = item->color(); - emit selected(item->color()); + ColorPickerItem *item = (ColorPickerItem *)sender(); + lastSel = item->color(); + Q_EMIT selected(item->color()); } hide(); @@ -691,7 +691,7 @@ void ColorPickerPopup::updateSelected() void ColorPickerPopup::mouseReleaseEvent(QMouseEvent *e) { if (!rect().contains(e->pos())) - hide(); + hide(); } /*! \internal @@ -705,96 +705,96 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e) bool foundFocus = false; for (int j = 0; !foundFocus && j < grid->rowCount(); ++j) { - for (int i = 0; !foundFocus && i < grid->columnCount(); ++i) { - if (widgetAt[j][i] && widgetAt[j][i]->hasFocus()) { - curRow = j; - curCol = i; - foundFocus = true; - break; - } - } + for (int i = 0; !foundFocus && i < grid->columnCount(); ++i) { + if (widgetAt[j][i] && widgetAt[j][i]->hasFocus()) { + curRow = j; + curCol = i; + foundFocus = true; + break; + } + } } switch (e->key()) { - case Qt::Key_Left: - if (curCol > 0) --curCol; - else if (curRow > 0) { --curRow; curCol = grid->columnCount() - 1; } - break; - case Qt::Key_Right: - if (curCol < grid->columnCount() - 1 && widgetAt[curRow][curCol + 1]) ++curCol; - else if (curRow < grid->rowCount() - 1) { ++curRow; curCol = 0; } - break; - case Qt::Key_Up: - if (curRow > 0) --curRow; - else curCol = 0; - break; - case Qt::Key_Down: - if (curRow < grid->rowCount() - 1) { - QWidget *w = widgetAt[curRow + 1][curCol]; - if (w) { - ++curRow; - } else for (int i = 1; i < grid->columnCount(); ++i) { - if (!widgetAt[curRow + 1][i]) { - curCol = i - 1; - ++curRow; - break; - } - } - } - break; - case Qt::Key_Space: - case Qt::Key_Return: - case Qt::Key_Enter: { - QWidget *w = widgetAt[curRow][curCol]; - if (w && w->inherits("ColorPickerItem")) { - ColorPickerItem *wi = reinterpret_cast(w); - wi->setSelected(true); + case Qt::Key_Left: + if (curCol > 0) --curCol; + else if (curRow > 0) { --curRow; curCol = grid->columnCount() - 1; } + break; + case Qt::Key_Right: + if (curCol < grid->columnCount() - 1 && widgetAt[curRow][curCol + 1]) ++curCol; + else if (curRow < grid->rowCount() - 1) { ++curRow; curCol = 0; } + break; + case Qt::Key_Up: + if (curRow > 0) --curRow; + else curCol = 0; + break; + case Qt::Key_Down: + if (curRow < grid->rowCount() - 1) { + QWidget *w = widgetAt[curRow + 1][curCol]; + if (w) { + ++curRow; + } else for (int i = 1; i < grid->columnCount(); ++i) { + if (!widgetAt[curRow + 1][i]) { + curCol = i - 1; + ++curRow; + break; + } + } + } + break; + case Qt::Key_Space: + case Qt::Key_Return: + case Qt::Key_Enter: { + QWidget *w = widgetAt[curRow][curCol]; + if (w && w->inherits("ColorPickerItem")) { + ColorPickerItem *wi = reinterpret_cast(w); + wi->setSelected(true); - QLayoutItem *layoutItem; + QLayoutItem *layoutItem; int i = 0; - while ((layoutItem = grid->itemAt(i)) != 0) { - QWidget *w = layoutItem->widget(); - if (w && w->inherits("ColorPickerItem")) { - ColorPickerItem *litem - = reinterpret_cast(layoutItem->widget()); - if (litem != wi) - litem->setSelected(false); - } - ++i; - } + while ((layoutItem = grid->itemAt(i)) != 0) { + QWidget *w = layoutItem->widget(); + if (w && w->inherits("ColorPickerItem")) { + ColorPickerItem *litem + = reinterpret_cast(layoutItem->widget()); + if (litem != wi) + litem->setSelected(false); + } + ++i; + } - lastSel = wi->color(); - emit selected(wi->color()); - hide(); - } else if (w && w->inherits("QPushButton")) { - ColorPickerItem *wi = reinterpret_cast(w); - wi->setSelected(true); + lastSel = wi->color(); + Q_EMIT selected(wi->color()); + hide(); + } else if (w && w->inherits("QPushButton")) { + ColorPickerItem *wi = reinterpret_cast(w); + wi->setSelected(true); - QLayoutItem *layoutItem; + QLayoutItem *layoutItem; int i = 0; - while ((layoutItem = grid->itemAt(i)) != 0) { - QWidget *w = layoutItem->widget(); - if (w && w->inherits("ColorPickerItem")) { - ColorPickerItem *litem - = reinterpret_cast(layoutItem->widget()); - if (litem != wi) - litem->setSelected(false); - } - ++i; - } + while ((layoutItem = grid->itemAt(i)) != 0) { + QWidget *w = layoutItem->widget(); + if (w && w->inherits("ColorPickerItem")) { + ColorPickerItem *litem + = reinterpret_cast(layoutItem->widget()); + if (litem != wi) + litem->setSelected(false); + } + ++i; + } - lastSel = wi->color(); - emit selected(wi->color()); - hide(); - } - } - break; + lastSel = wi->color(); + Q_EMIT selected(wi->color()); + hide(); + } + } + break; case Qt::Key_Escape: hide(); break; - default: - e->ignore(); - break; + default: + e->ignore(); + break; } widgetAt[curRow][curCol]->setFocus(); @@ -806,12 +806,12 @@ void ColorPickerPopup::keyPressEvent(QKeyEvent *e) void ColorPickerPopup::hideEvent(QHideEvent *e) { if (eventLoop) { - eventLoop->exit(); + eventLoop->exit(); } setFocus(); - emit hid(); + Q_EMIT hid(); QFrame::hideEvent(e); } @@ -832,23 +832,23 @@ void ColorPickerPopup::showEvent(QShowEvent *) { bool foundSelected = false; for (int i = 0; i < grid->columnCount(); ++i) { - for (int j = 0; j < grid->rowCount(); ++j) { - QWidget *w = widgetAt[j][i]; - if (w && w->inherits("ColorPickerItem")) { - if (((ColorPickerItem *)w)->isSelected()) { - w->setFocus(); - foundSelected = true; - break; - } - } - } + for (int j = 0; j < grid->rowCount(); ++j) { + QWidget *w = widgetAt[j][i]; + if (w && w->inherits("ColorPickerItem")) { + if (((ColorPickerItem *)w)->isSelected()) { + w->setFocus(); + foundSelected = true; + break; + } + } + } } if (!foundSelected) { - if (items.count() == 0) - setFocus(); - else - widgetAt[0][0]->setFocus(); + if (items.count() == 0) + setFocus(); + else + widgetAt[0][0]->setFocus(); } } @@ -861,7 +861,7 @@ void ColorPickerPopup::regenerateGrid() int columns = cols; if (columns == -1) - columns = (int) ceil(sqrt((float) items.count())); + columns = (int) ceil(sqrt((float) items.count())); // When the number of columns grows, the number of rows will // fall. There's no way to shrink a grid, so we create a new @@ -884,8 +884,8 @@ void ColorPickerPopup::regenerateGrid() } if (moreButton) { - grid->addWidget(moreButton, crow, ccol); - widgetAt[crow][ccol] = moreButton; + grid->addWidget(moreButton, crow, ccol); + widgetAt[crow][ccol] = moreButton; } updateGeometry(); } @@ -901,12 +901,12 @@ void ColorPickerPopup::getColorFromDialog() //QRgb rgb = QColorDialog::getRgba(lastSel.rgba(), &ok, parentWidget()); QColor col = QColorDialog::getColor(lastSel,parentWidget(),0,QColorDialog::ShowAlphaChannel); if (!col.isValid()) - return; + return; //QColor col = QColor::fromRgba(rgb); insertColor(col, tr("Custom"), -1); lastSel = col; - emit selected(col); + Q_EMIT selected(col); } void ColorPickerPopup::setLastSel(const QColor & col) { lastSel = col; } @@ -916,7 +916,7 @@ void ColorPickerPopup::setLastSel(const QColor & col) { lastSel = col; } whose name is set to \a text. */ ColorPickerItem::ColorPickerItem(const QColor &color, const QString &text, - QWidget *parent) + QWidget *parent) : QFrame(parent), c(color), t(text), sel(false) { setToolTip(t); @@ -994,7 +994,7 @@ void ColorPickerItem::mouseMoveEvent(QMouseEvent *) void ColorPickerItem::mouseReleaseEvent(QMouseEvent *) { sel = true; - emit selected(); + Q_EMIT selected(); } /*! @@ -1018,14 +1018,14 @@ void ColorPickerItem::paintEvent(QPaintEvent *) p.setPen( QPen( Qt::gray, 0, Qt::SolidLine ) ); if (sel) - p.drawRect(1, 1, w - 3, h - 3); + p.drawRect(1, 1, w - 3, h - 3); p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) ); p.drawRect(3, 3, w - 7, h - 7); p.fillRect(QRect(4, 4, w - 8, h - 8), QBrush(c)); if (hasFocus()) - p.drawRect(0, 0, w - 1, h - 1); + p.drawRect(0, 0, w - 1, h - 1); } /*! @@ -1062,7 +1062,7 @@ void ColorPickerButton::mouseReleaseEvent(QMouseEvent *) { setFrameShadow(Raised); repaint(); - emit clicked(); + Q_EMIT clicked(); } /*! @@ -1071,15 +1071,15 @@ void ColorPickerButton::mouseReleaseEvent(QMouseEvent *) void ColorPickerButton::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Up - || e->key() == Qt::Key_Down - || e->key() == Qt::Key_Left - || e->key() == Qt::Key_Right) { - qApp->sendEvent(parent(), e); + || e->key() == Qt::Key_Down + || e->key() == Qt::Key_Left + || e->key() == Qt::Key_Right) { + qApp->sendEvent(parent(), e); } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return) { - setFrameShadow(Sunken); - update(); + setFrameShadow(Sunken); + update(); } else { - QFrame::keyPressEvent(e); + QFrame::keyPressEvent(e); } } @@ -1089,16 +1089,16 @@ void ColorPickerButton::keyPressEvent(QKeyEvent *e) void ColorPickerButton::keyReleaseEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Up - || e->key() == Qt::Key_Down - || e->key() == Qt::Key_Left - || e->key() == Qt::Key_Right) { - qApp->sendEvent(parent(), e); + || e->key() == Qt::Key_Down + || e->key() == Qt::Key_Left + || e->key() == Qt::Key_Right) { + qApp->sendEvent(parent(), e); } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Space || e->key() == Qt::Key_Return) { - setFrameShadow(Raised); - repaint(); - emit clicked(); + setFrameShadow(Raised); + repaint(); + Q_EMIT clicked(); } else { - QFrame::keyReleaseEvent(e); + QFrame::keyReleaseEvent(e); } } @@ -1144,8 +1144,8 @@ void ColorPickerButton::paintEvent(QPaintEvent *e) p.drawRect(r.center().x() + offset , r.center().y() + offset, 1, 1); p.drawRect(r.center().x() + offset + 4, r.center().y() + offset, 1, 1); if (hasFocus()) { - p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) ); - p.drawRect(0, 0, width() - 1, height() - 1); + p.setPen( QPen( Qt::black, 0, Qt::SolidLine ) ); + p.drawRect(0, 0, width() - 1, height() - 1); } p.end(); diff --git a/src/Mod/Spreadsheet/Resources/icons/SpreadsheetPropertyController.svg b/src/Mod/Spreadsheet/Resources/icons/SpreadsheetPropertyController.svg index 94988cb08e..39dde8dbce 100644 --- a/src/Mod/Spreadsheet/Resources/icons/SpreadsheetPropertyController.svg +++ b/src/Mod/Spreadsheet/Resources/icons/SpreadsheetPropertyController.svg @@ -1,198 +1,86 @@ - - - - - - - - + + + + + - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + - - + + + + - + image/svg+xml - - + + + + + [Yorik van Havre] + + + SpreadsheetPropertyController + 2014-03-29 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Spreadsheet/Resources/icons/SpreadsheetPropertyController.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index a8a19e44cf..a3da8149f2 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -1023,21 +1023,27 @@ void DrawProjGroup::onDocumentRestored() } else if (hasProjection("Front")) { Base::Vector3d dirFront = getProjItem("Front")->Direction.getValue(); std::string viewDir = Cube::dirToView(dirFront); - Base::Vector3d rotFront = getProjItem("Rot")->RotationVector.getValue(); + Base::Vector3d rotFront(1.0,0.0,0.0); + App::Property* prop = getPropertyByName("RotationVector"); + if (prop) { + Base::Console().Log("INFO - DPG::onRestore - DPG has RotationVector property\n"); + rotFront = getProjItem("Front")->RotationVector.getValue(); + } else { + Base::Console().Log("INFO - DPG::onRestore - DPG has NO RotationVector property\n"); + } std::string viewRot = Cube::dirToView(rotFront); std::string config = viewDir + viewRot; - //find(config) or try/catch try { config = m_dirRotToConfig.at(config); setConfig(config); } catch (...) { - Base::Console().Message("ERROR: DPG cannot set configuration: %s using AD\n",config.c_str()); + Base::Console().Message("PROBLEM: DPG cannot set configuration: %s using default instead\n",config.c_str()); setConfig("AD"); } } else { - Base::Console().Message("ERROR: DPG cannot find Front view on restore\n"); - setConfig("AD"); // set to default config?? + Base::Console().Message("PROBLEM: DPG cannot find Front view on restore. Using default instead.\n"); + setConfig("AD"); } } diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp index c1671cea7d..f5276b2cfb 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp +++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp @@ -421,7 +421,7 @@ std::vector DrawProjectSplit::removeDuplicateEdges(std::vector 0) { + if (DrawUtil::vectorLess(item.end,item.start)) { Base::Vector3d vTemp = item.start; item.start = item.end; item.end = vTemp; @@ -453,7 +453,7 @@ std::vector DrawProjectSplit::removeDuplicateEdges(std::vector DrawProjectSplit::sortEdges(std::vector& e, bool ascend) { std::vector sorted = e; - std::sort(sorted.begin(), sorted.end(), edgeSortItem::edgeCompare); + std::sort(sorted.begin(), sorted.end(), edgeSortItem::edgeLess); if (ascend) { std::reverse(sorted.begin(),sorted.end()); } @@ -476,24 +476,23 @@ std::string edgeSortItem::dump(void) //true if "e1 < e2" - for sorting -/*static*/bool edgeSortItem::edgeCompare(const edgeSortItem& e1, const edgeSortItem& e2) +/*static*/bool edgeSortItem::edgeLess(const edgeSortItem& e1, const edgeSortItem& e2) { bool result = false; - int vCompare = DrawUtil::vectorCompare(e1.start, e2.start); - if ( vCompare == -1) { - result = true; - } else if (vCompare == 0) { - if (e1.startAngle < e2.startAngle) { - result = true; - } else if (DrawUtil::fpCompare(e1.startAngle, e2.startAngle)) { - if (e1.endAngle < e2.startAngle) { - result = true; - } else if (DrawUtil::fpCompare(e1.endAngle, e2.endAngle)) { - if (e1.idx < e2.idx) { - result = true; - } - } + if (e1.start != e2.start) { + if ( DrawUtil::vectorLess(e1.start, e2.start)) { + result = true; } + } else if (!DrawUtil::fpCompare(e1.startAngle, e2.startAngle)) { + if (e1.startAngle < e2.startAngle) { + result = true; + } + } else if (!DrawUtil::fpCompare(e1.endAngle, e2.endAngle)) { + if (e1.endAngle < e2.startAngle) { + result = true; + } + } else if (e1.idx < e2.idx) { + result = true; } return result; } diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.h b/src/Mod/TechDraw/App/DrawProjectSplit.h index 24822c789b..75388711fb 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.h +++ b/src/Mod/TechDraw/App/DrawProjectSplit.h @@ -68,7 +68,7 @@ public: double endAngle; unsigned int idx; - static bool edgeCompare(const edgeSortItem& e1, const edgeSortItem& e2); + static bool edgeLess(const edgeSortItem& e1, const edgeSortItem& e2); static bool edgeEqual(const edgeSortItem& e1, const edgeSortItem& e2); std::string dump(void); }; diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index db00a2154c..f8a3e8952c 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -277,33 +277,22 @@ std::string DrawUtil::formatVector(const Base::Vector3d& v) return result; } -//! compare 2 vectors for sorting purposes ( -1 -> v1 v1 == v2, 1 -> v1 > v2) -int DrawUtil::vectorCompare(const Base::Vector3d& v1, const Base::Vector3d& v2) +//! compare 2 vectors for sorting - true if v1 < v2 +bool DrawUtil::vectorLess(const Base::Vector3d& v1, const Base::Vector3d& v2) { - int result = 0; - if (v1 == v2) { - return result; - } - - if (v1.x < v2.x) { - result = -1; - } else if (DrawUtil::fpCompare(v1.x, v2.x)) { - if (v1.y < v2.y) { - result = -1; - } else if (DrawUtil::fpCompare(v1.y, v2.y)) { - if (v1.z < v2.z) { - result = -1; - } else { - result = 1; - } + bool result = false; + if (v1 != v2) { + if (!DrawUtil::fpCompare(v1.x,v2.x)) { + result = v1.x < v2.x; + } else if (!DrawUtil::fpCompare(v1.y,v2.y)) { + result = v1.y < v2.y; } else { - result = 1; //v2y > v1y + result = v1.z < v2.z; } - } else { - result = 1; //v1x > v2x } return result; -} +} + //!convert fromPoint in coordinate system fromSystem to reference coordinate system Base::Vector3d DrawUtil::toR3(const gp_Ax2 fromSystem, const Base::Vector3d fromPoint) diff --git a/src/Mod/TechDraw/App/DrawUtil.h b/src/Mod/TechDraw/App/DrawUtil.h index 739a2e284c..41059cfdb6 100644 --- a/src/Mod/TechDraw/App/DrawUtil.h +++ b/src/Mod/TechDraw/App/DrawUtil.h @@ -59,7 +59,7 @@ class TechDrawExport DrawUtil { static bool fpCompare(const double& d1, const double& d2); static Base::Vector3d vertex2Vector(const TopoDS_Vertex& v); static std::string formatVector(const Base::Vector3d& v); - static int vectorCompare(const Base::Vector3d& v1, const Base::Vector3d& v2); + static bool vectorLess(const Base::Vector3d& v1, const Base::Vector3d& v2); static Base::Vector3d toR3(const gp_Ax2 fromSystem, const Base::Vector3d fromPoint); static bool checkParallel(const Base::Vector3d v1, const Base::Vector3d v2); //! rotate vector by angle radians around axis through org diff --git a/src/Tools/plugins/widget/customwidgets.cpp b/src/Tools/plugins/widget/customwidgets.cpp index d96b9fb9cb..51f70a6dfa 100644 --- a/src/Tools/plugins/widget/customwidgets.cpp +++ b/src/Tools/plugins/widget/customwidgets.cpp @@ -182,7 +182,7 @@ void FileChooser::chooseFile() if (!fn.isEmpty()) { lineEdit->setText(fn); - emit fileNameSelected(fn); + Q_EMIT fileNameSelected(fn); } } @@ -595,9 +595,9 @@ QAbstractSpinBox::StepEnabled QuantitySpinBox::stepEnabled() const } return ret; } - -void QuantitySpinBox::stepBy(int steps) -{ + +void QuantitySpinBox::stepBy(int steps) +{ double step = StepSize * steps; double val = Value + step; if (val > Maximum) @@ -607,7 +607,7 @@ void QuantitySpinBox::stepBy(int steps) lineEdit()->setText(QString::fromUtf8("%L1 %2").arg(val).arg(UnitStr)); update(); -} +} void QuantitySpinBox::setUnitText(QString str) { @@ -792,9 +792,9 @@ public: UIntSpinBox::UIntSpinBox (QWidget* parent) : QSpinBox (parent) { - d = new UIntSpinBoxPrivate; + d = new UIntSpinBoxPrivate; d->mValidator = new UnsignedValidator(this->minimum(), this->maximum(), this); - connect(this, SIGNAL(valueChanged(int)), + connect(this, SIGNAL(valueChanged(int)), this, SLOT(valueChange(int))); setRange(0, 99); setValue(0); @@ -802,7 +802,7 @@ UIntSpinBox::UIntSpinBox (QWidget* parent) } UIntSpinBox::~UIntSpinBox() -{ +{ delete d->mValidator; delete d; d = 0; } @@ -1032,7 +1032,7 @@ void ColorButton::onChooseColor() if ( c.isValid() ) { setColor( c ); - emit changed(); + Q_EMIT changed(); } } diff --git a/src/Tools/plugins/widget/wizard.cpp b/src/Tools/plugins/widget/wizard.cpp index 7d788baf62..6aae3ac0af 100644 --- a/src/Tools/plugins/widget/wizard.cpp +++ b/src/Tools/plugins/widget/wizard.cpp @@ -153,7 +153,7 @@ void Wizard::setCurrentIndex(int index) textLabel->setText(stackWidget->currentWidget()->windowTitle()); _backButton->setEnabled(index > 0); _nextButton->setEnabled(index < count()-1); - emit currentIndexChanged(index); + Q_EMIT currentIndexChanged(index); } } @@ -171,7 +171,7 @@ void Wizard::setPageTitle(QString const &newTitle) { stackWidget->currentWidget()->setWindowTitle(newTitle); textLabel->setText(newTitle); - emit pageTitleChanged(newTitle); + Q_EMIT pageTitleChanged(newTitle); } WizardExtension::WizardExtension(Wizard *widget, QObject *parent)