Skip to content

Commit 8ecd7ea

Browse files
penavonpenavon
committed
Get ready for release 3.0.3
1 parent 0b71a5f commit 8ecd7ea

13 files changed

+361
-68
lines changed

‎RhodusIDE/Win32/Debug/rhodusIDE.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ Width=2199
66
[memoOutput]
77
Top=4
88
Left=1
9-
Width=1464
9+
Width=1276
1010
Height=262
1111
[synEditor]
1212
Top=1
1313
Left=1
14-
Width=1466
14+
Width=1278
1515
Height=937
1616
[pnlRight]
1717
Top=86
18-
Left=1779
19-
Width=412
18+
Left=1591
19+
Width=600
2020
Height=1269
2121
[pnlInfo]
2222
Top=580
2323
Left=1
24-
Width=410
24+
Width=598
2525
Height=688
2626
[pnlDrawing]
2727
Top=1
2828
Left=1
29-
Width=408
29+
Width=596
3030
Height=574
3131
[pnlLeftPanel]
3232
Top=86

‎RhodusIDE/Win32/Release/rhodusIDE.ini

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[MainForm]
2+
Top=333
3+
Left=820
4+
Height=1434
5+
Width=2199
6+
[memoOutput]
7+
Top=4
8+
Left=1
9+
Width=1276
10+
Height=262
11+
[synEditor]
12+
Top=1
13+
Left=1
14+
Width=1278
15+
Height=937
16+
[pnlRight]
17+
Top=86
18+
Left=1591
19+
Width=600
20+
Height=1269
21+
[pnlInfo]
22+
Top=580
23+
Left=1
24+
Width=598
25+
Height=688
26+
[pnlDrawing]
27+
Top=1
28+
Left=1
29+
Width=596
30+
Height=574
31+
[pnlLeftPanel]
32+
Top=86
33+
Left=0
34+
Width=300
35+
Height=1269
36+
[FontPreferences]
37+
fontSize=15
38+
fontName=Consolas
39+
[IDE]
40+
theme=Calypso SE

‎RhodusIDE/rhodusIDE.dproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectVersion>19.3</ProjectVersion>
55
<FrameworkType>VCL</FrameworkType>
66
<Base>True</Base>
7-
<Config Condition="'$(Config)'==''">Debug</Config>
7+
<Config Condition="'$(Config)'==''">Release</Config>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<TargetedPlatforms>1</TargetedPlatforms>
1010
<AppType>Application</AppType>
@@ -984,9 +984,9 @@
984984
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
985985
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
986986
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
987+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
987988
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
988989
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
989-
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
990990
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
991991
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
992992
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

‎RhodusIDE/rhodusIDE.res

0 Bytes
Binary file not shown.

‎RhodusIDE/ufMain.dfm

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,8 @@ object frmMain: TfrmMain
421421
' forward (200)'
422422
' heading = heading + 150 '
423423
'end')
424-
ExplicitLeft = 468
425-
ExplicitTop = 336
426-
ExplicitWidth = 300
427-
ExplicitHeight = 225
424+
ExplicitWidth = 869
425+
ExplicitHeight = 661
428426
end
429427
end
430428
object pnlRight: TPanel

‎Rhodus_Version_3/RhodusVersionThreeProject.dproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<FrameworkType>None</FrameworkType>
66
<MainSource>RhodusVersionThreeProject.dpr</MainSource>
77
<Base>True</Base>
8-
<Config Condition="'$(Config)'==''">Debug</Config>
8+
<Config Condition="'$(Config)'==''">Release</Config>
99
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1010
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Console</AppType>
@@ -161,9 +161,8 @@
161161
<DCC_AssertionsAtRuntime>false</DCC_AssertionsAtRuntime>
162162
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
163163
<VerInfo_MajorVer>3</VerInfo_MajorVer>
164-
<VerInfo_Release>1</VerInfo_Release>
165-
<VerInfo_Build>2</VerInfo_Build>
166-
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=3.0.1.2;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
164+
<VerInfo_Release>3</VerInfo_Release>
165+
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=3.0.3.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
167166
</PropertyGroup>
168167
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
169168
<DCC_DcuOutput>.\$(Platform)\$(Config)\dcu</DCC_DcuOutput>

