Browse Source

Comment out all things that use settings related things so we can at least start

Arjen Hiemstra 8 years ago
parent
commit
44246c0676

+ 4 - 4
cura/CuraApplication.py

@@ -101,8 +101,8 @@ class CuraApplication(QtApplication):
         self._camera_animation = None
         self._cura_actions = None
 
-        self.getMachineManager().activeMachineInstanceChanged.connect(self._onActiveMachineChanged)
-        self.getMachineManager().addMachineRequested.connect(self._onAddMachineRequested)
+        #self.getMachineManager().activeMachineInstanceChanged.connect(self._onActiveMachineChanged)
+        #self.getMachineManager().addMachineRequested.connect(self._onAddMachineRequested)
         self.getController().getScene().sceneChanged.connect(self.updatePlatformActivity)
         self.getController().toolOperationStopped.connect(self._onToolOperationStopped)
 
@@ -175,9 +175,9 @@ class CuraApplication(QtApplication):
         Selection.selectionChanged.connect(self.onSelectionChanged)
 
         root = controller.getScene().getRoot()
-        self._platform = Platform(root)
+        #self._platform = Platform(root)
 
-        self._volume = BuildVolume.BuildVolume(root)
+        #self._volume = BuildVolume.BuildVolume(root)
 
         self.getRenderer().setBackgroundColor(QColor(245, 245, 245))
 

+ 5 - 5
plugins/CuraEngineBackend/CuraEngineBackend.py

@@ -52,11 +52,11 @@ class CuraEngineBackend(Backend):
 
         # When there are current settings and machine instance is changed, there is no profile changed event. We should
         # pretend there is though.
-        Application.getInstance().getMachineManager().activeMachineInstanceChanged.connect(self._onActiveProfileChanged)
+        #Application.getInstance().getMachineManager().activeMachineInstanceChanged.connect(self._onActiveProfileChanged)
 
-        self._profile = None
-        Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onActiveProfileChanged)
-        self._onActiveProfileChanged()
+        #self._profile = None
+        #Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onActiveProfileChanged)
+        #self._onActiveProfileChanged()
 
         self._change_timer = QTimer()
         self._change_timer.setInterval(500)
@@ -84,7 +84,7 @@ class CuraEngineBackend(Backend):
         Application.getInstance().getController().toolOperationStarted.connect(self._onToolOperationStarted)
         Application.getInstance().getController().toolOperationStopped.connect(self._onToolOperationStopped)
 
-        Application.getInstance().getMachineManager().activeMachineInstanceChanged.connect(self._onInstanceChanged)
+        #Application.getInstance().getMachineManager().activeMachineInstanceChanged.connect(self._onInstanceChanged)
 
     def close(self):
         # Terminate CuraEngine if it is still running at this point

+ 3 - 3
resources/qml/Cura.qml

@@ -168,7 +168,7 @@ UM.MainWindow
 
                 Instantiator
                 {
-                    model: UM.MachineInstancesModel { }
+//                     model: UM.MachineInstancesModel { }
                     MenuItem
                     {
                         text: model.name;
@@ -187,7 +187,7 @@ UM.MainWindow
 
                 Instantiator
                 {
-                    model: UM.MachineVariantsModel { }
+//                     model: UM.MachineVariantsModel { }
                     MenuItem {
                         text: model.name;
                         checkable: true;
@@ -215,7 +215,7 @@ UM.MainWindow
                 Instantiator
                 {
                     id: profileMenuInstantiator
-                    model: UM.ProfilesModel {}
+//                     model: UM.ProfilesModel {}
                     property int separatorIndex: -1
 
                     Loader {

+ 1 - 1
resources/qml/ProfileSetup.qml

@@ -56,7 +56,7 @@ Item{
                 Instantiator
                 {
                     id: profileSelectionInstantiator
-                    model: UM.ProfilesModel {}
+//                     model: UM.ProfilesModel {}
                     property int separatorIndex: -1
 
                     Loader {

+ 3 - 3
resources/qml/SidebarHeader.qml

@@ -71,7 +71,7 @@ Item
                 id: machineSelectionMenu
                 Instantiator
                 {
-                    model: UM.MachineInstancesModel { }
+//                     model: UM.MachineInstancesModel { }
                     MenuItem
                     {
                         text: model.name;
@@ -139,7 +139,7 @@ Item
                     Instantiator
                     {
                         id: variantSelectionInstantiator
-                        model: UM.MachineVariantsModel { id: variantsModel }
+//                         model: UM.MachineVariantsModel { id: variantsModel }
                         MenuItem
                         {
                             text: model.name;
@@ -183,7 +183,7 @@ Item
                     Instantiator
                     {
                         id: materialSelectionInstantiator
-                        model: UM.MachineMaterialsModel { id: machineMaterialsModel }
+//                         model: UM.MachineMaterialsModel { id: machineMaterialsModel }
                         MenuItem
                         {
                             text: model.name;