Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: frontierpsycho/ongoing_canvas
base: c4e1b15e53
...
head fork: frontierpsycho/ongoing_canvas
compare: 549356e381
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
145 canvas/form_data/colors.json
@@ -1,55 +1,138 @@
{
"Feeling groups" : {
- "anger" : [[ "homicidal", "murderous", "irate", "evil", "wrath", "mad", "cruel", "bursting", "violent", "sinister", "yelling", "vicious", "cursing", "shouting", "furious", "threatening", "hateful"], ["spiteful", "upset", "rough", "pissed", "bastard", "angry", "sold", "disgruntled", "jealous", "bitter"]],
- "happiness" :[
- ["best", "blessed", "divine", "star", "super", "incredible", "amazing", "invincible", "superficial", "magic", "magical", "triumphant,immune", "perfect", "absolute", "complete", "whole", "full", "alive", "free", "honored", "honoured", "pure", "reborn", "immense", "immortal", "master", "supreme", "fulfilled", "profound", "ultra", "liberated", "original", "independent", "excellent", "glorious", "real", "true", "honest", "ideal", "fair", "religious", "genuine", "virgin", "poetic breathless", "born", "destined", "innocent"],
- ["greatest", "happiest", "fantastic", "awesome", "giant", "huge", "ecstatic", "luckiest", "amazed", "terrific", "enthusiastic", "terrific", "tremendous", "excited", "million", "party", "throbbing", "singing", "elated", "saved", "exciting", "golden", "gold", "rising", "won", "rich", "laughing", "thrilled", "smashing", "radiating", " happy", "gay", "bright", "cheery", "wonderful", "great", "brilliant", "swell", "smiling", "hilarious", "merry", "frisky", "cheerful", "upbeat", "musical", "sublime", "euphoric", "new", "good", "fun", "playful", "amused", "pleased", "playing", "greater", "chipper", "joking", "entertaining", "entertained", "nice", "happier", "sincere", "joyous", "happening", "uplifted", "sunny", "witty", "tickling intellectual", "sheer", "interested", "surprised", "reasonable", "focused", "comic", "interesting", "fine", "helpful", "changing", "coherent", "rational", "realistic", "informed", "knowledgeable", "certain", "exact", "concrete", "actual", "tangible", "substantial", "logical", "wondering"],
- ["loyal", "wiser", "healing", "serene", "peaceful", "relieved", "carefree", "weightless", "content", "contented", "completed", "refreshed", "released", "cleansed", "fortunate", "relaxed", "relaxing", "renewed", "light", "chilled", "clean", "clear", "rested", "mellow", "cool", "calm", "smooth", "improving", "refreshing", "understanding", "equal", "faithful", "better", "philosophical", "virtuous", "noble", "vindicated", "centered", "balanced", "improved", "healthier", "changed", "essential", "overcome", "recovering", "recovered", "escaped", "stimulated", "set", "beneficial", "subtle", "solved", "fixed", "loose", "looser", "settled", "disillusioned", "sober", "conscious", "quiet", "alright", "okay", "ok"],
- ["fabulous", "gorgeous", "model", "hot", "desired", "famous", "proud", "big", "shining", "successful", "center", "wet", "mighty", "charming", "surreal", "sexy", "attractive", "sexual", "erotic", "hot", "young", "stunning", "desirable", "fit", "superior", "golden", "gold", "smug", "younger", "female", "horny", "intimate", "romantic", "popular", "feminine", "sweet", "precious", "favourite", "impressed", "special", "significant", "aroused", "tender", "spontaneous", "festive", "glowing", "touched", "moved", "wanted", "accomplished", "privileged", "beautiful", "naughty", "fancy", "pretty", "akin", "sister,intoxicated", "enjoyable", "lovely", "charged", "cute", "closer", "sociable", "social", "pink", "chatty", "pop", "teenage", "teen", "hip", "pleasant", "trendy", "girly", "satisfying", "romance", "lively", "maternal", "favorite", "prettier", "noticed", "firm", "satisfied", "clever", "classy", "artistic", "tall", "drawn", "thin", "invited", "mysterious", "lean", "woozy", "skinnier", "talkative", "visible", "casual", "drinking", "drunk", "drunken", "slick"], ["beloved", "loved", "loving", "appreciated", "respected", "worthy", "generous", "thankful", "inspired", "freer", "glad", "wise", "charitable", "cherished", "fond", "home", "homey", "healed", "safe", "grown", "fresh", "healthy", "bonded", "pampered", "efficient", "lucky", "protected", "useful", "productive", "creative", "meaningful", "talented", "hopeful", "well", "friendly", "connected", "attached", "secure", "familiar", "mum", "positive", "gentle", "sound", "accepted", "considered", "caring", "active", "understood", "bohemian", "open", "opened", "sharing", "sympathetic", "assured", "decent", "humble advanced", "appropriate", "acceptable", "nicer", "correct", "competent", "valid", "educated", "sane", "polite", "neat", "wide", "proper", "easier", "available", "trusted", "natural", "stable", "patient", "conservative", "allowed", "protective"], ["male", "power", "passionate", "wild", "boss", "man", "manly", "empowered", "intelligent", "brave", "powerful", "victorious", "important", "willing", "masculine", "sharp", "eager", "strong", "tough", "devoted", "valuable", "confident", "justified", "motivated", "political", "determined", "prepared", "necessary", "reliable", "capable", "awake", "winning", "ambitious", "righteous", "right", "adventurous", "necessary", "validated", "expressed", "driven", "serious", "pro", "professional", "organized", "moral", "united", "human", "needed", "involved", "challenging", "daring", "dedicated", "committed", "pursuing", "steady", "vital", "effective", "convinced", "engaged", "critical", "impulsive", "direct", "present", "aware", "responsible"], ["warm", "cozy", "comfy", "comfortable", "peachy", "close", "resolved", "mature", "matured", "closest", "encouraged", "acknowledged", "supported", "sure", "perky", "personal", "energetic", "smart", "optimistic", "connecting", "groovy", "encouraging", "reassured", "induced", "ahead", "senior", "higher", "bigger", "potential", "farther", "learned", "liked", "enlightened", "defined", "solid", "missed", "rolling", "invigorated", "seen", "graduate", "comforted", "comforting", "sheltered", "welcomed", "welcome", "contributing", "included", "supportive", "ready", "able", "curious", "thoughtful", "qualified", "modern", "inclined", "experienced", "shared", "warmed", "linked", "worthwhile", "constructive", "relevant", "luckier", "individual", "specific", "figured", "accountable", "adjusted", "equipped", "compatible", "common"]
- ],
- "unhappiness" : [["suicidal", "desperate", "tortured", "rotten", "raped", "suffering", "mourning", "crying", "dreadful", "torn", "abused", "beaten", "crushed", "shot", "ripped", "buried", "burnt", "burned", "stabbed", "cursed", "bleeding", "unbearable", "violated", "worthless", "paralyzed", "shit", "bruised", "drowned", "condemned", "terrible", "horrible,sore", "worst", "miserable", "pathetic", "broken", "ruined", "harassed", "bottom", "bottomed", "smashed", "zero", "wicked", "heartbroken", "shattered", "hopeless", "abandoned,filthy", "rotting", "pitiful", "lowest", "small", "teeny", "tiny", "ant", "wee", "claustrophobic", "embarrassed", "homeless", "broke", "petty", "screwed", "wretched", "belittled,oldest,unaccomplished", "victimized", "drained", "depressed", "unloved", "slap", "punished", "cheap", "defeated", "awful", "old", "aged"]],
- "stress" : [["horrid", "panicked", "panic", "doomed", "choking", "suffocating", "terrified", "shock", "shocked", "paranoid", "trapped", "stressed", "stressful", "shaking", "helpless", "scared", "threatened", "intimidated", "frightened", "bipolar", "psycho", "stifled", "daunted", "overwhelmed", "defeated"]]
+ "virtue": [["best", "blessed", "divine", "star", "super", "solid", "amazing", "invincible", "superficial", "magic", "magical", "immune", "perfect", "absolute", "complete", "whole", "full", "free", "immense", "immortal", "supreme", "fulfilled", "profound", "ultra", "liberated", "real", "true", "honest", "devoted", "ideal", "fair", "religious","moral", "united", "human", "genuine", "virgin", "innocent"],["loyal", "wise", "wiser", "spiritual", "serene", "peaceful", "relieved", "carefree", "weightless", "content", "contented", "completed", "refreshed", "released", "cleansed", "fortunate", "relaxed", "relaxing", "renewed", "equal", "faithful", "better", "responsible", "obliged", "philosophical", "linked", "virtuous", "noble", "vindicated", "centered", "balanced", "improved", "healthier", "supportive", "changed", "essential", "overcome", "dedicated", "committed"],["light", "chilled", "clean", "clear", "rested", "mellow", "cool", "calm", "smooth", "improving", "refreshing", "understanding", "healing", "recovering", "recovered"],["escaped", "stimulated", "set", "polite", "beneficial", "subtle", "swimming", "solved", "fixed", "loose", "looser", "disillusioned", "sober", "appropriate", "decent", "fitting", "conscious", "quiet", "alright", "okay", "ok", "adult", "ordinary", "generic", "stereotypical", "typical", "conservative", "legal", "adequate", "sufficient"]],
+ "happiness" :[["alive", "greatest", "happiest", "fantastic", "awesome", "giant", "huge", "ecstatic", "luckiest", "amazed", "terrific", "enthusiastic", "terrific", "tremendous", "excited", "throbbing", "golden"],["festive", "singing", "dancing", "elated", "exciting", "gold", "rising", "won", "big", "laughing", "smashing", "smashing", "radiating", "happy", "gay", "bright", "cheery", "wonderful", "great", "brilliant", "swell", " smiling", "hilarious", "merry", "frisky", "cheerful", "upbeat", "musical", "sublime", "euphoric", "new", "good", "amused", "pleased", "playing", "greater", "chipper", "joking", "entertaining", "entertained", "nice", "happier", "sincere", "joyous", "happening", "uplifted", "sunny", "witty", "tickling"],["intellectual", "sheer", "interested", "surprised", "reasonable", "focused", "comic", "interesting", "fine],[helpful", "changing", "coherent", "rational", "realistic", "informed", "knowledgeable", "certain", "exact", "concrete", "actual", "tangible", "substantial", "logical", "wondering", "compelling", "accurate", "simple"]],
+ "confidence": [["million", "party", "unique", "fabulous", "gorgeous", "model", "hot", "exciting", "famous", "proud", "big", "shining", "successful", "center", "wet", "mighty", "charming", "surreal", "sexy", "attractive", "sexual", "erotic", "stunning", "desirable", "superior", "golden"],["intense", "male", "power", "passionate", "wild", "boss", "man", "manly", "empowered", "brave", "powerful", "victorious", "important", "willing", "masculine", "sharp", "eager", "strong", "tough", "obsessed", "obsessive", "possessive", "valuable", "confident", "justified", "motivated", "political", "determined", "prepared", "necessary", "reliable", "capable", "awake", "winning", "ambitious", "righteous", "right", "adventurous", "validated", "expressed", "driven", "serious", "pro", "ready", "able"],["biggest", "popular", "horny", "impressed", "invited", "mysterious", "slick","smug", "open", "younger", "female", "intimate", "romantic", "fit", "delicate", "feminine", "sweet", "precious", "favourite", "special", "rare", "significant", "aroused", "tender", "sister", "girly", "satisfying", "romance", "satisfied", "reassured", "induced", "ahead", "senior", "higher", "bigger", "potential", "farther", "touched", "moved", "wanted", "accomplished", "supported", "sure", "perky", "personal", "energetic", "smart", "optimistic"],["closer", "vague", "bohemian", "trivial","different", "spontaneous", "fun", "playful", "glowing", "privileged", "beautiful", "naughty", "fancy", "pretty", "young", "akin", "intoxicated", "enjoyable", "lovely", "giggly", "cute", "sociable", "social", "pink", "chatty", "pop", "teenage", "teen", "hip", "slutty", "trendy", "lively", "favorite", "prettier", "noticed", "defined", "firm", "tall", "drawn", "thin", "lean", "woozy", "skinnier", "talkative", "visible", "casual", "drinking", "drunk", "diet", "drunken", "tipsy", "independent", "master"],["professional", "modern", "needed", "involved", "encouraged", "acknowledged", "challenging", "daring", "pursuing", "steady", "vital", "effective", "convinced", "engaged", "critical", "impulsive", "direct", "present", "aware", "responsible", "obliged", "competitive", "definite", "downright", "obvious", "square", "mortal", "obligated", "obliged", "affected", "bond", "longing", "encouraging", "contributing", "included", "qualified", "experienced", "constructive", "relevant", "luckier", "individual", "specific", "figured", "accountable", "adjusted", "equipped", "compatible", "common", "handled", "sorted", "organized", "mainstream", "alt", "alternative", "alternate", "plain", "plane", "neutral"]],
+ "safety": [["beloved", "loved", "warm", "cozy", "comfy", "comfortable", "peachy", "close", "resolved", "mature", "matured", "closest", "loving"],[ "appreciated", "respected", "worthy", "generous", "thankful", "inspired", "freer", "glad", "charitable", "cherished", "fond", "home", "homey", "healed", "safe", "pleasant", "maternal", "grown", "healthy", "bonded", "pampered","connecting"],["groovy", "learned", "liked", "enlightened", "missed", "rolling", "invigorated", "seen", "graduate", "curious", "thoughtful", "inclined", "shared", "warmed", "worthwhile", "convenient", "efficient", "lucky", "protected", "useful", "productive", "creative", "meaningful", "talented", "hopeful", "joyful", "well","comforted", "comforting", "sheltered", "welcomed", "welcome", "friendly", "connected", "attached", "secure", "familiar", "mum", "positive", "gentle", "sound"],["accepted", "settled", "considered", "caring", "active", "understood", "charged", "bohemian", "open", "opened", "sharing", "sympathetic", "assured", "humble", "advanced", "acceptable", "nicer", "correct", "competent", "valid", "educated", "sane", "neat", "wide", "proper", "easier", "available", "trusted", "natural", "stable", "patient", "conservative", "allowed", "protective","basic", "normal", "regular", "average", "allowed", "middle", "medium", "semi", "same", "usual"]],
+ "unhappiness" : [["black", "dark", "suicidal", "desperate", "tortured", "rotten", "raped", "suffering", "mourning", "crying", "dreadful", "dread", "damned", "torn", "abused", "beaten", "crushed", "shot", "ripped", "buried", "burnt", "burned", "stabbed", "cursed", "bleeding", "vunbearable", "violated", "shit", "bruised", "drowned", "drained", "condemned", "terrible", "horrible", "sore", "worst", "miserable", "pathetic", "broken", "ruined", "dead", "smashed", "zero", "heartbroken", "shattered", "hopeless", "severe", "slave", "tragic", "painful", "injured", "destroyed", "wrecked"],["abandoned", "loneliest", "alienated", "isolated", "separated", "antisocial", "alone", "lone", "misunderstood", "introverted", "unwelcome", "shy", "detached", "disconnected", "rejected", "deserted", "outcast", "blocked", "ignored", "dumped", "unnoticed", "forgotten", "lonesome", "distant", "overlooked", "misplaced", "bottom", "bottomed", "worthless", "thrown", "shitty", "crappy", "shittier", "worn", "shut", "smaller", "hammered", "wasting", "unproductive", "unworthy", "pitiful", "petty", "lowest", "small", "teeny", "tiny", "ant", "wee", "meaningless", "damaged", "homeless", "broke", "sunk", "cracking", "wounded", "screwed", "wretched", "drained", "dejected", "depressed", "unloved", "slap", "punished", "defeated", "awful", "unhappy", "slapped", "blue", "mopey", "oldest", "old", "aged", "sad", "unaccomplished", "unfair", "sorry", "gloomy", "prone", "powerless", "depressing", "hollow", "divided", "sour", "worse"],["laid", "glum", "nostalgic", "melancholy", "melancholic", "aching", "sentimental", "hurt", "unfortunate", "pessimistic", "negative", "unwell", "unlucky", "unable", "melodramatic", "sappy", "moody", "frail", "homesick", "crippled", "failed", "failing", "low", "bad", "stinging", "disappointing", "complicated", "complex", "bland", "lazy", "lethargic", "drowsy", "uncreative", "hesitant", "drifting", "complicated", "complex", "burdened", "intruding", "unfulfilled", "restricted", "confined", "neglectful", "burdened", "missing", "dependant", "dependent", "looser", "heavier", "overweight", "ancient", "off", "redundant", "pointless", "scattered", "futile", "incapable", "useless", "stupid", "brick", "incompetent", "drugged", "speechless", "dry", "discontent", "naive", "clueless", "foreign", "alien", "paid", "owed", "wronged", "ancient", "off", "lower", "thru", "skinny", "thrown", "shitty", "crappy", "shittier", "worn", "shut", "smaller", "hammered", "wasting", "unproductive"],["lifeless","incomplete", "unrequited", "tired", "pale", "sluggish", "stagnant", "slow", "heavy", "boring", "deflated", "inept", "unmotivated", "invalid", "inferior", "latter", "fallen", "bum", "mundane", "dull", "routine", "mediocre", "uninspired", "unfinished", "aimless", "listless", "adrift", "static", "apathetic", "lying", "lacking", "soft", "bored", "sensitive", "introspective", "sleepy", "sheepish", "napping", "flat", "grey", "gray"]],
+ "anger" : [["vicious", "homicidal", "murderous", "killing", "irate", "evil", "wrath", "mad", "cruel", "bursting", "violent", "sinister", "dark", "vicious", "heartless", "yelling", "cursing", "shouting", "furious", "threatening", "hateful", "wicked", "attacking", "attack", "destructive", "hostile", "stabbed", "mean"],["yelled", "spiteful", "upset", "rough", "bastard", "angry", "stabbing", "bloody", "disgruntled", "jealous", "envious", "bitter", "dangerous", "aggressive", "pissed", "ironic", "sarcastic", "irritable", "foul", "idiotic", "obnoxious", "absurd", "arguing", "crabby", "giddy", "disturbed", "dissatisfied", "irritated", "frustrating", "frustrated", "morose", "annoyed", "cynical],[belittled", "degraded", "victimized", "persecuted", "harassed", "unappreciated", "undeserving", "mistreated", "insulted", "unfair", "neglected", "used", "hard", "defensive", "grouchy", "grumpy", "impatient", "uneasy", "bold", "raw"], ["ignorant", "unsatisfied", "jumpy", "bouncy", "bouncing", "rebellious", "stumbling", "cocky", "bitchy", "complaining", "nagging", "whining", "whiny", "childish", "cranky", "stubborn", "reluctant", "insensitive", "teasing", "rebel, thru", "done", "anti", "opposite", "opposed", "icy", "whatever", "indifferent", "unresolved", "distant", "bittersweet", "ambivalent", "mixed"]],
+ "disgust": [["hideous", "racist", "toxic", "hated", "rotting", "filthy", "nasty", "tainted"],["shamed", "ashamed", "shameful", "disgusted", "humiliated", "ugly", "ill", "infected", "contagious", "sicker", "undesirable", "dishonest", "untrue", "betraying", "unattractive", "greedy", "dizzy", "humbled", "embarrassed", "embarrassing", "disgusting", "gross", "queasy", "itchy", "wasted", "sold", "cheap", "coward", "wrong", "vain", "guilty", "regretful", "resentful", "ungrateful", "hypocritical", "lurking", "unpretty", "selfish", "plastic", "fake", "pretentious", "pretend", "spent", "irritating", "disrespectful", "arrogant", "possessive"],["disloyal", "annoying", "slutty", "insulting", "stuffy", "nauseated", "unclean", "trashy", "bloated", "shallow", "offensive", "irresponsible", "fatter", "fatty", "clumsy", "addicted", "twisted", "spoiled", "immature", "unpleasant", "swollen", "swelling", "consumed", "sticky", "stolen", "lousy", "cheesy", "crummy", "dun", "loopy", "goofy", "sloppy", "drifting", "slack"],["cheating", "reckless", "needy", "sickly", "sick", "sickish", "nauseous", "blah", "allergic", "wasteful", "waste", "stale", "moist", "greasy", "strange", "peculiar", "mushy", "awkward", "uncomfortable", "abnormal", "funny", "weird", "odd", "queer", "unusual", "bizarre"]],
+ "stress" : [["horrid", "panicked", "panic", "chaotic", "doomed", "choking", "choked", "terrified", "shock", "shocked", "paranoid", "panicky", "shaking", "helpless", "scared", "threatened", "intimidated", "frightened", "haunted", "manic", "bipolar", "psycho", "psychotic", "stifled", "criminal", "daunted", "overwhelmed", "faint", "defeated", "creepy", "sweaty", "sweating", "fucked", "condemned", "strangled"],["shaky", "crazy", "nuts", "devastated", "claustrophobic", "suffocating", "smothered", "trapped", "cracked", "failing", "indebted", "chained", "locked", "shaken", "rushed", "stretched", "struggling", "forced", "locked", "cornered", "constricted", "compelled", "stiff", "swallowed", "distressed", "oppressed", "constrained", "unhealthy", "troubled", "nervous", "trembling", "unsafe", "bound", "tied", "stuck", "pressed", "pushed", "pressured", "suppressed", "controlled", "cramped", "restrained", "dramatic", "struck", "stressed", "stressful", "war", "anxious", "hectic", "frantic", "edgy", "tense", "intense", "wobbly", "alcoholic", "strained", "irrational", "overloaded", "busy"],["afraid", "stalked", "swamped", "concerned", "mental", "scary", "insecure", "exposed", "naked", "bare", "numb", "suspicious", "iffy", "unprepared", "unstable", "restless", "jittery", "tingly", "tingling", "uptight", "tight", "agitated", "wired", "grouchy", "unnatural", "confined", "packed", "behind", "stuffed", "absorbed", "congested","creeping", "peckish", "frazzled", "lost", "discouraged", "disheartened", "impossible", "bothered", "obsessed", "obsessive", "limited", "suspect", "inappropriate", "tangled", "illegal", "dodgy", "constant", "careful", "tense", "starving", "fatigue", "fatigued", "dehydrated", "paralyzed", "feverish", "frozen", "freezing", "chilly", "weary", "cold", "achy", "exhausted", "thirsty", "hungry", "deaf", "blind", "starved"],["apprehensive", "impending", "imminent", "dazed", "distracted", "disjointed", "incoherent", "crowded", "confusing", "confused", "flustered", "puzzled", "unbalanced", "unsteady", "rambling", "fuzzy", "false", "insufficient", "careless", "compulsive", "hazy", "straw", "irrelevant", "tourist", "unsure", "disoriented", "disorganized", "unsettled", "unorganized", "uncertain"]]
},
+
"Coloring schemes" : {
- "anger" : [
- { "colors" : ["red"],
- "red" : "H0|S100|V100"
+ "virtue" : [
+ { "colors" : ["royalblue"],
+ "royalblue" : "H225|S70|V100"
+ },
+ { "colors" : ["lightblue"],
+ "lightblue" : "H200|S046|V100"
},
- { "colors" : ["gray"],
- "gray" : "H0|S0|V50"
+ { "colors" : ["friendsblue"],
+ "friendsblue" : "H2018|S57|V100"
+ },
+ { "colors" : ["cariblue"],
+ "cariblue" : "H180|S26|V100"
}
],
"happiness" : [
+ { "colors" : ["croque"],
+ "croque" : "H54|S100|V100"
+ },
+ { "colors" : ["orange"],
+ "orange" : "H43|S100|V100"
+ },
+ { "colors" : ["champagne"],
+ "champagne" : "H46|S10|V100"
+ },
{ "colors" : ["lemon"],
- "lemon" : "H40|S50|V100"
+ "lemon" : "H54|S23|V100"
+ }
+ ],
+ "confidence" : [
+ { "colors": ["deeppink"],
+ "deeppink" : "H327|S92|V100"
},
- { "colors" : ["yellow"],
- "yellow" : "H45|S50|V100"
+ { "colors": ["ferrared"],
+ "ferrared" : "H0|S100|V100"
},
- { "colors" : ["cyan"],
- "cyan" : "H190|S50|V100"
+ { "colors": ["hotpink"],
+ "hotpink" : "H330|S58|V100"
},
- { "colors" : ["pink"],
- "pink" : "H330|S50|V100"
+ { "colors": ["darcoral"],
+ "darcoral" : "H9|S72|V100"
},
- { "colors" : ["green"],
- "green" : "H120|S50|V100"
+ { "colors": ["coral"],
+ "coral" : "H16|S68|V100"
+ }
+ ],
+ "safety" : [
+
+ { "colors" : ["clorogreen"],
+ "clorogreen" : "H83|S81|V100"
},
- { "colors" : ["red"],
- "red" : "H0|S75|V100"
+ { "colors" : ["lightyellow"],
+ "lightyellow" : "H57|S61|V100"
},
- { "colors" : ["orange"],
- "orange" : "H20|S50|V100"
+ { "colors" : ["cozyorange"],
+ "cozyorange" : "H50|S100|V100"
+ },
+ { "colors" : ["deepgreen"],
+ "deepgreen" : "H120|S75|V80"
}
],
"unhappiness" : [
- { "colors": ["black"],
- "black" : "H270|S50|V50"
+
+ { "colors" : ["black"],
+ "black" : "H120|S75|V0"
+ },
+ { "colors" : ["deadpurple"],
+ "deadpurple" : "H240|S30|V50"
+ },
+ { "colors" : ["nostalgipink"],
+ "nostalgipink" : "H316|S16|V70"
+ },
+ { "colors" : ["deadgrey"],
+ "deadgrey" : "H247|S7|V78"
+
+ }
+ ],
+ "anger" : [
+
+ { "colors" : ["rage"],
+ "rage" : "H120|S75|V0"
+ },
+ { "colors" : ["darkred"],
+ "darkred" : "H3|S48|V38"
+ },
+ { "colors" : ["badgrey"],
+ "badgrey" : "H0|S6|V41"
+ },
+ { "colors" : ["redgrey"],
+ "redgrey" : "H0|S8|V78"
+
+ }
+ ],
+ "disgust" : [
+
+ { "colors" : ["darkdirt"],
+ "darkdirt" : "H43|S52|V27"
+ },
+ { "colors" : ["petrol"],
+ "petrol" : "H173|S25|V29"
+ },
+ { "colors" : ["plumpdirt"],
+ "plumpdirt" : "H330|S36|V43"
+ },
+ { "colors" : ["haki"],
+ "haki" : "H85|S6|V74"
+
}
],
"stress" : [
- { "colors": ["yellow"],
- "yellow" : "H60|S100|V75"
+
+ { "colors" : ["darkstress"],
+ "darkstress" : "H0|S0|V0"
+ },
+ { "colors" : ["panic"],
+ "panic" : "H61|S81|V65"
+ },
+ { "colors" : ["insecuregray"],
+ "insecuregray" : "H0|S1|V83"
+ },
+ { "colors" : ["dullgrey"],
+ "dullgrey" : "H60|S12|V51"
+
}
]
}
View
9 canvas/form_data/shapes.json
@@ -1,6 +1,11 @@
{
"happiness" : ["M0,72h17.992C17.992,42,42,17.992,72,17.992V0C32,0,0,32,0,72z"],
"unhappiness" : ["M72,72V54.008C42,54.008,17.992,30,17.992,0H0C0,40,32,72,72,72z"],
- "anger" : ["M72,0H54.008C54.008,30,30,54.008,0,54.008V72C40,72,72,40,72,0z"],
- "stress" : ["M0,0v17.992C30,17.992,54.008,42,54.008,72H72C72,32,40,0,0,0z"]
+ "virtue" : ["M72,0H54.008C54.008,30,30,54.008,0,54.008V72C40,72,72,40,72,0z"],
+ "anger" : ["M0,0v17.992C30,17.992,54.008,42,54.008,72H72C72,32,40,0,0,0z"],
+ "disgust" : ["M0,0v17.992C30,17.992,54.008,42,54.008,72H72C72,32,40,0,0,0z"],
+ "confidence" : ["M0,72h17.992C17.992,42,42,17.992,72,17.992V0C32,0,0,32,0,72z"],
+ "stress" : ["M72,72V54.008C42,54.008,17.992,30,17.992,0H0C0,40,32,72,72,72z"],
+ "safety" : ["M72,0H54.008C54.008,30,30,54.008,0,54.008V72C40,72,72,40,72,0z"],
+ "default" : ["M0,72h17.992C17.992,42,42,17.992,72,17.992V0C32,0,0,32,0,72z"]
}
View
57 canvas/form_generator/difffile
@@ -1,57 +0,0 @@
-diff --git a/canvas/form_generator/placement_strategy.py b/canvas/form_generator/placement_strategy.py
-index 4a5eb6d..b716ab2 100644
---- a/canvas/form_generator/placement_strategy.py
-+++ b/canvas/form_generator/placement_strategy.py
-@@ -16,13 +16,22 @@ class GridPlacementStrategy:
- def place(self, shape):
- coords = self.find_place(id)
- depth = self.cell_depth(coords)
-+
-+ rotated = False
-+
-+ #if self.chance() and depth > 1:
-+ if depth > 1:
-+ rotated = True
-
- shape.scale(self.depths[depth-1])
- self.translate_to_cell(coords, shape)
-- #if self.chance():
-- # self.move_to_corner(shape, "lr", depth)
--
-- if self.chance() and depth > 1:
-+ if self.chance():
-+ print "Depth is %d" % depth
-+ before = shape.transformation_matrix[-1]
-+ self.move_to_corner(shape, "ll", depth, rotated)
-+ print shape.transformation_matrix[-1] - before
-+
-+ if rotated:
- # move one cell to the right
- shape.translate(self.cell_width, 0)
- shape.rotate_horizontally()
-@@ -36,15 +45,24 @@ class GridPlacementStrategy:
-
- shape.translate(translate_x, translate_y)
-
-- def move_to_corner(self, shape, corner, depth):
-+ def move_to_corner(self, shape, corner, depth, rotated):
- translate_x = 0
- translate_y = 0
-+
- if corner[0] == "l":
-+ print "Moving to lower corner"
-+ print (1-self.depths[depth-1])
-+ print self.cell_height
- translate_y = (1-self.depths[depth-1])*self.cell_height
-
- if corner[1] == "r":
- translate_x = (1-self.depths[depth-1])*self.cell_width
-
-+ if rotated:
-+ pass
-+ #translate_x = translate_y*(1-0.707)
-+ #translate_y /= 0.707
-+
- shape.translate(translate_x, translate_y)
-
- def find_place(self, id):
View
17 canvas/form_generator/form_generator.py
@@ -39,7 +39,7 @@ def add_feeling(self):
logger.warning("Invalid feeling found in database: %d, %s" % (fd.id, str(fd.feeling.name)) )
self.counter += 1
else:
- self.feelingata = list(FeelingData.objects.order_by("postdatetime")[:200])
+ self.feelingata = list(FeelingData.objects.order_by("postdatetime")[:200]) # the database is asynchronously updated, these are mostly new
self.counter = 0
def broadcast(self, id, channel):
@@ -69,19 +69,21 @@ def get_feeling_coordinates(self, feeling_name):
return None
def generate_shape(self, feeling_data):
- for t in self.cells:
- if t[0] == feeling_data.id:
- return t[1]
+ if feeling_data in self.cells:
+ return self.cells[feeling_data.id]
shape = None
tupleOrNone = self.get_feeling_coordinates(feeling_data.feeling.name)
if tupleOrNone:
(current_group_name,subgroup_index) = tupleOrNone
- shape = Shape(self.shapes[current_group_name][0], feeling_data)
+ try:
+ shape = Shape(self.shapes[current_group_name][0], feeling_data)
+ except KeyError:
+ shape = Shape(self.shapes['default'][0], feeling_data)
colour = FormGenerator.get_colour(self.settings["Coloring schemes"][current_group_name][subgroup_index])
shape.colour = "hsl(%d, %d, %d)" % colour[0]
- self.placement_strategy.place(shape)
+ self.placement_strategy.place(feeling_data.id, shape)
return shape
return None
@@ -90,7 +92,8 @@ def add_shape(self, feeling_data):
shape = self.generate_shape(feeling_data)
if shape:
#self.cells[feeling_data.id] = shape
- self.cells.append((feeling_data.id, shape))
+ #self.cells.append((feeling_data.id, shape))
+ self.cells[feeling_data.id] = shape
return not (shape == None)
View
19 canvas/form_generator/placement_strategy.py
@@ -1,7 +1,7 @@
import random
class GridPlacementStrategy:
- def __init__(self, canvas_height, canvas_width, cell_height, cell_width, depth=3):
+ def __init__(self, canvas_height, canvas_width, cell_height, cell_width, grid, depth=3):
self.canvas_width = canvas_width
self.cell_width = cell_width
self.canvas_height = canvas_height
@@ -11,10 +11,11 @@ def __init__(self, canvas_height, canvas_width, cell_height, cell_width, depth=3
if self.width() == 0 or self.height() == 0:
raise ArgumentException("At least one cell should fit in the canvas's width")
- self.grid = [[[] for d in range(self.width())] for e in range(self.height())]
+ [grid.append([[] for d in range(self.width())]) for e in range(self.height())]
+ self.grid = grid
- def place(self, shape):
- coords = self.find_place(id)
+ def place(self, fd_id, shape):
+ coords = self.find_place(fd_id)
depth = self.cell_depth(coords)
rotated = False
@@ -74,7 +75,7 @@ def move_to_corner(self, shape, corner, depth, rotated):
shape.translate(translate_x, translate_y)
- def find_place(self, id):
+ def find_place(self, fd_id):
width = range(self.width())
random.shuffle(width)
height = range(self.height())
@@ -83,13 +84,17 @@ def find_place(self, id):
for i in width:
for j in height:
if self.cell_depth((j,i)) < self.depth:
- self.grid[j][i].append(id)
+ templist = self.grid[j] # grid is a managed sync object
+ templist[i].append(fd_id)
+ self.grid[j] = templist
return j,i
for i in width:
for j in height:
if self.cell_depth((j,i)) == self.depth:
- self.grid[j][i] = []
+ templist = self.grid[j]
+ templist[i] = [fd_id]
+ self.grid[j] = templist
return j,i
def width(self):
View
15 canvas/views.py
@@ -16,23 +16,26 @@
from canvas.form_generator.placement_strategy import GridPlacementStrategy
from canvas.forms import PlaygroundFilterForm
-def start_generator(cells_manager):
- form_generator = FormGenerator("canvas/form_data/colors.json", "canvas/form_data/shapes.json", GridPlacementStrategy(settings.CANVAS_HEIGHT, settings.CANVAS_WIDTH, 72, 72, depth=1), cells_manager, ongoing=True)
+def start_generator(cells_manager, grid_manager):
+ form_generator = FormGenerator("canvas/form_data/colors.json", "canvas/form_data/shapes.json", GridPlacementStrategy(settings.CANVAS_HEIGHT, settings.CANVAS_WIDTH, 72, 72, grid_manager, depth=1), cells_manager, ongoing=True)
manager = Manager()
-cells = manager.list()
+cells = manager.dict()
+grid = manager.list()
-p = Process(target=start_generator, args=(cells,))
+p = Process(target=start_generator, args=(cells, grid))
p.start()
class CanvasView(ListView):
global cells
+ global grid
context_object_name = "shapes"
template_name="canvas/canvas.html"
def get_queryset(self):
- shapes = [t[1] for t in cells] # unpack id, shape pairs
+ fd_ids = [subitem for sublist in grid for item in sublist for subitem in item]
+ shapes = [cells[fd_id] for fd_id in fd_ids]
return shapes
def get_context_data(self, **kwargs):
@@ -95,7 +98,7 @@ def get_context_data(self, **kwargs):
def broadcast(request, id):
global cells
if len(cells) > 0:
- shape = cells[-1][1]
+ shape = cells[int(id)]
try:
broadcast_channel({ 'shape': shape.path, 'colour': shape.colour, 'transform': shape.transformation_matrix } , "shapes")
except NoSocket:
View
4 settings.py
@@ -149,8 +149,8 @@
}
# project settings
-CANVAS_HEIGHT = 936
-CANVAS_WIDTH = 936
+CANVAS_HEIGHT = 756
+CANVAS_WIDTH = 1008
INTERVAL=1
SOCKETIO_PORT=9001

No commit comments for this range

Something went wrong with that request. Please try again.