Update 20250107

DOCGEN/Klassen/DocGenerator_from_EDOKA.cs

@@ -73,7 +73,7 @@ namespace DOCGEN.Generator
             string Extension = "";
             Logging.Logging.Debug("Generate_Doc_EDOKA", "Get_Vorlage", dokumentid);
 
-            dt = db.Get_Vorlage_By_DokumentID(dokumentid,useoffice);
+            dt = db.Get_Vorlage_By_DokumentID(dokumentid,useoffice, tempdir);
             db.dsdaten.Tables.Clear();
             dt2 = db.Get_ApplicationType_from_Vorlage(Convert.ToInt32(dt.Rows[0]["nr"].ToString()));
             Apptype = dt2.Rows[0][0].ToString();

DOCGEN/Klassen/SyncFWord.cs

@@ -148,11 +148,11 @@ namespace DOCGEN.Klassen
             }
         }
 
-        //private Image resizeImage(Image imgToResize, Size size)
-        //{
-        //    return (Image)new Bitmap(imgToResize, size);
+        private System.Drawing.Image resizeImage(System.Drawing.Image imgToResize, Size size)
+        {
+            return (System.Drawing.Image)new Bitmap(imgToResize, size);
 
-        //}
+        }
   
         public string Generate_Word(string base64, clsDocData docdata,  string img_UL="", string img_UR="",string img_faktura="")
         {
@@ -646,8 +646,11 @@ namespace DOCGEN.Klassen
                     
                     //barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAutoBest, docData.barcode_content, 4, 0, 0, "Left", docData.barcode_content, docData.barcode_font, docData.barcode_fontsize);
 
-                    barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii,docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text+docData.barcode_zusatz, docData.barcode_font, docData.barcode_fontsize+5);
+                    barcodeimage = Barcode.Get_Datamatrix(DataMatrix.net.DmtxScheme.DmtxSchemeAscii,docData.barcode_content, 6, 6, 0, "Right", docData.barcode_text+docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize);
+                    //barcodeimage= resizeImage(barcodeimage, new Size(docData.barcode_width, docData.barcode_height));
+                    barcodeimage = ScaleImage(barcodeimage, docData.barcode_width,docData.barcode_height);
                     //barcodeimage.Save(@"x:\bctest.png");
+                    
                     break;
                 default:
                     barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5C, docData.Dokumentid.Substring(9, 13), docData.Dokumentid.Substring(6, 16)+docData.barcode_zusatz, docData.barcode_textposition, docData.barcode_font, Convert.ToInt32(docData.barcode_fontsize), 0);
@@ -661,32 +664,40 @@ namespace DOCGEN.Klassen
               
                 WPicture picture = new WPicture(document);
                 picture.LoadImage(barcodeimage);
-                picture.Height = docData.barcode_height;
+                //picture.Height = docData.barcode_height;
                 
-                picture.Width = docData.barcode_width;
+                //picture.Width = docData.barcode_width;
                 picture.VerticalPosition = docData.barcode_left;
                 picture.HorizontalPosition = docData.barcode_top;
                 picture.HorizontalOrigin = HorizontalOrigin.Page ;
                 picture.VerticalOrigin = VerticalOrigin.Page;
                 picture.TextWrappingStyle = TextWrappingStyle.Square;
                 picture.TextWrappingType = TextWrappingType.Largest;
+                
+                //picture.Width = barcodeimage.Width;
+                //picture.Height = barcodeimage.Height;
                 if (docData.barcode_horizontal == 0)
                 {
                     picture.Rotation = 270;
-                    picture.Height = docData.barcode_height;
-                    picture.Width = docData.barcode_width;
+               //     picture.Height = docData.barcode_height;
+               //     picture.Width = docData.barcode_width;
                     picture.VerticalPosition = docData.barcode_top; ;
                     picture.HorizontalPosition = docData.barcode_left;
 
+
                 }
                 else
                 {
                     picture.Rotation = 0;
-                    picture.Height = docData.barcode_height;
-                    picture.Width = docData.barcode_width;
+             //       picture.Height = docData.barcode_height;
+             //       picture.Width = docData.barcode_width;
                     picture.VerticalPosition = docData.barcode_top; ;
                     picture.HorizontalPosition = docData.barcode_left;
 
+               //     picture.Width = barcodeimage.Width;
+                 //   picture.Height = barcodeimage.Height;
+
+
                 }
                 WPicture picture2 = new WPicture(document);
                 picture2 = picture;
@@ -706,7 +717,22 @@ namespace DOCGEN.Klassen
                     paragraph.ChildEntities.Add(picture);
             }
         }
+        public static System.Drawing.Image ScaleImage(System.Drawing.Image image, int maxWidth, int maxHeight)
+        {
+            var ratioX = (double)maxWidth / image.Width;
+            var ratioY = (double)maxHeight / image.Height;
+            var ratio = Math.Min(ratioX, ratioY);
 
+            var newWidth = (int)(image.Width * ratio);
+            var newHeight = (int)(image.Height * ratio);
+
+            var newImage = new Bitmap(newWidth, newHeight);
+
+            using (var graphics = Graphics.FromImage(newImage))
+                graphics.DrawImage(image, 0, 0, newWidth, newHeight);
+
+            return newImage;
+        }
         public void insert_Logo(WordDocument document, clsDocData docData) 
         {
             IWSection section = document.Sections[0];

DOCGEN/bin/Release/vbBarcodes.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<doc>
+<assembly>
+<name>
+vbBarcodes
+</name>
+</assembly>
+<members>
+<member name="T:vbBarcodes.My.Resources.Resources">
+<summary>
+  A strongly-typed resource class, for looking up localized strings, etc.
+</summary>
+</member>
+<member name="P:vbBarcodes.My.Resources.Resources.ResourceManager">
+<summary>
+  Returns the cached ResourceManager instance used by this class.
+</summary>
+</member>
+<member name="P:vbBarcodes.My.Resources.Resources.Culture">
+<summary>
+  Overrides the current thread's CurrentUICulture property for all
+  resource lookups using this strongly typed resource class.
+</summary>
+</member>
+</members>
+</doc>

DOCGEN/obj/Release/DOCGEN.csproj.FileListAbsolute.txt

@@ -132,3 +132,7 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Release\DocGen.csproj.CoreCompileInp
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Release\DocGen.csproj.Up2Date
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Release\DOCGEN.dll
 E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Release\DOCGEN.pdb
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Release\vbBarcodes.dll
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Release\MW6.SDK.dll
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Release\vbBarcodes.pdb
+E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Release\vbBarcodes.xml