Bugfixes

- Object_Editor: Fixed writing at the end of data - Object_View2D: Added standard configuration
Dadido3 · Jan 6, 2015 · 97c4a0f · 97c4a0f
1 parent 8341fe9
commit 97c4a0f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 26 deletions.
diff --git a/D3hex.pbp b/D3hex.pbp
@@ -7,7 +7,7 @@
   <section name="data">
     <explorer view="Includes\Object\Data_Inspector\" pattern="0"/>
     <log show="1"/>
-    <lastopen date="2015-01-05 19:50" user="David Vogel" host="DAVIDS_NOTEBOOK"/>
+    <lastopen date="2015-01-06 18:55" user="David Vogel" host="DAVIDS_NOTEBOOK"/>
   </section>
   <section name="files">
     <file name="Includes\About.pbi">
@@ -56,11 +56,11 @@
     </file>
     <file name="Includes\Object\Dummy\Object_Dummy.pbi">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="++++"/>
-      <fingerprint md5="234451cdbf5bff2a7dd0f25547525651"/>
+      <fingerprint md5="e4710566e0badeb386de200ee2c045df"/>
     </file>
     <file name="Includes\Object\Editor\Object_Editor.pbi">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="++++"/>
-      <fingerprint md5="14f8d6ad8077281397144af9e5c9a586"/>
+      <fingerprint md5="46eca56dc1a581c557017f0e01494cef"/>
     </file>
     <file name="Includes\Object\Editor\Object_Editor_Goto.pbi">
       <config load="0" scan="1" panel="1" warn="1" lastopen="0" panelstate="++++"/>
@@ -108,11 +108,11 @@
     </file>
     <file name="Includes\Object\View2D\Object_View2D.pbi">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="++++"/>
-      <fingerprint md5="b3aef93482ae69059514d6207b5f70d5"/>
+      <fingerprint md5="d452ad9053e11a77afc3f9a37f9eea14"/>
     </file>
     <file name="Includes\Object\View2D\Object_View2D_Settings.pbi">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="++++"/>
-      <fingerprint md5="38d25698c2f9ab4b9a027ad71a1b5d54"/>
+      <fingerprint md5="93bd4352767826b699767b0ec023b60c"/>
     </file>
     <file name="Includes\Object_Type.pbi">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="++"/>
@@ -136,7 +136,7 @@
     </file>
     <file name="Main.pb">
       <config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
-      <fingerprint md5="5128e617332564681be5ea92594c7db0"/>
+      <fingerprint md5="b7d632265c7c872046f69a3577e9ed25"/>
     </file>
   </section>
   <section name="targets">
@@ -147,8 +147,8 @@
       <executable value="Distribution\D3hex.x86.exe"/>
       <options unicode="1" xpskin="1" user="1" onerror="1"/>
       <icon enable="1">Data\Images\Icon.ico</icon>
-      <compilecount enable="1" value="225"/>
-      <buildcount enable="1" value="37"/>
+      <compilecount enable="1" value="227"/>
+      <buildcount enable="1" value="39"/>
       <versioninfo enable="1">
         <field3 value="D3hex"/>
         <field14 value="D3nexus.de"/>
@@ -163,8 +163,8 @@
       <options unicode="1" xpskin="1" user="1" onerror="1"/>
       <purifier enable="0" granularity="1,1,1,1"/>
       <icon enable="1">Data\Images\Icon.ico</icon>
-      <compilecount enable="1" value="2690"/>
-      <buildcount enable="1" value="44"/>
+      <compilecount enable="1" value="2702"/>
+      <buildcount enable="1" value="46"/>
       <versioninfo enable="1">
         <field3 value="D3hex"/>
         <field14 value="D3nexus.de"/>

diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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