R38 ExportWidth/ExportHeight

rmabout.lfm

@@ -1,12 +1,12 @@
 object AboutDialog: TAboutDialog
- Left = -1185
+ Left = 464
  Height = 313
- Top = 131
+ Top = 236
  Width = 600
  BorderStyle = bsDialog
  Caption = 'About'
- ClientHeight = 313
- ClientWidth = 600
+ ClientHeight = 0
+ ClientWidth = 0
  DesignTimePPI = 120
  LCLVersion = '2.0.10.0'
  object ProgramNameLabel: TLabel

rmabout.pas

@@ -8,7 +8,7 @@ interface
  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,lclintf;
 
 Const
- ProgramName ='Raster Master v1.0 Beta R37';
+ ProgramName ='Raster Master v1.0 Beta R38';
  ProgramLicense = 'Released under MIT License';
 
 type

rmcolorvga.lfm

@@ -1,7 +1,7 @@
 object RMVgaColorDialog: TRMVgaColorDialog
- Left = -760
+ Left = -1204
  Height = 348
- Top = 602
+ Top = 98
  Width = 512
  BorderStyle = bsDialog
  Caption = 'VGA Color'

rmexportprops.lfm

@@ -1,12 +1,12 @@
 object ImageExportForm: TImageExportForm
- Left = 74
- Height = 368
- Top = 408
- Width = 418
+ Left = 353
+ Height = 429
+ Top = 314
+ Width = 421
  BorderStyle = bsDialog
  Caption = 'Export Properties'
- ClientHeight = 0
- ClientWidth = 0
+ ClientHeight = 429
+ ClientWidth = 421
  DesignTimePPI = 120
  LCLVersion = '2.0.10.0'
  object EditName: TEdit
@@ -80,11 +80,11 @@ object ImageExportForm: TImageExportForm
  object Button1: TButton
  Left = 304
  Height = 31
- Top = 312
+ Top = 360
  Width = 94
  Caption = 'OK'
  OnClick = Button1Click
- TabOrder = 5
+ TabOrder = 7
  end
  object CompilerType: TLabel
  Left = 32
@@ -104,4 +104,40 @@ object ImageExportForm: TImageExportForm
  Style = csDropDownList
  TabOrder = 1
  end
+ object EditWidth: TEdit
+ Left = 104
+ Height = 28
+ Top = 272
+ Width = 48
+ MaxLength = 3
+ NumbersOnly = True
+ TabOrder = 5
+ Text = '0'
+ end
+ object WidthLabel: TLabel
+ Left = 53
+ Height = 20
+ Top = 272
+ Width = 40
+ Caption = 'Width'
+ ParentColor = False
+ end
+ object EditHeight: TEdit
+ Left = 104
+ Height = 28
+ Top = 312
+ Width = 48
+ MaxLength = 3
+ NumbersOnly = True
+ TabOrder = 6
+ Text = '0'
+ end
+ object HeightLabel: TLabel
+ Left = 48
+ Height = 20
+ Top = 312
+ Width = 45
+ Caption = 'Height'
+ ParentColor = False
+ end
 end

rmexportprops.pas

@@ -5,7 +5,8 @@
 interface
 
 uses
- Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,rmthumb,rwxgf2;
+ Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, MaskEdit,
+ rmthumb, rwxgf2;
 
 type
 
@@ -17,12 +18,16 @@ TImageExportForm = class(TForm)
  ComboCompiler: TComboBox;
  ComboMask: TComboBox;
  ComboPalette: TComboBox;
+ EditWidth: TEdit;
+ EditHeight: TEdit;
  EditName: TEdit;
  imageName: TLabel;
  ImageType: TLabel;
  CompilerType: TLabel;
  MaskType: TLabel;
  PaletteType: TLabel;
+ WidthLabel: TLabel;
+ HeightLabel: TLabel;
  ToggleBox1: TToggleBox;
  procedure Button1Click(Sender: TObject);
  procedure ComboCompilerChange(Sender: TObject);
@@ -280,6 +285,9 @@ procedure TImageExportForm.SetExportProps(props : ImageExportFormatRec);
  ComboImage.ItemIndex:=EO.Image;
  ComboMask.ItemIndex:=EO.mask;
  ComboPalette.ItemIndex:=EO.Palette;
+ EditWidth.Text:=IntToStr(props.Width);
+ EditHeight.Text:=IntToStr(props.Height);
+
  UpdateComboBoxes(ComboCompiler.ItemIndex);
 end;
 
@@ -290,6 +298,9 @@ procedure TImageExportForm.GetExportProps(var props : ImageExportFormatRec);
  props.Image:=ComboImage.ItemIndex;
  props.mask:=ComboMask.ItemIndex;
  props.Palette:=ComboPalette.ItemIndex;
+ props.Width:=StrToIntDef(EditWidth.Text,0);
+ props.Height:=StrToIntDef(EditHeight.Text,0);
+
 end;
 
 procedure TImageExportForm.InitComboBoxes;
@@ -329,6 +340,8 @@ procedure TImageExportForm.InitComboBoxes;
  ComboPalette.Items.Add('AmigaBASIC -4 Bit');
 
  ComboPalette.ItemIndex:=0;
+ EditWidth.Text:='0';
+ EditHeight.Text:='0';
 end;
 
 end.

rmthumb.pas

@@ -13,6 +13,8 @@
  Image : integer; // user - 0 = do not export, Image Format, 1 = PutImage format for most compiler
  Mask : integer; // user - 0 = do not export, 1 = Inverse mode - all black become white, all other colors become black
  Palette : integer; // user - 0 = do not export, 1 = EGA Index, 2 VGA, 3 Amiga RGB - will determine from palette mode in RM
