Browse Source

Remove canvas print stuff

tags/1.9.7
falkTX 10 years ago
parent
commit
79d5f97448
2 changed files with 4 additions and 25 deletions
  1. +0
    -1
      resources/ui/carla_host.ui
  2. +4
    -24
      source/carla_host.py

+ 0
- 1
resources/ui/carla_host.ui View File

@@ -218,7 +218,6 @@
<addaction name="act_canvas_refresh"/> <addaction name="act_canvas_refresh"/>
<addaction name="menu_Canvas_Zoom"/> <addaction name="menu_Canvas_Zoom"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="act_canvas_print"/>
<addaction name="act_canvas_save_image"/> <addaction name="act_canvas_save_image"/>
</widget> </widget>
<widget class="QMenu" name="menu_Settings"> <widget class="QMenu" name="menu_Settings">


+ 4
- 24
source/carla_host.py View File

@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-


# Carla host code # Carla host code
# Copyright (C) 2011-2014 Filipe Coelho <falktx@falktx.com>
# Copyright (C) 2011-2016 Filipe Coelho <falktx@falktx.com>
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as # modify it under the terms of the GNU General Public License as
@@ -27,11 +27,11 @@ from carla_config import *
if config_UseQt5: if config_UseQt5:
from PyQt5.QtCore import qCritical, QFileInfo, QModelIndex, QPointF, QTimer from PyQt5.QtCore import qCritical, QFileInfo, QModelIndex, QPointF, QTimer
from PyQt5.QtGui import QImage, QPalette from PyQt5.QtGui import QImage, QPalette
from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
from PyQt5.QtWidgets import QAction, QApplication, QFileSystemModel, QListWidgetItem, QMainWindow from PyQt5.QtWidgets import QAction, QApplication, QFileSystemModel, QListWidgetItem, QMainWindow
else: else:
from PyQt4.QtCore import qCritical, QFileInfo, QModelIndex, QPointF, QTimer from PyQt4.QtCore import qCritical, QFileInfo, QModelIndex, QPointF, QTimer
from PyQt4.QtGui import QAction, QApplication, QFileSystemModel, QImage, QListWidgetItem, QMainWindow, QPalette, QPrinter, QPrintDialog
from PyQt4.QtGui import QImage, QPalette
from PyQt4.QtGui import QAction, QApplication, QFileSystemModel, QListWidgetItem, QMainWindow


# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Custom) # Imports (Custom)
@@ -140,8 +140,7 @@ class HostWindow(QMainWindow):
# ---------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------
# Internal stuff (patchbay) # Internal stuff (patchbay)


self.fExportImage = QImage()
self.fExportPrinter = None
self.fExportImage = QImage()


self.fPeaksCleared = True self.fPeaksCleared = True


@@ -216,7 +215,6 @@ class HostWindow(QMainWindow):
self.ui.act_canvas_show_internal.setVisible(False) self.ui.act_canvas_show_internal.setVisible(False)
self.ui.act_canvas_show_external.setVisible(False) self.ui.act_canvas_show_external.setVisible(False)
self.ui.act_canvas_arrange.setVisible(False) self.ui.act_canvas_arrange.setVisible(False)
self.ui.act_canvas_print.setVisible(False)
self.ui.act_canvas_refresh.setVisible(False) self.ui.act_canvas_refresh.setVisible(False)
self.ui.act_canvas_save_image.setVisible(False) self.ui.act_canvas_save_image.setVisible(False)
self.ui.act_canvas_zoom_100.setVisible(False) self.ui.act_canvas_zoom_100.setVisible(False)
@@ -374,7 +372,6 @@ class HostWindow(QMainWindow):
self.ui.act_canvas_zoom_in.triggered.connect(self.slot_canvasZoomIn) self.ui.act_canvas_zoom_in.triggered.connect(self.slot_canvasZoomIn)
self.ui.act_canvas_zoom_out.triggered.connect(self.slot_canvasZoomOut) self.ui.act_canvas_zoom_out.triggered.connect(self.slot_canvasZoomOut)
self.ui.act_canvas_zoom_100.triggered.connect(self.slot_canvasZoomReset) self.ui.act_canvas_zoom_100.triggered.connect(self.slot_canvasZoomReset)
self.ui.act_canvas_print.triggered.connect(self.slot_canvasPrint)
self.ui.act_canvas_save_image.triggered.connect(self.slot_canvasSaveImage) self.ui.act_canvas_save_image.triggered.connect(self.slot_canvasSaveImage)
self.ui.act_canvas_arrange.setEnabled(False) # TODO, later self.ui.act_canvas_arrange.setEnabled(False) # TODO, later


@@ -1119,23 +1116,6 @@ class HostWindow(QMainWindow):
def slot_canvasZoomReset(self): def slot_canvasZoomReset(self):
self.scene.zoom_reset() self.scene.zoom_reset()


@pyqtSlot()
def slot_canvasPrint(self):
self.scene.clearSelection()

if self.fExportPrinter is None:
self.fExportPrinter = QPrinter()

dialog = QPrintDialog(self.fExportPrinter, self)

if dialog.exec_():
painter = QPainter(self.fExportPrinter)
painter.save()
painter.setRenderHint(QPainter.Antialiasing)
painter.setRenderHint(QPainter.TextAntialiasing)
self.scene.render(painter)
painter.restore()

@pyqtSlot() @pyqtSlot()
def slot_canvasSaveImage(self): def slot_canvasSaveImage(self):
newPath = QFileDialog.getSaveFileName(self, self.tr("Save Image"), filter=self.tr("PNG Image (*.png);;JPEG Image (*.jpg)")) newPath = QFileDialog.getSaveFileName(self, self.tr("Save Image"), filter=self.tr("PNG Image (*.png);;JPEG Image (*.jpg)"))


Loading…
Cancel
Save