Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unifr #2

Open
wants to merge 3 commits into
base: unifr
Choose a base branch
from
Open

Unifr #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6bb379
first commit.
incidincer Aug 4, 2015
fe0488f
second commit.
incidincer Aug 4, 2015
47323d5
MetaData functionality in MPProxy and some changes in ICEExperiments
incidincer Aug 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ICEExperiments/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,11 @@
<artifactId>DragNDrop</artifactId>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>ch.unifr.pai.twice.widgets</groupId>
<artifactId>RemoteWidgets</artifactId>
<version>0.9.0</version>
</dependency>

</dependencies>
</project>
198 changes: 119 additions & 79 deletions ICEExperiments/src/main/java/ch/unifr/pai/ice/client/ICEMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,33 @@
*
*************************************************************************************************/


import java.util.Date;

import ch.unifr.pai.twice.multipointer.controller.client.TouchPadWidget;
import ch.unifr.pai.ice.client.clickblobs.ClickBlobs1user;
import ch.unifr.pai.ice.client.clickblobs.ClickBlobs2users;
import ch.unifr.pai.ice.client.clickblobs.ClickBlobs4users;
import ch.unifr.pai.ice.client.textedit.TextEntrySepSpace;
import ch.unifr.pai.ice.client.dragNdrop.DnD2users;
import ch.unifr.pai.ice.client.dragNdrop.DnD4users;
import ch.unifr.pai.ice.client.dragNdrop.DND4users4spaces;

import ch.unifr.pai.ice.client.dragNdrop.DnD1user;
import ch.unifr.pai.ice.client.textedit.TextEntry1Space;
import ch.unifr.pai.ice.client.tracking.LineTracking1user;
import ch.unifr.pai.twice.multipointer.controller.client.TouchPadWidget;

import ch.unifr.pai.twice.multipointer.provider.client.MultiCursorController;
import ch.unifr.pai.twice.multipointer.provider.client.NoMultiCursorController;
import ch.unifr.pai.twice.utils.device.client.DeviceType;
import ch.unifr.pai.twice.utils.device.client.UUID;

import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;

import com.google.gwt.dom.client.Style.Unit;