+ Width : integer; // width overwrite - if not 0 use this value as width
+ Height : integer; // height overwrite - if not 0 use this value as height
  end;
 
  ImageThumbPropsRec = Packed Record
@@ -82,6 +84,9 @@
  function GetWidth(index : integer) : integer;
  function GetHeight(index : integer) : integer;
 
+ function GetExportWidth(index : integer) : integer;
+ function GetExportHeight(index : integer) : integer;
+
  procedure MakeThumbImage(index : integer;var imglist : TImageList;action : integer);
  procedure MakeThumbImageFromCore(index : integer;var imglist : TImageList;action : integer);
 
@@ -190,6 +195,9 @@ procedure TImageThumb.AddImage; //adds image to end of list
  //copy the Export props from the first thum image
  ImageMain[ImageCount-1].Props.ExportFormat:=ImageMain[0].Props.ExportFormat;
  ImageMain[ImageCount-1].Props.ExportFormat.Name:='Image'+IntToStr(ImageCount);
+
+// ImageMain[ImageCount-1].Props.ExportFormat.Width:=0;
+// ImageMain[ImageCount-1].Props.ExportFormat.Height:=0;
  end;
 end;
 
@@ -338,6 +346,7 @@ procedure TImageThumb.SetColor(index : integer;colorIndex : integer; var cr : TR
  ImageMain[index].Props.Palette[colorIndex].b:=cr.b;
 end;
 
+
 function TImageThumb.GetWidth(index : integer) : integer;
 begin
  GetWidth:=ImageMain[index].Props.Width;
@@ -348,6 +357,33 @@ function TImageThumb.GetHeight(index : integer) : integer;
  GetHeight:=ImageMain[index].Props.Height;
 end;
 
+
+//if there is a custom width property (not 0) and less then props width
+function TImageThumb.GetExportWidth(index : integer) : integer;
+var
+ width : integer;
+begin
+ Width:=ImageMain[index].Props.Width;
+ if (ImageMain[index].Props.ExportFormat.Width > 0) AND (ImageMain[index].Props.ExportFormat.Width < ImageMain[index].Props.Width) then
+ begin
+ Width:=ImageMain[index].Props.ExportFormat.Width;
+ end;
+ GetExportWidth:=Width;
+end;
+
+//if there is a custom height property (not 0) and less then props height
+function TImageThumb.GetExportHeight(index : integer) : integer;
+var
+ height : integer;
+begin
+ Height:=ImageMain[index].Props.Height;
+ if (ImageMain[index].Props.ExportFormat.Height > 0) AND (ImageMain[index].Props.ExportFormat.Height < ImageMain[index].Props.Height) then
+ begin
+ Height:=ImageMain[index].Props.ExportFormat.Height;
+ end;
+ GetExportHeight:=Height;
+end;
+
 procedure TImageThumb.GetExportOptions(index : integer;var EO : ImageExportFormatRec);
 begin
  EO:=ImageMain[index].Props.ExportFormat;
@@ -469,7 +505,7 @@ procedure TImageThumb.OpenProject(filename : string;insertmode : boolean);
  Blockread(F,head,sizeof(head));
 {$I+}
  if IORESULT <>0 then exit;
- if (head.sig='RMP') and (head.version=1) then
+ if (head.sig='RMP') and (head.version=2) then
  begin
  //delete all current images - use should be warn when oopening files
  count:=head.ImageCount;
@@ -508,8 +544,8 @@ procedure TImageThumb.SaveProject(filename : string);
  count:=GetCount;
 
  head.ImageCount:=count;
- head.SIG:='RMP'; // Raster Master Project
- head.version:=1;
+ head.SIG:='RMP';  // Raster Master Project
+ head.version:=2; // v2 introduced in R38 (added ExportWidth/ExportHieght), all previous up v37 were v1
  Blockwrite(F,head,sizeof(head));
  {$I+}
  if IORESULT <>0 then exit;

rres.pas

@@ -234,8 +234,8 @@ function GetRESPaletteSize(nColors,Lan,rgbFormat : integer) : longint;
  count:=ImageThumbBase.GetCount;
  for i:=0 to count-1 do
  begin
- width:=ImageThumbBase.GetWidth(i);
- height:=ImageThumbBase.GetHeight(i);
+ width:=ImageThumbBase.GetExportWidth(i);
+ height:=ImageThumbBase.GetExportHeight(i);
  ImageThumbBase.GetExportOptions(i,EO);
  SetThumbIndex(i); //important - otherwise the GetMaxColor and GetPixel functions will not get the right data
 
@@ -376,8 +376,8 @@ function GetRESPaletteSize(nColors,Lan,rgbFormat : integer) : longint;
  begin
  ImageThumbBase.GetExportOptions(i,EO);
 
- width:=ImageThumbBase.GetWidth(i);
- height:=ImageThumbBase.GetHeight(i);
+ width:=ImageThumbBase.GetExportWidth(i);
+ height:=ImageThumbBase.GetExportHeight(i);
  nColors:=ImageThumbBase.GetMaxColor(i)+1;
  Size:=GetRESImageSize(width,height,nColors,EO.Lan,EO.Image);
 
@@ -454,8 +454,8 @@ function GetRESPaletteSize(nColors,Lan,rgbFormat : integer) : longint;
  //convert and dump image
  for i:=0 to count-1 do
  begin
- width:=ImageThumbBase.GetWidth(i);
- height:=ImageThumbBase.GetHeight(i);
+ width:=ImageThumbBase.GetExportWidth(i);
+ height:=ImageThumbBase.GetExportHeight(i);
  ImageThumbBase.GetExportOptions(i,EO);
  SetThumbIndex(i); //important - otherwise the GetMaxColor and GetPixel functions will not get the right data