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

remove unneeded orig files

Browse Source
This commit is contained in:
Stefan Tröger
2016-04-12 19:10:19 +02:00
parent 4119bb7adc
commit 483e64f368
37 changed files with 0 additions and 20826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/Mod/Assembly/App/AppAssemblyPy.cpp.orig
View File

@@ -1,98 +0,0 @@
/***************************************************************************
* Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library 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 library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
#endif
#include <Base/PyObjectBase.h>
#include <Base/Console.h>
#include <App/PartPy.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <Mod/PartDesign/App/BodyPy.h>
#include "ViewProviderBody.h"
#include "Utils.h"
//static PyObject * setActiveBody(PyObject *self, PyObject *args)
//{
// PyObject *object=0;
// if (PyArg_ParseTuple(args,"|O!",&(PartDesign::BodyPy::Type), &object)&& object) {
// PartDesign::Body* Item = static_cast<PartDesign::BodyPy*>(object)->getBodyPtr();
// // Should be set!
// assert(Item);
//
// // Set old body inactive if we are activating another body in the same document
// if ((PartDesignGui::ActivePartObject != NULL) &&
// (PartDesignGui::ActivePartObject->getDocument() == Item->getDocument()))
// PartDesignGui::ActivePartObject->IsActive.setValue(false);
// PartDesignGui::ActivePartObject = Item;
// PartDesignGui::ActiveAppDoc = Item->getDocument();
// PartDesignGui::ActiveGuiDoc = Gui::Application::Instance->getDocument(PartDesignGui::ActiveAppDoc);
// PartDesignGui::ActiveVp = dynamic_cast<Gui::ViewProviderDocumentObject*> (PartDesignGui::ActiveGuiDoc->getViewProvider(Item));
// PartDesignGui::ActiveVp->show();
// Item->IsActive.setValue(true);
// } else {
// // This handles the case of deactivating the workbench
// PartDesignGui::ActivePartObject=0;
// PartDesignGui::ActiveGuiDoc =0;
// PartDesignGui::ActiveAppDoc =0;
// PartDesignGui::ActiveVp =0;
// }
//
// Py_Return;
//}
//
//static PyObject * getActiveBody(PyObject *, PyObject *)
//{
// if (PartDesignGui::ActivePartObject == NULL) {
// return Py::_None();
// }
//
// return PartDesignGui::ActivePartObject->getPyObject();
//}
/* registration table */
struct PyMethodDef Assembly_methods[] = {
//{"setActiveBody" ,setActiveBody ,METH_VARARGS,
// "setActiveBody(BodyObject) -- Set the PartBody object in work."},
//{"getActiveBody" ,getActiveBody ,METH_NOARGS,
// "getActiveBody() -- Get the PartBody object in work."},
<<<<<<< f03c0f9bdef9886ee45a086b02fa7ebaa99b6825:src/Mod/Assembly/App/AppAssemblyPy.cpp
{"setUpPart" ,setUpPart ,METH_VARARGS,
"setUpPart(Part) -- Sets a empty part object up for usage in PartDesign."},
{NULL, NULL} /* end of table marker */
=======
{NULL, NULL} /* end of table marker */
>>>>>>> OriginGroup: add new abstraction layer between the Part and the GeoFeatureGroup:src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp
};

81
src/Mod/Assembly/Gui/Resources/Assembly.qrc.orig
View File

@@ -1,81 +0,0 @@
<<<<<<< d6421cef81c1d7a191d1524d88c63e56e3f6d864
<RCC>
<qresource>
<file>icons/Assembly_ConstraintLock.svg</file>
<file>icons/Assembly_ConstraintDistance.svg</file>
<file>icons/Assembly_ConstraintAngle.svg</file>
<file>icons/Assembly_ConstraintOrientation.svg</file>
<file>icons/Assembly_ConstraintCoincidence.svg</file>
<file>icons/Assembly_ConstraintAlignment.svg</file>
<file>translations/Assembly_af.qm</file>
<file>translations/Assembly_de.qm</file>
<file>translations/Assembly_fi.qm</file>
<file>translations/Assembly_fr.qm</file>
<file>translations/Assembly_hr.qm</file>
<file>translations/Assembly_it.qm</file>
<file>translations/Assembly_nl.qm</file>
<file>translations/Assembly_no.qm</file>
<file>translations/Assembly_ru.qm</file>
<file>translations/Assembly_uk.qm</file>
<file>translations/Assembly_tr.qm</file>
<file>translations/Assembly_sv-SE.qm</file>
<file>translations/Assembly_pl.qm</file>
<file>translations/Assembly_zh-TW.qm</file>
<file>translations/Assembly_pt-BR.qm</file>
<file>translations/Assembly_cs.qm</file>
<file>translations/Assembly_sk.qm</file>
<file>translations/Assembly_es-ES.qm</file>
<file>translations/Assembly_zh-CN.qm</file>
<file>translations/Assembly_ja.qm</file>
<file>translations/Assembly_ro.qm</file>
<file>translations/Assembly_hu.qm</file>
<file>translations/Assembly_pt-PT.qm</file>
<file>translations/Assembly_sr.qm</file>
<file>translations/Assembly_el.qm</file>
<file>translations/Assembly_sl.qm</file>
</qresource>
</RCC>
=======
<RCC>
<qresource>
<file>icons/Assembly_ConstraintBidirectional.svg</file>
<file>icons/Assembly_ConstraintUnidirectional1.svg</file>
<file>icons/Assembly_ConstraintUnidirectional2.svg</file>
<file>icons/Assembly_ConstraintPerpendicular.svg</file>
<file>icons/Assembly_ConstraintParallel.svg</file>
<file>icons/Assembly_ConstraintOpposite.svg</file>
<file>icons/Assembly_ConstraintEqual.svg</file>
<file>icons/Assembly_ConstraintLock.svg</file>
<file>icons/Assembly_ConstraintDistance.svg</file>
<file>icons/Assembly_ConstraintAngle.svg</file>
<file>icons/Assembly_ConstraintOrientation.svg</file>
<file>icons/Assembly_ConstraintCoincidence.svg</file>
<file>icons/Assembly_ConstraintAlignment.svg</file>
<file>icons/Assembly_ConstraintGeneral.svg</file>
<file>translations/Assembly_af.qm</file>
<file>translations/Assembly_de.qm</file>
<file>translations/Assembly_fi.qm</file>
<file>translations/Assembly_fr.qm</file>
<file>translations/Assembly_hr.qm</file>
<file>translations/Assembly_it.qm</file>
<file>translations/Assembly_nl.qm</file>
<file>translations/Assembly_no.qm</file>
<file>translations/Assembly_ru.qm</file>
<file>translations/Assembly_uk.qm</file>
<file>translations/Assembly_tr.qm</file>
<file>translations/Assembly_sv-SE.qm</file>
<file>translations/Assembly_pl.qm</file>
<file>translations/Assembly_zh-TW.qm</file>
<file>translations/Assembly_pt-BR.qm</file>
<file>translations/Assembly_cs.qm</file>
<file>translations/Assembly_sk.qm</file>
<file>translations/Assembly_es-ES.qm</file>
<file>translations/Assembly_zh-CN.qm</file>
<file>translations/Assembly_ja.qm</file>
<file>translations/Assembly_ro.qm</file>
<file>translations/Assembly_hu.qm</file>
<file>translations/Assembly_pt-PT.qm</file>
<file>translations/Assembly_sr.qm</file>
</qresource>
</RCC>
>>>>>>> revidsed assembly constraint gui interaction