qi-hardware/nn-usb-fpga
1
0
Fork 0
mirror of git://projects.qi-hardware.com/nn-usb-fpga.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Updating prototype of SIE code generator.

Browse Source
This commit is contained in:
Juan64Bits
2010-11-10 14:20:10 -05:00
parent d302857917
commit 9d578912b7
48 changed files with 1785 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Software/sie_cg/block_editor/adc_single.die Normal file
View File

@@ -0,0 +1,23 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="ADC Single">
<Polygon>
<Point x="-80" y="0"/>
<Point x="-60" y="-40"/>
<Point x="60" y="-40"/>
<Point x="60" y="40"/>
<Point x="110" y="40"/>
<Point x="110" y="-40"/>
<Point x="60" y="-40"/>
<Point x="110" y="-40"/>
<Point x="110" y="40"/>
<Point x="-60" y="40"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="0" posOffset-y="20" editableItem="0" ID="3" text="ADC Single Channel" posOffset-x="0"/>
<TextItem myStyleIO="0" posOffset-y="-0" editableItem="1" ID="4" text="0" posOffset-x="20"/>
<TextItem myStyleIO="0" posOffset-y="-0" editableItem="0" ID="5" text="CH:" posOffset-x="-20"/>
<TextItem myStyleIO="0" posOffset-y="-20" editableItem="0" ID="6" text="SP:" posOffset-x="-20"/>
<TextItem myStyleIO="0" posOffset-y="-20" editableItem="1" ID="7" text="255" posOffset-x="20"/>
<TextItem myStyleIO="8" posOffset-y="-20" editableItem="0" ID="8" text="UChar" posOffset-x="110"/>
</TextItems>
</CustomItem>

14
Software/sie_cg/block_editor/constant.die Normal file
View File

@@ -0,0 +1,14 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="Constant">
<Polygon>
<Point x="-50" y="-10"/>
<Point x="-50" y="30"/>
<Point x="30" y="30"/>
<Point x="30" y="-10"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="0" posOffset-y="-0" editableItem="1" ID="21" text="Value" posOffset-x="-30"/>
<TextItem myStyleIO="3" posOffset-y="-20" editableItem="0" ID="15" text="OUT Integer" posOffset-x="30"/>
<TextItem myStyleIO="0" posOffset-y="-0" editableItem="1" ID="19" text="1" posOffset-x="10"/>
</TextItems>
</CustomItem>

4
Software/sie_cg/block_editor/diagramscene.cpp
View File

@@ -118,8 +118,8 @@ void DiagramScene::doSnapToGrid(QGraphicsSceneMouseEvent *mouseEvent)
{
if(snapToGrid){
mouseEvent->setScenePos(QPointF(
int(mouseEvent->scenePos().x()/myGrid)*myGrid,
int(mouseEvent->scenePos().y()/myGrid)*myGrid
round(mouseEvent->scenePos().x()/myGrid)*myGrid,
round(mouseEvent->scenePos().y()/myGrid)*myGrid
));
}
}

18
Software/sie_cg/block_editor/left_shift.die Normal file
View File

@@ -0,0 +1,18 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="Left Shift">
<Polygon>
<Point x="-70" y="-30"/>
<Point x="-70" y="20"/>
<Point x="60" y="20"/>
<Point x="60" y="-30"/>
<Point x="-50" y="-30"/>
<Point x="-70" y="-30"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="9" posOffset-y="-0" editableItem="0" ID="13" text="OUT" posOffset-x="60"/>
<TextItem myStyleIO="138" posOffset-y="-0" editableItem="0" ID="12" text="IN" posOffset-x="-70"/>
<TextItem myStyleIO="0" posOffset-y="-10" editableItem="1" ID="11" text="1" posOffset-x="10"/>
<TextItem myStyleIO="0" posOffset-y="-10" editableItem="0" ID="10" text="&lt;&lt;" posOffset-x="-20"/>
<TextItem myStyleIO="0" posOffset-y="20" editableItem="0" ID="5" text="Bitwise Shift" posOffset-x="-10"/>
</TextItems>
</CustomItem>

26
Software/sie_cg/block_editor/mainwindow.cpp
View File

