3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "Use optional last output (file) name from output-dev to set project name."

Browse source 
This reverts commit c2c53d51c1.
This commit is contained in:
Ghostkeeper 2021-09-10 16:46:53 +02:00
parent 9e2b556ce8
commit 24ff3692bd
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cura/UI/PrintInformation.py
View file

@ -13,7 +13,6 @@ from UM.Qt.Duration import Duration
from UM.Scene.SceneNode import SceneNode
from UM.i18n import i18nCatalog
from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError
from UM.OutputDevice import OutputDevice
if TYPE_CHECKING:
from cura.CuraApplication import CuraApplication
@ -68,8 +67,7 @@ class PrintInformation(QObject):
self._application.globalContainerStackChanged.connect(self._updateJobName)
self._application.globalContainerStackChanged.connect(self.setToZeroPrintInformation)
self._application.fileLoaded.connect(self.setBaseName)
self._application.workspaceLoaded.connect(self.setProjectName)
self._application.getOutputDeviceManager().writeStarted.connect(self._onOutputStart)
self._application.workspaceLoaded.connect(self._onWorkspaceLoaded)
self._application.getMachineManager().rootMaterialChanged.connect(self._onActiveMaterialsChanged)
self._application.getInstance().getPreferences().preferenceChanged.connect(self._onPreferencesChanged)
@ -442,12 +440,6 @@ class PrintInformation(QObject):
self.setToZeroPrintInformation(self._active_build_plate)
def _onOutputStart(self, output_device: OutputDevice) -> None:
"""If this is the sort of output 'device' (like local or online file storage, rather than a printer),
the user could have altered the file-name, and thus the project name should be altered as well."""
new_name = output_device.getLastOutputName()
if new_name is not None:
if len(os.path.dirname(new_name)) > 0:
self.setProjectName(new_name)
else:
self.setJobName(new_name)
def _onWorkspaceLoaded(self, new_name: str) -> None:
"""Update the job name whenever a new workspace is loaded."""
self.setJobName(os.path.splitext(os.path.basename(new_name))[0])

4
plugins/DigitalLibrary/src/DigitalFactoryController.py
View file

@ -603,8 +603,8 @@ class DigitalFactoryController(QObject):
self._saveFileToSelectedProjectHelper(filename, formats)
def _saveFileToSelectedProjectHelper(self, filename: str, formats: List[str]) -> None:
# Indicate we have started sending a job (and propagate any user file name changes back to the open project)
self.uploadStarted.emit(filename)
# Indicate we have started sending a job.
self.uploadStarted.emit()
library_project_id = self._project_model.items[self._selected_project_idx]["libraryProjectId"]
library_project_name = self._project_model.items[self._selected_project_idx]["displayName"]

4
plugins/DigitalLibrary/src/DigitalFactoryOutputDevice.py
View file

@ -105,10 +105,8 @@ class DigitalFactoryOutputDevice(ProjectOutputDevice):
self.enabled = logged_in and self._controller.userAccountHasLibraryAccess()
self.enabledChanged.emit()
def _onWriteStarted(self, new_name: Optional[str] = None) -> None:
def _onWriteStarted(self) -> None:
self._writing = True
if new_name:
self.setLastOutputName(new_name) # On saving, the user can change the name, this should propagate.
self.writeStarted.emit(self)
def _onWriteFinished(self) -> None: