[Armagetronad-commits] SF.net SVN: armagetronad: [7245] tools/acme/trunk

[<dav...@us...>]

Revision: 7245
          http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7245&view=rev
Author:   davidfancella
Date:     2007-05-21 17:12:46 -0700 (Mon, 21 May 2007)

Log Message:
-----------
Drawing grid lines in the main map editor now

Modified Paths:
--------------
    tools/acme/trunk/libacmegui/editors/mapEditor.py
    tools/acme/trunk/libacmegui/editors/mapwidgets/wall.py
    tools/acme/trunk/resources/ui/main.ui

Modified: tools/acme/trunk/libacmegui/editors/mapEditor.py
===================================================================
--- tools/acme/trunk/libacmegui/editors/mapEditor.py	2007-05-21 22:52:35 UTC (rev 7244)
+++ tools/acme/trunk/libacmegui/editors/mapEditor.py	2007-05-22 00:12:46 UTC (rev 7245)
@@ -91,3 +91,44 @@
         self.scale(1/self.scaleFactor, 1/self.scaleFactor)
         
         print scaleFactorDelta
+        
+    def drawBackground(self, painter, rect):
+        backBrush = QtGui.QBrush(QtGui.QColor( 0, 0, 0) )
+        painter.setBackground(backBrush)
+        
+        painter.fillRect(rect, backBrush)
+        
+        frontBrush = QtGui.QBrush(QtGui.QColor( 50, 50, 50) )
+        painter.setBrush(frontBrush)
+        frontPen = QtGui.QPen(QtCore.Qt.SolidLine)
+        frontPen.setBrush(frontBrush)
+        frontPen.setWidth(1)
+        painter.setPen(frontPen)
+        
+        leftx, bottomy = rect.x(), rect.y()
+        width, height = rect.width(), rect.height()
+        
+        leftStart = leftx
+        while(leftStart % 50 != 0):
+            leftStart += 1
+            
+        bottomStart = bottomy
+        while(bottomStart % 50 != 0):
+            bottomStart += 1
+        
+        # Draw grid
+        for a in range(int(leftStart), int(leftx + width), 50 ):
+            painter.drawLine(a, bottomy, a, bottomy + height)
+        for a in range(int(bottomStart), int(bottomy + height), 50 ):
+            painter.drawLine(leftx, a, leftx + width, a)
+        
+        frontPen.setWidthF(3.0)
+        painter.setPen(frontPen)
+        # Draw axes
+        if leftx <= 0 and (leftx + width) >= 0:
+            painter.drawLine(0,bottomy, 0, bottomy + height)
+        if bottomy <= 0 and (bottomy + height) >= 0:
+            painter.drawLine(leftx, 0, leftx + width, 0)
+        
+        
+        

Modified: tools/acme/trunk/libacmegui/editors/mapwidgets/wall.py
===================================================================
--- tools/acme/trunk/libacmegui/editors/mapwidgets/wall.py	2007-05-21 22:52:35 UTC (rev 7244)
+++ tools/acme/trunk/libacmegui/editors/mapwidgets/wall.py	2007-05-22 00:12:46 UTC (rev 7245)
@@ -40,6 +40,10 @@
     def paint(self, painter, option, widget):
         painter.setPen(QtCore.Qt.black);
         thePointList = QtGui.QPolygonF()
+        forePen = QtGui.QPen(QtCore.Qt.SolidLine)
+        forePen.setColor( QtGui.QColor( 255, 255, 255) )
+        forePen.setWidthF(1.8)
+        painter.setPen(forePen)
         
         for a in self.theWall.points:
             thePointList.append( QtCore.QPointF(a[0], a[1]) )

Modified: tools/acme/trunk/resources/ui/main.ui
===================================================================
--- tools/acme/trunk/resources/ui/main.ui	2007-05-21 22:52:35 UTC (rev 7244)
+++ tools/acme/trunk/resources/ui/main.ui	2007-05-22 00:12:46 UTC (rev 7245)
@@ -28,26 +28,30 @@
       <widget class="QStackedWidget" name="toolView" >
        <property name="sizePolicy" >
         <sizepolicy>
-         <hsizetype>4</hsizetype>
+         <hsizetype>7</hsizetype>
          <vsizetype>4</vsizetype>
-         <horstretch>1</horstretch>
+         <horstretch>3</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <widget class="QWidget" name="page_2" />
       </widget>
-      <widget class="QToolBox" name="editToolBox" >
+      <widget class="QDockWidget" name="propertyBox" >
        <property name="sizePolicy" >
         <sizepolicy>
          <hsizetype>7</hsizetype>
-         <vsizetype>5</vsizetype>
-         <horstretch>0</horstretch>
+         <vsizetype>4</vsizetype>
+         <horstretch>1</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="currentIndex" >
-        <number>-1</number>
+       <property name="features" >
+        <set>QDockWidget::NoDockWidgetFeatures</set>
        </property>
+       <property name="windowTitle" >
+        <string>Properties</string>
+       </property>
+       <widget class="QWidget" name="dockWidgetContents" />
       </widget>
      </widget>
     </item>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.