@@ -168,6 +168,20 @@ void MainWindow::createToolBox()
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("Float"),
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("Short"),
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("Long"),
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("UChar"),
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("UInt"),
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("UShort"),
QIcon(":/images/background1.png")),++i,0);
layout->addWidget(createToolButton(129+i,tr("ULong"),
QIcon(":/images/background1.png")),++i,0);
//OUTPUTS
i=0;
@@ -181,6 +195,18 @@ void MainWindow::createToolBox()
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("Float"),
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("Short"),
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("Long"),
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("UChar"),
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("UInt"),
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("UShort"),
QIcon(":/images/background3.png")),++i,1);
layout->addWidget(createToolButton(i,tr("ULong"),
QIcon(":/images/background3.png")),++i,1);
layout->setRowStretch(3, 10);
layout->setColumnStretch(2, 10);

32
Software/sie_cg/block_editor/pwm_single.die Normal file
View File

@@ -0,0 +1,32 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="PWM Single">
<Polygon>
<Point x="-90" y="-50"/>
<Point x="50" y="-50"/>
<Point x="50" y="-30"/>
<Point x="-90" y="-30"/>
<Point x="-90" y="20"/>
<Point x="-40" y="20"/>
<Point x="50" y="20"/>
<Point x="50" y="10"/>
<Point x="-40" y="10"/>
<Point x="-40" y="-10"/>
<Point x="-20" y="-10"/>
<Point x="0" y="-10"/>
<Point x="0" y="10"/>
<Point x="10" y="10"/>
<Point x="10" y="-10"/>
<Point x="50" y="-10"/>
<Point x="50" y="10"/>
<Point x="50" y="-30"/>
<Point x="50" y="20"/>
<Point x="-90" y="20"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="137" posOffset-y="-0" editableItem="0" ID="14" text="UChar" posOffset-x="-90"/>
<TextItem myStyleIO="0" posOffset-y="20" editableItem="0" ID="15" text="|-Duty-|" posOffset-x="-20"/>
<TextItem myStyleIO="0" posOffset-y="40" editableItem="1" ID="16" text="0" posOffset-x="0"/>
<TextItem myStyleIO="0" posOffset-y="40" editableItem="0" ID="11" text="Out:" posOffset-x="-20"/>
<TextItem myStyleIO="0" posOffset-y="40" editableItem="0" ID="18" text="PWM" posOffset-x="-50"/>
</TextItems>
</CustomItem>

18
Software/sie_cg/block_editor/right_shift.die Normal file
View File

@@ -0,0 +1,18 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="Right Shift">
<Polygon>
<Point x="-70" y="-30"/>
<Point x="-70" y="20"/>
<Point x="60" y="20"/>
<Point x="60" y="-30"/>
<Point x="-50" y="-30"/>
<Point x="-70" y="-30"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="9" posOffset-y="-0" editableItem="0" ID="13" text="OUT" posOffset-x="60"/>
<TextItem myStyleIO="138" posOffset-y="-0" editableItem="0" ID="12" text="IN" posOffset-x="-70"/>
<TextItem myStyleIO="0" posOffset-y="-10" editableItem="1" ID="11" text="1" posOffset-x="10"/>
<TextItem myStyleIO="0" posOffset-y="-10" editableItem="0" ID="10" text=">>" posOffset-x="-20"/>
<TextItem myStyleIO="0" posOffset-y="20" editableItem="0" ID="5" text="Bitwise Shift" posOffset-x="-10"/>
</TextItems>
</CustomItem>

12
Software/sie_cg/block_editor/test_block2.die
View File

@@ -1,15 +1,15 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="Test Block 2">
<Polygon>
<Point x="-50" y="-20"/>
<Point x="-30" y="0"/>
<Point x="-50" y="20"/>
<Point x="-60" y="-20"/>
<Point x="-40" y="0"/>
<Point x="-60" y="20"/>
<Point x="30" y="20"/>
<Point x="60" y="0"/>
<Point x="40" y="-20"/>
<Point x="50" y="0"/>
<Point x="30" y="-20"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="130" posOffset-y="-0" editableItem="0" ID="1" text=" IN Bool" posOffset-x="-30"/>
<TextItem myStyleIO="0" posOffset-y="30" editableItem="0" ID="0" text="Test Block 2" posOffset-x="-10"/>
<TextItem myStyleIO="130" posOffset-y="-0" editableItem="0" ID="1" text=" IN Bool" posOffset-x="-30"/>
</TextItems>
</CustomItem>

69
Software/sie_cg/block_editor/timer.die Normal file
View File

