MS_25052016

This commit is contained in:
SchreiberM 2016-05-25 11:59:00 +02:00
parent 9f93268c98
commit 26bf6ea6aa
8 changed files with 189 additions and 68 deletions

View File

@ -1642,6 +1642,61 @@ Public Class ClassControlBuilder
Me.AddToPanel(control)
End If
End Sub
Public Sub AddDataGridViewCheckable(id As Integer,
name As String,
x As Integer,
y As Integer,
vwidth As Integer,
vheight As Integer,
_new As Boolean,
read_only As Boolean,
required As Boolean,
columnTitle As String,
Optional parent As GroupBox = Nothing,
Optional _designMode As Boolean = False)
Dim control As New DevExpress.XtraGrid.GridControl
Dim gridview As New DevExpress.XtraGrid.Views.Grid.GridView
control.MainView = gridview
Dim defaultSize = New Size(200, 150)
Dim metadata As New ClassControlMetadata()
metadata.Id = id
metadata.Name = name
metadata.Required = required
control.Tag = metadata
control.Name = name
control.Parent = _master_panel
If _new And IsNothing(parent) Then
control.Location = Me.GetCursorPosition()
control.Size = defaultSize
ElseIf _new And Not IsNothing(parent) Then
Dim cursor = Me.GetCursorPosition()
control.Location = New Point(cursor.X - parent.Location.X,
cursor.Y - parent.Location.Y)
Else
control.Location = New Point(x, y)
control.Size = New Size(vwidth, vheight)
End If
If _designMode = True Then
control.Cursor = Cursors.Hand
End If
Me.SetEventHandlers(control)
Me.CurrentControl = DirectCast(control, DevExpress.XtraGrid.GridControl)
If Not IsNothing(parent) Then
control.Parent = parent
Me.AddToGroupBox(parent, control)
Else
control.Parent = _master_panel
Me.AddToPanel(control)
End If
End Sub
Public Sub AddPictureBox(id As Integer,
name As String,
x As Integer,

View File

@ -36,6 +36,8 @@
ElseIf control.Name.Contains("f_addformdata") Then
Return 9
End If
Case CurrentType.Contains("DEVEXPRESS.XTRAGRID.GRIDCONTROL".ToUpper)
Return 14
Case CurrentType.Contains("CheckedListBoxControl".ToUpper)
Return 12
Case CurrentType.Contains("ListBoxControl".ToUpper)

View File

@ -95,12 +95,10 @@
Else
final = ClassDatabase.Return_Datatable(sqlCommand)
End If
ClassControlValueCache.SaveToCache(sqlCommand, final)
Console.WriteLine("CACHE MISS")
Else
final = cached
Console.WriteLine("CACHE HIT")
' Console.WriteLine("CACHE HIT")
End If
Return final
@ -137,7 +135,7 @@
control.EndUpdate()
sw.Stop()
Console.WriteLine("SetDataSource for {0} took {1}ms", control.Name, sw.ElapsedMilliseconds)
' Console.WriteLine("SetDataSource for {0} took {1}ms", control.Name, sw.ElapsedMilliseconds)
End Sub
Overloads Shared Sub SetDataSource(control As DevExpress.XtraEditors.CheckedListBoxControl, dt As DataTable)

View File

@ -178,14 +178,12 @@ Public Class ClassControlValues
sw.Stop()
If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> LoadControlHints took {0} to load", Format(elapsed, "0.000000000") & " seconds"), False)
sw.Start()
Dim result As Double = 0
For Each control As Control In controls
Dim ControlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
' Wert per LINQ aus DT_ControlValues suchen der zur aktuellen controlId passt
Dim values As List(Of Object) = (From row In DT_ControlValues.AsEnumerable()
Where row.Item("CONTROL_ID") = ControlId
Select row.Item("VALUE")).ToList()
If TypeOf control Is GroupBox Then
Dim groupbox As GroupBox = DirectCast(control, GroupBox)
LoadControlValues(RecordId, ParentRecordId, FormId, groupbox.Controls, Entity_ID)
@ -193,7 +191,7 @@ Public Class ClassControlValues
LoadControlValue(RecordId, ParentRecordId, ControlId, control, values, Entity_ID)
End If
Next
Console.WriteLine("Secons Sum: " & result)
elapsed = sw.Elapsed.TotalSeconds
sw.Stop()
If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Loop LoadControlValue took {0} to load", Format(elapsed, "0.000000000") & " seconds"), False)

View File

@ -3286,14 +3286,14 @@ Public Class frmConstructor_Main
End If
TabWindream.Text = stg & " (" & windreamSucheErgebnisse.Count & ")"
AxObjectListControl.SetIconMode(True)
AxObjectListControl.RemoveAllColumnHeader()
Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
'AxObjectListControl.SetIconMode(True)
'AxObjectListControl.RemoveAllColumnHeader()
'Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
'Change the status icon
'ICON STATES:
Me.AxObjectListControl.SetStatusIcon(0)
'Me.AxObjectListControl.SetStatusIcon(0)
'Change the icon
Me.AxObjectListControl.SetStatusIcon(2)
' Me.AxObjectListControl.SetStatusIcon(2)
Try
Dim sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 1"
@ -3315,7 +3315,7 @@ Public Class frmConstructor_Main
'You need to use the column name here
'Please note that some attributes or indices will not be displayed
'Try not to add the same header twice, it will throw cause problems if you do that
Me.AxObjectListControl.AddColumnHeader(ColumnName, Width)
' Me.AxObjectListControl.AddColumnHeader(ColumnName, Width)
anzparam += 1
End If
End If
@ -3353,7 +3353,7 @@ Public Class frmConstructor_Main
'You need to use the column name here
'Please note that some attributes or indices will not be displayed
'Try not to add the same header twice, it will throw cause problems if you do that
Me.AxObjectListControl.AddColumnHeader(spar, width)
' Me.AxObjectListControl.AddColumnHeader(spar, width)
Next
End If
@ -3365,22 +3365,22 @@ Public Class frmConstructor_Main
Dim results As WINDREAMLib.WMObjects = windreamSucheErgebnisse
If LogErrorsOnly = False Then ClassLogger.Add(" >> results loaded ", False)
'Set the contents without displaying them
AxObjectListControl.SetContentsEx(results)
'AxObjectListControl.SetContentsEx(results)
'Change the icon
AxObjectListControl.SetStatusIcon(5)
' AxObjectListControl.SetStatusIcon(5)
'Display the results...
'The Previous Object Count
Dim poc As Integer = 0
'Display new objects, as long as the objectcount changes after displaying the objects
Do Until (poc <> AxObjectListControl.GetObjectCount)
poc = AxObjectListControl.GetObjectCount
'If you want, you can display more items at a timeRefresh_FollowUp_TabHeader
'But do not display to many at a time or the user interface could freeze
'Maybe try 50
AxObjectListControl.DisplayResults(WDResultListCount)
Loop
AxObjectListControl.SetStatusIcon(3)
'Do Until (poc <> AxObjectListControl.GetObjectCount)
' poc = AxObjectListControl.GetObjectCount
' 'If you want, you can display more items at a timeRefresh_FollowUp_TabHeader
' 'But do not display to many at a time or the user interface could freeze
' 'Maybe try 50
' AxObjectListControl.DisplayResults(WDResultListCount)
'Loop
'AxObjectListControl.SetStatusIcon(3)
Else
Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden"
If USER_LANGUAGE <> "de-DE" Then
@ -3915,17 +3915,17 @@ Public Class frmConstructor_Main
ClassLogger.Add(" >> Undefined Search-pattern in windream-search config: " & content, True)
End Select
End Function
Private Sub AxObjectListControl_ItemClicked(sender As Object, e As EventArgs) Handles AxObjectListControl.ItemClicked
CheckDocView()
End Sub
'Private Sub AxObjectListControl_ItemClicked(sender As Object, e As EventArgs) Handles AxObjectListControl.ItemClicked
' CheckDocView()
'End Sub
Sub Clear_Windream_ResultList()
Try
Dim sw As New Stopwatch
sw.Start()
AxObjectListControl.RemoveAllColumnHeader()
Me.AxObjectListControl.ClearResultList()
'AxObjectListControl.RemoveAllColumnHeader()
'Me.AxObjectListControl.ClearResultList()
Dim stg As String = "windream-Dateien"
If USER_LANGUAGE <> "de-DE" Then
stg = "windream-files"
@ -3942,10 +3942,10 @@ Public Class frmConstructor_Main
End Sub
Sub CheckDocView()
Dim _index = AxObjectListControl.GetFirstSelectedObject
Dim path As String = AxObjectListControl.GetObjectPath(_index)
path = path.Replace("?", vWLaufwerk)
DocViewString = path
'Dim _index = AxObjectListControl.GetFirstSelectedObject
'Dim path As String = AxObjectListControl.GetObjectPath(_index)
'path = path.Replace("?", vWLaufwerk)
'DocViewString = path
If WD_ShowDocs = True Then
CloseWDDocview()
@ -5018,17 +5018,17 @@ Public Class frmConstructor_Main
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
End Sub
Private Sub AxObjectListControl_CausesValidationChanged(sender As Object, e As EventArgs) Handles AxObjectListControl.CausesValidationChanged
Console.WriteLine("CausesValidationChanged")
End Sub
'Private Sub AxObjectListControl_CausesValidationChanged(sender As Object, e As EventArgs) Handles AxObjectListControl.CausesValidationChanged
' Console.WriteLine("CausesValidationChanged")
'End Sub
Private Sub AxObjectListControl_SettingFlagChanged(sender As Object, e As EventArgs) Handles AxObjectListControl.SettingFlagChanged
Console.WriteLine("SettingFlagChanged")
End Sub
'Private Sub AxObjectListControl_SettingFlagChanged(sender As Object, e As EventArgs) Handles AxObjectListControl.SettingFlagChanged
' Console.WriteLine("SettingFlagChanged")
'End Sub
Private Sub AxObjectListControl_Validated(sender As Object, e As EventArgs) Handles AxObjectListControl.Validated
Console.WriteLine("Validated")
End Sub
'Private Sub AxObjectListControl_Validated(sender As Object, e As EventArgs) Handles AxObjectListControl.Validated
' Console.WriteLine("Validated")
'End Sub
Private Sub tslblLocked_VisibleChanged(sender As Object, e As EventArgs) Handles tslblLocked.VisibleChanged
If tslblLocked.Visible = True Then

View File

@ -25,7 +25,6 @@ Partial Class frmLevel_Designer
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLevel_Designer))
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.pnlDesigner = New SnapPanelControl.SnapPanel()
Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
Me.lblFormName = New System.Windows.Forms.ToolStripLabel()
Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
@ -44,6 +43,7 @@ Partial Class frmLevel_Designer
Me.btn_addformdata = New System.Windows.Forms.Button()
Me.btn_addtocal = New System.Windows.Forms.Button()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.btnTableCheckable = New System.Windows.Forms.Button()
Me.btnListBox = New System.Windows.Forms.Button()
Me.btnListBoxCheckable = New System.Windows.Forms.Button()
Me.btnRadioButton = New System.Windows.Forms.Button()
@ -57,6 +57,7 @@ Partial Class frmLevel_Designer
Me.btnlabel = New System.Windows.Forms.Button()
Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog()
Me.ttTooltip = New System.Windows.Forms.ToolTip(Me.components)
Me.pnlDesigner = New SnapPanelControl.SnapPanel()
CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer1.Panel1.SuspendLayout()
Me.SplitContainer1.Panel2.SuspendLayout()
@ -87,16 +88,6 @@ Partial Class frmLevel_Designer
'
Me.SplitContainer1.Panel2.Controls.Add(Me.TabControl1)
'
'pnlDesigner
'
Me.pnlDesigner.AllowDrop = True
Me.pnlDesigner.BackColor = System.Drawing.SystemColors.ControlLight
Me.pnlDesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
resources.ApplyResources(Me.pnlDesigner, "pnlDesigner")
Me.pnlDesigner.GridSize = 8
Me.pnlDesigner.Name = "pnlDesigner"
Me.pnlDesigner.ShowGrid = True
'
'ToolStrip1
'
Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
@ -217,6 +208,7 @@ Partial Class frmLevel_Designer
'
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.btnTableCheckable)
Me.GroupBox1.Controls.Add(Me.btnListBox)
Me.GroupBox1.Controls.Add(Me.btnListBoxCheckable)
Me.GroupBox1.Controls.Add(Me.btnRadioButton)
@ -232,6 +224,14 @@ Partial Class frmLevel_Designer
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.TabStop = False
'
'btnTableCheckable
'
resources.ApplyResources(Me.btnTableCheckable, "btnTableCheckable")
Me.btnTableCheckable.Image = Global.DD_Record_Organiser.My.Resources.Resources.ListBox_686_24
Me.btnTableCheckable.Name = "btnTableCheckable"
Me.btnTableCheckable.Tag = "dgvcheck"
Me.btnTableCheckable.UseVisualStyleBackColor = True
'
'btnListBox
'
resources.ApplyResources(Me.btnListBox, "btnListBox")
@ -334,6 +334,16 @@ Partial Class frmLevel_Designer
resources.ApplyResources(Me.OFDWindreamsuche, "OFDWindreamsuche")
Me.OFDWindreamsuche.RestoreDirectory = True
'
'pnlDesigner
'
Me.pnlDesigner.AllowDrop = True
Me.pnlDesigner.BackColor = System.Drawing.SystemColors.ControlLight
Me.pnlDesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
resources.ApplyResources(Me.pnlDesigner, "pnlDesigner")
Me.pnlDesigner.GridSize = 8
Me.pnlDesigner.Name = "pnlDesigner"
Me.pnlDesigner.ShowGrid = True
'
'frmLevel_Designer
'
resources.ApplyResources(Me, "$this")
@ -395,4 +405,5 @@ Partial Class frmLevel_Designer
Friend WithEvents btn_addtocal As System.Windows.Forms.Button
Friend WithEvents pgControlProperties As System.Windows.Forms.PropertyGrid
Friend WithEvents pnlDesigner As SnapPanelControl.SnapPanel
Friend WithEvents btnTableCheckable As System.Windows.Forms.Button
End Class

View File

@ -142,7 +142,7 @@
<value>pnlDesigner</value>
</data>
<data name="&gt;&gt;pnlDesigner.Type" xml:space="preserve">
<value>SnapPanelControl.SnapPanel, SnapPanelControl, Version=1.0.5910.28047, Culture=neutral, PublicKeyToken=null</value>
<value>SnapPanelControl.SnapPanel, SnapPanelControl, Version=1.0.5989.19477, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pnlDesigner.Parent" xml:space="preserve">
<value>SplitContainer1.Panel1</value>
@ -471,6 +471,42 @@
<data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnTableCheckable.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
</data>
<data name="btnTableCheckable.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="btnTableCheckable.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnTableCheckable.Location" type="System.Drawing.Point, System.Drawing">
<value>140, 164</value>
</data>
<data name="btnTableCheckable.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 31</value>
</data>
<data name="btnTableCheckable.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="btnTableCheckable.Text" xml:space="preserve">
<value>Tabelle Checkable</value>
</data>
<data name="btnTableCheckable.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleRight</value>
</data>
<data name="&gt;&gt;btnTableCheckable.Name" xml:space="preserve">
<value>btnTableCheckable</value>
</data>
<data name="&gt;&gt;btnTableCheckable.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnTableCheckable.Parent" xml:space="preserve">
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnTableCheckable.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnListBox.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
</data>
@ -505,7 +541,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnListBox.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="btnListBoxCheckable.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -541,7 +577,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnListBoxCheckable.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="btnRadioButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -577,7 +613,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnRadioButton.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="btngb.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -589,7 +625,7 @@
<value>NoControl</value>
</data>
<data name="btngb.Location" type="System.Drawing.Point, System.Drawing">
<value>140, 164</value>
<value>140, 200</value>
</data>
<data name="btngb.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 31</value>
@ -613,7 +649,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btngb.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="btnpb.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -649,7 +685,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnpb.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="btnTabelle.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -685,7 +721,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnTabelle.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="btnCheckbox.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -721,7 +757,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnCheckbox.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="btndtp.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -757,7 +793,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btndtp.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="btncmb.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -793,7 +829,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btncmb.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="btntextbox.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -829,7 +865,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btntextbox.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="btnlabel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt, style=Bold</value>
@ -865,7 +901,7 @@
<value>GroupBox1</value>
</data>
<data name="&gt;&gt;btnlabel.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="GroupBox1.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9.75pt, style=Bold</value>
@ -1005,6 +1041,9 @@
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>frmLevel_Designer</value>
</data>

