Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
Mehdi Haddad committed May 3, 2018
1 parent f4528a9 commit 5ee30fe
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 49 deletions.
66 changes: 33 additions & 33 deletions save/Example.upmt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
],
"mDescription": "",
"mColor": "#80B380",
"mColor": "#4D804D",
"mName": "Auditory sensation"
}
],
Expand All @@ -37,26 +37,26 @@
{
"mDescription": "",
"mColor": "#000000",
"mName": "density"
"mName": "temperature"
},
{
"mDescription": "",
"mColor": "#000000",
"mName": "temperature"
"mName": "shape"
},
{
"mDescription": "",
"mColor": "#000000",
"mName": "shape"
"mName": "location"
},
{
"mDescription": "",
"mColor": "#000000",
"mName": "location"
"mName": "density"
}
],
"mDescription": "",
"mColor": "#FFCC66",
"mColor": "#FFB366",
"mName": "Bodily feeling"
},
{
Expand All @@ -68,7 +68,7 @@
}
],
"mDescription": "",
"mColor": "#E699B3",
"mColor": "#80334D",
"mName": "Emotion"
}
],
Expand Down Expand Up @@ -112,20 +112,11 @@
}
],
"mDescription": "",
"mColor": "#E699B3",
"mColor": "#80334D",
"mName": "Emotion"
},
{
"mProperties": [
{
"mValue": "compact",
"mExtract": {
"mText": "tight"
},
"mDescription": "",
"mColor": "#000000",
"mName": "density"
},
{
"mValue": "cold",
"mExtract": {
Expand All @@ -152,10 +143,19 @@
"mDescription": "",
"mColor": "#000000",
"mName": "location"
},
{
"mValue": "compact",
"mExtract": {
"mText": "tight"
},
"mDescription": "",
"mColor": "#000000",
"mName": "density"
}
],
"mDescription": "",
"mColor": "#FFCC66",
"mColor": "#FFB366",
"mName": "Bodily feeling"
}
],
Expand All @@ -164,7 +164,7 @@
"mParentMomentID": 1763325,
"mParentCol": 0,
"mGridCol": 0,
"mColor": "#FFFFFF",
"mColor": "#DBEFDF",
"mCurrentProperty": {
"mValue": "chest",
"mExtract": {
Expand Down Expand Up @@ -204,7 +204,7 @@
}
],
"mDescription": "",
"mColor": "#80B380",
"mColor": "#4D804D",
"mName": "Auditory sensation"
}
],
Expand All @@ -213,7 +213,7 @@
"mParentMomentID": 1763325,
"mParentCol": 0,
"mGridCol": 1,
"mColor": "#83CDF7",
"mColor": "#BBE4FB",
"mCurrentProperty": {
"mValue": "outside",
"mExtract": {
Expand All @@ -233,15 +233,6 @@
"mCategories": [
{
"mProperties": [
{
"mValue": "fluid",
"mExtract": {
"mText": "melt, to dilute"
},
"mDescription": "",
"mColor": "#000000",
"mName": "density"
},
{
"mValue": "warm",
"mExtract": {
Expand All @@ -268,10 +259,19 @@
"mDescription": "",
"mColor": "#000000",
"mName": "location"
},
{
"mValue": "fluid",
"mExtract": {
"mText": "melt, to dilute"
},
"mDescription": "",
"mColor": "#000000",
"mName": "density"
}
],
"mDescription": "",
"mColor": "#FFCC66",
"mColor": "#FFB366",
"mName": "Bodily feeling"
}
],
Expand All @@ -280,7 +280,7 @@
"mParentMomentID": 1763325,
"mParentCol": 0,
"mGridCol": 2,
"mColor": "#D33A3A",
"mColor": "#F1D9D9",
"mCurrentProperty": {
"mValue": "body",
"mExtract": {
Expand All @@ -297,7 +297,7 @@
"mParentMomentID": -1,
"mParentCol": 0,
"mGridCol": 0,
"mColor": "#F49BF7",
"mColor": "#FFFFFF",
"mID": 1763325,
"mRow": 0
}
Expand Down
3 changes: 2 additions & 1 deletion src/application/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package application;

import java.awt.Desktop;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -408,7 +409,7 @@ public void export(Project p){
ObjectOutputStream oos = null;
try {
PrintWriter writer = new PrintWriter("exports/"+p.getName()+".csv", "UTF-8");
writer.println("\"ENTRETIEN\",\"ID\",\"NOM\",\"EXTRAIT\",\"COULEUR\",\"DEBUT\",\"FIN\",\"CLASSE\",\"PROP\",\"VALEUR\"");
writer.println("\"INTERVIEW\",\"ID\",\"NAME\",\"EXTRACT\",\"COLOR\",\"DURATION\",\"CATEGORY\",\"PROPERTY\",\"VALUE\"");
for(DescriptionInterview ent : p.getInterviews()){
for (int i = 0; i < ent.getMoments().size(); i++) {
MomentExperience m = ent.getMoments().get(i);
Expand Down
7 changes: 5 additions & 2 deletions src/controller/AboutController.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package controller;

import java.awt.Desktop;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -60,9 +61,11 @@ public void initialize(URL location, ResourceBundle resources) {
public void link2Github() {
Stage web = new Stage();

buttonLink2Github.setOnAction((ActionEvent action)->{
buttonLink2Github.setOnAction((ActionEvent action)->{
try {
java.awt.Desktop.getDesktop().browse(new URI("https://github.com/coco35700/uPMT"));

Desktop.getDesktop().browse(new URI("https://github.com/coco35700/uPMT"));

} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Expand Down
23 changes: 10 additions & 13 deletions src/view/HelpView.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,14 @@

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.text.Text?>

<AnchorPane xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
<AnchorPane pickOnBounds="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<BorderPane prefWidth="569.0" AnchorPane.topAnchor="14.0">
<top>
<Text lineSpacing="5.0" smooth="false" stroke="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="This is a tool called uPMT which is aimed at reserchers using explicitation or micropheno-menological interviews to study lived experience.&#10;It has been designed to help analyze the micro-dynamics of experience as described in interview transcriptions, by modelling and formalizing the sequential unfolding of &quot;experience moments&quot; described with concepts and attributes.&#10;&#10;&#10;@Version1.0 of the software was implemented by :&#10; - Corentin Jezequel in late 2017,&#10; - Eva Bourgeais--Boon, Mehdi Haddad and Yinxing Huang in late 2018, &#10;under the supervision of Yannick Prié and Thomas Rabeyron." textAlignment="CENTER" wrappingWidth="490.0" BorderPane.alignment="TOP_CENTER">
<BorderPane.margin>
<Insets bottom="40.0" left="10.0" right="10.0" top="40.0" />
</BorderPane.margin>
</Text>
</top>
<BorderPane prefWidth="569.0" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="10.0">
<bottom>
<HBox alignment="CENTER" prefHeight="33.0" prefWidth="569.0" spacing="25.0" BorderPane.alignment="CENTER">
<children>
Expand All @@ -32,9 +25,13 @@
</opaqueInsets>
</HBox>
</bottom>
<center>
<Label lineSpacing="1.0" text="Current version: 0.2.1&#10;uPMT is aimed at researchers using microphenomenology interviews (also know as explicitation interviews) to study lived experience. It has been designed to help analyze the micro-dynamics of experience as described in interview transcriptions, by modelling and formalizing the sequential unfolding of &quot;experience moments&quot; described with categories and properties, and linked to the descriptemes - excerpts of the transcript - that justify them.&#10;&#10;Current work is carried out by Mehdi Haddad, Eva Boon, and Yinxing Huang, under the supervision of Yannick Prié. The first version of the software was implemented by Corentin Jezequel in late 2017, under the supervision of Yannick Prié and Thomas Rabeyron." textAlignment="CENTER" textOverrun="CLIP" wrapText="true" BorderPane.alignment="CENTER">
<padding>
<Insets bottom="20.0" />
</padding>
</Label>
</center>
</BorderPane>
</children>
<padding>
<Insets bottom="25.0" top="5.0" />
</padding>
</AnchorPane>

0 comments on commit 5ee30fe

Please sign in to comment.