@@ -0,0 +1,69 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="Timer">
<Polygon>
<Point x="-70" y="-80"/>
<Point x="-70" y="80"/>
<Point x="80" y="80"/>
<Point x="80" y="-80"/>
<Point x="-70" y="-80"/>
<Point x="-70" y="-30"/>
<Point x="80" y="-30"/>
<Point x="80" y="80"/>
<Point x="50" y="80"/>
<Point x="40" y="50"/>
<Point x="30" y="50"/>
<Point x="20" y="60"/>
<Point x="40" y="40"/>
<Point x="40" y="40"/>
<Point x="40" y="30"/>
<Point x="30" y="40"/>
<Point x="30" y="30"/>
<Point x="30" y="30"/>
<Point x="10" y="30"/>
<Point x="10" y="30"/>
<Point x="10" y="30"/>
<Point x="30" y="30"/>
<Point x="30" y="20"/>
<Point x="40" y="30"/>
<Point x="40" y="20"/>
<Point x="30" y="10"/>
<Point x="30" y="10"/>
<Point x="40" y="0"/>
<Point x="50" y="10"/>
<Point x="50" y="0"/>
<Point x="40" y="-10"/>
<Point x="30" y="-20"/>
<Point x="20" y="-20"/>
<Point x="30" y="-10"/>
<Point x="20" y="0"/>
<Point x="20" y="0"/>
<Point x="-10" y="0"/>
<Point x="-20" y="-10"/>
<Point x="-10" y="-20"/>
<Point x="-20" y="-20"/>
<Point x="-40" y="0"/>
<Point x="-40" y="10"/>
<Point x="-30" y="0"/>
<Point x="-20" y="10"/>
<Point x="-20" y="10"/>
<Point x="-20" y="10"/>
<Point x="-30" y="20"/>
<Point x="-30" y="40"/>
<Point x="-20" y="50"/>
<Point x="-10" y="60"/>
<Point x="20" y="60"/>
<Point x="-10" y="60"/>
<Point x="-20" y="50"/>
<Point x="-30" y="50"/>
<Point x="-30" y="50"/>
<Point x="-40" y="80"/>
<Point x="-70" y="80"/>
<Point x="-70" y="80"/>
<Point x="-70" y="80"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="0" posOffset-y="40" editableItem="1" ID="1" text="1 " posOffset-x="-10"/>
<TextItem myStyleIO="0" posOffset-y="40" editableItem="0" ID="2" text="ms" posOffset-x="10"/>
<TextItem myStyleIO="0" posOffset-y="60" editableItem="0" ID="0" text="System Timer" posOffset-x="0"/>
</TextItems>
</CustomItem>

29
Software/sie_cg/block_editor/while.die Normal file
View File

@@ -0,0 +1,29 @@
<!--File for SIE Code Generator. Custmos Blocks-->
<CustomItem BlockName="System While">
<Polygon>
<Point x="-50" y="-30"/>
<Point x="50" y="-30"/>
<Point x="50" y="-10"/>
<Point x="-50" y="-10"/>
<Point x="-50" y="30"/>
<Point x="0" y="30"/>
<Point x="0" y="0"/>
<Point x="40" y="0"/>
<Point x="40" y="20"/>
<Point x="20" y="20"/>
<Point x="20" y="10"/>
<Point x="10" y="20"/>
<Point x="20" y="30"/>
<Point x="20" y="20"/>
<Point x="20" y="30"/>
<Point x="50" y="30"/>
<Point x="50" y="-10"/>
<Point x="50" y="30"/>
<Point x="-50" y="30"/>
<Point x="-50" y="-10"/>
</Polygon>
<TextItems>
<TextItem myStyleIO="130" posOffset-y="-10" editableItem="0" ID="14" text="IN Bool" posOffset-x="-50"/>
<TextItem myStyleIO="0" posOffset-y="20" editableItem="0" ID="23" text="System While" posOffset-x="0"/>
</TextItems>
</CustomItem>

10
Software/sie_cg/diagramscene.cpp
View File

