From 97c4a0f9e6801bba02d87b2daeab9efac97b9fc2 Mon Sep 17 00:00:00 2001 From: Dadido3 Date: Tue, 6 Jan 2015 19:07:43 +0100 Subject: [PATCH] Bugfixes - Object_Editor: Fixed writing at the end of data - Object_View2D: Added standard configuration --- D3hex.pbp | 20 +++++++++---------- Includes/Object/Dummy/Object_Dummy.pbi | 5 ++--- Includes/Object/Editor/Object_Editor.pbi | 17 ++++++++++------ Includes/Object/View2D/Object_View2D.pbi | 7 +++++-- .../Object/View2D/Object_View2D_Settings.pbi | 7 +++++-- Main.pb | 10 +++++++--- 6 files changed, 40 insertions(+), 26 deletions(-) diff --git a/D3hex.pbp b/D3hex.pbp index ce78158..c3f3bd3 100644 --- a/D3hex.pbp +++ b/D3hex.pbp @@ -7,7 +7,7 @@
- +
@@ -56,11 +56,11 @@ - + - + @@ -108,11 +108,11 @@ - + - + @@ -136,7 +136,7 @@ - +
@@ -147,8 +147,8 @@ Data\Images\Icon.ico - - + + @@ -163,8 +163,8 @@ Data\Images\Icon.ico - - + + diff --git a/Includes/Object/Dummy/Object_Dummy.pbi b/Includes/Object/Dummy/Object_Dummy.pbi index 5d81479..bfd3c5c 100644 --- a/Includes/Object/Dummy/Object_Dummy.pbi +++ b/Includes/Object/Dummy/Object_Dummy.pbi @@ -262,7 +262,6 @@ Procedure Object_Dummy_Set_Data(*Object_Output.Object_Output, Position.q, Size.i ProcedureReturn #False EndIf - ; #### Reallocate if the operation increases the size of the object (Todo) Temp_Size = Position + Size - *Object_Dummy\Raw_Data_Size If Temp_Size > 0 @@ -376,8 +375,8 @@ EndIf ; IDE Options = PureBasic 5.31 (Windows - x64) -; CursorPosition = 254 -; FirstLine = 225 +; CursorPosition = 203 +; FirstLine = 203 ; Folding = -- ; EnableUnicode ; EnableXP \ No newline at end of file diff --git a/Includes/Object/Editor/Object_Editor.pbi b/Includes/Object/Editor/Object_Editor.pbi index c345e7c..595db76 100644 --- a/Includes/Object/Editor/Object_Editor.pbi +++ b/Includes/Object/Editor/Object_Editor.pbi @@ -1452,6 +1452,7 @@ Procedure Object_Editor_Write_Nibble(*Object.Object, Char.a, Abort.i=#False) Protected Select_Start.q, Select_Length.q Protected Result = #False Protected Temp_Char.a + Protected Found ; #### Determine the start and length of the selected range If *Object_Editor\Select_Start < *Object_Editor\Select_End @@ -1488,10 +1489,14 @@ Procedure Object_Editor_Write_Nibble(*Object.Object, Char.a, Abort.i=#False) If *Object_Editor\Select_Nibble If Object_Input_Get_Data(FirstElement(*Object\Input()), Select_Start, 1, @Temp_Char, #Null) - If *Object_Editor\Temp_Nibble - Temp_Char & $0F - Temp_Char | *Object_Editor\Temp_Nibble_Value << 4 - EndIf + Found = #True + EndIf + If *Object_Editor\Temp_Nibble + Temp_Char & $0F + Temp_Char | *Object_Editor\Temp_Nibble_Value << 4 + Found = #True + EndIf + If Found Temp_Char & $F0 Temp_Char | Char Result = Object_Input_Set_Data(FirstElement(*Object\Input()), Select_Start, 1, @Temp_Char) @@ -2413,8 +2418,8 @@ MenuItem(#Object_Editor_PopupMenu_Select_All, "Select All", ImageID(Icon_Select_ ; IDE Options = PureBasic 5.31 (Windows - x64) -; CursorPosition = 663 -; FirstLine = 621 +; CursorPosition = 1493 +; FirstLine = 1481 ; Folding = ------- ; EnableUnicode ; EnableXP \ No newline at end of file diff --git a/Includes/Object/View2D/Object_View2D.pbi b/Includes/Object/View2D/Object_View2D.pbi index cfe2ac4..6e8caa7 100644 --- a/Includes/Object/View2D/Object_View2D.pbi +++ b/Includes/Object/View2D/Object_View2D.pbi @@ -203,6 +203,9 @@ Procedure Object_View2D_Create(Requester) *Object_View2D_Input = *Object_Input\Custom_Data *Object_View2D_Input\D3HT_Chunk = D3HT_Create(SizeOf(Object_View2D_Input_Chunk_ID), SizeOf(Integer), 65536) + *Object_View2D_Input\Pixel_Format = #PixelFormat_24_BGR + *Object_View2D_Input\Bits_Per_Pixel = 24 + *Object_View2D_Input\Width = 1024 ProcedureReturn *Object EndProcedure @@ -1338,7 +1341,7 @@ DataSection Object_View2D_Icon_Normalize: : IncludeBinary "../../../Data/Icons/Graph_Normalize.png" EndDataSection ; IDE Options = PureBasic 5.31 (Windows - x64) -; CursorPosition = 1318 -; FirstLine = 1298 +; CursorPosition = 205 +; FirstLine = 175 ; Folding = ---- ; EnableXP \ No newline at end of file diff --git a/Includes/Object/View2D/Object_View2D_Settings.pbi b/Includes/Object/View2D/Object_View2D_Settings.pbi index fc19ea0..347e575 100644 --- a/Includes/Object/View2D/Object_View2D_Settings.pbi +++ b/Includes/Object/View2D/Object_View2D_Settings.pbi @@ -337,6 +337,9 @@ Procedure Object_View2D_Settings_Window_Event_Button_In_Add() *Object_View2D_Input = *Object_Input\Custom_Data *Object_View2D_Input\D3HT_Chunk = D3HT_Create(SizeOf(Object_View2D_Input_Chunk_ID), SizeOf(Integer), 65536) + *Object_View2D_Input\Pixel_Format = #PixelFormat_24_BGR + *Object_View2D_Input\Bits_Per_Pixel = 24 + *Object_View2D_Input\Width = 1024 *Object_View2D_Settings\Update_ListIcon = #True *Object_View2D\Redraw = #True @@ -576,7 +579,7 @@ EndProcedure ; IDE Options = PureBasic 5.31 (Windows - x64) -; CursorPosition = 292 -; FirstLine = 256 +; CursorPosition = 341 +; FirstLine = 307 ; Folding = -- ; EnableXP \ No newline at end of file diff --git a/Main.pb b/Main.pb index 8715135..ee04f32 100644 --- a/Main.pb +++ b/Main.pb @@ -138,6 +138,10 @@ ; - Object descriptor changed To NBT ; - Object_Editor: limited marked output To selection ; - Object_Random: limited output To size +; +; - V0.941 (06.01.2015) +; - Object_Editor: Fixed writing at the end of data +; - Object_View2D: Added standard configuration ; ; ##################################################### Begin ####################################################### @@ -157,7 +161,7 @@ XIncludeFile "Includes/UnitEngine.pbi" ; ##################################################### Constants ################################################### -#Version = 0940 +#Version = 0941 Enumeration #Data_Raw @@ -875,8 +879,8 @@ DataSection EndDataSection ; IDE Options = PureBasic 5.31 (Windows - x64) -; CursorPosition = 129 -; FirstLine = 108 +; CursorPosition = 143 +; FirstLine = 123 ; Folding = -- ; EnableUnicode ; EnableXP \ No newline at end of file