‎Rhodus_Version_3/RhodusVersionThreeProject.res

0 Bytes
Binary file not shown.

‎Rhodus_Version_3/SampleScripts/plotBarGraph.rh

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
import graphics
2+
import math
3+
import random
4+
import time
5+
6+
p = graphics.size()
7+
width = p[0]; height = p[1];
8+
9+
xmin = 0; xmax = 10
10+
ymin = 0; ymax = 10
11+
12+
axiswidth = width - 180
13+
leftEdge = 100
14+
15+
axisheight = height - 150
16+
bottomEdge = 80
17+
18+
function fx (x)
19+
return leftEdge + math.round(axiswidth * (x - xmin) / (xmax - xmin));
20+
end
21+
22+
function fy (y)
23+
return (height - math.round(axisheight * (y - ymin) / (ymax - ymin))) - bottomEdge;
24+
end
25+
26+
27+
function funcToScreen(x, y)
28+
result = [0,0]
29+
result[0] = leftEdge + math.round(axiswidth * (x - xmin) / (xmax - xmin));
30+
result[1] = (height - math.round(axisheight * (y - ymin) / (ymax - ymin))) - bottomEdge;
31+
return result
32+
end
33+
34+
function moveto (x, y)
35+
result = funcToScreen (x, y)
36+
graphics.moveto (result[0], result[1])
37+
end
38+
39+
function lineto (x, y)
40+
result = funcToScreen (x, y)
41+
graphics.lineto (result[0], result[1])
42+
end
43+
44+
function drawAxes()
45+
start = funcToScreen (xmin, ymin)
46+
finish = funcToScreen (xmax, ymin)
47+
graphics.moveto(start[0], start[1])
48+
graphics.lineto(finish[0],finish[1])
49+
50+
start = funcToScreen (xmin, ymin)
51+
finish = funcToScreen (xmin, ymax)
52+
graphics.moveto(start[0], start[1])
53+
graphics.lineto(finish[0],finish[1])
54+
55+
startx = xmin
56+
hstep = (xmax - xmin)/10
57+
for i = 1 to 10 do
58+
start = funcToScreen (startx, ymin)
59+
graphics.moveto(start[0], start[1])
60+
graphics.lineto(start[0], start[1]+10)
61+
startx = startx + hstep
62+
end
63+
64+
starty = ymin
65+
hstep = (ymax - ymin)/10
66+
for i = 1 to 10 do
67+
start = funcToScreen (xmin, starty)
68+
graphics.moveto(start[0], start[1])
69+
graphics.lineto(start[0]-10, start[1])
70+
starty = starty + hstep
71+
end
72+
end
73+
74+
function drawPoint (x, y)
75+
pts = funcToScreen (x, y)
76+
graphics.fillellipse (pts[0]-3, pts[1]-3, 6, 6)
77+
end
78+
79+
graphics.clear()
80+
81+
graphics.beginupdate()
82+
graphics.brushcolor (255,255,255)
83+
graphics.penwidth (2)
84+
drawAxes()
85+
86+
y = []; npoints = 30
87+
for j = 1 to 30 do
88+
t0 = time.getTickCount()
89+
for i = 1 to 100000 do
90+
a = 2.3 + 3.4
91+
end
92+
y.append (time.getTickCount() - t0);
93+
end
94+
95+
barWidth = 10
96+
barSpacing = axiswidth / npoints
97+
itemX = leftEdge + barSpacing / 2
98+
99+
graphics.pencolor ("thistle")
100+
bottomEdge = fy (0)
101+
for i = 0 to npoints - 1 do
102+
x1 = itemX - barWidth / 2;
103+
y1 = bottomEdge - y[i] / 120 * axisheight;
104+
x2 = itemX + barWidth / 2;
105+
y2 = bottomEdge - 1;
106+
graphics.fillrect (x1, y1, x2-x1, y2-y1)
107+
108+
itemX = itemX + barSpacing;
109+
end
110+
111+
graphics.endupdate()
112+
113+
114+