@@ -176,8 +176,8 @@ void DiagramScene::doSnapToGrid(QGraphicsSceneMouseEvent *mouseEvent)
{
if(snapToGrid){
mouseEvent->setScenePos(QPointF(
int(mouseEvent->scenePos().x()/myGrid)*myGrid,
int(mouseEvent->scenePos().y()/myGrid)*myGrid
round(mouseEvent->scenePos().x()/myGrid)*myGrid,
round(mouseEvent->scenePos().y()/myGrid)*myGrid
));
}
}
@@ -190,7 +190,7 @@ void DiagramScene::mouseMoveEvent(QGraphicsSceneMouseEvent *mouseEvent)
line->setLine(newLine);
} else if (myMode == MoveItem) {
QGraphicsScene::mouseMoveEvent(mouseEvent);
}
}
}
void DiagramScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *mouseEvent)
@@ -277,6 +277,10 @@ QDomDocument DiagramScene::toXmlFormat()
QDomElement diagram = document.createElement("Diagram");
document.appendChild(diagram);
QDomElement test = document.createElement("Test");
test.text().fromAscii("TEXT HERE");
document.appendChild(test);
//Lists of items
QList<DiagramItem *> Items;
QList<Arrow *> Arrows;

40
Software/sie_cg/diagramscene.pro.user
View File

