Mercurial > pygpibtoolkit / changeset

--- a/hpgl_plotter.qrc	Fri Jan 18 16:33:51 2008 +0100
+++ b/hpgl_plotter.qrc	Sun Jan 20 17:09:31 2008 +0100
@@ -4,5 +4,7 @@
         <file>icons/led_green.svg</file>
         <file>icons/led_green_off.png</file>
         <file>icons/led_green_off.svg</file>
+        <file>icons/led_red.svg</file>
+        <file>icons/led_red_off.svg</file>
     </qresource>
 </RCC>

--- a/icons/led_green.svg	Fri Jan 18 16:33:51 2008 +0100
+++ b/icons/led_green.svg	Sun Jan 20 17:09:31 2008 +0100
@@ -9,14 +9,15 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
+   width="278.25241"
+   height="278.25241"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/david/Electronic/HP3562/icons"
    sodipodi:docname="led_green.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
   <defs
      id="defs4">
     <linearGradient
@@ -82,13 +83,13 @@
      inkscape:pageshadow="2"
      inkscape:zoom="0.48082306"
      inkscape:cx="372.04724"
-     inkscape:cy="586.3824"
+     inkscape:cy="207.1213"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="996"
      inkscape:window-height="714"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-x="25"
+     inkscape:window-y="4" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -103,7 +104,8 @@
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-175.95852,-171.79899)">
     <rect
        style="opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.29390666;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29390666, 0.29390666;stroke-dashoffset:0;stroke-opacity:1"
        id="rect2160"
@@ -124,10 +126,10 @@
        height="259.97089"
        width="259.97089"
        id="rect3134"
-       style="opacity:1;fill:url(#radialGradient3142);fill-opacity:1.0;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.29390666;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29390666, 0.29390666;stroke-dashoffset:0;stroke-opacity:1" />
+       style="opacity:1;fill:url(#radialGradient3142);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.29390666;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29390666, 0.29390666;stroke-dashoffset:0;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient4129);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 185.09375 180.9375 L 185.09375 352.5625 C 190.93752 352.79982 196.83856 352.9375 202.78125 352.9375 C 312.80014 352.9375 406.95049 311.61044 445.0625 253.25 L 445.0625 180.9375 L 185.09375 180.9375 z "
+       d="M 185.09375,180.9375 L 185.09375,352.5625 C 190.93752,352.79982 196.83856,352.9375 202.78125,352.9375 C 312.80014,352.9375 406.95049,311.61044 445.0625,253.25 L 445.0625,180.9375 L 185.09375,180.9375 z "
        id="path3144" />
     <path
        sodipodi:type="arc"

--- a/icons/led_green_off.svg	Fri Jan 18 16:33:51 2008 +0100
+++ b/icons/led_green_off.svg	Sun Jan 20 17:09:31 2008 +0100
@@ -9,14 +9,15 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
+   width="278.25241"
+   height="278.25241"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.45.1"
    sodipodi:docbase="/home/david/Electronic/HP3562/icons"
    sodipodi:docname="led_green_off.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
   <defs
      id="defs4">
     <linearGradient
@@ -61,13 +62,13 @@
      inkscape:pageshadow="2"
      inkscape:zoom="0.48082306"
      inkscape:cx="372.04724"
-     inkscape:cy="586.3824"
+     inkscape:cy="-64.793696"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="996"
      inkscape:window-height="714"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-x="22"
+     inkscape:window-y="21" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -82,7 +83,8 @@
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-175.95852,-171.79899)">
     <rect
        style="opacity:1;fill:#009900;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.29390666;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:0.29390666, 0.29390666;stroke-dashoffset:0;stroke-opacity:1"
        id="rect2160"
@@ -99,7 +101,7 @@
        style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#008304;stroke-width:9.17689896;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <path
        style="fill:url(#linearGradient4129);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 185.09375 180.9375 L 185.09375 352.5625 C 190.93752 352.79982 196.83856 352.9375 202.78125 352.9375 C 312.80014 352.9375 406.95049 311.61044 445.0625 253.25 L 445.0625 180.9375 L 185.09375 180.9375 z "
+       d="M 185.09375,180.9375 L 185.09375,352.5625 C 190.93752,352.79982 196.83856,352.9375 202.78125,352.9375 C 312.80014,352.9375 406.95049,311.61044 445.0625,253.25 L 445.0625,180.9375 L 185.09375,180.9375 z "
        id="path3144" />
     <path
        sodipodi:type="arc"

--- a/qgpib_plotter.py	Fri Jan 18 16:33:51 2008 +0100
+++ b/qgpib_plotter.py	Sun Jan 20 17:09:31 2008 +0100
@@ -71,8 +71,6 @@
         if index.isValid():
             value = unicode(self.plotsView.model().data(index, Qt.DisplayRole).toString())
             
-            #self.plotterWidget = QHPGLPlotterWidget(self)
-            #self.setCentralWidget(self.plotterWidget)
             self.plotterWidget.clear()
             self.plotterWidget.parse(self._plots[value])
             

--- a/qhpgl_plotter.ui	Fri Jan 18 16:33:51 2008 +0100
+++ b/qhpgl_plotter.ui	Sun Jan 20 17:09:31 2008 +0100
@@ -48,48 +48,69 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents" >
     <layout class="QVBoxLayout" >
-     <property name="spacing" >
-      <number>4</number>
-     </property>
-     <property name="leftMargin" >
-      <number>2</number>
-     </property>
-     <property name="topMargin" >
-      <number>2</number>
-     </property>
-     <property name="rightMargin" >
-      <number>2</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>2</number>
-     </property>
      <item>
-      <widget class="QToolButton" name="captureButton" >
-       <property name="minimumSize" >
-        <size>
-         <width>0</width>
-         <height>29</height>
-        </size>
-       </property>
-       <property name="text" >
-        <string>on line</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="hpgl_plotter.qrc" >:/icons/led_green.png</iconset>
-       </property>
-       <property name="iconSize" >
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-       <property name="checkable" >
-        <bool>true</bool>
-       </property>
-       <property name="toolButtonStyle" >
-        <enum>Qt::ToolButtonTextBesideIcon</enum>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" >
+       <item>
+        <widget class="QToolButton" name="captureButton" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>29</height>
+          </size>
+         </property>
+         <property name="text" >
+          <string>on line</string>
+         </property>
+         <property name="icon" >
+          <iconset resource="hpgl_plotter.qrc" >:/icons/led_green.svg</iconset>
+         </property>
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+         <property name="checkable" >
+          <bool>true</bool>
+         </property>
+         <property name="toolButtonStyle" >
+          <enum>Qt::ToolButtonTextBesideIcon</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="receivingButton" >
+         <property name="text" >
+          <string/>
+         </property>
+         <property name="icon" >
+          <iconset resource="hpgl_plotter.qrc" >:/icons/led_red_off.svg</iconset>
+         </property>
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+         <property name="flat" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
       <widget class="QListView" name="plotsView" />