‎Rhodus_Version_3/SampleScripts/plotfunction.rh

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
import graphics
2+
import math
3+
import random
4+
5+
p = graphics.size()
6+
width = p[0]; height = p[1];
7+
8+
xmin = 0; xmax = 10
9+
ymin = 0; ymax = 10
10+
11+
axiswidth = width - 180
12+
leftEdge = 100
13+
14+
axisheight = height - 150
15+
bottomEdge = 80
16+
17+
function funcToScreen(x, y)
18+
result = [0,0]
19+
result[0] = leftEdge + math.round(axiswidth * (x - xmin) / (xmax - xmin));
20+
result[1] = (height - math.round(axisheight * (y - ymin) / (ymax - ymin))) - bottomEdge;
21+
return result
22+
end
23+
24+
function moveto (x, y)
25+
result = funcToScreen (x, y)
26+
graphics.moveto (result[0], result[1])
27+
end
28+
29+
function lineto (x, y)
30+
result = funcToScreen (x, y)
31+
graphics.lineto (result[0], result[1])
32+
end
33+
34+
function drawAxes()
35+
start = funcToScreen (xmin, ymin)
36+
finish = funcToScreen (xmax, ymin)
37+
graphics.moveto(start[0], start[1])
38+
graphics.lineto(finish[0],finish[1])
39+
40+
start = funcToScreen (xmin, ymin)
41+
finish = funcToScreen (xmin, ymax)
42+
graphics.moveto(start[0], start[1])
43+
graphics.lineto(finish[0],finish[1])
44+
45+
startx = xmin
46+
hstep = (xmax - xmin)/10
47+
for i = 1 to 10 do
48+
start = funcToScreen (startx, ymin)
49+
graphics.moveto(start[0], start[1])
50+
graphics.lineto(start[0], start[1]+10)
51+
startx = startx + hstep
52+
end
53+
54+
starty = ymin
55+
hstep = (ymax - ymin)/10
56+
for i = 1 to 10 do
57+
start = funcToScreen (xmin, starty)
58+
graphics.moveto(start[0], start[1])
59+
graphics.lineto(start[0]-10, start[1])
60+
starty = starty + hstep
61+
end
62+
end
63+
64+
function drawFunction (fcn, lower, upper)
65+
x = lower
66+
moveto (x, 2 + fcn (x))
67+
while x < upper do
68+
x = x + 0.3
69+
lineto (x, 2 + fcn (x))
70+
end
71+
end;
72+
73+
function drawPoint (x, y)
74+
pts = funcToScreen (x, y)
75+
graphics.fillellipse (pts[0]-3, pts[1]-3, 6, 6)
76+
end
77+
78+
graphics.clear()
79+
80+
graphics.beginupdate()
81+
graphics.brushcolor (255,255,255)
82+
graphics.penwidth (2)
83+
drawAxes()
84+
drawFunction (math.sin, 0, 10)
85+
graphics.penwidth (2)
86+
graphics.pencolor (40,40,0)
87+
88+
npoints = 60
89+
x = [0]; y = [random.random()*7]
90+
for i = 1 to npoints do
91+
x.append (i/6); y.append (random.random()*7)
92+
end
93+
94+
graphics.pencolor (150,30,190)
95+
moveto (x[0], y[0])
96+
for i = 1 to npoints do
97+
lineto (x[i],y[i])
98+
end
99+
100+
graphics.pencolor (0,0,230)
101+
for i = 0 to npoints do
102+
drawPoint (x[i],y[i])
103+
end
104+
graphics.endupdate()
105+
106+
107+

‎Rhodus_Version_3/uBuiltInConfig.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ interface
1414
Uses SysUtils, Classes, uLibModule, System.Diagnostics;
1515

1616
const
17-
RHODUS_VERSION : AnsiString = '3.0.2.2';
17+
RHODUS_VERSION : AnsiString = '3.0.3.0';
1818

1919
type
2020
TBuiltInConfig= class (TModuleLib)

0 commit comments

Comments
 (0)