@@ -76,7 +76,7 @@
<valuemap type="QVariantMap">
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
<valuelist key="abstractProcess.Environment" type="QVariantList">
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-MI4KrAyPP5,guid=5c5c5e6146195c74b6ad266d4cc07afd</value>
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bm3IFDvHlY,guid=a9cadece3d5adbab4e7ecc664cc367c4</value>
<value type="QString">DEFAULTS_PATH=/usr/share/gconf/gnome.default.path</value>
<value type="QString">DESKTOP_SESSION=gnome</value>
<value type="QString">DISPLAY=:0.0</value>
@@ -84,12 +84,11 @@
<value type="QString">GDM_KEYBOARD_LAYOUT=es</value>
<value type="QString">GDM_LANG=en_US.utf8</value>
<value type="QString">GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
<value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-CFAuJK</value>
<value type="QString">GNOME_KEYRING_PID=1516</value>
<value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-EOe3re</value>
<value type="QString">GNOME_KEYRING_PID=1591</value>
<value type="QString">GTK_MODULES=canberra-gtk-module</value>
<value type="QString">HOME=/home/juan64bits</value>
<value type="QString">LANG=en_US.utf8</value>
<value type="QString">LANGUAGE=</value>
<value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value>
<value type="QString">LOGNAME=juan64bits</value>
<value type="QString">MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path</value>
@@ -97,20 +96,20 @@
<value type="QString">PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
<value type="QString">PWD=/home/juan64bits</value>
<value type="QString">QTDIR=/usr/share/qt4</value>
<value type="QString">SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/1534,unix/Maximus:/tmp/.ICE-unix/1534</value>
<value type="QString">SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/1609,unix/Maximus:/tmp/.ICE-unix/1609</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SPEECHD_PORT=7560</value>
<value type="QString">SSH_AGENT_PID=1570</value>
<value type="QString">SSH_AUTH_SOCK=/tmp/keyring-CFAuJK/ssh</value>
<value type="QString">SSH_AGENT_PID=1645</value>
<value type="QString">SSH_AUTH_SOCK=/tmp/keyring-EOe3re/ssh</value>
<value type="QString">USER=juan64bits</value>
<value type="QString">USERNAME=juan64bits</value>
<value type="QString">XAUTHORITY=/var/run/gdm/auth-for-juan64bits-V4ry7M/database</value>
<value type="QString">XAUTHORITY=/var/run/gdm/auth-for-juan64bits-XFOps8/database</value>
<value type="QString">XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg</value>
<value type="QString">XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
<value type="QString">XDG_SESSION_COOKIE=b9a7fbc4d869fc15bd6cdd474bcc9a28-1287682812.550485-1725059380</value>
<value type="QString">XDG_SESSION_COOKIE=b9a7fbc4d869fc15bd6cdd474bcc9a28-1287874500.2500-279079160</value>
</valuelist>
<valuelist key="abstractProcess.arguments" type="QVariantList">
<value type="QString">/home/juan64bits/QT/diagramscene/diagramscene.pro</value>
<value type="QString">/home/juan64bits/QT/sie_cg/diagramscene.pro</value>
<value type="QString">-spec</value>
<value type="QString">linux-g++</value>
<value type="QString">-r</value>
@@ -118,7 +117,7 @@
</valuelist>
<value key="abstractProcess.command" type="QString">/usr/bin/qmake-qt4</value>
<value key="abstractProcess.enabled" type="bool">false</value>
<value key="abstractProcess.workingDirectory" type="QString">/home/juan64bits/QT/diagramscene</value>
<value key="abstractProcess.workingDirectory" type="QString">/home/juan64bits/QT/sie_cg</value>
</valuemap>
</data>
<data>
@@ -126,7 +125,7 @@
<valuemap type="QVariantMap">
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
<valuelist key="abstractProcess.Environment" type="QVariantList">
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-MI4KrAyPP5,guid=5c5c5e6146195c74b6ad266d4cc07afd</value>
<value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-bm3IFDvHlY,guid=a9cadece3d5adbab4e7ecc664cc367c4</value>
<value type="QString">DEFAULTS_PATH=/usr/share/gconf/gnome.default.path</value>
<value type="QString">DESKTOP_SESSION=gnome</value>
<value type="QString">DISPLAY=:0.0</value>
@@ -134,12 +133,11 @@
<value type="QString">GDM_KEYBOARD_LAYOUT=es</value>
<value type="QString">GDM_LANG=en_US.utf8</value>
<value type="QString">GNOME_DESKTOP_SESSION_ID=this-is-deprecated</value>
<value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-CFAuJK</value>
<value type="QString">GNOME_KEYRING_PID=1516</value>
<value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-EOe3re</value>
<value type="QString">GNOME_KEYRING_PID=1591</value>
<value type="QString">GTK_MODULES=canberra-gtk-module</value>
<value type="QString">HOME=/home/juan64bits</value>
<value type="QString">LANG=en_US.utf8</value>
<value type="QString">LANGUAGE=</value>
<value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator</value>
<value type="QString">LOGNAME=juan64bits</value>
<value type="QString">MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path</value>
@@ -147,17 +145,17 @@
<value type="QString">PATH=/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games</value>
<value type="QString">PWD=/home/juan64bits</value>
<value type="QString">QTDIR=/usr/share/qt4</value>
<value type="QString">SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/1534,unix/Maximus:/tmp/.ICE-unix/1534</value>
<value type="QString">SESSION_MANAGER=local/Maximus:@/tmp/.ICE-unix/1609,unix/Maximus:/tmp/.ICE-unix/1609</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SPEECHD_PORT=7560</value>
<value type="QString">SSH_AGENT_PID=1570</value>
<value type="QString">SSH_AUTH_SOCK=/tmp/keyring-CFAuJK/ssh</value>
<value type="QString">SSH_AGENT_PID=1645</value>
<value type="QString">SSH_AUTH_SOCK=/tmp/keyring-EOe3re/ssh</value>
<value type="QString">USER=juan64bits</value>
<value type="QString">USERNAME=juan64bits</value>
<value type="QString">XAUTHORITY=/var/run/gdm/auth-for-juan64bits-V4ry7M/database</value>
<value type="QString">XAUTHORITY=/var/run/gdm/auth-for-juan64bits-XFOps8/database</value>
<value type="QString">XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg</value>
<value type="QString">XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/</value>
<value type="QString">XDG_SESSION_COOKIE=b9a7fbc4d869fc15bd6cdd474bcc9a28-1287682812.550485-1725059380</value>
<value type="QString">XDG_SESSION_COOKIE=b9a7fbc4d869fc15bd6cdd474bcc9a28-1287874500.2500-279079160</value>
</valuelist>
<value key="abstractProcess.IgnoreReturnValue" type="bool">false</value>
<valuelist key="abstractProcess.arguments" type="QVariantList">
@@ -165,7 +163,7 @@
</valuelist>
<value key="abstractProcess.command" type="QString">/usr/bin/make</value>
<value key="abstractProcess.enabled" type="bool">true</value>
<value key="abstractProcess.workingDirectory" type="QString">/home/juan64bits/QT/diagramscene</value>
<value key="abstractProcess.workingDirectory" type="QString">/home/juan64bits/QT/sie_cg</value>
</valuemap>
</data>
<data>

4
Software/sie_cg/mainwindow.cpp
View File

@@ -374,7 +374,7 @@ void MainWindow::createToolBox()
toolBox = new QToolBox;
toolBox->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Ignored));
toolBox->setMinimumWidth(itemWidget->sizeHint().width());
toolBox->addItem(itemWidget, tr("Basic Flowchart Shapes"));
toolBox->addItem(itemWidget, tr("Basic blocks"));
//toolBox->addItem(backgroundWidget, tr("Backgrounds"));
//Add tool box to window
@@ -896,7 +896,7 @@ void MainWindow::editLibPath()
QList<QListWidgetItem *> selected = libUi->listLib->selectedItems();
if(selected.count()>0)
{
callexternapp("block_editor/blockeditor",selected.at(0)->text());
callexternapp("block_editor/blockeditor",selected.at(0)->text());
}
}

