Changeset 11644 for code/branches/Dialog_HS17/data/gui

Timestamp:

Dec 8, 2017, 2:55:15 PM (7 years ago)

Author:

kuchlert

Message:

eigentlich fertig nur noch altes system entfernen

Location:

code/branches/Dialog_HS17/data/gui

Files:

• layouts/Dialog.layout (modified) (1 diff)
• scripts/Dialog.lua (modified) (6 diffs)

code/branches/Dialog_HS17/data/gui/layouts/Dialog.layout

@@ -31 +31 @@
             </Window>
 
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/DialogAns" >
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
+            <Window Type="MenuWidgets/Listbox" Name="orxonox/AnsListbox" >
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.604166,0},{0.15,0},{0.958333,0},{0.636,0}}" />
-                <Window Type="MenuWidgets/Listbox" Name="orxonox/AnsListbox" >
-                    <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                    <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
-                    <Event Name="ItemSelectionChanged" Function="Dialog.answer_changed" />
-                </Window>
+                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.225,0},{0.95,0},{0.85,0}}" />
+                <Event Name="ItemSelectionChanged" Function="Dialog.answer_changed" />
             </Window>
+        
             <Window Type="MenuWidgets/Button" Name="orxonox/SayButton" >
                 <Property Name="Text" Value="Say" />

code/branches/Dialog_HS17/data/gui/scripts/Dialog.lua

@@ -6 +6 @@
 P.detailsWindows = {}
 P.showing = false
+P.choice = 0
 
--- Design parameters
-P.imageHeight = 50
-P.detailImageSize = 100
-P.textHeight = 50
-P.buttonWidth = 50
-
-function P.onLoad()
+function P.onLoad() --wird ausgefuert wenn Fenster geladen
     P.wrapper = nil
 end
 
-function P.onShow()
+function P.onShow() --wird ausgefuert wenn Dialogfenster gezeigt
 
     orxonox.CommandExecutor:execute("setTimeFactor 0")
@@ -25 +20 @@
 end
 
-function P.onHide()
+function P.onHide() --aufgefuert wenn Fenster geschlossen wird
     orxonox.CommandExecutor:execute("setTimeFactor 1")
     P.showing = false
@@ -31 +26 @@
 end
 
-function P.createDialog()
+function P.createDialog() -- initiallisiert das Dialog Fenster, setzt Namen sowie die erste Frage mit enstprechenden Antworten
 
     local manager = orxonox.DialogManager:getInstance()
@@ -44 +39 @@
     questionfiled:setText(question)
 
-    listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+    local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+    CEGUI.toListbox(listboxwindow):resetList()
 
-    local themeList = {}
-    --[[
-    table.insert(themeList, "Default")
-    table.insert(themeList, "Drum n' Bass")
-    table.insert(themeList, "8-Bit Style")
-    table.insert(themeList, "Corny Jazz")
-    table.insert(themeList, "Metal")
-    --]]
+    local ansList = {}
     local anssize = manager:getSize()
 
     for index = 0, anssize -1, 1 do
-        table.insert(themeList, manager:getAnswer(index))
+        table.insert(ansList, manager:getAnswer(index))
     end  
 
-    for k,v in pairs(themeList) do
+    for k,v in pairs(ansList) do
         item = CEGUI.createListboxTextItem(v)
         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
@@ -67 +56 @@
 end
 
-function P.updateDialog()
+function P.updateDialog()   --updated den Dialog entsprechend der Ausgeaehlten option der letzten Frage, setzt Frage und Antwortmoeglichkeiten neu
     local manager = orxonox.DialogManager:getInstance()
-    --manager:update()
+    manager:update(P.choice)
 
     local questionfiled = winMgr:getWindow("orxonox/Dialog/Question")
     local question = manager:getQuestion()
     questionfiled:setText(question)
+
+    local listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+    listboxwindow:resetList()
+
+    local ansList = {}
+    local anssize = manager:getSize()
+
+    for index = 0, anssize -1, 1 do
+        table.insert(ansList, manager:getAnswer(index))
+    end  
+
+    for k,v in pairs(ansList) do
+        item = CEGUI.createListboxTextItem(v)
+        item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
+        CEGUI.toListbox(listboxwindow):addItem(item)
+    end
+
+    P.choice = 0
 end
 
-function P.answer_changed(e)
-    -- body
+function P.answer_changed(e)    --wird aufgerufen falls Auswahl geaendert wird und setzt enstprechenden Indexparameter  
+    listboxwindow = winMgr:getWindow("orxonox/AnsListbox")
+    selection = listboxwindow:getFirstSelectedItem()
+    if selection ~= nil then
+    P.choice = listboxwindow:getItemIndex(selection)
+    else 
+        P.choice = 0
+    end
 end
 
 
-function P.cleanup(destroyDetails)
-    
+function P.cleanup(destroyDetails)  --loest Fenster wieder auf (!nicht selbst geschrieben, nur uebernommen, eventuell nicht noetiger code)
+
     if P.wrapper ~= nil then
         winMgr:destroyWindow(P.wrapper)
@@ -101 +114 @@
 
 
-function P.Button_clicked(e)
-    local ending = orxonox.DialogManager:getInstance():endtest()
-    orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialog")
+function P.Button_clicked(e)    --wird bei click auf say knopf ausgeloest, entscheidet ob Dialog schliesst oder updated und fuert entsprechen aus
+    local ending = orxonox.DialogManager:getInstance():endtest(P.choice)
     
     if ending then
         orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialog")
-    
-    
     else 
         P.updateDialog(index)