diff --git a/components/industrialstuff/Example/LEDNumberDemo/LEDNumberDemo.lpi b/components/industrialstuff/Example/LEDNumberDemo/LEDNumberDemo.lpi index 6b4be8da1..a38ba3518 100644 --- a/components/industrialstuff/Example/LEDNumberDemo/LEDNumberDemo.lpi +++ b/components/industrialstuff/Example/LEDNumberDemo/LEDNumberDemo.lpi @@ -15,7 +15,6 @@ - diff --git a/components/industrialstuff/Example/MultiSliderSample/main.lfm b/components/industrialstuff/Example/MultiSliderSample/main.lfm index 4c30fd5f5..37237704b 100644 --- a/components/industrialstuff/Example/MultiSliderSample/main.lfm +++ b/components/industrialstuff/Example/MultiSliderSample/main.lfm @@ -1,18 +1,18 @@ object Form1: TForm1 Left = 326 - Height = 396 + Height = 294 Top = 127 Width = 528 - Caption = 'Form1' - ClientHeight = 396 + Caption = 'MultiSlider Demo' + ClientHeight = 294 ClientWidth = 528 OnCreate = FormCreate - LCLVersion = '2.1.0.0' + LCLVersion = '2.3.0.0' object cbVertical: TCheckBox Left = 110 Height = 19 Top = 154 - Width = 59 + Width = 57 Caption = 'Vertical' OnChange = cbVerticalChange TabOrder = 0 @@ -21,7 +21,7 @@ object Form1: TForm1 Left = 110 Height = 19 Top = 177 - Width = 80 + Width = 78 Caption = 'AutoRotate' Checked = True OnChange = cbAutoRotateChange @@ -48,7 +48,7 @@ object Form1: TForm1 Left = 252 Height = 15 Top = 64 - Width = 48 + Width = 49 Caption = 'Max = 80' ParentColor = False end @@ -86,11 +86,13 @@ object Form1: TForm1 Left = 328 Height = 25 Top = 82 - Width = 120 + Width = 104 BorderWidth = 2 + ButtonColorAutoSize = False ButtonColorSize = 16 ButtonColor = clBlack Caption = 'Form' + Margin = 4 OnColorChanged = cbFormColorColorChanged end object cmbThumbStyle: TComboBox @@ -117,18 +119,20 @@ object Form1: TForm1 Left = 328 Height = 25 Top = 112 - Width = 120 + Width = 104 BorderWidth = 2 + ButtonColorAutoSize = False ButtonColorSize = 16 ButtonColor = clBlack Caption = 'Thumb' + Margin = 4 OnColorChanged = cbColorThumbColorChanged end object cbFlat: TCheckBox Left = 200 Height = 19 Top = 154 - Width = 39 + Width = 37 Caption = 'Flat' OnChange = cbFlatChange TabOrder = 3 @@ -145,7 +149,7 @@ object Form1: TForm1 Left = 280 Height = 15 Top = 181 - Width = 80 + Width = 79 Caption = 'Track thickness' ParentColor = False end @@ -169,7 +173,7 @@ object Form1: TForm1 Left = 110 Height = 19 Top = 128 - Width = 62 + Width = 60 Caption = 'Enabled' Checked = True OnChange = cbEnabledChange @@ -180,18 +184,20 @@ object Form1: TForm1 Left = 328 Height = 25 Top = 140 - Width = 120 + Width = 104 BorderWidth = 2 + ButtonColorAutoSize = False ButtonColorSize = 16 ButtonColor = clBlack Caption = 'Control' + Margin = 4 OnColorChanged = cbSliderColorColorChanged end object cbTransparent: TCheckBox Left = 200 Height = 19 Top = 128 - Width = 83 + Width = 80 Caption = 'Transparent' Checked = True OnChange = cbTransparentChange diff --git a/components/industrialstuff/Example/MultiSliderSample/main.pas b/components/industrialstuff/Example/MultiSliderSample/main.pas index 6cacfdaea..29fca977c 100644 --- a/components/industrialstuff/Example/MultiSliderSample/main.pas +++ b/components/industrialstuff/Example/MultiSliderSample/main.pas @@ -71,7 +71,7 @@ begin slider := TMultiSlider.Create(self); slider.Parent := self; slider.Align := alTop; - slider.BorderSpacing.Around := 8; + slider.BorderSpacing.Around := 16; // slider.Left := 8; // slider.Top := 8; slider.Vertical := false; diff --git a/components/industrialstuff/Example/u_industrial.lfm b/components/industrialstuff/Example/u_industrial.lfm index 1d3d08b28..75aa6d250 100644 --- a/components/industrialstuff/Example/u_industrial.lfm +++ b/components/industrialstuff/Example/u_industrial.lfm @@ -1,16 +1,16 @@ object Form1: TForm1 Left = 159 - Height = 223 + Height = 295 Top = 156 Width = 824 Caption = 'IndustrialStuff Example' - ClientHeight = 223 + ClientHeight = 295 ClientWidth = 824 - LCLVersion = '2.1.0.0' + LCLVersion = '2.3.0.0' object indLed1: TindLed - Left = 200 + Left = 168 Height = 35 - Top = 33 + Top = 32 Width = 34 LedValue = False Bevels = < @@ -36,7 +36,7 @@ object Form1: TForm1 ShapeLedColorDisabled = 13416 end object StopLightSensor1: TStopLightSensor - Left = 96 + Left = 32 Height = 59 Top = 24 Width = 25 @@ -54,10 +54,10 @@ object Form1: TForm1 State = slRED end object LEDNumber1: TLEDNumber - Left = 40 - Height = 28 - Top = 128 - Width = 177 + Left = 32 + Height = 30 + Top = 104 + Width = 170 Caption = 'Lazarus' end object AnalogSensor1: TAnalogSensor @@ -81,7 +81,6 @@ object Form1: TForm1 ColorRed = clYellow ColorYellow = clRed Value = 50 - ValueMin = 0 ValueMax = 100 ValueRed = 25 ValueYellow = 75 @@ -89,14 +88,13 @@ object Form1: TForm1 end object indGnouMeter1: TindGnouMeter Left = 440 - Height = 155 + Height = 202 Top = 13 Width = 120 Caption = 'Voltage' Value = 50 ParentColor = False SignalUnit = 'mV' - ValueMin = 0 ValueMax = 100 Digits = 0 Increment = 10 @@ -105,22 +103,12 @@ object Form1: TForm1 BarThickness = 6 MarkerColor = clBlue end - object Arrow1: TArrow - Left = 48 - Height = 20 - Top = 41 - Width = 20 - Constraints.MinHeight = 8 - Constraints.MinWidth = 8 - end object AdvLed1: TAdvLed - Left = 152 + Left = 104 Height = 24 Top = 40 Width = 24 Kind = lkYellowLight - State = lsOn - Blink = False end object A3nalogGauge1: TA3nalogGauge Left = 568 @@ -140,9 +128,9 @@ object Form1: TForm1 Position = 50 end object MultiSlider1: TMultiSlider - Left = 25 + Left = 144 Height = 35 - Top = 180 + Top = 240 Width = 504 ColorAbove = clRed ColorBelow = clYellow @@ -171,4 +159,15 @@ object Form1: TForm1 TabOrder = 3 Text = 'akVertical' end + object LCDDisplay1: TLCDDisplay + Left = 16 + Height = 61 + Top = 165 + Width = 320 + DisplayLineCount = 1 + Lines.Strings = ( + 'Lazarus' + ' ' + ) + end end diff --git a/components/industrialstuff/Example/u_industrial.pas b/components/industrialstuff/Example/u_industrial.pas index 766b87945..b071a31b2 100644 --- a/components/industrialstuff/Example/u_industrial.pas +++ b/components/industrialstuff/Example/u_industrial.pas @@ -6,8 +6,8 @@ interface uses Classes, SysUtils, FileUtil, IndLed, Sensors, LedNumber, IndGnouMeter, AdvLed, - A3nalogGauge, indSliders, Forms, Controls, Graphics, Dialogs, Arrow, ComCtrls, - StdCtrls; + A3nalogGauge, indSliders, indLCDDisplay, Forms, Controls, Graphics, Dialogs, + ComCtrls, StdCtrls; type @@ -17,10 +17,10 @@ type A3nalogGauge1: TA3nalogGauge; AdvLed1: TAdvLed; AnalogSensor1: TAnalogSensor; - Arrow1: TArrow; ComboBox1: TComboBox; indGnouMeter1: TindGnouMeter; indLed1: TindLed; + LCDDisplay1: TLCDDisplay; LEDNumber1: TLEDNumber; MultiSlider1: TMultiSlider; StopLightSensor1: TStopLightSensor; diff --git a/components/industrialstuff/screenshots/LEDNumberDemo.png b/components/industrialstuff/screenshots/LEDNumberDemo.png new file mode 100644 index 000000000..8f97cd39b Binary files /dev/null and b/components/industrialstuff/screenshots/LEDNumberDemo.png differ diff --git a/components/industrialstuff/screenshots/MultiSliderDemo.png b/components/industrialstuff/screenshots/MultiSliderDemo.png new file mode 100644 index 000000000..e75578a68 Binary files /dev/null and b/components/industrialstuff/screenshots/MultiSliderDemo.png differ diff --git a/components/industrialstuff/screenshots/ex_industrialstuff_2.png b/components/industrialstuff/screenshots/ex_industrialstuff_2.png new file mode 100644 index 000000000..3f2500442 Binary files /dev/null and b/components/industrialstuff/screenshots/ex_industrialstuff_2.png differ