4
Software/sie_cg/mainwindow.h
View File

@@ -212,8 +212,8 @@ public:
{
QProcess lnexternapp;
lnexternapp.start(QString("%1 %2").arg(execFile).arg(execParm));
lnexternapp.waitForFinished(-1);
retnValu = QString(lnexternapp.readAll());
//lnexternapp.waitForFinished(-1);
//retnValu = QString(lnexternapp.readAll());
}
};

54
Software/sie_cg/test.sie
View File

@@ -7,35 +7,53 @@ Arrows depend of items, and items depend of libraries!!!!
-->
<Diagram>
<Libraries>
<Library Dir="block_editor/timer.die"/>
<Library Dir="block_editor/adc_single.die"/>
<Library Dir="block_editor/left_shift.die"/>
<Library Dir="block_editor/right_shift.die"/>
<Library Dir="block_editor/pwm_single.die"/>
<Library Dir="block_editor/constant.die"/>
<Library Dir="block_editor/while.die"/>
<Library Dir="block_editor/test_block1.die"/>
<Library Dir="block_editor/test_block2.die"/>
<Library Dir="block_editor/test_block3.die"/>
</Libraries>
<DiagramItems>
<DiagramItem x="2780" y="2540" z="500" type="Test Block 2" ID="0" color="#0000ff">
<diagramValues/>
</DiagramItem>
<DiagramItem x="2510" y="2440" z="500" type="Test Block 1" ID="1" color="#808080">
<DiagramItem x="2280" y="2110" z="500" type="Timer" ID="0" color="#00ff00">
<diagramValues>
<diagramValue value="0.001" ID="1"/>
<diagramValue value="1 " ID="1"/>
</diagramValues>
</DiagramItem>
<DiagramItem x="2230" y="2550" z="500" type="Test Block 3" ID="2" color="#ff0000">
<DiagramItem x="2460" y="2350" z="500" type="Right Shift" ID="1" color="#00ffff">
<diagramValues>
<diagramValue value="1" ID="11"/>
</diagramValues>
</DiagramItem>
<DiagramItem x="2670" y="2350" z="500" type="PWM Single" ID="2" color="#808000">
<diagramValues>
<diagramValue value="0" ID="16"/>
</diagramValues>
</DiagramItem>
<DiagramItem x="2580" y="2110" z="500" type="System While" ID="3" color="#ff00ff">
<diagramValues/>
</DiagramItem>
<DiagramItem x="2470" y="2100" z="500" type="Constant" ID="4" color="#00ffff">
<diagramValues>
<diagramValue value="Value" ID="21"/>
<diagramValue value="1" ID="19"/>
</diagramValues>
</DiagramItem>
<DiagramItem x="2220" y="2330" z="-0.1" type="ADC Single" ID="5" color="#808080">
<diagramValues>
<diagramValue value="0" ID="4"/>
<diagramValue value="255" ID="7"/>
</diagramValues>
</DiagramItem>
</DiagramItems>
<Arrows>
<Arrow end-ID="1" end-Owner="0" start-x="140" start-y="0" start-Owner="1" ID="0" start-ID="3" end-x="-30" end-y="0" color="#808080">
<arrowCorners>
<arrowCorner x="2700" y="2440"/>
<arrowCorner x="2699.5" y="2539.5"/>
</arrowCorners>
</Arrow>
<Arrow end-ID="4" end-Owner="1" start-x="60" start-y="0" start-Owner="2" ID="1" start-ID="0" end-x="-120" end-y="0" color="#808080">
<arrowCorners>
<arrowCorner x="2340" y="2550"/>
<arrowCorner x="2340" y="2440"/>
</arrowCorners>
</Arrow>
<Arrow end-ID="12" end-Owner="1" start-x="110" start-y="20" start-Owner="5" ID="0" start-ID="8" end-x="-70" end-y="0" color="#000000"/>
<Arrow end-ID="14" end-Owner="2" start-x="60" start-y="0" start-Owner="1" ID="1" start-ID="13" end-x="-90" end-y="0" color="#000000"/>
<Arrow end-ID="14" end-Owner="3" start-x="30" start-y="20" start-Owner="4" ID="2" start-ID="15" end-x="-50" end-y="10" color="#000000"/>
</Arrows>
</Diagram>
<Test/>

BIN
Software/sie_cg/test1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 KiB