import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.event.logical.shared.SelectionEvent;
Expand All @@ -52,106 +62,136 @@ public class ICEMain implements EntryPoint {

public static String identifier;
int nbSentences = 4;
TextEntry1Space trainingTextEntry1Space1User = new TextEntry1Space(1, 2, -1);
TextEntry1Space textEntry1Space1User = new TextEntry1Space(1, nbSentences, 1);
// TextEntry1Space textEntry1Space2Users = new TextEntry1Space(2, nbSentences,2);
// TextEntry1Space textEntry1Space4Users = new TextEntry1Space(4, nbSentences,3);
// TextEntrySepSpace textEntrySepSpace2Users = new TextEntrySepSpace(2,nbSentences, 20);
// TextEntrySepSpace textEntrySepSpace4Users = new TextEntrySepSpace(4,nbSentences, 21);
ClickBlobs1user trainingCheckBoxes = new ClickBlobs1user(4, false, false);
ClickBlobs1user checkBoxes = new ClickBlobs1user(20, false, true);
// ClickBlobs2users checkB2u = new ClickBlobs2users(20, false);
// ClickBlobs4users checkB4u = new ClickBlobs4users(20, false);
int trainingnbSentences = 1;

//TextEntry1Space trainingTextEntry1Space1User = new TextEntry1Space(1, 2, -1);
//TextEntry1Space textEntry1Space1User = new TextEntry1Space(1, nbSentences, 1);
//TextEntry1Space textEntry1Space2Users = new TextEntry1Space(2, nbSentences,2);
//TextEntry1Space textEntry1Space4Users = new TextEntry1Space(4, nbSentences,3);

TextEntrySepSpace trainingtextEntrySepSpace1Users = new TextEntrySepSpace(1,trainingnbSentences, -1); //-1 is for not logging
TextEntrySepSpace textEntrySepSpace1Users = new TextEntrySepSpace(1,nbSentences, 19);
TextEntrySepSpace textEntrySepSpace2Users = new TextEntrySepSpace(2,nbSentences, 18);
TextEntrySepSpace textEntrySepSpace4Users = new TextEntrySepSpace(4,nbSentences, 21);

ClickBlobs1user trainingCheckBoxes = new ClickBlobs1user(4, false, true);
ClickBlobs1user checkBoxes = new ClickBlobs1user(4, false, true);
ClickBlobs2users checkB2u = new ClickBlobs2users(4, false);
ClickBlobs4users checkB4u = new ClickBlobs4users(4, false);

DnD1user trainingDNdBoxes = new DnD1user(4, false);
DnD1user dNdBoxes = new DnD1user(20, true);
// DnD2users dNdBoxes2S = new DnD2users();
// DnD4users dNdBoxes4S = new DnD4users();
// DND4users4spaces dN4dropBoxes = new DND4users4spaces(10);
DnD1user dNdBoxes = new DnD1user(10, true);
DnD2users dNdBoxes2S = new DnD2users();
DnD4users dNdBoxes4S = new DnD4users();
//DND4users4spaces dN4dropBoxes = new DND4users4spaces(10);

LineTracking1user trainingLineTracking = new LineTracking1user(false, "trace-training.png");
LineTracking1user lineTracking = new LineTracking1user(true, "trace-experiment.png");
//LineTracking1user trainingLineTracking = new LineTracking1user(false, "trace-training.png");
//LineTracking1user lineTracking = new LineTracking1user(true, "trace-experiment.png");
// LineTracking2users lineTracking2users = new LineTracking2users();
// LineTracking4users lineTracking4users = new LineTracking4users();

TabLayoutPanel tabPanel = new TabLayoutPanel(40, Unit.PX);

NoMultiCursorController c = MultiCursorController.getInstance();


@Override
public void onModuleLoad() {
if (DeviceType.getDeviceType() != DeviceType.MULTICURSOR) {
TouchPadWidget widget = GWT.create(TouchPadWidget.class);
RootLayoutPanel.get().add(widget);
widget.initialize(UUID.get(), null, null);
widget.start();
}
else {


if (DeviceType.getDeviceType() == DeviceType.MULTICURSOR) {

/***************************************
* Get the size of the browser window.
***************************************/
c.start();
***************************************/
MultiCursorController multiCursor = GWT.create(NoMultiCursorController.class);
multiCursor.start();


identifier = String.valueOf(new Date().getTime() / 1000);
Window.alert("Start experiment: " + identifier);
RootLayoutPanel.get().add(tabPanel);
/*
* tabPanel setup
*/

tabPanel.add(trainingCheckBoxes, "TA");
tabPanel.add(trainingTextEntry1Space1User, "TB");
tabPanel.add(trainingDNdBoxes, "TC");
tabPanel.add(trainingLineTracking, "TD");
// tabPanel.add(textEntry1Space2Users, "TE 1 Space - 2 users");
// tabPanel.add(textEntry1Space4Users, "TE 1 Space - 4 users");
// tabPanel.add(textEntrySepSpace2Users, "TE multi Space - 2 users");
// tabPanel.add(textEntrySepSpace4Users, "TE multi Space - 4 users");
tabPanel.add(checkBoxes, "A");
tabPanel.add(textEntry1Space1User, "B");
// tabPanel.add(checkB2u, "Click blobs 2 users");
// tabPanel.add(checkB4u, "Click blobs 4 users");
tabPanel.add(dNdBoxes, "C");
// tabPanel.add(dNdBoxes2S, "D & D 2 spaces");
// tabPanel.add(dNdBoxes4S, "D & D 4 spaces");
// tabPanel.add(dN4dropBoxes, "D & 4 D boxes");
tabPanel.add(lineTracking, "D");
// tabPanel.add(lineTracking2users, "L tracking 2");
// tabPanel.add(lineTracking4users, "L tracking 4");
tabPanel.selectTab(0);
if (tabPanel.getWidget(0) instanceof RequireInitialisation) {


/*
* tabPanel setup
*/

//*****************Trainings***************************//
//tabPanel.add(trainingCheckBoxes, "TA");
//tabPanel.add(trainingtextEntrySepSpace1Users, "TB"); //tabPanel.add(trainingTextEntry1Space1User, "TB");
//tabPanel.add(trainingDNdBoxes, "TC");
//tabPanel.add(trainingLineTracking, "TD");

//*****************Click Blobs***************************//
//tabPanel.add(checkBoxes, "A");
//tabPanel.add(checkB2u, "Click blobs 2 users");
tabPanel.add(checkB4u, "Click blobs 4 users");

//*****************Text Edit****************************//
//tabPanel.add(textEntrySepSpace1Users, "B");
//tabPanel.add(textEntrySepSpace2Users, "TE multi Space - 2 users");
tabPanel.add(textEntrySepSpace4Users, "TE multi Space - 4 users");

////******************D&D*********************************//
//tabPanel.add(dNdBoxes, "C");
//tabPanel.add(dNdBoxes2S, "D & D 2 spaces");
tabPanel.add(dNdBoxes4S, "D & D 4 spaces");
//tabPanel.add(dN4dropBoxes, "D & 4 D boxes");


//tabPanel.add(textEntry1Space1User, "B");
//tabPanel.add(textEntry1Space2Users, "TE 1 Space - 2 users");
//tabPanel.add(textEntry1Space4Users, "TE 1 Space - 4 users");
//tabPanel.add(lineTracking, "D");
// tabPanel.add(lineTracking2users, "L tracking 2");
// tabPanel.add(lineTracking4users, "L tracking 4");

tabPanel.selectTab(0);

if (tabPanel.getWidget(0) instanceof RequireInitialisation) {
Scheduler.get().scheduleDeferred(new ScheduledCommand() {

@Override
public void execute() {
((RequireInitialisation) tabPanel.getWidget(0)).initialise();
}
});
}

tabPanel.addSelectionHandler(new SelectionHandler<Integer>() {

@Override
public void onSelection(SelectionEvent event) {

Scheduler.get().scheduleDeferred(new ScheduledCommand() {

@Override
public void execute() {
((RequireInitialisation) tabPanel.getWidget(0)).initialise();
((RequireInitialisation) tabPanel.getWidget(tabPanel.getSelectedIndex())).initialise();
}
});
}
});

tabPanel.addSelectionHandler(new SelectionHandler<Integer>() {

@Override
public void onSelection(SelectionEvent event) {

Scheduler.get().scheduleDeferred(new ScheduledCommand() {

@Override
public void execute() {
((RequireInitialisation) tabPanel.getWidget(tabPanel.getSelectedIndex())).initialise();
}
});
}
});
/*
* re-position of the widgets on the resized window
*/
Window.addResizeHandler(new ResizeHandler() {
@Override
public void onResize(ResizeEvent event) {

/*
* re-position of the widgets on the resized window
*/
Window.addResizeHandler(new ResizeHandler() {
@Override
public void onResize(ResizeEvent event) {
}
});


}
});
}

else {

TouchPadWidget widget = GWT.create(TouchPadWidget.class);
RootLayoutPanel.get().add(widget);
//widget.initialize(UUID.get(), null, null);
widget.start();
}

}


}
Loading