[Uludag-commits] r15650 - trunk/staj-projeleri/scanner/src
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
5 Eki 2007 Cum 12:01:02 EEST
Author: asli.okur
Date: Fri Oct 5 12:01:02 2007
New Revision: 15650
Removed:
trunk/staj-projeleri/scanner/src/toolbar.py
Modified:
trunk/staj-projeleri/scanner/src/previewArea.py
trunk/staj-projeleri/scanner/src/scanner.py
Log:
Modified: trunk/staj-projeleri/scanner/src/previewArea.py
=================================================================
--- trunk/staj-projeleri/scanner/src/previewArea.py (original)
+++ trunk/staj-projeleri/scanner/src/previewArea.py Fri Oct 5 12:01:02 2007
@@ -33,5 +33,4 @@
def resizeEvent(self, event):
if self.previewImage.fitted:
- self.previewImage.fit()
-
+ self.previewImage.fit()
\ No newline at end of file
Modified: trunk/staj-projeleri/scanner/src/scanner.py
=================================================================
--- trunk/staj-projeleri/scanner/src/scanner.py (original)
+++ trunk/staj-projeleri/scanner/src/scanner.py Fri Oct 5 12:01:02 2007
@@ -6,7 +6,6 @@
import sane
from options import *
-from toolbar import *
from previewArea import *
from scanresult import *
from scanresultmulti import *
@@ -24,8 +23,6 @@
def __init__(self,parent = None,name = None,fl = 0):
KMainWindow.__init__(self,parent,name,fl)
- #sane.init()
-
self.statusBar()
self.statusBar().message("Ready")
@@ -60,20 +57,8 @@
self.toolBar().insertButton(loadIcon("viewmag1"), 6, SIGNAL("released()"), self.previewArea.previewImage.zoomactual, True, "Actual Size")
self.toolBar().insertButton(loadIcon("viewmag-"), 7, SIGNAL("released()"), self.previewArea.previewImage.zoomout, True, "Zoom Out")
- #self.toolbar = Toolbar(self.centralWidget())
- #self.hLayout.addWidget(self.toolbar)
-
- #self.previewArea = PreviewArea(self.centralWidget())
self.hLayout.addWidget(self.previewArea)
- #self.connect(self.toolbar.previewButton,SIGNAL("released()"),self.previewScan)
- #self.connect(self.toolbar.scanButton,SIGNAL("released()"),self.startScan)
- #self.connect(self.toolbar.fitButton,SIGNAL("released()"),self.previewArea.previewImage.fit)
- #self.connect(self.toolbar.fitSelectButton,SIGNAL("released()"),self.previewArea.previewImage.fitSelect)
- #self.connect(self.toolbar.zoominButton,SIGNAL("released()"),self.previewArea.previewImage.zoomin)
- #self.connect(self.toolbar.actualSizeButton,SIGNAL("released()"),self.previewArea.previewImage.zoomactual)
- #self.connect(self.toolbar.zoomoutButton,SIGNAL("released()"),self.previewArea.previewImage.zoomout)
-
self.connect(self.previewArea.previewImage,PYSIGNAL("selectionCreated"),self.selectArea)
self.progress = Progress(self.centralWidget())
@@ -90,7 +75,7 @@
self.languageChange()
- self.resize(QSize(744,600).expandedTo(self.minimumSizeHint()))
+ self.resize(QSize(744,620).expandedTo(self.minimumSizeHint()))
self.clearWState(Qt.WState_Polished)
def exit(self):
@@ -104,7 +89,6 @@
return qApp.translate("Scanner",s,c)
def newDeviceSelected(self):
- #self.toolbar.setEnabled(True)
self.toolBar().setEnabled(True)
self.previewArea.setEnabled(True)
br_x = br_y = -1
@@ -118,7 +102,6 @@
self.previewArea.formEmptyImage(br_x,br_y)
def noDeviceSelected(self):
- #self.toolbar.setEnabled(False)
self.toolBar().setEnabled(False)
self.previewArea.noImage()
self.previewArea.setEnabled(False)
@@ -168,29 +151,17 @@
self.options.device.__setattr__("br_x",max(option.deviceOption.constraint))
if option.deviceOption.name == "br-y":
self.options.device.__setattr__("br_y",max(option.deviceOption.constraint))
-
- #self.options.device.start()
-
- #im = self.options.device.snap();
- self.previewThread = PreviewThread(self, self.options.device)
+
+ self.previewThread = PreviewThread(self, self.options.device)
self.previewThread.start()
- #self.previewThread.work(self.options)
- #self.previewArea.previewImage.setImage(im)
-
- #self.options.setOptionValues(oldValues)
- #self.statusBar().message("Ready")
-
def stopScan(self):
if self.options.device != None:
- #self.options.device.cancel()
self.stopThread = StopThread(self, self.options.device)
self.stopThread.start()
#qApp.wakeUpGuiThread()
qApp.processEvents()
self.progress.setLabelText("<p align=\"center\">Stopping</p>")
- #self.statusBar().message("Ready")
- #self.progress.hide()
def backToNormal(self):
self.progress.setLabelText("<p align=\"center\">Scanning in progress</p>")
@@ -234,43 +205,5 @@
self.statusBar().message("Busy")
qApp.processEvents()
self.progress.show()
- #self.progress.setProgress(0)
- #self.hide()
-
- #self.options.device.start()
- #im = self.options.device.snap()
-
self.scanThread = ScanThread(self, self.options.device)
self.scanThread.start()
- #self.scanThread.work(self.options)
- #while(self.worker.finished() == False):
- #pass
-
- #im = self.scanThread.getImage()
-
- #qApp.processEvents()
- #qEventLoop.processEvents(AllEvents,500)
-
-
-
- #self.maxDiff = 20
- #self.aveRgb = 0x222625
- #self.minSize = 90000
- #self.enableExtract = True
- #if self.enableExtract:
- #extract(im,self.maxDiff,self.aveRgb,self.minSize)
- #s = ScanResultMulti(self,"scanResultMulti",1)
- #tmpImage = QImage()
- #while(nextImage(tmpImage)):
- #s.addImage(tmpImage)
- #else:
- #s = ScanResult(im,self,"scanResult",1)
-
- #self.progress.setProgress(100)
- #s.show()
- #self.statusBar().message("Ready")
- #self.progress.reset()
- #self.show()
- #self.progress.hide()
-
- #return
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi