Browse Source

Revert "Add SolidWorks plugin"

This reverts commit 1c39c90494a664fafdfdd127ace578bd274b19eb.
Lipu Fei 7 years ago
parent
commit
ddaac2fbbc

+ 0 - 11
plugins/CuraSolidWorksPlugin/CMakeLists.txt

@@ -1,11 +0,0 @@
-project(CuraSolidWorksIntegrationPlugin NONE)
-cmake_minimum_required(VERSION 2.8.12)
-
-install(FILES
-    __init__.py
-    CommonComReader.py
-    SolidWorksConstants.py
-    SolidWorksReader.py
-    LICENSE
-    DESTINATION lib/cura/plugins/CuraSolidWorksIntegrationPlugin
-)

+ 0 - 200
plugins/CuraSolidWorksPlugin/CommonComReader.py

@@ -1,200 +0,0 @@
-# Copyright (c) 2017 Thomas Karl Pietrowski
-
-# Buildins
-import os
-import tempfile
-
-# Uranium/Cura
-from UM.Application import Application
-from UM.i18n import i18nCatalog
-i18n_catalog = i18nCatalog("CuraSolidWorksIntegrationPlugin")
-from UM.Message import Message
-from UM.Logger import Logger
-from UM.Mesh.MeshReader import MeshReader
-from UM.PluginRegistry import PluginRegistry
-from UM.Scene.SceneNode import SceneNode
-
-# PyWin32
-from comtypes.client import GetClassObject
-
-
-class CommonCOMReader(MeshReader):
-    def __init__(self, app_name, app_friendly_name):
-        super().__init__()
-        self._app_name = app_name
-        self._app_friendly_name = app_friendly_name
-
-        # Start/stop behaviour
-
-        # Technically neither preloading nor keeping the instance up, is possible, since Cura calls the file reader from different/new threads
-        # The error when trying to use it here is:
-        # > pywintypes.com_error: (-2147417842, 'The application called an interface that was marshalled for a different thread.', None, None)
-        self._app_preload = False
-        self._app_keep_running = False
-
-        """
-        if self._app_preload and not self._app_keep_running:
-            self._app_keep_running = True
-        """
-
-        # Preparations
-        """
-        if self._app_preload:
-            Logger.log("d", "Preloading %s..." %(self._app_friendlyName))
-            self.startApp()
-        """
-
-        Logger.log("d", "Looking for readers...")
-        self.__init_builtin_readers__()
-
-    def __init_builtin_readers__(self):
-        self._file_formats_first_choice = [] # Ordered list of preferred formats
-        self._reader_for_file_format = {}
-
-        # Trying 3MF first because it describes the model much better..
-        # However, this is untested since this plugin was only tested with STL support
-        if PluginRegistry.getInstance().isActivePlugin("3MFReader"):
-            self._reader_for_file_format["3mf"] = PluginRegistry.getInstance().getPluginObject("3MFReader")
-            self._file_formats_first_choice.append("3mf")
-
-        if PluginRegistry.getInstance().isActivePlugin("STLReader"):
-            self._reader_for_file_format["stl"] = PluginRegistry.getInstance().getPluginObject("STLReader")
-            self._file_formats_first_choice.append("stl")
-
-        if not len(self._reader_for_file_format):
-            Logger.log("d", "Could not find any reader for (probably) supported file formats!")
-
-    def getSaveTempfileName(self, suffix = ""):
-        # Only get a save name for a temp_file here...
-        temp_stl_file = tempfile.NamedTemporaryFile()
-        temp_stl_file_name = "%s%s" % (temp_stl_file.name, suffix)
-        temp_stl_file.close()
-
-        return temp_stl_file_name
-
-    def startApp(self, visible = False):
-        Logger.log("d", "Starting %s...", self._app_friendly_name)
-
-        com_class_object = GetClassObject(self._app_name)
-        com_instance = com_class_object.CreateInstance()
-
-        return com_instance
-
-    def checkApp(self):
-        raise NotImplementedError("Checking app is not implemented!")
-
-    def getAppVisible(self, state):
-        raise NotImplementedError("Toggle for visibility not implemented!")
-
-    def setAppVisible(self, state, **options):
-        raise NotImplementedError("Toggle for visibility not implemented!")
-
-    def closeApp(self, **options):
-        raise NotImplementedError("Procedure how to close your app is not implemented!")
-
-    def openForeignFile(self, **options):
-        "This function shall return options again. It optionally contains other data, which is needed by the reader for other tasks later."
-        raise NotImplementedError("Opening files is not implemented!")
-
-    def exportFileAs(self, model, **options):
-        raise NotImplementedError("Exporting files is not implemented!")
-
-    def closeForeignFile(self, **options):
-        raise NotImplementedError("Closing files is not implemented!")
-
-    def nodePostProcessing(self, node):
-        return node
-
-    def read(self, file_path):
-        options = {"foreignFile": file_path,
-                   "foreignFormat": os.path.splitext(file_path)[1],
-                   }
-
-        # Starting app, if needed
-        try:
-            options["app_instance"] = self.startApp()
-        except Exception:
-            Logger.logException("e", "Failed to start <%s>...", self._app_name)
-            error_message = Message(i18n_catalog.i18nc("@info:status", "Error while starting %s!" % self._app_friendly_name))
-            error_message.show()
-            return None
-
-        # Tell the 3rd party application to open a file...
-        Logger.log("d", "Opening file with %s..." % self._app_friendly_name)
-        options = self.openForeignFile(**options)
-
-        # Append all formats which are not preferred to the end of the list
-        fileFormats = self._file_formats_first_choice
-        for file_format in self._reader_for_file_format.keys():
-            if file_format not in fileFormats:
-                fileFormats.append(file_format)
-
-        # Trying to convert into all formats 1 by 1 and continue with the successful export
-        Logger.log("i", "Trying to convert into: %s", fileFormats)
-        for file_format in fileFormats:
-            Logger.log("d", "Trying to convert <%s> into '%s'", file_path, file_format)
-
-            options["tempType"] = file_format
-
-            options["tempFile"] = self.getSaveTempfileName(".%s" % file_format.upper())
-            Logger.log("d", "Using temporary file <%s>", options["tempFile"])
-
-            # In case there is already a file with this name (very unlikely...)
-            if os.path.isfile(options["tempFile"]):
-                Logger.log("w", "Removing already available file, called: %s", options["tempFile"])
-                os.remove(options["tempFile"])
-
-            Logger.log("d", "Saving as: <%s>", options["tempFile"])
-            try:
-                self.exportFileAs(**options)
-            except:
-                Logger.logException("e", "Could not export <%s> into '%s'.", file_path, file_format)
-                continue
-
-            if os.path.isfile(options["tempFile"]):
-                Logger.log("d", "Saved as: <%s>", options["tempFile"])
-            else:
-                Logger.log("d", "Temporary file not found after export!")
-                continue
-
-            # Opening the resulting file in Cura
-            try:
-                #reader = self._readerForFileformat[fileFormat]
-                reader = Application.getInstance().getMeshFileHandler().getReaderForFile(options["tempFile"])
-                if not reader:
-                    Logger.log("d", "Found no reader for %s. That's strange...")
-                    continue
-                Logger.log("d", "Using reader: %s", reader.getPluginId())
-                temp_scene_node = reader.read(options["tempFile"])
-            except:
-                Logger.logException("e", "Failed to open exported <%s> file in Cura!", file_format)
-                continue
-
-            # Remove the temp_file again
-            Logger.log("d", "Removing temporary STL file, called <%s>", options["tempFile"])
-            os.remove(options["tempFile"])
-
-            break
-
-        # Closing document in the app
-        self.closeForeignFile(**options)
-
-        # Closing the app again..
-        self.closeApp(**options)
-
-        scene_node = SceneNode()
-        temp_scene_node = self.nodePostProcessing(temp_scene_node)
-        mesh = temp_scene_node.getMeshDataTransformed()
-
-        # When using 3MF as the format to convert into we get an list of meshes instead of only one mesh directly.
-        # This is a little workaround since reloading of 3MF files doesn't work at the moment.
-        if type(mesh) == list:
-            error_message = Message(i18n_catalog.i18nc("@info:status", "Please keep in mind, that you have to reopen your SolidWorks file manually! Reloading the model won't work!"))
-            error_message.show()
-            mesh = mesh.set(file_name = None)
-        else:
-            mesh = mesh.set(file_name = file_path)
-        scene_node.setMeshData(mesh)
-
-        if scene_node:
-            return scene_node