View File

@ -104,6 +104,10 @@
DesignerCtrlBuilder.AddListBox(0, "lbx" & random, 0, 0, def_font_family, def_font_color, def_font_size, def_font_style, 0, True, 0, 0, True, False, False, "", "", Parent)
' Aktuelles Control in die Datenbank speichern
ClassControlCommands.InsertControl(DesignerCtrlBuilder.CurrentControl)
Case "dgvcheck"
DesignerCtrlBuilder.AddDataGridViewCheckable(0, "dgvcheck" & random, 0, 0, 0, 0, True, False, False, "dgvcheck" & random, Parent)
' Aktuelles Control in die Datenbank speichern
ClassControlCommands.InsertControl(DesignerCtrlBuilder.CurrentControl)
Case Else
MsgBox("Event '" & type & "' nicht definiert")
End Select
@ -507,7 +511,8 @@
btn_addformdata.MouseDown,
btnRadioButton.MouseDown,
btnListBoxCheckable.MouseDown,
btnListBox.MouseDown
btnListBox.MouseDown,
btnTableCheckable.MouseDown
Mouse_Down = True
End Sub
@ -522,7 +527,8 @@
btn_addformdata.MouseMove,
btnRadioButton.MouseMove,
btnListBoxCheckable.MouseMove,
btnListBox.MouseMove
btnListBox.MouseMove,
btnTableCheckable.MouseMove
If Mouse_Down Then
Dim ctrl As Button = DirectCast(sender, Button)
@ -1007,4 +1013,16 @@
lblStatus.Visible = False
End If
End Sub
Private Sub btnTableCheckable_MouseDown(sender As Object, e As MouseEventArgs) Handles btnTableCheckable.MouseDown
End Sub
Private Sub btnTableCheckable_MouseMove(sender As Object, e As MouseEventArgs) Handles btnTableCheckable.MouseMove
End Sub
Private Sub btnTableCheckable_Click(sender As Object, e As EventArgs) Handles btnTableCheckable.Click
End Sub
End Class