Thread: [Pikloops-svn] SF.net SVN: pikloops: [134] prog/trunk/src/mainwidgetpl.cpp
Brought to you by:
dionysos-sf
Menu
▾
▴
pikloops-svn
|
From: <dio...@us...> - 2007-10-09 17:37:38
|
Revision: 134
http://pikloops.svn.sourceforge.net/pikloops/?rev=134&view=rev
Author: dionysos-sf
Date: 2007-10-09 10:37:40 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
Typo in generated code
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-09 17:31:15 UTC (rev 133)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-09 17:37:40 UTC (rev 134)
@@ -131,16 +131,16 @@
tmpCode += QString(i18n("\tmovwf \tCounterA\n\n"));
tmpCode += loopName ;
tmpCode += "\n" ;
- tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
if (loopValues->getCounterB()!=-1) {
- tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
}
if (loopValues->getCounterC()!=-1) {
- tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
}
if (loopValues->getCounterD()!=-1) {
- tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1 \n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:37:27
|
Revision: 137
http://pikloops.svn.sourceforge.net/pikloops/?rev=137&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:37:31 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Some cleanup
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:30:14 UTC (rev 136)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:37:31 UTC (rev 137)
@@ -53,8 +53,9 @@
QHGroupBox *grinput = new QHGroupBox(i18n("Input data") , this) ;
new QLabel(i18n("Frequency (MHz)"), grinput) ;
clock = new QComboBox(grinput) ;
- static const char* items[] = { "1.000000", "2.000000", "4.000000","8.000000", "10.000000", "16.000000",
- "20.000000", "24.000000", "32.000000","40.000000",0};
+ static const char* items[] = { "1.000000", "2.000000", "4.000000", "8.000000",
+ "10.000000", "16.000000", "20.000000", "24.000000",
+ "32.000000", "40.000000", 0};
clock->insertStrList( items );
clock->setEditable(true) ;
clock->setCurrentItem(6) ;
@@ -73,7 +74,7 @@
CodeText->setReadOnly(true);
cycles = new QLabel(statusMessage
- .arg(loopValues->getTimeDelay(),0,'f',8)
+ .arg(loopValues->getTimeDelay(),0,'f',8)
.arg((loopValues->getMachineCycles()),0,'f',0) , groutput ) ;
connect(clock, SIGNAL(activated(const QString &)), this, SLOT(ClockChanged(const QString &)));
@@ -96,7 +97,6 @@
*/
void MainWidgetPL::refreshWidget()
{
-
// set label names
QString routineName = i18n("delay_") ;
routineName += delay->text() ;
@@ -114,15 +114,15 @@
tmpCode += routineName ;
tmpCode += "\n" ;
- if (loopValues->getCounterD()!=-1) {
+ if ( loopValues->getCounterD() != -1 ) {
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
}
- if (loopValues->getCounterC()!=-1) {
+ if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
}
- if (loopValues->getCounterB()!=-1) {
+ if ( loopValues->getCounterB() !=-1 ) {
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
}
@@ -133,17 +133,18 @@
tmpCode += "\n" ;
tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
- if (loopValues->getCounterB()!=-1) {
+ if ( loopValues->getCounterB() != -1 ) {
tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
}
- if (loopValues->getCounterC()!=-1) {
+ if ( loopValues->getCounterC() !=-1 ) {
tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
}
- if (loopValues->getCounterD()!=-1) {
+ if ( loopValues->getCounterD() !=-1 ) {
tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
+ tmpCode += "\n" ;
// update status line
cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
@@ -160,9 +161,7 @@
void MainWidgetPL::setValues()
{
loopValues->setClockFrequency(clock->currentText().toDouble());
-
loopValues->setTimeDelay(delay->text().toDouble());
-
loopValues->Refresh();
refreshWidget();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:39:45
|
Revision: 138
http://pikloops.svn.sourceforge.net/pikloops/?rev=138&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:39:48 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Default frequency is 4MHz
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:37:31 UTC (rev 137)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:39:48 UTC (rev 138)
@@ -43,7 +43,7 @@
: QVBox(parent, name)
{
QFont LabelFont;
- loopValues = new PiKDelay(20.00, 1.00);
+ loopValues = new PiKDelay(4.00, 1.00);
statusMessage = i18n("Actual delay: %1 s (%2 clock cycles).") ;
setSpacing(3) ;
@@ -58,7 +58,7 @@
"32.000000", "40.000000", 0};
clock->insertStrList( items );
clock->setEditable(true) ;
- clock->setCurrentItem(6) ;
+ clock->setCurrentItem(2) ;
QToolTip::add(clock,i18n("Select a standard device clock, or type a custom clock frequency.")) ;
(new QHBox(grinput))->setMinimumWidth(40) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:53:35
|
Revision: 139
http://pikloops.svn.sourceforge.net/pikloops/?rev=139&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:53:40 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
More cleanup
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:39:48 UTC (rev 138)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:53:40 UTC (rev 139)
@@ -115,16 +115,16 @@
tmpCode += "\n" ;
if ( loopValues->getCounterD() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
+ tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
+ tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
}
if ( loopValues->getCounterC() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
+ tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
+ tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
}
if ( loopValues->getCounterB() !=-1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
+ tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
}
tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterA(),0,10);
@@ -134,13 +134,13 @@
tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
if ( loopValues->getCounterB() != -1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
}
if ( loopValues->getCounterC() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
}
if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:56:23
|
Revision: 140
http://pikloops.svn.sourceforge.net/pikloops/?rev=140&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:56:26 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Remove useless white space in assembler code line
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:53:40 UTC (rev 139)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:56:26 UTC (rev 140)
@@ -115,32 +115,32 @@
tmpCode += "\n" ;
if ( loopValues->getCounterD() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterD\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterD(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterD\n"));
}
if ( loopValues->getCounterC() != -1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterC\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterC\n"));
}
if ( loopValues->getCounterB() !=-1 ) {
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterB\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterB\n"));
}
- tmpCode += QString("\tmovlw \tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString(i18n("\tmovwf \tCounterA\n\n"));
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString(i18n("\tmovwf\tCounterA\n\n"));
tmpCode += loopName ;
tmpCode += "\n" ;
- tmpCode += QString(i18n("\tdecfsz \tCounterA,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterA,1\n\tgoto\t%1\n")).arg(loopName);
if ( loopValues->getCounterB() != -1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterB,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterB,1\n\tgoto\t%1\n")).arg(loopName);
}
if ( loopValues->getCounterC() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterC,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterC,1\n\tgoto\t%1\n")).arg(loopName);
}
if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz \tCounterD,1\n\tgoto \t%1\n")).arg(loopName);
+ tmpCode += QString(i18n("\tdecfsz\tCounterD,1\n\tgoto\t%1\n")).arg(loopName);
}
tmpCode += QString("\treturn");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 14:57:04
|
Revision: 141
http://pikloops.svn.sourceforge.net/pikloops/?rev=141&view=rev
Author: dionysos-sf
Date: 2007-10-11 07:57:08 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Simplify string
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:56:26 UTC (rev 140)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:57:08 UTC (rev 141)
@@ -143,8 +143,7 @@
tmpCode += QString(i18n("\tdecfsz\tCounterD,1\n\tgoto\t%1\n")).arg(loopName);
}
- tmpCode += QString("\treturn");
- tmpCode += "\n" ;
+ tmpCode += QString("\treturn\n");
// update status line
cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 15:05:58
|
Revision: 142
http://pikloops.svn.sourceforge.net/pikloops/?rev=142&view=rev
Author: dionysos-sf
Date: 2007-10-11 08:06:01 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Don't localize PIC instructions
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 14:57:08 UTC (rev 141)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 15:06:01 UTC (rev 142)
@@ -116,31 +116,47 @@
if ( loopValues->getCounterD() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterD(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterD\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterD"));
+ tmpCode += "\n";
}
if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterC\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += "\n";
}
if ( loopValues->getCounterB() !=-1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterB\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += "\n";
}
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString(i18n("\tmovwf\tCounterA\n\n"));
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n\n";
tmpCode += loopName ;
tmpCode += "\n" ;
- tmpCode += QString(i18n("\tdecfsz\tCounterA,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
if ( loopValues->getCounterB() != -1 ) {
- tmpCode += QString(i18n("\tdecfsz\tCounterB,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
if ( loopValues->getCounterC() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz\tCounterC,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
if ( loopValues->getCounterD() !=-1 ) {
- tmpCode += QString(i18n("\tdecfsz\tCounterD,1\n\tgoto\t%1\n")).arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterD"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
}
tmpCode += QString("\treturn\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-11 15:07:38
|
Revision: 143
http://pikloops.svn.sourceforge.net/pikloops/?rev=143&view=rev
Author: dionysos-sf
Date: 2007-10-11 08:07:42 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
Harmonious code
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-11 15:06:01 UTC (rev 142)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-11 15:07:42 UTC (rev 143)
@@ -133,15 +133,17 @@
tmpCode += "\n";
}
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ if ( loopValues->getCounterA() !=-1 ) {
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterA"));
tmpCode += "\n\n";
- tmpCode += loopName ;
- tmpCode += "\n" ;
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
tmpCode += QString("\tdecfsz\t");
tmpCode += QString(i18n("CounterA"));
tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ }
if ( loopValues->getCounterB() != -1 ) {
tmpCode += QString("\tdecfsz\t");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-17 09:00:26
|
Revision: 157
http://pikloops.svn.sourceforge.net/pikloops/?rev=157&view=rev
Author: dionysos-sf
Date: 2007-10-17 02:00:28 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Fix compile time error
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-16 15:25:41 UTC (rev 156)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-17 09:00:28 UTC (rev 157)
@@ -136,10 +136,7 @@
tmpCode += QString(i18n("The lowest delay you can get have to be greater than %1s").arg(minDelay,0,'f',8)) ;
}
}
- else {
-
-
- if ( loopValues->getCounterC() != -1 ) {
+ else if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterC"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-17 11:34:47
|
Revision: 167
http://pikloops.svn.sourceforge.net/pikloops/?rev=167&view=rev
Author: dionysos-sf
Date: 2007-10-17 04:34:51 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Fix compile time error
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-17 11:31:36 UTC (rev 166)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-17 11:34:51 UTC (rev 167)
@@ -136,7 +136,8 @@
tmpCode += QString(i18n("The lowest delay you can get have to be greater than %1s").arg(minDelay,0,'f',8)) ;
}
}
- else if ( loopValues->getCounterC() != -1 ) {
+ else {
+ if ( loopValues->getCounterC() != -1 ) {
tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
tmpCode += QString("\tmovwf\t");
tmpCode += QString(i18n("CounterC"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dio...@us...> - 2007-10-17 11:36:38
|
Revision: 168
http://pikloops.svn.sourceforge.net/pikloops/?rev=168&view=rev
Author: dionysos-sf
Date: 2007-10-17 04:36:43 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Indentation
Modified Paths:
--------------
prog/trunk/src/mainwidgetpl.cpp
Modified: prog/trunk/src/mainwidgetpl.cpp
===================================================================
--- prog/trunk/src/mainwidgetpl.cpp 2007-10-17 11:34:51 UTC (rev 167)
+++ prog/trunk/src/mainwidgetpl.cpp 2007-10-17 11:36:43 UTC (rev 168)
@@ -137,73 +137,73 @@
}
}
else {
- if ( loopValues->getCounterC() != -1 ) {
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterC"));
- tmpCode += "\n";
- tmpCode += loopName ;
- tmpCode += "\n" ;
- tmpCode += QString("\tcall\t");
- tmpCode += subRoutineName ;
- tmpCode += "\n" ;
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterC"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
- tmpCode += QString("\treturn\n");
- tmpCode += "\n" ;
- tmpCode += subRoutineName ;
- tmpCode += "\n" ;
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterB"));
- tmpCode += "\n";
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterA"));
- tmpCode += "\n";
- tmpCode += loopSubRoutineName ;
- tmpCode += "\n" ;
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterA"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopSubRoutineName);
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterB"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopSubRoutineName);
- tmpCode += QString("\treturn\n");
+ if ( loopValues->getCounterC() != -1 ) {
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterC(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += "\n";
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tcall\t");
+ tmpCode += subRoutineName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterC"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\treturn\n");
+ tmpCode += "\n" ;
+ tmpCode += subRoutineName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += "\n";
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n";
+ tmpCode += loopSubRoutineName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopSubRoutineName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopSubRoutineName);
+ tmpCode += QString("\treturn\n");
+ }
+ else if ( loopValues->getCounterB() !=-1 ) {
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += "\n";
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n";
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterB"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\treturn\n");
+ }
+ else if ( loopValues->getCounterA() !=-1 ) {
+ tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
+ tmpCode += QString("\tmovwf\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += "\n";
+ tmpCode += loopName ;
+ tmpCode += "\n" ;
+ tmpCode += QString("\tdecfsz\t");
+ tmpCode += QString(i18n("CounterA"));
+ tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
+ tmpCode += QString("\treturn\n");
+ }
}
- else if ( loopValues->getCounterB() !=-1 ) {
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterB(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterB"));
- tmpCode += "\n";
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterA"));
- tmpCode += "\n";
- tmpCode += loopName ;
- tmpCode += "\n" ;
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterA"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterB"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
- tmpCode += QString("\treturn\n");
- }
- else if ( loopValues->getCounterA() !=-1 ) {
- tmpCode += QString("\tmovlw\tD'%1'\n").arg(loopValues->getCounterA(),0,10);
- tmpCode += QString("\tmovwf\t");
- tmpCode += QString(i18n("CounterA"));
- tmpCode += "\n";
- tmpCode += loopName ;
- tmpCode += "\n" ;
- tmpCode += QString("\tdecfsz\t");
- tmpCode += QString(i18n("CounterA"));
- tmpCode += QString(",1\n\tgoto\t%1\n").arg(loopName);
- tmpCode += QString("\treturn\n");
- }
- }
// update status line
cycles->setText(statusMessage.arg(loopValues->getTimeDelay(),0,'f',8)
.arg((loopValues->getMachineCycles()),0,'f',0) ) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X