+ 0 - 38
plugins/CuraSolidWorksPlugin/ConfigDialog.py

@@ -1,38 +0,0 @@
-# Copyright (c) 2017 Ultimaker B.V.
-# PluginBrowser is released under the terms of the AGPLv3 or higher.
-from UM.Extension import Extension
-from UM.i18n import i18nCatalog
-from UM.Logger import Logger
-from UM.PluginRegistry import PluginRegistry
-from UM.Application import Application
-
-from PyQt5.QtCore import QUrl, QObject, pyqtSignal
-from PyQt5.QtQml import QQmlComponent, QQmlContext
-
-import os
-
-i18n_catalog = i18nCatalog("cura")
-
-
-class ConfigDialog(QObject, Extension):
-    def __init__(self, parent = None):
-        super().__init__(parent)
-        self._dialog = None
-        self.addMenuItem(i18n_catalog.i18n("Configure"), self._openConfigDialog)
-
-    def _openConfigDialog(self):
-        if not self._dialog:
-            self._createDialog()
-        self._dialog.show()
-
-    def _createDialog(self):
-        path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "ConfigDialog.qml"))
-        self._qml_component = QQmlComponent(Application.getInstance()._engine, path)
-
-        # We need access to engine (although technically we can't)
-        self._qml_context = QQmlContext(Application.getInstance()._engine.rootContext())
-        self._qml_context.setContextProperty("manager", self)
-        self._dialog = self._qml_component.create(self._qml_context)
-        if self._dialog is None:
-            Logger.log("e", "QQmlComponent status %s", self._qml_component.status())
-            Logger.log("e", "QQmlComponent errorString %s", self._qml_component.errorString())

+ 0 - 112
plugins/CuraSolidWorksPlugin/ConfigDialog.qml

@@ -1,112 +0,0 @@
-// Copyright (c) 2017 Ultimaker B.V.
-// Cura is released under the terms of the AGPLv3 or higher.
-
-import QtQuick 2.1
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
-
-import UM 1.2 as UM
-import Cura 1.0 as Cura
-
-UM.Dialog
-{
-    width: 300 * Screen.devicePixelRatio
-    minimumWidth: 300 * Screen.devicePixelRatio
-
-    height: 100 * Screen.devicePixelRatio
-    minimumHeight: 100 * Screen.devicePixelRatio
-
-    title: catalog.i18nc("@title:window", "Cura SolidWorks Plugin Configuration")
-
-    onVisibilityChanged:
-    {
-        if (visible)
-        {
-            choiceDropdown.updateCurrentIndex();
-        }
-    }
-
-    GridLayout
-    {
-        UM.I18nCatalog{id: catalog; name: "cura"}
-        anchors.fill: parent
-        Layout.fillWidth: true
-        columnSpacing: 16
-        rowSpacing: 10
-        columns: 1
-
-        Row
-        {
-            width: parent.width
-
-            Label {
-                text: catalog.i18nc("@action:label", "Default quality of the exported STL:")
-                width: 150
-                anchors.verticalCenter: parent.verticalCenter
-            }
-        }
-
-        Row
-        {
-            ComboBox
-            {
-                id: choiceDropdown
-
-                currentIndex: updateCurrentIndex()
-
-                function updateCurrentIndex()
-                {
-                    var index = 0;
-                    var currentChoice = UM.Preferences.getValue("cura_solidworks/choice_on_exporting_stl_quality");
-                    for (var i = 0; i < model.count; ++i)
-                    {
-                        if (model.get(i).code == currentChoice)
-                        {
-                            index = i;
-                            break;
-                        }
-                    }
-                    currentIndex = index;
-                }
-
-                model: ListModel
-                {
-                    id: choiceModel
-
-                    Component.onCompleted:
-                    {
-                        append({ text: catalog.i18nc("@option:curaSolidworksStlQuality", "Always ask"), code: "always_ask" });
-                        append({ text: catalog.i18nc("@option:curaSolidworksStlQuality", "Always use Fine quality"), code: "always_use_fine" });
-                        append({ text: catalog.i18nc("@option:curaSolidworksStlQuality", "Always use Coarse quality"), code: "always_use_coarse" });
-                    }
-                }
-            }
-        }
-    }
-
-    rightButtons: [
-        Button
-        {
-            id: ok_button
-            text: catalog.i18nc("@action:button", "OK")
-            onClicked:
-            {
-                UM.Preferences.setValue("cura_solidworks/choice_on_exporting_stl_quality",
-                    choiceModel.get(choiceDropdown.currentIndex).code);
-                close();
-            }
-            enabled: true
-        },
-        Button
-        {
-            id: cancel_button
-            text: catalog.i18nc("@action:button", "Cancel")
-            onClicked:
-            {
-                close();
-            }
-            enabled: true
-        }
-    ]
-}

+ 0 - 107
plugins/CuraSolidWorksPlugin/ExportSTLUI.qml

@@ -1,107 +0,0 @@
-// Copyright (c) 2017 Ultimaker B.V.
-// Cura is released under the terms of the AGPLv3 or higher.
-
-import QtQuick 2.1
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import QtQuick.Window 2.1
-
-import UM 1.2 as UM
-import Cura 1.0 as Cura
-
-UM.Dialog
-{
-    width: 300 * Screen.devicePixelRatio;
-    minimumWidth: 300 * Screen.devicePixelRatio;
-
-    height: 100 * Screen.devicePixelRatio;
-    minimumHeight: 100 * Screen.devicePixelRatio;
-
-    title: catalog.i18nc("@title:window", "Import SolidWorks File as STL...")
-
-    onVisibilityChanged:
-    {
-        if (visible)
-        {
-            qualityDropdown.currentIndex = 1;
-            rememberChoiceCheckBox.checked = UM.Preferences.getValue("cura_solidworks/choice_on_exporting_stl_quality") != "always_ask";
-        }
-    }
-
-    GridLayout
-    {
-        UM.I18nCatalog{id: catalog; name: "cura"}
-        anchors.fill: parent;
-        Layout.fillWidth: true
-        columnSpacing: 16
-        rowSpacing: 4
-        columns: 1
-
-        UM.TooltipArea {
-            Layout.fillWidth:true
-            height: childrenRect.height
-            text: catalog.i18nc("@info:tooltip", "Quality of the Exported STL")
-            Row {
-                width: parent.width
-
-                Label {
-                    text: catalog.i18nc("@action:label", "Quality")
-                    width: 100
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                ComboBox
-                {
-                    id: qualityDropdown
-                    model: ListModel
-                    {
-                        id: qualityModel
-
-                        Component.onCompleted:
-                        {
-                            append({ text: catalog.i18nc("@option:curaSolidworksStlQuality", "Coarse"), code: "coarse" });
-                            append({ text: catalog.i18nc("@option:curaSolidworksStlQuality", "Fine"), code: "fine" });
-                        }
-                    }
-                    currentIndex: 1
-                }
-            }
-        }
-
-        Row
-        {
-            width: parent.width
-
-            CheckBox
-            {
-                id: rememberChoiceCheckBox
-                text: catalog.i18nc("@text:window", "Remember my choice")
-                checked: UM.Preferences.getValue("cura_solidworks/choice_on_exporting_stl_quality") != "always_ask"
-            }
-        }
-    }
-
-    rightButtons: [
-        Button
-        {
-            id: ok_button
-            text: catalog.i18nc("@action:button", "OK")
-            onClicked:
-            {
-                manager.setQuality(qualityModel.get(qualityDropdown.currentIndex).code, rememberChoiceCheckBox.checked);
-                manager.onOkButtonClicked();
-            }
-            enabled: true
-        },
-        Button
-        {
-            id: cancel_button
-            text: catalog.i18nc("@action:button", "Cancel")
-            onClicked:
-            {
-                manager.onCancelButtonClicked();
-            }
-            enabled: true
-        }
-    ]
-}

+ 0 - 661
plugins/CuraSolidWorksPlugin/LICENSE

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

+ 0 - 45
plugins/CuraSolidWorksPlugin/SolidWorksConstants.py

@@ -1,45 +0,0 @@
-# Copyright (c) 2017 Thomas Karl Pietrowski
-
-
-class SolidWorksEnums:
-    class swUserPreferenceToggle_e:
-        swSTLBinaryFormat = 69
-
-    class swDocumentTypes_e:
-        swDocNONE = 0
-        swDocPART = 1
-        swDocASSEMBLY = 2
-        swDocDRAWING = 3
-
-    class FileTypes:
-        # Enums to open files
-        SWpart = 1
-        SWassembly = 2
-        SWdrawing = 3
-
-    swSTLQuality = 78
-
-    class swLengthUnit_e:
-        swMM = 0
-        swCM = 1
-        swMETER = 2
-        swINCHES = 3
-        swFEET = 4
-        swFEETINCHES = 5
-        swANGSTROM = 6
-        swNANOMETER = 7
-        swMICRON = 8
-        swMIL = 9
-        swUIN = 10
-
-    class swUserPreferenceIntegerValue_e:
-        swExportSTLQuality = 78
-        swExportStlUnits = 211
-
-    class swSTLQuality_e:
-        swSTLQuality_Coarse = 1
-        swSTLQuality_Fine = 2
-        swSTLQuality_Custom = 3
-
-    class UserPreferences:
-        swSTLComponentsIntoOneFile = 72

+ 0 - 231
plugins/CuraSolidWorksPlugin/SolidWorksReader.py

@@ -1,231 +0,0 @@
-# Copyright (c) 2017 Thomas Karl Pietrowski
-
-# TODOs:
-# * Adding selection to separately import parts from an assembly
-
-# Buildings
-import math
-
-# Uranium/Cura
-from UM.i18n import i18nCatalog
-from UM.Message import Message
-from UM.Logger import Logger
-from UM.Math.Vector import Vector
-from UM.Math.Quaternion import Quaternion
-from UM.Mesh.MeshReader import MeshReader
-
-# Our plugin
-from .CommonComReader import CommonCOMReader
-from .SolidWorksConstants import SolidWorksEnums
-from .SolidWorksReaderUI import SolidWorksReaderUI
-
-i18n_catalog = i18nCatalog("CuraSolidWorksIntegrationPlugin")
-
-
-class SolidWorksReader(CommonCOMReader):
-    def __init__(self):
-        super().__init__("SldWorks.Application", "SolidWorks")
-
-        self._extension_part = ".SLDPRT"
-        self._extension_assembly = ".SLDASM"
-        self._supported_extensions = [self._extension_part.lower(),
-                                      self._extension_assembly.lower(),
-                                      ]
-
-        self._convert_assembly_into_once = True  # False is not implemented now!
-        self._file_formats_first_choice = []
-        self._revision = None
-        self._revision_major = None
-        self._revision_minor = None
-        self._revision_patch = None
-
-        self._ui = SolidWorksReaderUI()
-        self._selected_quality = None
-        self._quality_value_map = {"coarse": SolidWorksEnums.swSTLQuality_e.swSTLQuality_Coarse,
-                                   "find": SolidWorksEnums.swSTLQuality_e.swSTLQuality_Fine}
-
-        self.root_component = None
-
-    def preRead(self, file_name, *args, **kwargs):
-        self._ui.showConfigUI()
-        self._ui.waitForUIToClose()
-
-        if self._ui.getCancelled():
-            return MeshReader.PreReadResult.cancelled
-
-        # get quality
-        self._selected_quality = self._ui.quality
-        if self._selected_quality is None:
-            self._selected_quality = "fine"
-        self._selected_quality = self._selected_quality.lower()
-
-        # give actual value for quality
-        self._selected_quality = self._quality_value_map.get(self._selected_quality,
-                                                             SolidWorksEnums.swSTLQuality_e.swSTLQuality_Fine)
-
-        return MeshReader.PreReadResult.accepted
-
-    def setAppVisible(self, state, **options):
-        options["app_instance"].Visible = state
-
-    def getAppVisible(self, state, **options):
-        return options["app_instance"].Visible
-
-    def startApp(self, visible=False):
-        app_instance = super().startApp(visible = visible)
-
-        # Getting revision after starting
-        revision_number = app_instance.RevisionNumber()
-        Logger.log("d", "SolidWorks RevisionNumber: %s", revision_number)
-        self._revision = [int(x) for x in revision_number.split(".")]
-        self._revision_major = self._revision[0]
-        self._revision_minor = self._revision[1]
-        self._revision_patch = self._revision[2]
-
-        # Re-generate a list of preferred file formats
-        self.updateFormatsFirstChoise()
-
-        return app_instance
-
-    def updateFormatsFirstChoise(self):
-        self._file_formats_first_choice = ["stl"]
-        if self._revision_major >= 25 and "3mf" in self._reader_for_file_format.keys():
-            self._file_formats_first_choice.insert(0, "3mf")
-
-        return self._file_formats_first_choice
-
-    def checkApp(self, **options):
-        functions_to_be_checked = ("OpenDoc", "CloseDoc")
-        for func in functions_to_be_checked:
-            try:
-                getattr(options["app_instance"], func)
-            except:
-                Logger.logException("e", "Error which occurred when checking for a valid app instance")
-                return False
-        return True
-
-    def closeApp(self, **options):
-        if "app_instance" in options.keys():
-            del options["app_instance"]
-
-    def walkComponentsInAssembly(self, root = None):
-        if root is None:
-            root = self.root_component
-
-        children = root.GetChildren
-
-        if children:
-            children = [self.walkComponentsInAssembly(child) for child in children]
-            return root, children
-        else:
-            return root
-
-        """
-        models = options["sw_model"].GetComponents(True)
-
-        for model in models:
-            #Logger.log("d", model.GetModelDoc2())
-            #Logger.log("d", repr(model.GetTitle))
-            Logger.log("d", repr(model.GetPathName))
-            #Logger.log("d", repr(model.GetType))
-            if model.GetPathName in ComponentsCount.keys():
-                ComponentsCount[model.GetPathName] = ComponentsCount[model.GetPathName] + 1
-            else:
-                ComponentsCount[model.GetPathName] = 1
-
-        for key in ComponentsCount.keys():
-            Logger.log("d", "Found %s %s-times in the assembly!" %(key, ComponentsCount[key]))
-        """
-
-    def openForeignFile(self, **options):
-        if options["foreignFormat"].upper() == self._extension_part:
-            filetype = SolidWorksEnums.FileTypes.SWpart
-        elif options["foreignFormat"].upper() == self._extension_assembly:
-            filetype = SolidWorksEnums.FileTypes.SWassembly
-        else:
-            raise NotImplementedError("Unknown extension. Something went terribly wrong!")
-
-        #options["sw_model"] = options["app_instance"].OpenDoc(options["foreignFile"], filetype)
-        documentSpecification = options["app_instance"].GetOpenDocSpec(options["foreignFile"])
-
-        ## NOTE: SPEC: FileName
-        #documentSpecification.FileName
-
-        ## NOTE: SPEC: DocumentType
-        ## TODO: Really needed here?!
-        documentSpecification.DocumentType = filetype
-
-        ## TODO: Test the impact of LightWeight = True
-        #documentSpecification.LightWeight = True
-        documentSpecification.Silent = True
-
-        ## TODO: Double check, whether file was really opened read-only..
-        documentSpecification.ReadOnly = True
-
-        options["sw_model"] = options["app_instance"].OpenDoc7(documentSpecification._comobj)
-
-        if documentSpecification.Warning:
-            Logger.log("w", "Warnings happened while opening your SolidWorks file!")
-        if documentSpecification.Error:
-            Logger.log("e", "Errors happened while opening your SolidWorks file!")
-            error_message = Message(i18n_catalog.i18nc("@info:status", "Errors appeared while opening your SolidWorks file! \
-            Please check, whether it is possible to open your file in SolidWorks itself without any problems as well!" % (self._app_friendly_name)))
-            error_message.show()
-
-        # Might be useful in the future, but no need for this ATM
-        #self.configuration = self.model.getActiveConfiguration
-        #self.root_component = self.configuration.GetRootComponent
-
-        ## EXPERIMENTAL: Browse single parts in assembly
-        #if filetype == SolidWorksEnums.FileTypes.SWassembly:
-        #    Logger.log("d", 'walkComponentsInAssembly: ' + repr(self.walkComponentsInAssembly()))
-
-        return options
-
-    def exportFileAs(self, **options):
-        if options["tempType"] == "stl":
-            if options["foreignFormat"].upper() == self._extension_assembly:
-                # Backing up current setting of swSTLComponentsIntoOneFile
-                swSTLComponentsIntoOneFileBackup = options["app_instance"].GetUserPreferenceToggle(SolidWorksEnums.UserPreferences.swSTLComponentsIntoOneFile)
-                options["app_instance"].SetUserPreferenceToggle(SolidWorksEnums.UserPreferences.swSTLComponentsIntoOneFile, self._convert_assembly_into_once)
-
-            swExportSTLQualityBackup = options["app_instance"].GetUserPreferenceIntegerValue(SolidWorksEnums.swUserPreferenceIntegerValue_e.swExportSTLQuality)
-            options["app_instance"].SetUserPreferenceIntegerValue(SolidWorksEnums.swUserPreferenceIntegerValue_e.swExportSTLQuality, SolidWorksEnums.swSTLQuality_e.swSTLQuality_Fine)
-
-            # Changing the default unit for STLs to mm, which is expected by Cura
-            swExportStlUnitsBackup = options["app_instance"].GetUserPreferenceIntegerValue(SolidWorksEnums.swUserPreferenceIntegerValue_e.swExportStlUnits)
-            options["app_instance"].SetUserPreferenceIntegerValue(SolidWorksEnums.swUserPreferenceIntegerValue_e.swExportStlUnits, SolidWorksEnums.swLengthUnit_e.swMM)
-
-            # Changing the output type temporary to binary
-            swSTLBinaryFormatBackup = options["app_instance"].GetUserPreferenceToggle(SolidWorksEnums.swUserPreferenceToggle_e.swSTLBinaryFormat)
-            options["app_instance"].SetUserPreferenceToggle(SolidWorksEnums.swUserPreferenceToggle_e.swSTLBinaryFormat, True)
-
-        options["sw_model"].SaveAs(options["tempFile"])
-
-        if options["tempType"] == "stl":
-            # Restoring swSTLBinaryFormat
-            options["app_instance"].SetUserPreferenceToggle(SolidWorksEnums.swUserPreferenceToggle_e.swSTLBinaryFormat, swSTLBinaryFormatBackup)
-
-            # Restoring swExportStlUnits
-            options["app_instance"].SetUserPreferenceIntegerValue(SolidWorksEnums.swUserPreferenceIntegerValue_e.swExportStlUnits, swExportStlUnitsBackup)
-
-            # Restoring swSTLQuality_Fine
-            options["app_instance"].SetUserPreferenceIntegerValue(SolidWorksEnums.swUserPreferenceIntegerValue_e.swExportSTLQuality, swExportSTLQualityBackup)
-
-            if options["foreignFormat"].upper() == self._extension_assembly:
-                # Restoring swSTLComponentsIntoOneFile
-                options["app_instance"].SetUserPreferenceToggle(SolidWorksEnums.UserPreferences.swSTLComponentsIntoOneFile, swSTLComponentsIntoOneFileBackup)
-
-    def closeForeignFile(self, **options):
-        options["app_instance"].CloseDoc(options["foreignFile"])
-
-    def areReadersAvailable(self):
-        return bool(self._reader_for_file_format)
-
-    def nodePostProcessing(self, node):
-        if self._revision_major == 24: # Known problem under SolidWorks 2016: Exported models are rotated by -90 degrees. This rotates it back!
-            rotation = Quaternion.fromAngleAxis(math.radians(90), Vector.Unit_X)
-            node.rotate(rotation)
-        return node
-
-    ## Decide if we need to use ascii or binary in order to read file

+ 0 - 95
plugins/CuraSolidWorksPlugin/SolidWorksReaderUI.py

@@ -1,95 +0,0 @@
-# Copyright (c) 2017 Ultimaker B.V.
-# Cura is released under the terms of the AGPLv3 or higher.
-
-import os
-import threading
-
-from PyQt5.QtCore import Qt, QUrl, pyqtSignal, QObject
-from PyQt5.QtQml import QQmlComponent, QQmlContext
-
-from UM.FlameProfiler import pyqtSlot
-from UM.Application import Application
-from UM.PluginRegistry import PluginRegistry
-
-from UM.i18n import i18nCatalog
-
-from UM.Preferences import Preferences
-
-catalog = i18nCatalog("cura")
-
-
-class SolidWorksReaderUI(QObject):
-    show_config_ui_trigger = pyqtSignal()
-
-    def __init__(self):
-        super().__init__()
-
-        Preferences.getInstance().addPreference("cura_solidworks/choice_on_exporting_stl_quality", "always_ask")
-
-        self._cancelled = False
-        self._ui_view = None
-        self.show_config_ui_trigger.connect(self._onShowConfigUI)
-
-        self.quality = None
-
-        self._ui_lock = threading.Lock()
-
-    def getCancelled(self):
-        return self._cancelled
-
-    def waitForUIToClose(self):
-        self._ui_lock.acquire()
-        self._ui_lock.release()
-
-    def showConfigUI(self):
-        preference = Preferences.getInstance().getValue("cura_solidworks/choice_on_exporting_stl_quality")
-        if preference != "always_ask":
-            if preference == "always_use_fine":
-                self.quality = "fine"
-            elif preference == "always_use_coarse":
-                self.quality = "coarse"
-            else:
-                self.quality = "fine"
-            return
-
-        self._ui_lock.acquire()
-        self._cancelled = False
-        self.show_config_ui_trigger.emit()
-
-    @pyqtSlot(str, bool)
-    def setQuality(self, quality, remember_my_choice):
-        self.quality = quality
-        if not remember_my_choice:
-            Preferences.getInstance().setValue("cura_solidworks/choice_on_exporting_stl_quality", "always_ask")
-        else:
-            choice = "always_use_fine"
-            if quality == "coarse":
-                choice = "always_use_coarse"
-            Preferences.getInstance().setValue("cura_solidworks/choice_on_exporting_stl_quality", choice)
-
-    def _onShowConfigUI(self):
-        if self._ui_view is None:
-            self._createConfigUI()
-        self._ui_view.show()
-
-    def _createConfigUI(self):
-        if self._ui_view is None:
-            path = QUrl.fromLocalFile(os.path.join(PluginRegistry.getInstance().getPluginPath("CuraSolidWorksPlugin"), "ExportSTLUI.qml"))
-            component = QQmlComponent(Application.getInstance()._engine, path)
-            self._ui_context = QQmlContext(Application.getInstance()._engine.rootContext())
-            self._ui_context.setContextProperty("manager", self)
-            self._ui_view = component.create(self._ui_context)
-
-            self._ui_view.setFlags(self._ui_view.flags() & ~Qt.WindowCloseButtonHint & ~Qt.WindowMinimizeButtonHint & ~Qt.WindowMaximizeButtonHint)
-
-    @pyqtSlot()
-    def onOkButtonClicked(self):
-        self._cancelled = False
-        self._ui_view.close()
-        self._ui_lock.release()
-
-    @pyqtSlot()
-    def onCancelButtonClicked(self):
-        self._cancelled = True
-        self._ui_view.close()
-        self._ui_lock.release()

+ 0 - 58
plugins/CuraSolidWorksPlugin/__init__.py

@@ -1,58 +0,0 @@
-# Copyright (c) 2016 Thomas Karl Pietrowski
-
-# TODO: Adding support for basic CATIA support
-
-from UM.Platform import Platform
-
-from UM.i18n import i18nCatalog
-i18n_catalog = i18nCatalog("CuraSolidWorksIntegrationPlugin")
-
-if Platform.isWindows():
-    # For installation check
-    import winreg
-    # The reader plugin itself
-    from . import SolidWorksReader
-
-    def is_SolidWorks_available():
-        try:
-            # Could find a better key to detect whether SolidWorks is installed..
-            winreg.OpenKey(winreg.HKEY_CLASSES_ROOT, "SldWorks.Application")
-            return True
-        except:
-            return False
-
-
-def getMetaData():
-    return {
-        "mesh_reader":
-        [
-            {
-                "extension": "SLDPRT",
-                "description": i18n_catalog.i18nc("@item:inlistbox", "SolidWorks part file")
-            },
-            {
-                "extension": "SLDASM",
-                "description": i18n_catalog.i18nc("@item:inlistbox", "SolidWorks assembly file")
-            }
-        ]
-    }
-
-    # TODO:
-    # Needs more documentation on how to convert a CATproduct in CATIA using COM API
-    #
-    #{
-    #    "extension": "CATProduct",
-    #    "description": i18n_catalog.i18nc("@item:inlistbox", "CATproduct file")
-    #}
-
-
-def register(app):
-    # Solid works only runs on Windows.
-    plugin_data = {}
-    if Platform.isWindows():
-        reader = SolidWorksReader.SolidWorksReader()
-        if is_SolidWorks_available() and reader.areReadersAvailable():
-            plugin_data["mesh_reader"] = reader
-        from .ConfigDialog import ConfigDialog
-        plugin_data["extension"] = ConfigDialog()
-    return plugin_data

Some files were not shown because too many files changed in this diff